Rebase against 634cb775c27b61ad6ce1fbe3e9972b0edfa31dcb.

This commit is contained in:
Zebediah Figura
2020-06-15 17:43:18 -05:00
parent b6595d9e28
commit 32fcc0d75b
19 changed files with 182 additions and 461 deletions

View File

@@ -1,4 +1,4 @@
From 85887cf68b055ca7149a428b32e9cac31e2190ca Mon Sep 17 00:00:00 2001
From 02562df4bb8c6c805b140335b9076a2a895244bf 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 9e1cc85a36e..3f4ba60b7bb 100644
/***********************************************************************
* wine_server_release_fd (NTDLL.@)
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index b09049b855b..bd37b8362b0 100644
index 73be77e7afc..2393f73b306 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -937,6 +937,7 @@ static struct unix_funcs unix_funcs =
@@ -952,6 +952,7 @@ static struct unix_funcs unix_funcs =
fork_and_exec,
wine_server_call,
server_send_fd,
@@ -91,7 +91,7 @@ index cf6f6c3832c..586d0ffcf72 100644
/***********************************************************************
* server_get_unix_fd
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index e82b0960343..673d01c6bf9 100644
index 223015a785a..9c385ec42d8 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -99,6 +99,7 @@ extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN;
@@ -103,19 +103,19 @@ index e82b0960343..673d01c6bf9 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 958fab4c059..873cc7abdf2 100644
index 6c8e151b554..dd5c3e3784e 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 43
+#define NTDLL_UNIXLIB_VERSION 44
-#define NTDLL_UNIXLIB_VERSION 46
+#define NTDLL_UNIXLIB_VERSION 47
struct unix_funcs
{
@@ -239,6 +239,7 @@ struct unix_funcs
@@ -267,6 +267,7 @@ struct unix_funcs
/* server functions */
unsigned int (CDECL *server_call)( void *req_ptr );
void (CDECL *server_send_fd)( int fd );