Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
9dc28927
Commit
9dc28927
authored
Nov 24, 2020
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
include: Use proper dllimports for kernel32 functions.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
c6f2ef3d
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
20 additions
and
11 deletions
+20
-11
Makefile.in
dlls/kernelbase/Makefile.in
+1
-0
debug.c
dlls/kernelbase/debug.c
+1
-0
locale.c
dlls/kernelbase/locale.c
+1
-0
Makefile.in
dlls/ntdll/Makefile.in
+1
-1
exception.c
dlls/ntdll/exception.c
+2
-1
delay_load.c
dlls/winecrt0/delay_load.c
+6
-5
winbase.h
include/winbase.h
+3
-3
winbase16.h
include/wine/winbase16.h
+2
-0
winnls.h
include/winnls.h
+3
-1
No files found.
dlls/kernelbase/Makefile.in
View file @
9dc28927
EXTRADEFS
=
-DWINBASEAPI
=
MODULE
=
kernelbase.dll
IMPORTLIB
=
kernelbase
IMPORTS
=
uuid ntdll winecrt0
...
...
dlls/kernelbase/debug.c
View file @
9dc28927
...
...
@@ -314,6 +314,7 @@ void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD cou
RtlRaiseException
(
&
record
);
}
__ASM_STDCALL_IMPORT
(
RaiseException
,
16
)
/***********************************************************************
...
...
dlls/kernelbase/locale.c
View file @
9dc28927
...
...
@@ -28,6 +28,7 @@
#include "ntstatus.h"
#define WIN32_NO_STATUS
#define WINNORMALIZEAPI
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
...
...
dlls/ntdll/Makefile.in
View file @
9dc28927
EXTRADEFS
=
-D_NTSYSTEM_
-D_ACRTIMP
=
EXTRADEFS
=
-D_NTSYSTEM_
-D_ACRTIMP
=
-DWINBASEAPI
=
MODULE
=
ntdll.dll
IMPORTLIB
=
ntdll
IMPORTS
=
winecrt0
...
...
dlls/ntdll/exception.c
View file @
9dc28927
...
...
@@ -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
)
/**********************************************************************
...
...
dlls/winecrt0/delay_load.c
View file @
9dc28927
...
...
@@ -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
);
...
...
include/winbase.h
View file @
9dc28927
...
...
@@ -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
);
...
...
include/wine/winbase16.h
View file @
9dc28927
...
...
@@ -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
);
...
...
include/winnls.h
View file @
9dc28927
...
...
@@ -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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment