wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 3c72034b72014a087eae8d181252c67cb0782e28.

Browse Source 
64-bit syscalls are broken.
This commit is contained in:
Zebediah Figura
2020-06-04 18:26:54 -05:00
parent 7b78338b07
commit 8a2765d125
8 changed files with 172 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/ws2_32-WSACleanup/0002-ws2_32-Invalidate-client-side-file-descriptor-cache-.patch
View File

@@ -1,4 +1,4 @@
From d6f023a80929f22d520584d47abb08e5b523e0c0 Mon Sep 17 00:00:00 2001
From 613ea1e263d4fbda67465ebaae2331df7728106a Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 6 Sep 2015 12:41:17 +0200
Subject: [PATCH] ws2_32: Invalidate client-side file descriptor cache in
@@ -29,7 +29,7 @@ index 42532bd9f1c..ba46f170670 100644
@ cdecl wine_server_handle_to_fd(long long ptr ptr)
@ cdecl wine_server_release_fd(long long)
diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c
index bde4a2add18..de3b4b9d2e7 100644
index 6fb86a68d6f..2f95e190963 100644
--- a/dlls/ntdll/server.c
+++ b/dlls/ntdll/server.c
@@ -239,6 +239,14 @@ void CDECL wine_server_release_fd( HANDLE handle, int unix_fd )
@@ -48,10 +48,10 @@ index bde4a2add18..de3b4b9d2e7 100644
/***********************************************************************
* server_init_process
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index 1297c451a10..06c0174dd5e 100644
index 767cae92b48..05c6f1e43bf 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -1044,6 +1044,7 @@ static struct unix_funcs unix_funcs =
@@ -1074,6 +1074,7 @@ static struct unix_funcs unix_funcs =
server_wait,
server_queue_process_apc,
server_send_fd,
@@ -60,10 +60,10 @@ index 1297c451a10..06c0174dd5e 100644
server_fd_to_handle,
server_handle_to_fd,
diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
index 17b23e58d28..f7d172cf324 100644
index 66c438fd62d..c6eb52c5986 100644
--- a/dlls/ntdll/unix/server.c
+++ b/dlls/ntdll/unix/server.c
@@ -983,6 +983,26 @@ static int remove_fd_from_cache( HANDLE handle )
@@ -991,6 +991,26 @@ static int remove_fd_from_cache( HANDLE handle )
return fd;
}
@@ -91,10 +91,10 @@ index 17b23e58d28..f7d172cf324 100644
/***********************************************************************
* server_get_unix_fd
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index 14c4ee4cd97..5657bc9c27d 100644
index 6fdaa17f087..6512160972d 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -90,6 +90,7 @@ extern unsigned int CDECL server_wait( const select_op_t *select_op, data_size_t
@@ -85,6 +85,7 @@ extern unsigned int CDECL server_wait( const select_op_t *select_op, data_size_t
const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN;
extern unsigned int CDECL server_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN;
extern void CDECL server_send_fd( int fd ) DECLSPEC_HIDDEN;
@@ -103,19 +103,19 @@ index 14c4ee4cd97..5657bc9c27d 100644
int *needs_close, enum server_fd_type *type,
unsigned int *options ) DECLSPEC_HIDDEN;
diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h
index 67c63fd9268..51e27be22b7 100644
index 4e5cec6637e..72f35cf67e8 100644
--- a/dlls/ntdll/unixlib.h
+++ b/dlls/ntdll/unixlib.h
@@ -28,7 +28,7 @@ struct ldt_copy;
struct msghdr;
/* increment this when you change the function table */
-#define NTDLL_UNIXLIB_VERSION 19
+#define NTDLL_UNIXLIB_VERSION 20
-#define NTDLL_UNIXLIB_VERSION 27
+#define NTDLL_UNIXLIB_VERSION 28
struct unix_funcs
{
@@ -128,6 +128,7 @@ struct unix_funcs
@@ -184,6 +184,7 @@ struct unix_funcs
const LARGE_INTEGER *timeout );
unsigned int (CDECL *server_queue_process_apc)( HANDLE process, const apc_call_t *call, apc_result_t *result );
void (CDECL *server_send_fd)( int fd );