paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-06-06 07:18:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Delay-load CoWaitForMultipleHandles to not force the dependency on ole32.dll.

Browse Source
This commit is contained in:
Rika Ichinose 2023-07-20 01:17:45 +03:00 committed by Michael Van Canneyt
parent 53315ded97
commit 943b88e3da
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rtl/win/systhrd.inc
View File

@ -545,7 +545,26 @@ end;
type type
PWOHandleArray = ^THandle; PWOHandleArray = ^THandle;
function CoWaitForMultipleHandles(dwFlags, dwTimeout: DWORD; cHandles: uint32; pHandles: PWOHandleArray; out lpdwindex: DWORD): HRESULT; stdcall; external 'ole32.dll' name 'CoWaitForMultipleHandles'; function FirstCoWaitForMultipleHandles(dwFlags, dwTimeout: DWORD; cHandles: uint32; pHandles: PWOHandleArray; out lpdwindex: DWORD): HRESULT; stdcall; forward;
var
Ole32Dll: THandle = 0; { Unloaded at win32 & win64 system_exit. }
CoWaitForMultipleHandles: function(dwFlags, dwTimeout: DWORD; cHandles: uint32; pHandles: PWOHandleArray; out lpdwindex: DWORD): HRESULT; stdcall;
= @FirstCoWaitForMultipleHandles;
function FirstCoWaitForMultipleHandles(dwFlags, dwTimeout: DWORD; cHandles: uint32; pHandles: PWOHandleArray; out lpdwindex: DWORD): HRESULT; stdcall;
var
LocalOle32Dll: THandle;
begin
if Ole32Dll = 0 then
begin
LocalOle32Dll := WinLoadLibraryW('ole32.dll');
if InterlockedCompareExchange(Pointer(Ole32Dll), Pointer(LocalOle32Dll), nil) <> nil then
WinFreeLibrary(LocalOle32Dll);
end;
CodePointer(CoWaitForMultipleHandles) := WinGetProcAddress(Ole32Dll, 'CoWaitForMultipleHandles');
Result := CoWaitForMultipleHandles(dwFlags, dwTimeout, cHandles, pHandles, lpdwindex);
end;
function intbasiceventWaitFor(Timeout : Cardinal;state:peventstate;UseCOMWait: Boolean = False) : longint; function intbasiceventWaitFor(Timeout : Cardinal;state:peventstate;UseCOMWait: Boolean = False) : longint;
const COWAIT_DEFAULT = 0; const COWAIT_DEFAULT = 0;

5
rtl/win32/system.pp
View File

@ -117,6 +117,11 @@ begin
{ what about Input and Output ?? PM } { what about Input and Output ?? PM }
{ now handled, FPK } { now handled, FPK }
end; end;
if Ole32Dll <> 0 then
begin
WinFreeLibrary(Ole32Dll); { Careful, FreeLibrary should not be called from DllMain. }
Ole32Dll := 0;
end;
{$ifndef FPC_USE_WIN32_SEH} {$ifndef FPC_USE_WIN32_SEH}
if not IsLibrary then if not IsLibrary then
remove_exception_handlers; remove_exception_handlers;

5
rtl/win64/system.pp
View File

@ -117,6 +117,11 @@ begin
{ what about Input and Output ?? PM } { what about Input and Output ?? PM }
{ now handled, FPK } { now handled, FPK }
end; end;
if Ole32Dll <> 0 then
begin
WinFreeLibrary(Ole32Dll); { Careful, FreeLibrary should not be called from DllMain. }
Ole32Dll := 0;
end;
{ call exitprocess, with cleanup as required } { call exitprocess, with cleanup as required }
ExitProcess(exitcode); ExitProcess(exitcode);