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 17529582402ebe27ef975fc7dcb8353f4f95e629.

Browse Source
This commit is contained in:
Zebediah Figura
2020-06-08 15:59:31 -05:00
parent 044cb93066
commit 9a4c8c5631
10 changed files with 156 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 1bb20ff5903d8d5e81e8a2b7b22bf67b189b16ec Mon Sep 17 00:00:00 2001
From 20661308a50202350a3a2887cbd558b1e931aad1 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
@@ -17,7 +17,7 @@ Subject: [PATCH] ws2_32: Invalidate client-side file descriptor cache in
9 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index c4d78128758..3d6c8850086 100644
index ce5c580bd54..279845ae830 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1576,6 +1576,7 @@
@@ -48,10 +48,10 @@ index 6fb86a68d6f..2f95e190963 100644
/***********************************************************************
* server_init_process
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index b5ee692024c..d8827b147df 100644
index 618e3d6adb3..bdda739897b 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -1074,6 +1074,7 @@ static struct unix_funcs unix_funcs =
@@ -1076,6 +1076,7 @@ static struct unix_funcs unix_funcs =
server_select,
server_wait,
server_send_fd,
@@ -91,10 +91,10 @@ index fb3f98dd579..0754928cfe8 100644
/***********************************************************************
* server_get_unix_fd
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index a422fd825ed..880e3aacf33 100644
index 03b92f9e912..19104f0f5cc 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -84,6 +84,7 @@ extern unsigned int CDECL server_select( const select_op_t *select_op, data_size
@@ -89,6 +89,7 @@ extern unsigned int CDECL server_select( const select_op_t *select_op, data_size
extern unsigned int CDECL server_wait( const select_op_t *select_op, data_size_t size, UINT flags,
const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN;
extern void CDECL server_send_fd( int fd ) DECLSPEC_HIDDEN;
@@ -103,19 +103,19 @@ index a422fd825ed..880e3aacf33 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 58bdad19397..83c9f3a163b 100644
index 017a0a71b3f..6a751993421 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 30
+#define NTDLL_UNIXLIB_VERSION 31
-#define NTDLL_UNIXLIB_VERSION 32
+#define NTDLL_UNIXLIB_VERSION 33
struct unix_funcs
{
@@ -187,6 +187,7 @@ struct unix_funcs
@@ -189,6 +189,7 @@ struct unix_funcs
unsigned int (CDECL *server_wait)( const select_op_t *select_op, data_size_t size, UINT flags,
const LARGE_INTEGER *timeout );
void (CDECL *server_send_fd)( int fd );