Module: wine Branch: master Commit: 9dc2892785649b22272f68de42bbd55e72a64bf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dc2892785649b22272f68de4...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Nov 24 18:41:13 2020 +0100
include: Use proper dllimports for kernel32 functions.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/debug.c | 1 + dlls/kernelbase/locale.c | 1 + dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/exception.c | 3 ++- dlls/winecrt0/delay_load.c | 11 ++++++----- include/winbase.h | 6 +++--- include/wine/winbase16.h | 2 ++ include/winnls.h | 4 +++- 9 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index 14953246f24..971022139c5 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINBASEAPI= MODULE = kernelbase.dll IMPORTLIB = kernelbase IMPORTS = uuid ntdll winecrt0 diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 0382ea9f95a..52d0f705267 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -314,6 +314,7 @@ void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD cou
RtlRaiseException( &record ); } +__ASM_STDCALL_IMPORT(RaiseException,16)
/*********************************************************************** diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 9cfb9f129ee..7218a159844 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -28,6 +28,7 @@
#include "ntstatus.h" #define WIN32_NO_STATUS +#define WINNORMALIZEAPI #include "windef.h" #include "winbase.h" #include "winreg.h" diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 02eb5f1d871..b2f63d9f63a 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_NTSYSTEM_ -D_ACRTIMP= +EXTRADEFS = -D_NTSYSTEM_ -D_ACRTIMP= -DWINBASEAPI= MODULE = ntdll.dll IMPORTLIB = ntdll IMPORTS = winecrt0 diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index a6b4b6a7baa..6b51be39be0 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -634,7 +634,7 @@ BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) __ENDTRY return FALSE; } - +__ASM_STDCALL_IMPORT(IsBadStringPtrA,8)
/************************************************************* * IsBadStringPtrW @@ -656,6 +656,7 @@ BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) __ENDTRY return FALSE; } +__ASM_STDCALL_IMPORT(IsBadStringPtrW,8)
/********************************************************************** diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index 8c8a9cc836a..1778856aa56 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -23,16 +23,17 @@ #include "winbase.h" #include "delayloadhandler.h"
-void *WINAPI ResolveDelayLoadedAPI( void* base, const IMAGE_DELAYLOAD_DESCRIPTOR* desc, - PDELAYLOAD_FAILURE_DLL_CALLBACK dllhook, - PDELAYLOAD_FAILURE_SYSTEM_ROUTINE syshook, - IMAGE_THUNK_DATA* addr, ULONG flags ); -void *WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function ); +WINBASEAPI void *WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function );
#ifdef _WIN32
extern IMAGE_DOS_HEADER __ImageBase;
+WINBASEAPI void *WINAPI ResolveDelayLoadedAPI( void* base, const IMAGE_DELAYLOAD_DESCRIPTOR* desc, + PDELAYLOAD_FAILURE_DLL_CALLBACK dllhook, + PDELAYLOAD_FAILURE_SYSTEM_ROUTINE syshook, + IMAGE_THUNK_DATA* addr, ULONG flags ); + FARPROC WINAPI __delayLoadHelper2( const IMAGE_DELAYLOAD_DESCRIPTOR *descr, IMAGE_THUNK_DATA *addr ) { return ResolveDelayLoadedAPI( &__ImageBase, descr, NULL, DelayLoadFailureHook, addr, 0 ); diff --git a/include/winbase.h b/include/winbase.h index 82797efc2b0..dc8aa081be4 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -25,10 +25,12 @@ extern "C" { #endif
+#ifndef WINBASEAPI #ifdef _KERNEL32_ #define WINBASEAPI #else -#define WINBASEAPI DECLSPEC_HIDDEN +#define WINBASEAPI DECLSPEC_IMPORT +#endif #endif
#ifdef _ADVAPI32_ @@ -2473,8 +2475,6 @@ WINBASEAPI void WINAPI MakeCriticalSectionGlobal(CRITICAL_SECTION *lpCrit #define MakeProcInstance(proc,inst) (proc) WINADVAPI BOOL WINAPI MakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD); WINADVAPI VOID WINAPI MapGenericMask(PDWORD,PGENERIC_MAPPING); -WINBASEAPI HMODULE WINAPI MapHModuleSL(WORD); -WINBASEAPI WORD WINAPI MapHModuleLS(HMODULE); WINBASEAPI BOOL WINAPI MapUserPhysicalPages(PVOID,ULONG_PTR,PULONG_PTR); WINBASEAPI LPVOID WINAPI MapViewOfFile(HANDLE,DWORD,DWORD,DWORD,SIZE_T); WINBASEAPI LPVOID WINAPI MapViewOfFileEx(HANDLE,DWORD,DWORD,DWORD,SIZE_T,LPVOID); diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index d4a5096ee11..5938ef19966 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -515,6 +515,8 @@ BOOL16 WINAPI LocalUnlock16(HLOCAL16); LPVOID WINAPI LockResource16(HGLOBAL16); HGLOBAL16 WINAPI LockSegment16(HGLOBAL16); FARPROC16 WINAPI MakeProcInstance16(FARPROC16,HANDLE16); +HMODULE WINAPI MapHModuleSL(WORD); +WORD WINAPI MapHModuleLS(HMODULE); HFILE16 WINAPI OpenFile16(LPCSTR,OFSTRUCT*,UINT16); DWORD WINAPI RegCloseKey16(HKEY); DWORD WINAPI RegCreateKey16(HKEY,LPCSTR,PHKEY); diff --git a/include/winnls.h b/include/winnls.h index 2964ae56853..e90b6f5a22f 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -24,11 +24,13 @@ extern "C" { #endif
+#ifndef WINNORMALIZEAPI #ifndef _NORMALIZE_ -# define WINNORMALIZEAPI DECLSPEC_HIDDEN +# define WINNORMALIZEAPI DECLSPEC_IMPORT #else # define WINNORMALIZEAPI #endif +#endif
/* Country codes */ #define CTRY_DEFAULT (0)