wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 619bd1867ac650aa664327765a8ec7fbdeaa73d8.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2021-06-16 07:59:02 +10:00
parent eeec769eeb
commit c933b26cb6
5 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/eventfd_synchronization/0035-ntdll-server-Implement-alertable-waits.patch
View File

@ -1,4 +1,4 @@
From 52c6ab47d908e75409bb3b7f2faac66da16ea23a Mon Sep 17 00:00:00 2001
From 2d3957bbd6fb87e30bde05713c97ad42d57b3cf1 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Mon, 6 Jul 2020 17:17:31 -0500
Subject: [PATCH] ntdll, server: Implement alertable waits.
@ -164,22 +164,22 @@ index d1a282c65e9..2a7c3865617 100644
/* We need to let the server know when we are doing a message wait, and when we
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index f6934ae9e91..c3ad33e282b 100644
index c8c959029d0..1d40afcb569 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -61,6 +61,7 @@ struct ntdll_thread_data
@@ -52,6 +52,7 @@ struct ntdll_thread_data
{
void *cpu_data[16]; /* reserved for CPU-specific data */
struct debug_info *debug_info; /* info for debugstr functions */
void *kernel_stack; /* stack for thread startup and kernel syscalls */
+ int esync_apc_fd; /* fd to wait on for user APCs */
int request_fd; /* fd for sending server requests */
int reply_fd; /* fd for receiving server replies */
int wait_fd[2]; /* fd for sleeping server requests */
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 422be6d8a73..1ff97ed5129 100644
index 83b8b892b0f..977bfdd2dd2 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -2888,6 +2888,7 @@ static TEB *init_teb( void *ptr, PEB *peb, BOOL is_wow )
@@ -2888,6 +2888,7 @@ static TEB *init_teb( void *ptr, BOOL is_wow )
teb->StaticUnicodeString.Buffer = teb->StaticUnicodeBuffer;
teb->StaticUnicodeString.MaximumLength = sizeof(teb->StaticUnicodeBuffer);
thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch;
@ -244,10 +244,10 @@ index aeb58c5469c..cea025d9308 100644
void esync_clear( int fd );
diff --git a/server/protocol.def b/server/protocol.def
index 14558f2d842..fad731bdc74 100644
index 5eadd8795f2..bb6f1d1c589 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -3794,3 +3794,7 @@ enum esync_type
@@ -3784,3 +3784,7 @@ enum esync_type
@REQ(esync_msgwait)
int in_msgwait; /* are we in a message wait? */
@END

31
patches/ntdll-NtAlertThreadByThreadId/0007-ntdll-Reimplement-Win32-futexes-on-top-of-thread-ID-.patch
View File

@ -1,4 +1,4 @@
From 4c3b3a58f64e3bf023778edb8a8543a2a3289070 Mon Sep 17 00:00:00 2001
From 9e5d23232d1e857e1b57292f0f56487943fb0ba4 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Mon, 2 Nov 2020 20:24:07 -0600
Subject: [PATCH] ntdll: Reimplement Win32 futexes on top of thread-ID alerts.
@ -8,8 +8,8 @@ Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
dlls/ntdll/sync.c | 158 +++++++++++++++++++++++++++++++++++++-
dlls/ntdll/unix/loader.c | 3 -
dlls/ntdll/unix/sync.c | 162 ---------------------------------------
dlls/ntdll/unixlib.h | 6 +-
4 files changed, 156 insertions(+), 173 deletions(-)
dlls/ntdll/unixlib.h | 4 -
4 files changed, 155 insertions(+), 172 deletions(-)
diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index f1263ae33fd..348f260c3b0 100644
@ -206,10 +206,10 @@ index f1263ae33fd..348f260c3b0 100644
+ }
}
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index ff49cd5f26b..6626e02139b 100644
index c26028d756e..f046d2db878 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -1811,9 +1811,6 @@ static struct unix_funcs unix_funcs =
@@ -1822,9 +1822,6 @@ static struct unix_funcs unix_funcs =
#endif
DbgUiIssueRemoteBreakin,
RtlGetSystemTimePrecise,
@ -220,10 +220,10 @@ index ff49cd5f26b..6626e02139b 100644
fast_RtlpUnWaitCriticalSection,
fast_RtlDeleteCriticalSection,
diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
index 48960b5cb83..d8663e47ee6 100644
index 9ebcf60c820..5e49593fa4a 100644
--- a/dlls/ntdll/unix/sync.c
+++ b/dlls/ntdll/unix/sync.c
@@ -80,10 +80,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sync);
@@ -81,10 +81,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sync);
HANDLE keyed_event = 0;
@ -234,7 +234,7 @@ index 48960b5cb83..d8663e47ee6 100644
static const char *debugstr_timeout( const LARGE_INTEGER *timeout )
{
if (!timeout) return "(infinite)";
@@ -193,24 +189,6 @@ static void timespec_from_timeout( struct timespec *timespec, const LARGE_INTEGE
@@ -194,24 +190,6 @@ static void timespec_from_timeout( struct timespec *timespec, const LARGE_INTEGE
#endif
@ -259,7 +259,7 @@ index 48960b5cb83..d8663e47ee6 100644
/* create a struct security_descriptor and contained information in one contiguous piece of memory */
NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret,
data_size_t *ret_len )
@@ -2924,71 +2902,6 @@ NTSTATUS CDECL fast_RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable,
@@ -2980,71 +2958,6 @@ NTSTATUS CDECL fast_RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable,
return STATUS_SUCCESS;
}
@ -331,7 +331,7 @@ index 48960b5cb83..d8663e47ee6 100644
#else
NTSTATUS CDECL fast_RtlTryAcquireSRWLockExclusive( RTL_SRWLOCK *lock )
@@ -3031,79 +2944,4 @@ NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value
@@ -3087,79 +3000,4 @@ NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value
return STATUS_NOT_IMPLEMENTED;
}
@ -412,18 +412,9 @@ index 48960b5cb83..d8663e47ee6 100644
- mutex_unlock( &addr_mutex );
-}
diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h
index d0f2f4ed508..f5462125874 100644
index cbe5c9d3ccd..914a2f3b7b7 100644
--- a/dlls/ntdll/unixlib.h
+++ b/dlls/ntdll/unixlib.h
@@ -26,7 +26,7 @@
struct _DISPATCHER_CONTEXT;
/* increment this when you change the function table */
-#define NTDLL_UNIXLIB_VERSION 121
+#define NTDLL_UNIXLIB_VERSION 122
struct unix_funcs
{
@@ -38,10 +38,6 @@ struct unix_funcs
/* other Win32 API functions */
NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process );

