paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-30 04:52:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

rtl: don't crash if resource is not found in TResourceStream and was passed by ID instead of Name (in this case exception tried to get a string from ID)

Browse Source 
git-svn-id: trunk@17173 -
This commit is contained in:
paul 2011-03-24 03:44:26 +00:00
parent 9ae0414dda
commit 812a665cbe
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/objpas/classes/classesh.inc
View File

@ -926,7 +926,7 @@ type
private private
Res: TFPResourceHandle; Res: TFPResourceHandle;
Handle: THandle; Handle: THandle;
procedure Initialize(Instance: THandle; Name, ResType: PWideChar); procedure Initialize(Instance: THandle; Name, ResType: PWideChar; NameIsID: Boolean);
public public
constructor Create(Instance: THandle; const ResName: WideString; ResType: PWideChar); constructor Create(Instance: THandle; const ResName: WideString; ResType: PWideChar);
constructor CreateFromID(Instance: THandle; ResID: Integer; ResType: PWideChar); constructor CreateFromID(Instance: THandle; ResID: Integer; ResType: PWideChar);
@ -937,7 +937,7 @@ type
private private
Res: TFPResourceHandle; Res: TFPResourceHandle;
Handle: THandle; Handle: THandle;
procedure Initialize(Instance: THandle; Name, ResType: PChar); procedure Initialize(Instance: THandle; Name, ResType: PChar; NameIsID: Boolean);
public public
constructor Create(Instance: THandle; const ResName: string; ResType: PChar); constructor Create(Instance: THandle; const ResName: string; ResType: PChar);
constructor CreateFromID(Instance: THandle; ResID: Integer; ResType: PChar); constructor CreateFromID(Instance: THandle; ResID: Integer; ResType: PChar);

32
rtl/objpas/classes/streams.inc
View File

@ -772,49 +772,61 @@ end;
{****************************************************************************} {****************************************************************************}
{$ifdef UNICODE} {$ifdef UNICODE}
procedure TResourceStream.Initialize(Instance: THandle; Name, ResType: PWideChar); procedure TResourceStream.Initialize(Instance: THandle; Name, ResType: PWideChar; NameIsID: Boolean);
begin begin
Res:=FindResource(Instance, Name, ResType); Res:=FindResource(Instance, Name, ResType);
if Res=0 then if Res=0 then
raise EResNotFound.CreateFmt(SResNotFound,[Name]); if NameIsID then
raise EResNotFound.CreateFmt(SResNotFound,[IntToStr(PtrInt(Name))])
else
raise EResNotFound.CreateFmt(SResNotFound,[Name]);
Handle:=LoadResource(Instance,Res); Handle:=LoadResource(Instance,Res);
if Handle=0 then if Handle=0 then
raise EResNotFound.CreateFmt(SResNotFound,[Name]); if NameIsID then
raise EResNotFound.CreateFmt(SResNotFound,[IntToStr(PtrInt(Name))])
else
raise EResNotFound.CreateFmt(SResNotFound,[Name]);
SetPointer(LockResource(Handle),SizeOfResource(Instance,Res)); SetPointer(LockResource(Handle),SizeOfResource(Instance,Res));
end; end;
constructor TResourceStream.Create(Instance: THandle; const ResName: WideString; ResType: PWideChar); constructor TResourceStream.Create(Instance: THandle; const ResName: WideString; ResType: PWideChar);
begin begin
inherited create; inherited create;
Initialize(Instance,PWideChar(ResName),ResType); Initialize(Instance,PWideChar(ResName),ResType,False);
end; end;
constructor TResourceStream.CreateFromID(Instance: THandle; ResID: Integer; ResType: PWideChar); constructor TResourceStream.CreateFromID(Instance: THandle; ResID: Integer; ResType: PWideChar);
begin begin
inherited create; inherited create;
Initialize(Instance,PWideChar(ResID),ResType); Initialize(Instance,PWideChar(ResID),ResType,True);
end; end;
{$else UNICODE} {$else UNICODE}
procedure TResourceStream.Initialize(Instance: THandle; Name, ResType: PChar); procedure TResourceStream.Initialize(Instance: THandle; Name, ResType: PChar; NameIsID: Boolean);
begin begin
Res:=FindResource(Instance, Name, ResType); Res:=FindResource(Instance, Name, ResType);
if Res=0 then if Res=0 then
raise EResNotFound.CreateFmt(SResNotFound,[Name]); if NameIsID then
raise EResNotFound.CreateFmt(SResNotFound,[IntToStr(PtrInt(Name))])
else
raise EResNotFound.CreateFmt(SResNotFound,[Name]);
Handle:=LoadResource(Instance,Res); Handle:=LoadResource(Instance,Res);
if Handle=0 then if Handle=0 then
raise EResNotFound.CreateFmt(SResNotFound,[Name]); if NameIsID then
raise EResNotFound.CreateFmt(SResNotFound,[IntToStr(PtrInt(Name))])
else
raise EResNotFound.CreateFmt(SResNotFound,[Name]);
SetPointer(LockResource(Handle),SizeOfResource(Instance,Res)); SetPointer(LockResource(Handle),SizeOfResource(Instance,Res));
end; end;
constructor TResourceStream.Create(Instance: THandle; const ResName: string; ResType: PChar); constructor TResourceStream.Create(Instance: THandle; const ResName: string; ResType: PChar);
begin begin
inherited create; inherited create;
Initialize(Instance,pchar(ResName),ResType); Initialize(Instance,pchar(ResName),ResType,False);
end; end;
constructor TResourceStream.CreateFromID(Instance: THandle; ResID: Integer; ResType: PChar); constructor TResourceStream.CreateFromID(Instance: THandle; ResID: Integer; ResType: PChar);
begin begin
inherited create; inherited create;
Initialize(Instance,pchar(PtrInt(ResID)),ResType); Initialize(Instance,pchar(PtrInt(ResID)),ResType,True);
end; end;
{$endif UNICODE} {$endif UNICODE}