paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2026-01-04 18:26:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Avoid useless exceptions by checking existence of resource

Browse Source
This commit is contained in:
Michaël Van Canneyt 2023-03-07 11:42:58 +01:00
parent d383f6102d
commit f9a96e5e63
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rtl/objpas/classes/classes.inc
View File

@ -1404,21 +1404,27 @@ end;
{ all targets should at least include the sysres.inc dummy in the system unit to compile this }
function CreateComponentfromRes(const res : string;Inst : THandle;var Component : TComponent) : Boolean;
var
ResStream : TResourceStream;
ResID : TFPResourceHandle;
begin
result:=true;
if Inst=0 then
Inst:=HInstance;
ResId:=FindResource(Inst, Res, RT_RCDATA);
result:=ResID<>0;
try
ResStream:=TResourceStream.Create(Inst,res,RT_RCDATA);
try
Component:=ResStream.ReadComponent(Component);
finally
ResStream.Free;
end;
if Result then
begin
ResStream:=TResourceStream.CreateFromID(Inst,ResID,RT_RCDATA);
try
Component:=ResStream.ReadComponent(Component);
finally
ResStream.Free;
end;
end;
except
on EResNotFound do
result:=false;