mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-16 05:26:43 +00:00
include: Use proper dllimports for kernel32 functions.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
c6f2ef3d1c
commit
9dc2892785
|
@ -1,3 +1,4 @@
|
||||||
|
EXTRADEFS = -DWINBASEAPI=
|
||||||
MODULE = kernelbase.dll
|
MODULE = kernelbase.dll
|
||||||
IMPORTLIB = kernelbase
|
IMPORTLIB = kernelbase
|
||||||
IMPORTS = uuid ntdll winecrt0
|
IMPORTS = uuid ntdll winecrt0
|
||||||
|
|
|
@ -314,6 +314,7 @@ void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD cou
|
||||||
|
|
||||||
RtlRaiseException( &record );
|
RtlRaiseException( &record );
|
||||||
}
|
}
|
||||||
|
__ASM_STDCALL_IMPORT(RaiseException,16)
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
|
|
||||||
#include "ntstatus.h"
|
#include "ntstatus.h"
|
||||||
#define WIN32_NO_STATUS
|
#define WIN32_NO_STATUS
|
||||||
|
#define WINNORMALIZEAPI
|
||||||
#include "windef.h"
|
#include "windef.h"
|
||||||
#include "winbase.h"
|
#include "winbase.h"
|
||||||
#include "winreg.h"
|
#include "winreg.h"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
EXTRADEFS = -D_NTSYSTEM_ -D_ACRTIMP=
|
EXTRADEFS = -D_NTSYSTEM_ -D_ACRTIMP= -DWINBASEAPI=
|
||||||
MODULE = ntdll.dll
|
MODULE = ntdll.dll
|
||||||
IMPORTLIB = ntdll
|
IMPORTLIB = ntdll
|
||||||
IMPORTS = winecrt0
|
IMPORTS = winecrt0
|
||||||
|
|
|
@ -634,7 +634,7 @@ BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max )
|
||||||
__ENDTRY
|
__ENDTRY
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
__ASM_STDCALL_IMPORT(IsBadStringPtrA,8)
|
||||||
|
|
||||||
/*************************************************************
|
/*************************************************************
|
||||||
* IsBadStringPtrW
|
* IsBadStringPtrW
|
||||||
|
@ -656,6 +656,7 @@ BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max )
|
||||||
__ENDTRY
|
__ENDTRY
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
__ASM_STDCALL_IMPORT(IsBadStringPtrW,8)
|
||||||
|
|
||||||
|
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
|
|
|
@ -23,16 +23,17 @@
|
||||||
#include "winbase.h"
|
#include "winbase.h"
|
||||||
#include "delayloadhandler.h"
|
#include "delayloadhandler.h"
|
||||||
|
|
||||||
void *WINAPI ResolveDelayLoadedAPI( void* base, const IMAGE_DELAYLOAD_DESCRIPTOR* desc,
|
WINBASEAPI void *WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function );
|
||||||
PDELAYLOAD_FAILURE_DLL_CALLBACK dllhook,
|
|
||||||
PDELAYLOAD_FAILURE_SYSTEM_ROUTINE syshook,
|
|
||||||
IMAGE_THUNK_DATA* addr, ULONG flags );
|
|
||||||
void *WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function );
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
||||||
extern IMAGE_DOS_HEADER __ImageBase;
|
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 )
|
FARPROC WINAPI __delayLoadHelper2( const IMAGE_DELAYLOAD_DESCRIPTOR *descr, IMAGE_THUNK_DATA *addr )
|
||||||
{
|
{
|
||||||
return ResolveDelayLoadedAPI( &__ImageBase, descr, NULL, DelayLoadFailureHook, addr, 0 );
|
return ResolveDelayLoadedAPI( &__ImageBase, descr, NULL, DelayLoadFailureHook, addr, 0 );
|
||||||
|
|
|
@ -25,10 +25,12 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef WINBASEAPI
|
||||||
#ifdef _KERNEL32_
|
#ifdef _KERNEL32_
|
||||||
#define WINBASEAPI
|
#define WINBASEAPI
|
||||||
#else
|
#else
|
||||||
#define WINBASEAPI DECLSPEC_HIDDEN
|
#define WINBASEAPI DECLSPEC_IMPORT
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _ADVAPI32_
|
#ifdef _ADVAPI32_
|
||||||
|
@ -2473,8 +2475,6 @@ WINBASEAPI void WINAPI MakeCriticalSectionGlobal(CRITICAL_SECTION *lpCrit
|
||||||
#define MakeProcInstance(proc,inst) (proc)
|
#define MakeProcInstance(proc,inst) (proc)
|
||||||
WINADVAPI BOOL WINAPI MakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD);
|
WINADVAPI BOOL WINAPI MakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD);
|
||||||
WINADVAPI VOID WINAPI MapGenericMask(PDWORD,PGENERIC_MAPPING);
|
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 BOOL WINAPI MapUserPhysicalPages(PVOID,ULONG_PTR,PULONG_PTR);
|
||||||
WINBASEAPI LPVOID WINAPI MapViewOfFile(HANDLE,DWORD,DWORD,DWORD,SIZE_T);
|
WINBASEAPI LPVOID WINAPI MapViewOfFile(HANDLE,DWORD,DWORD,DWORD,SIZE_T);
|
||||||
WINBASEAPI LPVOID WINAPI MapViewOfFileEx(HANDLE,DWORD,DWORD,DWORD,SIZE_T,LPVOID);
|
WINBASEAPI LPVOID WINAPI MapViewOfFileEx(HANDLE,DWORD,DWORD,DWORD,SIZE_T,LPVOID);
|
||||||
|
|
|
@ -515,6 +515,8 @@ BOOL16 WINAPI LocalUnlock16(HLOCAL16);
|
||||||
LPVOID WINAPI LockResource16(HGLOBAL16);
|
LPVOID WINAPI LockResource16(HGLOBAL16);
|
||||||
HGLOBAL16 WINAPI LockSegment16(HGLOBAL16);
|
HGLOBAL16 WINAPI LockSegment16(HGLOBAL16);
|
||||||
FARPROC16 WINAPI MakeProcInstance16(FARPROC16,HANDLE16);
|
FARPROC16 WINAPI MakeProcInstance16(FARPROC16,HANDLE16);
|
||||||
|
HMODULE WINAPI MapHModuleSL(WORD);
|
||||||
|
WORD WINAPI MapHModuleLS(HMODULE);
|
||||||
HFILE16 WINAPI OpenFile16(LPCSTR,OFSTRUCT*,UINT16);
|
HFILE16 WINAPI OpenFile16(LPCSTR,OFSTRUCT*,UINT16);
|
||||||
DWORD WINAPI RegCloseKey16(HKEY);
|
DWORD WINAPI RegCloseKey16(HKEY);
|
||||||
DWORD WINAPI RegCreateKey16(HKEY,LPCSTR,PHKEY);
|
DWORD WINAPI RegCreateKey16(HKEY,LPCSTR,PHKEY);
|
||||||
|
|
|
@ -24,11 +24,13 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef WINNORMALIZEAPI
|
||||||
#ifndef _NORMALIZE_
|
#ifndef _NORMALIZE_
|
||||||
# define WINNORMALIZEAPI DECLSPEC_HIDDEN
|
# define WINNORMALIZEAPI DECLSPEC_IMPORT
|
||||||
#else
|
#else
|
||||||
# define WINNORMALIZEAPI
|
# define WINNORMALIZEAPI
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Country codes */
|
/* Country codes */
|
||||||
#define CTRY_DEFAULT (0)
|
#define CTRY_DEFAULT (0)
|
||||||
|
|
Loading…
Reference in a new issue