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 a9c4b309f6af82b624604bd0df898ad88d59ab5a

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-11-20 10:28:28 +11:00
parent d391086546
commit a9639c412f
4 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/eventfd_synchronization/0042-ntdll-Use-shared-memory-segments-to-store-semaphore-.patch
View File

@@ -1,4 +1,4 @@
From 74673086285abb335d58cecf4327bf08034210a6 Mon Sep 17 00:00:00 2001
From 430aff7c0693c5529ce4af2d515bf48d6ba49e15 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Mon, 11 Jun 2018 13:10:36 -0500
Subject: [PATCH] ntdll: Use shared memory segments to store semaphore and
@@ -16,7 +16,7 @@ since now we don't have to allocate separate structures.
3 files changed, 155 insertions(+), 199 deletions(-)
diff --git a/dlls/ntdll/esync.c b/dlls/ntdll/esync.c
index c1d8882d8..e8ee1cbc9 100644
index c1d8882d817..e8ee1cbc9ff 100644
--- a/dlls/ntdll/esync.c
+++ b/dlls/ntdll/esync.c
@@ -32,6 +32,7 @@
@@ -658,7 +658,7 @@ index c1d8882d8..e8ee1cbc9 100644
}
}
diff --git a/dlls/ntdll/esync.h b/dlls/ntdll/esync.h
index f79b9a06c..88f491e5a 100644
index f79b9a06c90..88f491e5ab4 100644
--- a/dlls/ntdll/esync.h
+++ b/dlls/ntdll/esync.h
@@ -19,6 +19,7 @@
@@ -670,7 +670,7 @@ index f79b9a06c..88f491e5a 100644
extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 9972d680e..f9c529357 100644
index 119d35731f4..2ac4ef6a23b 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -44,6 +44,7 @@
@@ -688,9 +688,9 @@ index 9972d680e..f9c529357 100644
+ if (do_esync())
+ esync_init();
+
init_unix_codepage();
init_directories();
init_user_process_params( info_size );
--
2.23.0
2.24.0

12
patches/eventfd_synchronization/0074-ntdll-server-Abort-if-esync-is-enabled-for-the-serve.patch
View File

@@ -1,4 +1,4 @@
From 4293d1e7797b999611ecc410b24052a1566715b6 Mon Sep 17 00:00:00 2001
From ba4c80e2a7abe2ba265f949312c78045bef5695c Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Sat, 4 Aug 2018 15:15:12 -0500
Subject: [PATCH] ntdll, server: Abort if esync is enabled for the server but
@@ -11,7 +11,7 @@ Subject: [PATCH] ntdll, server: Abort if esync is enabled for the server but
3 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/dlls/ntdll/esync.c b/dlls/ntdll/esync.c
index 8255810a9..fb1953fb9 100644
index 8255810a924..fb1953fb90c 100644
--- a/dlls/ntdll/esync.c
+++ b/dlls/ntdll/esync.c
@@ -115,10 +115,29 @@ static void **shm_addrs;
@@ -61,7 +61,7 @@ index 8255810a9..fb1953fb9 100644
pagesize = sysconf( _SC_PAGESIZE );
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index f9c529357..80f1304a3 100644
index 2ac4ef6a23b..6df24c076c5 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -4405,8 +4405,7 @@ void __wine_process_init(void)
@@ -72,10 +72,10 @@ index f9c529357..80f1304a3 100644
- esync_init();
+ esync_init();
init_unix_codepage();
init_directories();
init_user_process_params( info_size );
diff --git a/server/esync.c b/server/esync.c
index 1fc9316b1..cb4de2daa 100644
index 1fc9316b1b5..cb4de2daa77 100644
--- a/server/esync.c
+++ b/server/esync.c
@@ -395,6 +395,18 @@ DECL_HANDLER(create_esync)
@@ -98,5 +98,5 @@ index 1fc9316b1..cb4de2daa 100644
if ((esync = create_esync( root, &name, objattr->attributes, req->initval, req->flags, req->type, sd )))
--
2.23.0
2.24.0