Rebase against afd5550b07f6d55e56738f61d829085d6bc82888.

This commit is contained in:
Alistair Leslie-Hughes
2021-06-17 10:06:41 +10:00
parent c933b26cb6
commit 876024f44f
5 changed files with 32 additions and 42 deletions

View File

@@ -1,4 +1,4 @@
From 7dccf4db15b800a7781fea24b357b5c804802993 Mon Sep 17 00:00:00 2001
From acfa81780932de0b511e0454056ad82d1fcccc98 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Mon, 31 Aug 2020 23:38:09 -0500
Subject: [PATCH] ntdll: Reimplement the critical section fast path on top of
@@ -10,8 +10,8 @@ Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
dlls/ntdll/unix/loader.c | 3 -
dlls/ntdll/unix/sync.c | 109 ---------------------------------
dlls/ntdll/unix/unix_private.h | 3 -
dlls/ntdll/unixlib.h | 5 +-
5 files changed, 24 insertions(+), 131 deletions(-)
dlls/ntdll/unixlib.h | 3 -
5 files changed, 23 insertions(+), 130 deletions(-)
diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index c73fb09da47..6edf104c5e9 100644
@@ -83,7 +83,7 @@ index c73fb09da47..6edf104c5e9 100644
return ret;
}
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index e9942c0ceeb..5abdc1dc545 100644
index b51d726c5e4..063f48148d7 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -1822,9 +1822,6 @@ static struct unix_funcs unix_funcs =
@@ -217,10 +217,10 @@ index 5e49593fa4a..84f7c937be3 100644
/* Futex-based SRW lock implementation:
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index a721a29dc5a..c9793da8ec1 100644
index 9b27dc7ee7d..7460387c4bb 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -104,9 +104,6 @@ extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*)
@@ -95,9 +95,6 @@ extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*)
extern void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) DECLSPEC_HIDDEN;
extern void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN;
extern void (WINAPI *p__wine_ctrl_routine)(void *) DECLSPEC_HIDDEN;
@@ -231,18 +231,9 @@ index a721a29dc5a..c9793da8ec1 100644
extern NTSTATUS CDECL fast_RtlAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN;
extern NTSTATUS CDECL fast_RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN;
diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h
index f5462125874..ca668995562 100644
index 10b0f57fbed..37a0e2da83c 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 122
+#define NTDLL_UNIXLIB_VERSION 123
struct unix_funcs
{
@@ -40,9 +40,6 @@ struct unix_funcs
LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void);