wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 1bc9c4fdb2e6c2762105c14cdafb7d4ea3370625

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-06-19 21:02:14 +10:00
parent b5055c0b1b
commit 694f513d71
3 changed files with 10 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/ntdll-WRITECOPY/0001-ntdll-Trigger-write-watches-before-passing-userdata-.patch
View File

@@ -1,8 +1,8 @@
From a370fb90c05a5077a9285c1235767cf1b1b6fa5f Mon Sep 17 00:00:00 2001
From 5eb4990fc228eec0ba5066ee319a730be2e624a3 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 4 Oct 2014 02:35:44 +0200
Subject: ntdll: Trigger write watches before passing userdata pointer to
wait_reply.
Subject: [PATCH] ntdll: Trigger write watches before passing userdata pointer
to wait_reply.
---
dlls/advapi32/tests/security.c | 1 -
@@ -10,10 +10,10 @@ Subject: ntdll: Trigger write watches before passing userdata pointer to
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 41219087421..5f5c59ed100 100644
index ac444b4854e..671aaaa3fb4 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -1494,7 +1494,6 @@ todo_wine
@@ -1587,7 +1587,6 @@ todo_wine
"failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err);
todo_wine
ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen);
@@ -22,12 +22,12 @@ index 41219087421..5f5c59ed100 100644
"Access and/or AccessStatus were changed!\n");
diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c
index 1e84fbf418e..f7aca1b07b0 100644
index f82ab3ced95..9670b0abc2b 100644
--- a/dlls/ntdll/server.c
+++ b/dlls/ntdll/server.c
@@ -314,9 +314,18 @@ unsigned int server_call_unlocked( void *req_ptr )
@@ -316,9 +316,18 @@ unsigned int server_call_unlocked( void *req_ptr )
*/
unsigned int wine_server_call( void *req_ptr )
unsigned int CDECL wine_server_call( void *req_ptr )
{
+ struct __server_request_info * const req = req_ptr;
sigset_t old_set;
@@ -45,5 +45,5 @@ index 1e84fbf418e..f7aca1b07b0 100644
ret = server_call_unlocked( req_ptr );
pthread_sigmask( SIG_SETMASK, &old_set, NULL );
--
2.14.1
2.20.1