paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-20 18:53:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

* fixed stream resource unicode issue

Browse Source 
git-svn-id: trunk@1160 -
This commit is contained in:
oro06 2005-09-23 10:02:01 +00:00
parent 2476957db9
commit 84cd7d6706
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -755,30 +755,52 @@ end;
{* TResourceStream *} {* TResourceStream *}
{****************************************************************************} {****************************************************************************}
procedure TResourceStream.Initialize(Instance: THandle; Name, ResType: PChar); {$ifdef UNICODE}
procedure TResourceStream.Initialize(Instance: THandle; Name, ResType: PWideChar);
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]); 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]); 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);
begin
inherited create;
Initialize(Instance,PWideChar(ResName),ResType);
end;
constructor TResourceStream.CreateFromID(Instance: THandle; ResID: Integer; ResType: PWideChar);
begin
inherited create;
Initialize(Instance,PWideChar(ResID),ResType);
end;
{$else UNICODE}
procedure TResourceStream.Initialize(Instance: THandle; Name, ResType: PChar);
begin
Res:=FindResource(Instance, Name, ResType);
if Res=0 then
raise EResNotFound.CreateFmt(SResNotFound,[Name]);
Handle:=LoadResource(Instance,Res);
if Handle=0 then
raise EResNotFound.CreateFmt(SResNotFound,[Name]);
SetPointer(LockResource(Handle),SizeOfResource(Instance,Res));
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);
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);
end; end;
{$endif UNICODE}
destructor TResourceStream.Destroy; destructor TResourceStream.Destroy;