From 1f769067a3f45e2f51ab597b46bd041120d1f413 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 3 Nov 2023 15:15:18 +0100 Subject: [PATCH] include: Use NTSYSAPI for all ntdll exports. --- include/ddk/wdm.h | 2 +- include/ip2string.h | 35 ++++++++++++++++------------------- include/wine/debug.h | 2 +- include/wine/server.h | 6 +++--- include/wine/unixlib.h | 26 +++++++++++++------------- include/winnt.h | 4 ++-- include/winternl.h | 2 +- 7 files changed, 37 insertions(+), 40 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index be275bef582..7dcec028a50 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1849,7 +1849,7 @@ BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS); #ifdef __x86_64__ -void WINAPI RtlCopyMemoryNonTemporal(void*,const void*,SIZE_T); +NTSYSAPI void WINAPI RtlCopyMemoryNonTemporal(void*,const void*,SIZE_T); #else #define RtlCopyMemoryNonTemporal RtlCopyMemory #endif diff --git a/include/ip2string.h b/include/ip2string.h index 84835d45933..95a841595a5 100644 --- a/include/ip2string.h +++ b/include/ip2string.h @@ -23,32 +23,29 @@ extern "C" { #endif -char * WINAPI RtlIpv4AddressToStringA(const IN_ADDR *address, char *str); -WCHAR * WINAPI RtlIpv4AddressToStringW(const IN_ADDR *address, WCHAR *str); +NTSYSAPI char * WINAPI RtlIpv4AddressToStringA(const IN_ADDR *address, char *str); +NTSYSAPI WCHAR * WINAPI RtlIpv4AddressToStringW(const IN_ADDR *address, WCHAR *str); #define RtlIpv4AddressToString WINELIB_NAME_AW(RtlIpv4AddressToString) -NTSTATUS WINAPI RtlIpv4AddressToStringExA(const IN_ADDR *address, USHORT port, char *str, ULONG *size); -NTSTATUS WINAPI RtlIpv4AddressToStringExW(const IN_ADDR *address, USHORT port, WCHAR *str, ULONG *size); +NTSYSAPI NTSTATUS WINAPI RtlIpv4AddressToStringExA(const IN_ADDR *address, USHORT port, char *str, ULONG *size); +NTSYSAPI NTSTATUS WINAPI RtlIpv4AddressToStringExW(const IN_ADDR *address, USHORT port, WCHAR *str, ULONG *size); #define RtlIpv4AddressToStringEx WINELIB_NAME_AW(RtlIpv4AddressToStringEx) - -char * WINAPI RtlIpv6AddressToStringA(const IN6_ADDR *address, char *str); -WCHAR * WINAPI RtlIpv6AddressToStringW(const IN6_ADDR *address, WCHAR *str); +NTSYSAPI char * WINAPI RtlIpv6AddressToStringA(const IN6_ADDR *address, char *str); +NTSYSAPI WCHAR * WINAPI RtlIpv6AddressToStringW(const IN6_ADDR *address, WCHAR *str); #define RtlIpv6AddressToString WINELIB_NAME_AW(RtlIpv6AddressToString) -NTSTATUS WINAPI RtlIpv6AddressToStringExA(const IN6_ADDR *address, LONG scope, USHORT port, char *str, ULONG *size); -NTSTATUS WINAPI RtlIpv6AddressToStringExW(const IN6_ADDR *address, LONG scope, USHORT port, WCHAR *str, ULONG *size); +NTSYSAPI NTSTATUS WINAPI RtlIpv6AddressToStringExA(const IN6_ADDR *address, LONG scope, USHORT port, char *str, ULONG *size); +NTSYSAPI NTSTATUS WINAPI RtlIpv6AddressToStringExW(const IN6_ADDR *address, LONG scope, USHORT port, WCHAR *str, ULONG *size); #define RtlIpv6AddressToStringEx WINELIB_NAME_AW(RtlIpv6AddressToStringEx) - -NTSTATUS WINAPI RtlIpv4StringToAddressA(const char *str, BOOLEAN strict, const char **terminator, IN_ADDR *address); -NTSTATUS WINAPI RtlIpv4StringToAddressW(const WCHAR *str, BOOLEAN strict, const WCHAR **terminator, IN_ADDR *address); +NTSYSAPI NTSTATUS WINAPI RtlIpv4StringToAddressA(const char *str, BOOLEAN strict, const char **terminator, IN_ADDR *address); +NTSYSAPI NTSTATUS WINAPI RtlIpv4StringToAddressW(const WCHAR *str, BOOLEAN strict, const WCHAR **terminator, IN_ADDR *address); #define RtlIpv4StringToAddress WINELIB_NAME_AW(RtlIpv4StringToAddress) -NTSTATUS WINAPI RtlIpv4StringToAddressExA(const char *str, BOOLEAN strict, IN_ADDR *address, USHORT *port); -NTSTATUS WINAPI RtlIpv4StringToAddressExW(const WCHAR *str, BOOLEAN strict, IN_ADDR *address, USHORT *port); +NTSYSAPI NTSTATUS WINAPI RtlIpv4StringToAddressExA(const char *str, BOOLEAN strict, IN_ADDR *address, USHORT *port); +NTSYSAPI NTSTATUS WINAPI RtlIpv4StringToAddressExW(const WCHAR *str, BOOLEAN strict, IN_ADDR *address, USHORT *port); #define RtlIpv4StringToAddressEx WINELIB_NAME_AW(RtlIpv4StringToAddressEx) - -NTSTATUS WINAPI RtlIpv6StringToAddressA(const char *str, const char **terminator, IN6_ADDR *address); -NTSTATUS WINAPI RtlIpv6StringToAddressW(const WCHAR *str, const WCHAR **terminator, IN6_ADDR *address); +NTSYSAPI NTSTATUS WINAPI RtlIpv6StringToAddressA(const char *str, const char **terminator, IN6_ADDR *address); +NTSYSAPI NTSTATUS WINAPI RtlIpv6StringToAddressW(const WCHAR *str, const WCHAR **terminator, IN6_ADDR *address); #define RtlIpv6StringToAddress WINELIB_NAME_AW(RtlIpv6StringToAddress) -NTSTATUS WINAPI RtlIpv6StringToAddressExA(const char *str, IN6_ADDR *address, ULONG *scope, USHORT *port); -NTSTATUS WINAPI RtlIpv6StringToAddressExW(const WCHAR *str, IN6_ADDR *address, ULONG *scope, USHORT *port); +NTSYSAPI NTSTATUS WINAPI RtlIpv6StringToAddressExA(const char *str, IN6_ADDR *address, ULONG *scope, USHORT *port); +NTSYSAPI NTSTATUS WINAPI RtlIpv6StringToAddressExW(const WCHAR *str, IN6_ADDR *address, ULONG *scope, USHORT *port); #define RtlIpv6StringToAddressEx WINELIB_NAME_AW(RtlIpv6StringToAddressEx) #ifdef __cplusplus diff --git a/include/wine/debug.h b/include/wine/debug.h index 70fab5a247b..281666fbff1 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -108,7 +108,7 @@ struct __wine_debug_channel #define WINE_FIXME_(ch) WINE_FIXME #endif -extern int WINAPI __wine_dbg_write( const char *str, unsigned int len ); +NTSYSAPI int WINAPI __wine_dbg_write( const char *str, unsigned int len ); extern unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ); extern const char * __cdecl __wine_dbg_strdup( const char *str ); extern int __cdecl __wine_dbg_output( const char *str ); diff --git a/include/wine/server.h b/include/wine/server.h index 228682dc914..87b43c7e63f 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -49,9 +49,9 @@ struct __server_request_info struct __server_iovec data[__SERVER_MAX_DATA]; /* request variable size data */ }; -extern unsigned int CDECL wine_server_call( void *req_ptr ); -extern NTSTATUS CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ); -extern NTSTATUS CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options ); +NTSYSAPI unsigned int CDECL wine_server_call( void *req_ptr ); +NTSYSAPI NTSTATUS CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ); +NTSYSAPI NTSTATUS CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options ); /* do a server call and set the last error code */ static inline unsigned int wine_server_call_err( void *req_ptr ) diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 935baa0d5ba..26c6d68071d 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -33,13 +33,13 @@ extern const unixlib_entry_t __wine_unix_call_funcs[]; extern const unixlib_entry_t __wine_unix_call_wow64_funcs[]; /* some useful helpers from ntdll */ -extern const char *ntdll_get_build_dir(void); -extern const char *ntdll_get_data_dir(void); -extern DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ); -extern int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ); -extern int ntdll_wcsicmp( const WCHAR *str1, const WCHAR *str2 ); -extern int ntdll_wcsnicmp( const WCHAR *str1, const WCHAR *str2, int n ); -extern NTSTATUS ntdll_init_syscalls( SYSTEM_SERVICE_TABLE *table, void **dispatcher ); +NTSYSAPI const char *ntdll_get_build_dir(void); +NTSYSAPI const char *ntdll_get_data_dir(void); +NTSYSAPI DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ); +NTSYSAPI int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ); +NTSYSAPI int ntdll_wcsicmp( const WCHAR *str1, const WCHAR *str2 ); +NTSYSAPI int ntdll_wcsnicmp( const WCHAR *str1, const WCHAR *str2, int n ); +NTSYSAPI NTSTATUS ntdll_init_syscalls( SYSTEM_SERVICE_TABLE *table, void **dispatcher ); /* exception handling */ @@ -55,10 +55,10 @@ typedef struct { __int64 reg[24]; } __wine_jmp_buf; typedef struct { int reg; } __wine_jmp_buf; #endif -extern int __attribute__ ((__nothrow__,__returns_twice__)) __wine_setjmpex( __wine_jmp_buf *buf, - EXCEPTION_REGISTRATION_RECORD *frame ); -extern void DECLSPEC_NORETURN __wine_longjmp( __wine_jmp_buf *buf, int retval ); -extern void ntdll_set_exception_jmp_buf( __wine_jmp_buf *jmp ); +NTSYSAPI int __attribute__ ((__nothrow__,__returns_twice__)) __wine_setjmpex( __wine_jmp_buf *buf, + EXCEPTION_REGISTRATION_RECORD *frame ); +NTSYSAPI void DECLSPEC_NORETURN __wine_longjmp( __wine_jmp_buf *buf, int retval ); +NTSYSAPI void ntdll_set_exception_jmp_buf( __wine_jmp_buf *jmp ); #define __TRY \ do { __wine_jmp_buf __jmp; \ @@ -84,7 +84,7 @@ extern void ntdll_set_exception_jmp_buf( __wine_jmp_buf *jmp ); } \ } while (0); -NTSTATUS KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ); +NTSYSAPI NTSTATUS KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ); /* wide char string functions */ @@ -270,7 +270,7 @@ static inline ULONG ntdll_wcstoul( const WCHAR *s, WCHAR **end, int base ) #else /* WINE_UNIX_LIB */ -extern NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); +NTSYSAPI NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); extern unixlib_handle_t __wine_unixlib_handle DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI __wine_init_unix_call(void) DECLSPEC_HIDDEN; diff --git a/include/winnt.h b/include/winnt.h index 6ff508215dd..7bbf224e3c9 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2386,9 +2386,9 @@ struct _TEB; #ifdef WINE_UNIX_LIB # ifdef __GNUC__ -struct _TEB * WINAPI NtCurrentTeb(void) __attribute__((pure)); +NTSYSAPI struct _TEB * WINAPI NtCurrentTeb(void) __attribute__((pure)); # else -struct _TEB * WINAPI NtCurrentTeb(void); +NTSYSAPI struct _TEB * WINAPI NtCurrentTeb(void); # endif #elif defined(__i386__) && defined(__GNUC__) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) diff --git a/include/winternl.h b/include/winternl.h index aad7fe58105..ff8756211a1 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -5179,7 +5179,7 @@ static inline PLIST_ENTRY RemoveTailList(PLIST_ENTRY le) /* Wine internal functions */ -extern NTSTATUS WINAPI __wine_unix_spawnvp( char * const argv[], int wait ); +NTSYSAPI NTSTATUS WINAPI __wine_unix_spawnvp( char * const argv[], int wait ); /* The thread information for 16-bit threads */ /* NtCurrentTeb()->SubSystemTib points to this */