Rebase against 7a9745022b1bfcc235b922be98a8fdc91976c587.

This commit is contained in:
Zebediah Figura
2021-02-08 16:01:40 -06:00
parent 677b445b0d
commit 6347bdd1fc
12 changed files with 12 additions and 729 deletions

View File

@@ -1,28 +1,15 @@
From 967a59e4a02f5aa9a607e52b3cbc91a0d268c064 Mon Sep 17 00:00:00 2001
From 00a5e4e8b55ad439d5c3d8faa876d08df8be759f Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 4 Oct 2014 02:35:44 +0200
Subject: [PATCH] ntdll: Trigger write watches before passing userdata pointer
to wait_reply.
---
dlls/advapi32/tests/security.c | 1 -
dlls/ntdll/unix/server.c | 8 ++++++++
2 files changed, 8 insertions(+), 1 deletion(-)
dlls/ntdll/unix/server.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index ab572421a735..01f7a8783b18 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -1557,7 +1557,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);
-todo_wine
ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed,
"Access and/or AccessStatus were changed!\n");
diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
index 452094ff5dc0..3c0d29a00624 100644
index 6af8effe9e1..6dbd9cb3ea0 100644
--- a/dlls/ntdll/unix/server.c
+++ b/dlls/ntdll/unix/server.c
@@ -282,9 +282,17 @@ unsigned int server_call_unlocked( void *req_ptr )