You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 52a99f2eadf04394a99d81f97a9a6d2a454fa959.
[api-ms-win-Stub_DLLs] Removed multiple api-ms-win stub dlls (accepted upstream). [kernel32-QT_Environment_Variables] Removed patch to avoid inheritance of QT_ environment variables from host environment to Wine (accepted upstream). [kernel32-VirtualProtect] Removed patch to allow to pass NULL as old protection to VirtualProtect for Win9x compatibility (accepted upstream). [services-SERVICE_FILE_SYSTEM_DRIVER] Removed patch to load SERVICE_FILE_SYSTEM_DRIVER services with winedevice (accepted upstream). [wpcap-Several_Fixes] Removed patch to fix possible crash in pcap_loop (accepted upstream).
This commit is contained in:
@@ -1,18 +1,31 @@
|
||||
From e4f9424f025aebdbcd96a6f0eb2c39f479b4eda7 Mon Sep 17 00:00:00 2001
|
||||
From ac6a2310dd3423f6129a930778713fb418d3ed53 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.
|
||||
|
||||
---
|
||||
dlls/ntdll/server.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
dlls/advapi32/tests/security.c | 1 -
|
||||
dlls/ntdll/server.c | 8 ++++++++
|
||||
2 files changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
|
||||
index 3e1ced0..fbc1bb8 100644
|
||||
--- a/dlls/advapi32/tests/security.c
|
||||
+++ b/dlls/advapi32/tests/security.c
|
||||
@@ -1447,7 +1447,6 @@ todo_wine
|
||||
todo_wine
|
||||
ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have "
|
||||
"failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err);
|
||||
-todo_wine
|
||||
ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed,
|
||||
"Access and/or AccessStatus were changed!\n");
|
||||
|
||||
diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c
|
||||
index aabda4f..4d5d4ba 100644
|
||||
index 356d631..de9c186 100644
|
||||
--- a/dlls/ntdll/server.c
|
||||
+++ b/dlls/ntdll/server.c
|
||||
@@ -292,6 +292,14 @@ unsigned int wine_server_call( void *req_ptr )
|
||||
@@ -305,6 +305,14 @@ unsigned int wine_server_call( void *req_ptr )
|
||||
sigset_t old_set;
|
||||
unsigned int ret;
|
||||
|
||||
@@ -28,5 +41,5 @@ index aabda4f..4d5d4ba 100644
|
||||
ret = send_request( req );
|
||||
if (!ret) ret = wait_reply( req );
|
||||
--
|
||||
2.2.1
|
||||
2.7.1
|
||||
|
||||
|
Reference in New Issue
Block a user