ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

include: Use proper dllimports for kernel32 functions. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-11-24 18:41:13 +01:00
parent c6f2ef3d1c
commit 9dc2892785
9 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/kernelbase/Makefile.in
View File

@ -1,3 +1,4 @@
EXTRADEFS = -DWINBASEAPI=
MODULE = kernelbase.dll
IMPORTLIB = kernelbase
IMPORTS = uuid ntdll winecrt0

1
dlls/kernelbase/debug.c
View File

@ -314,6 +314,7 @@ void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD cou
RtlRaiseException( &record );
}
__ASM_STDCALL_IMPORT(RaiseException,16)
/***********************************************************************

1
dlls/kernelbase/locale.c
View File

@ -28,6 +28,7 @@
#include "ntstatus.h"
#define WIN32_NO_STATUS
#define WINNORMALIZEAPI
#include "windef.h"
#include "winbase.h"
#include "winreg.h"

2
dlls/ntdll/Makefile.in
View File

@ -1,4 +1,4 @@
EXTRADEFS = -D_NTSYSTEM_ -D_ACRTIMP=
EXTRADEFS = -D_NTSYSTEM_ -D_ACRTIMP= -DWINBASEAPI=
MODULE = ntdll.dll
IMPORTLIB = ntdll
IMPORTS = winecrt0

3
dlls/ntdll/exception.c
View File

@ -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)
/**********************************************************************

11
dlls/winecrt0/delay_load.c
View File

@ -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 );

6
include/winbase.h
View File

@ -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);

2
include/wine/winbase16.h
View File

@ -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);

4
include/winnls.h
View File

@ -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)