2
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "25271032dfb3f126a8b0dff2adb9b96a7d09241d"
echo "619bd1867ac650aa664327765a8ec7fbdeaa73d8"
}
# Show version information

16
patches/winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch
View File

@ -1,4 +1,4 @@
From e4a379c6f59b132e13194de5480f7b9b5e1485a3 Mon Sep 17 00:00:00 2001
From 0c4efb2f3ff519fdf2a93e7dc4741c9321315a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 8 Jun 2017 23:38:38 +0200
Subject: [PATCH] win32k.sys: Add stub driver.
@ -16,17 +16,17 @@ Subject: [PATCH] win32k.sys: Add stub driver.
create mode 100644 dlls/win32k.sys/win32k.sys.spec
diff --git a/configure.ac b/configure.ac
index daa7203748c..8844de0161e 100644
index 0972051831f..e277f1bdd23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3799,6 +3799,7 @@ WINE_CONFIG_MAKEFILE(dlls/wevtsvc)
@@ -3821,6 +3821,7 @@ WINE_CONFIG_MAKEFILE(dlls/wevtsvc)
WINE_CONFIG_MAKEFILE(dlls/wiaservc)
WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests)
WINE_CONFIG_MAKEFILE(dlls/wimgapi)
+WINE_CONFIG_MAKEFILE(dlls/win32k.sys)
WINE_CONFIG_MAKEFILE(dlls/win32s16.dll16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/win32u)
WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16)
diff --git a/dlls/win32k.sys/Makefile.in b/dlls/win32k.sys/Makefile.in
new file mode 100644
index 00000000000..7fac5d557eb
@ -337,10 +337,10 @@ index 00000000000..c79439151e4
+@ cdecl -private memmove(ptr ptr long) ntoskrnl.exe.memmove
+@ cdecl -private memset(ptr long long) ntoskrnl.exe.memset
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 6ae4e96e37f..82159d3bd7b 100644
index b47926d0701..7f10100f9df 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2680,6 +2680,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
@@ -2921,6 +2921,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,explorer.exe
11,,iexplore.exe
11,,notepad.exe
@ -349,10 +349,10 @@ index 6ae4e96e37f..82159d3bd7b 100644
; skip .NET fake dlls in Wine Mono package
11,,aspnet_regiis.exe,-
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 4a151545aa0..3934cbb93d4 100755
index e6a831025c6..da3e87edec5 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -498,6 +498,7 @@ my @dll_groups =
@@ -503,6 +503,7 @@ my @dll_groups =
[
"ntoskrnl.exe",
"hal",

2
staging/upstream-commit
View File

@ -1 +1 @@
25271032dfb3f126a8b0dff2adb9b96a7d09241d
619bd1867ac650aa664327765a8ec7fbdeaa73d8