From e82b9c3b2eedf3b912258f15f57a0e52d3d4546c Mon Sep 17 00:00:00 2001 From: svenbarth Date: Sun, 24 May 2020 19:43:36 +0000 Subject: [PATCH] * 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 git-svn-id: trunk@45489 - --- rtl/inc/resh.inc | 2 ++ rtl/inc/sysres.inc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/rtl/inc/resh.inc b/rtl/inc/resh.inc index b31395733a..372b47a4de 100644 --- a/rtl/inc/resh.inc +++ b/rtl/inc/resh.inc @@ -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 diff --git a/rtl/inc/sysres.inc b/rtl/inc/sysres.inc index 4a8eeb28f3..ffde8e147c 100644 --- a/rtl/inc/sysres.inc +++ b/rtl/inc/sysres.inc @@ -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} (*****************************************************************************