You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-12-15 08:03:15 -08:00
Rebase against 35e43ccf1b42e9f67d7765753f0c3ef8cf102c46.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 328517d4516b3767ff21c6ffe4f45b29989edfea Mon Sep 17 00:00:00 2001
|
||||
From d90049788ebde3f53bb864cdaae25feecc490ad4 Mon Sep 17 00:00:00 2001
|
||||
From: Zebediah Figura <z.figura12@gmail.com>
|
||||
Date: Sun, 22 Nov 2020 20:51:10 -0600
|
||||
Subject: [PATCH] ntdll: Reimplement SRW locks on top of Win32 futexes.
|
||||
@@ -391,10 +391,10 @@ index 225216cbe2a..950a5047752 100644
|
||||
|
||||
/***********************************************************************
|
||||
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
|
||||
index f161040ff43..8e5e8410d1c 100644
|
||||
index ab27626fb6f..f98e33b45fb 100644
|
||||
--- a/dlls/ntdll/unix/loader.c
|
||||
+++ b/dlls/ntdll/unix/loader.c
|
||||
@@ -1595,12 +1595,6 @@ static struct unix_funcs unix_funcs =
|
||||
@@ -1691,12 +1691,6 @@ static struct unix_funcs unix_funcs =
|
||||
#endif
|
||||
DbgUiIssueRemoteBreakin,
|
||||
RtlGetSystemTimePrecise,
|
||||
@@ -746,7 +746,7 @@ index d4092438644..b67f5fc8f10 100644
|
||||
-
|
||||
-#endif
|
||||
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
|
||||
index dc6d5462c0c..ffc701b1c27 100644
|
||||
index acbfd6b2a5e..3066dbd325a 100644
|
||||
--- a/dlls/ntdll/unix/unix_private.h
|
||||
+++ b/dlls/ntdll/unix/unix_private.h
|
||||
@@ -98,12 +98,6 @@ extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULON
|
||||
@@ -763,15 +763,15 @@ index dc6d5462c0c..ffc701b1c27 100644
|
||||
|
||||
extern USHORT * CDECL get_unix_codepage_data(void) DECLSPEC_HIDDEN;
|
||||
diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h
|
||||
index 046418e50e3..a90aa183287 100644
|
||||
index 44f0c1aa4ea..9d5aca187fa 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 112
|
||||
+#define NTDLL_UNIXLIB_VERSION 113
|
||||
-#define NTDLL_UNIXLIB_VERSION 113
|
||||
+#define NTDLL_UNIXLIB_VERSION 114
|
||||
|
||||
struct unix_funcs
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user