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

Fix non-Windows resources since me and merging without TortoiseSVN don't go along that well :/

Browse Source 
rtl/inc/system.inc:
  + ResHeader variable that provides the public _FPC_ResLocation symbol used by intres.inc; this variable will always be available and without indirect entry information it will simply hook up to FPC_RESLOCATION itself
  * SetupEntryInformation: setup FPCResLocation
rtl/inc/intres.inc:
  * no need to cater for indirect entry or not anymore

git-svn-id: trunk@33964 -
This commit is contained in:
svenbarth 2016-06-12 10:57:15 +00:00
parent fa4690eef8
commit f8ff8eca4d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rtl/inc/intres.inc
View File

@ -34,12 +34,7 @@ type
var var
{$ifdef FPC_HAS_WINLIKERESOURCES} {$ifdef FPC_HAS_WINLIKERESOURCES}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
ResHeader : PPResHdr; external name '_FPC_ResLocation'; ResHeader : PPResHdr; external name '_FPC_ResLocation';
{$else}
ResHeaderVar : PResHdr; external name 'FPC_RESLOCATION';
ResHeader : PPResHdr = @ResHeaderVar;
{$endif}
{$else} {$else}
ResHeaderVar : PResHdr = nil; ResHeaderVar : PResHdr = nil;
ResHeader : PPResHdr= @ResHeaderVar; ResHeader : PPResHdr= @ResHeaderVar;

8
rtl/inc/system.inc
View File

@ -111,6 +111,7 @@ var
FPCResStrInitTables : Pointer;public name '_FPC_ResStrInitTables'; FPCResStrInitTables : Pointer;public name '_FPC_ResStrInitTables';
{$endif FPC_HAS_RESSTRINITS} {$endif FPC_HAS_RESSTRINITS}
FPCResourceStringTables : Pointer;public name '_FPC_ResourceStringTables'; FPCResourceStringTables : Pointer;public name '_FPC_ResourceStringTables';
FPCResLocation : Pointer;public name'_FPC_ResLocation';
{$else FPC_HAS_INDIRECT_ENTRY_INFORMATION} {$else FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{$ifdef FPC_HAS_RESSTRINITS} {$ifdef FPC_HAS_RESSTRINITS}
FPCResStrInitTablesVar : record end; external name 'FPC_RESSTRINITTABLES'; FPCResStrInitTablesVar : record end; external name 'FPC_RESSTRINITTABLES';
@ -118,6 +119,12 @@ var
{$endif FPC_HAS_RESSTRINITS} {$endif FPC_HAS_RESSTRINITS}
FPCResourceStringTablesVar : record end; External Name 'FPC_RESOURCESTRINGTABLES'; FPCResourceStringTablesVar : record end; External Name 'FPC_RESOURCESTRINGTABLES';
FPCResourceStringTables : Pointer = @FPCResourceStringTablesVar;public name '_FPC_ResourceStringTables'; FPCResourceStringTables : Pointer = @FPCResourceStringTablesVar;public name '_FPC_ResourceStringTables';
{$ifdef FPC_HAS_WINLIKERESOURCES}
FPCResLocationVar: record end; external name 'FPC_RESLOCATION';
{$else FPC_HAS_WINLIKERESOURCES}
FPCResLocationVar : Pointer = Nil;
{$endif FPC_HAS_WINLIKERESOURCES}
FPCResLocation : Pointer = @FPCResLocationVar;public name '_FPC_ResLocation';
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION} {$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION} {$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
@ -126,6 +133,7 @@ begin
EntryInformation := info; EntryInformation := info;
FPCResStrInitTables := info.ResStrInitTables; FPCResStrInitTables := info.ResStrInitTables;
FPCResourceStringTables := info.ResourceStringTables; FPCResourceStringTables := info.ResourceStringTables;
FPCResLocation := info.ResLocation;
{$ifdef FPC_SYSTEM_HAS_OSSETUPENTRYINFORMATION} {$ifdef FPC_SYSTEM_HAS_OSSETUPENTRYINFORMATION}
OSSetupEntryInformation(info); OSSetupEntryInformation(info);
{$endif FPC_SYSTEM_HAS_OSSETUPENTRYINFORMATION} {$endif FPC_SYSTEM_HAS_OSSETUPENTRYINFORMATION}