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 48020f4846cca1a02f4e1dc037e2cc2068df5e9c.

Browse Source
This commit is contained in:
Zebediah Figura
2020-06-02 18:20:16 -05:00
parent 676f261e5e
commit a4d98c48f9
27 changed files with 312 additions and 335 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 9d0ef7cd2af3c8ca34f24247a7927c24c7086741 Mon Sep 17 00:00:00 2001
From 88f8d0382e55cbe97ae5d7937a63bd801f277f25 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
@@ -48,10 +48,10 @@ index c7788b99e2d..54291d0a909 100644
/***********************************************************************
* server_init_process
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index aa020845bb9..0ef08edc474 100644
index 0f342e8277e..4c7a5c488dc 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -1014,6 +1014,7 @@ static struct unix_funcs unix_funcs =
@@ -1045,6 +1045,7 @@ static struct unix_funcs unix_funcs =
server_wait,
server_queue_process_apc,
server_send_fd,
@@ -60,7 +60,7 @@ index aa020845bb9..0ef08edc474 100644
server_fd_to_handle,
server_handle_to_fd,
diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
index 8889c5d4b12..929ff354d65 100644
index 17b23e58d28..f7d172cf324 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 )
@@ -91,10 +91,10 @@ index 8889c5d4b12..929ff354d65 100644
/***********************************************************************
* server_get_unix_fd
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index 0694426dddb..5c13dce0b0a 100644
index 8562efb7dd4..ee2bd47ad70 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -68,6 +68,7 @@ extern unsigned int CDECL server_wait( const select_op_t *select_op, data_size_t
@@ -90,6 +90,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 0694426dddb..5c13dce0b0a 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 323141d3840..0189c247b7a 100644
index fb755373f07..7df35f0eee1 100644
--- a/dlls/ntdll/unixlib.h
+++ b/dlls/ntdll/unixlib.h
@@ -27,7 +27,7 @@
struct ldt_copy;
@@ -28,7 +28,7 @@ struct ldt_copy;
struct msghdr;
/* increment this when you change the function table */
-#define NTDLL_UNIXLIB_VERSION 13
+#define NTDLL_UNIXLIB_VERSION 14
-#define NTDLL_UNIXLIB_VERSION 16
+#define NTDLL_UNIXLIB_VERSION 17
struct unix_funcs
{
@@ -80,6 +80,7 @@ struct unix_funcs
@@ -127,6 +127,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 );