Alexandre Julliard : ntdll: Make __wine_unix_call() WINAPI to follow syscall conventions.
Alexandre Julliard
julliard at winehq.org
Wed Aug 11 16:42:16 CDT 2021
Module: wine
Branch: master
Commit: d7add3821898b6f002c3df969f1198b30fcfc8c4
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7add3821898b6f002c3df969f1198b30fcfc8c4
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Aug 11 20:07:15 2021 +0200
ntdll: Make __wine_unix_call() WINAPI to follow syscall conventions.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/ntdll.spec | 2 +-
dlls/ntdll/unix/loader.c | 2 +-
include/winternl.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 5ac5a16ed44..36d997d1762 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1625,7 +1625,7 @@
@ cdecl -syscall wine_server_handle_to_fd(long long ptr ptr)
# Unix interface
-@ cdecl -syscall __wine_unix_call(int64 long ptr)
+@ stdcall -syscall __wine_unix_call(int64 long ptr)
@ cdecl __wine_set_unix_funcs(long ptr)
@ cdecl __wine_init_unix_lib(long long ptr ptr)
@ stdcall __wine_ctrl_routine(ptr)
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index f1a2b9f5a79..7d9635db535 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -1141,7 +1141,7 @@ static NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr
/***********************************************************************
* __wine_unix_call
*/
-NTSTATUS CDECL __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args )
+NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args )
{
return ((unixlib_entry_t*)(UINT_PTR)handle)[code]( args );
}
diff --git a/include/winternl.h b/include/winternl.h
index 562a35a83a1..523e65007ed 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -4617,7 +4617,7 @@ typedef UINT64 unixlib_handle_t;
/* Wine internal functions */
extern NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out );
-extern NTSTATUS CDECL __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args );
+extern NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args );
/* The thread information for 16-bit threads */
/* NtCurrentTeb()->SubSystemTib points to this */
More information about the wine-cvs
mailing list