Browse Source

* import library function with a name that does not conflict with the functions exported in the interface

git-svn-id: trunk@45986 -
svenbarth 5 years ago
parent
commit
ef099b2075
2 changed files with 8 additions and 8 deletions
  1. 5 5
      rtl/win16/sysdl.inc
  2. 3 3
      rtl/win16/winprocsh.inc

+ 5 - 5
rtl/win16/sysdl.inc

@@ -20,7 +20,7 @@ var
 
 function SysLoadLibraryU(const Name : UnicodeString) : TlibHandle;
 begin
-  Result:=LoadLibrary(LPCSTR(AnsiString(Name)));
+  Result:=WinLoadLibrary(LPCSTR(AnsiString(Name)));
   if Result<=HINSTANCE_ERROR then
   begin
     LastLoadLibraryError:=Result;
@@ -30,7 +30,7 @@ end;
 
 function SysLoadLibraryA(const Name: RawByteString) : TLibHandle;
 begin
-  Result:=LoadLibrary(LPCSTR(Name));
+  Result:=WinLoadLibrary(LPCSTR(Name));
   if Result<=HINSTANCE_ERROR then
   begin
     LastLoadLibraryError:=Result;
@@ -40,20 +40,20 @@ end;
 
 function SysGetProcedureAddress(Lib : TLibHandle; const ProcName : AnsiString) : FarPointer;
 begin
-  Result:=GetProcAddress(Lib,LPCSTR(ProcName));
+  Result:=WinGetProcAddress(Lib,LPCSTR(ProcName));
 end;
 
 {$push}
 {$warn 4056 off}
 function SysGetProcedureAddressOrdinal(Lib : TLibHandle; Ordinal : TOrdinalEntry) : FarPointer;
 begin
-  Result:=GetProcAddress(Lib,LPCSTR(Ordinal));
+  Result:=WinGetProcAddress(Lib,LPCSTR(Ordinal));
 end;
 {$pop}
 
 function SysUnloadLibrary(Lib : TLibHandle) : Boolean;
 begin
-  FreeLibrary(Lib);
+  WinFreeLibrary(Lib);
   Result:=true;
 end;
 

+ 3 - 3
rtl/win16/winprocsh.inc

@@ -61,8 +61,8 @@ procedure SwitchStackTo(StackSegment, StackPointer, StackTop: UINT); external 'K
 function LoadModule(ModuleName: LPCSTR; ParameterName: LPVOID): HINST; external 'KERNEL';
 function FreeModule(Module: HINST): BOOL; external 'KERNEL';
 
-function LoadLibrary(LibFileName: LPCSTR): HINST; external 'KERNEL';
-procedure FreeLibrary(LibModule: HINST); external 'KERNEL';
+function WinLoadLibrary(LibFileName: LPCSTR): HINST; external 'KERNEL' name 'LoadLibrary';
+procedure WinFreeLibrary(LibModule: HINST); external 'KERNEL' name 'FreeLibrary';
 
 function WinExec(CmdLine: LPCSTR; CmdShow: UINT): UINT; external 'KERNEL';
 
@@ -71,7 +71,7 @@ function GetModuleHandle(ModuleName: LPCSTR): HMODULE; external 'KERNEL';
 function GetModuleUsage(Module: HINST): SmallInt; external 'KERNEL';
 function GetModuleFileName(Module: HINST; FileName: LPSTR; Size: SmallInt): SmallInt; external 'KERNEL';
 
-function GetProcAddress(Module: HINST; ProcName: LPCSTR): FARPROC; external 'KERNEL';
+function WinGetProcAddress(Module: HINST; ProcName: LPCSTR): FARPROC; external 'KERNEL' name 'GetProcAddress';
 
 function GetInstanceData(Instance: HINST; Data: PBYTE; Count: SmallInt): SmallInt; external 'KERNEL';