From: Rémi Bernon rbernon@codeweavers.com
--- dlls/ntdll/unix/server.c | 4 ++-- dlls/ntdll/unix/sync.c | 2 +- dlls/ntdll/unix/virtual.c | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index e8da94ebc64..349d99fefe3 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1151,7 +1151,7 @@ int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, SERVER_START_REQ( get_handle_fd ) { req->handle = wine_server_obj_handle( handle ); - if (!(ret = wine_server_call( req ))) + if (!(ret = server_call_unlocked( req ))) { if (type) *type = reply->type; if (options) *options = reply->options; @@ -1914,7 +1914,7 @@ NTSTATUS WINAPI NtClose( HANDLE handle ) SERVER_START_REQ( close_handle ) { req->handle = wine_server_obj_handle( handle ); - ret = wine_server_call( req ); + ret = server_call_unlocked( req ); } SERVER_END_REQ;
diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index acdb7b3d9f8..56bfe6df70f 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -332,7 +332,7 @@ static NTSTATUS get_inproc_sync( HANDLE handle, ACCESS_MASK desired_access, stru SERVER_START_REQ( get_inproc_sync_fd ) { req->handle = wine_server_obj_handle( handle ); - if (!(ret = wine_server_call( req ))) + if (!(ret = server_call_unlocked( req ))) { obj_handle_t fd_handle; sync->fd = wine_server_receive_fd( &fd_handle ); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index bf09559d755..dcb6d7fde6f 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3442,7 +3442,7 @@ static NTSTATUS virtual_map_image( HANDLE mapping, void **addr_ptr, SIZE_T *size req->size = size; req->entry = image_info->entry_point; req->machine = image_info->machine; - status = wine_server_call( req ); + status = server_call_unlocked( req ); } SERVER_END_REQ; } @@ -3580,7 +3580,7 @@ static unsigned int virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG_P req->base = wine_server_client_ptr( view->base ); req->size = size; req->start = offset.QuadPart; - res = wine_server_call( req ); + res = server_call_unlocked( req ); } SERVER_END_REQ; } @@ -3886,7 +3886,7 @@ NTSTATUS virtual_create_builtin_view( void *module, const UNICODE_STRING *nt_nam { wine_server_add_data( req, info, sizeof(*info) ); wine_server_add_data( req, nt_name->Buffer, nt_name->Length ); - status = wine_server_call( req ); + status = server_call_unlocked( req ); } SERVER_END_REQ;
@@ -4952,7 +4952,7 @@ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG typ req->base = wine_server_client_ptr( view->base ); req->offset = (char *)base - (char *)view->base; req->size = size; - wine_server_call( req ); + server_call_unlocked( req ); } SERVER_END_REQ; } @@ -6273,7 +6273,7 @@ static NTSTATUS unmap_view_of_section( HANDLE process, PVOID addr, ULONG flags ) SERVER_START_REQ( unmap_view ) { req->base = wine_server_client_ptr( view->base ); - status = wine_server_call( req ); + status = server_call_unlocked( req ); } SERVER_END_REQ; if (!status) @@ -6644,7 +6644,7 @@ NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID addr1, PVOID addr2) { req->base1 = wine_server_client_ptr( view1->base ); req->base2 = wine_server_client_ptr( view2->base ); - status = wine_server_call( req ); + status = server_call_unlocked( req ); } SERVER_END_REQ; }