paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-08 20:28:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

* disable the new FindResource(Ex) overloads for Win16 for now (the one with PChar is disabled as well); this will need to be revisited once Win16 receives proper resource support

Browse Source 
git-svn-id: trunk@45489 -
This commit is contained in:
svenbarth 2020-05-24 19:43:36 +00:00
parent 84a1f614d9
commit e82b9c3b2e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/inc/resh.inc
View File

@ -78,10 +78,12 @@ Function FreeResource(ResData: TFPResourceHGLOBAL): LongBool;
{$ifdef FPC_HAS_FEATURE_ANSISTRINGS}
Function FindResource(ModuleHandle: TFPResourceHMODULE; const ResourceName, ResourceType: AnsiString): TFPResourceHandle;
Function FindResourceEx(ModuleHandle: TFPResourceHMODULE; const ResourceType, ResourceName: AnsiString; Language : word): TFPResourceHandle;
{$ifndef Win16}
Function FindResource(ModuleHandle: TFPResourceHMODULE; const ResourceName: AnsiString; ResourceType: PChar): TFPResourceHandle;
Function FindResourceEx(ModuleHandle: TFPResourceHMODULE; ResourceType: PChar; const ResourceName: AnsiString; Language : word): TFPResourceHandle;
Function FindResource(ModuleHandle: TFPResourceHMODULE; ResourceName: PChar; const ResourceType: AnsiString): TFPResourceHandle;
Function FindResourceEx(ModuleHandle: TFPResourceHMODULE; const ResourceType: AnsiString; ResourceName: PChar; Language : word): TFPResourceHandle;
{$endif Win16}
{$endif}
type

2
rtl/inc/sysres.inc
View File

@ -44,6 +44,7 @@ begin
Result:=FindResourceEx(ModuleHandle,PChar(ResourceType),PChar(ResourceName),Language);
end;
{$ifndef Win16}
Function FindResource(ModuleHandle: TFPResourceHMODULE; const ResourceName: AnsiString; ResourceType: PChar): TFPResourceHandle;
begin
@ -67,6 +68,7 @@ Function FindResourceEx(ModuleHandle: TFPResourceHMODULE; const ResourceType: An
begin
Result:=FindResourceEx(ModuleHandle,PChar(ResourceType),ResourceName,Language);
end;
{$endif Win16}
{$endif}
(*****************************************************************************