From: Torge Matthies tmatthies@codeweavers.com
--- dlls/ntdll/ntdll.spec | 6 +++--- dlls/ntdll/unix/server.c | 6 +++--- include/wine/server.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 23661b311e0..1e6576a5422 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1685,9 +1685,9 @@ # or 'wine_' (for user-visible functions) to avoid namespace conflicts.
# Server interface -@ stdcall -syscall -norelay wine_server_call(ptr) -@ stdcall -syscall wine_server_fd_to_handle(long long long ptr) -@ stdcall -syscall wine_server_handle_to_fd(long long ptr ptr) +@ cdecl -syscall -norelay wine_server_call(ptr) +@ cdecl -syscall wine_server_fd_to_handle(long long long ptr) +@ cdecl -syscall wine_server_handle_to_fd(long long ptr ptr)
# Unix interface @ stdcall __wine_unix_call(int64 long ptr) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 0d8e43b9c49..e659aa9a528 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -274,7 +274,7 @@ unsigned int server_call_unlocked( void *req_ptr ) * * Perform a server call. */ -unsigned int SYSCALL wine_server_call( void *req_ptr ) +unsigned int CDECL wine_server_call( void *req_ptr ) { sigset_t old_set; unsigned int ret; @@ -1072,7 +1072,7 @@ done: /*********************************************************************** * wine_server_fd_to_handle */ -NTSTATUS SYSCALL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ) +NTSTATUS CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ) { unsigned int ret;
@@ -1096,7 +1096,7 @@ NTSTATUS SYSCALL wine_server_fd_to_handle( int fd, unsigned int access, unsigned * * Retrieve the file descriptor corresponding to a file handle. */ -NTSTATUS SYSCALL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, +NTSTATUS CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options ) { int needs_close; diff --git a/include/wine/server.h b/include/wine/server.h index aa644a1f829..228682dc914 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 SYSCALL wine_server_call( void *req_ptr ); -extern NTSTATUS SYSCALL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ); -extern NTSTATUS SYSCALL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options ); +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 );
/* do a server call and set the last error code */ static inline unsigned int wine_server_call_err( void *req_ptr )