marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Move delay-load functions to kernelbase. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Alexandre Julliard 2019-09-26 10:33:54 +02:00
parent 950773dc06
commit 0f5538b9e3
4 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/kernel32/kernel32.spec
View File

@ -356,7 +356,7 @@
@ stdcall DecodeSystemPointer(ptr) ntdll.RtlDecodeSystemPointer
@ stdcall DefineDosDeviceA(long str str)
@ stdcall DefineDosDeviceW(long wstr wstr)
@ stdcall DelayLoadFailureHook(str str)
@ stdcall -import DelayLoadFailureHook(str str)
@ stdcall DeleteAtom(long)
# @ stub DeleteBoundaryDescriptor
@ stdcall DeleteCriticalSection(ptr) ntdll.RtlDeleteCriticalSection

17
dlls/kernel32/module.c
View File

@ -1018,23 +1018,6 @@ FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function )
return get_proc_address_wrapper( hModule, function );
}
/***********************************************************************
* DelayLoadFailureHook (KERNEL32.@)
*/
FARPROC WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function )
{
ULONG_PTR args[2];
if ((ULONG_PTR)function >> 16)
ERR( "failed to delay load %s.%s\n", name, function );
else
ERR( "failed to delay load %s.%u\n", name, LOWORD(function) );
args[0] = (ULONG_PTR)name;
args[1] = (ULONG_PTR)function;
RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args );
return NULL;
}
typedef struct _PEB32
{
BOOLEAN InheritedAddressSpace;

4
dlls/kernelbase/kernelbase.spec
View File

@ -244,7 +244,7 @@
# @ stub DecodeRemotePointer
@ stdcall DecodeSystemPointer(ptr) ntdll.RtlDecodeSystemPointer
@ stdcall DefineDosDeviceW(long wstr wstr) kernel32.DefineDosDeviceW
@ stdcall DelayLoadFailureHook(str str) kernel32.DelayLoadFailureHook
@ stdcall DelayLoadFailureHook(str str)
# @ stub DelayLoadFailureHookLookup
@ stdcall DeleteAce(ptr long)
# @ stub DeleteBoundaryDescriptor
@ -1344,7 +1344,7 @@
@ stdcall ResetEvent(long)
# @ stub ResetState
@ stdcall ResetWriteWatch(ptr long)
@ stdcall ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) kernel32.ResolveDelayLoadedAPI
@ stdcall -import ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) LdrResolveDelayLoadedAPI
# @ stub ResolveDelayLoadsFromDll
@ stdcall ResolveLocaleName(wstr ptr long)
@ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error

18
dlls/kernelbase/loader.c
View File

@ -42,6 +42,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(module);
***********************************************************************/
/***********************************************************************
* DelayLoadFailureHook (kernelbase.@)
*/
FARPROC WINAPI DECLSPEC_HOTPATCH DelayLoadFailureHook( LPCSTR name, LPCSTR function )
{
ULONG_PTR args[2];
if ((ULONG_PTR)function >> 16)
ERR( "failed to delay load %s.%s\n", name, function );
else
ERR( "failed to delay load %s.%u\n", name, LOWORD(function) );
args[0] = (ULONG_PTR)name;
args[1] = (ULONG_PTR)function;
RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args );
return NULL;
}
/****************************************************************************
* DisableThreadLibraryCalls (kernelbase.@)
*/