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 1e8f4c059befe4a026ddf5c56e81d720b35c6c2f.
This commit is contained in:
@@ -1,20 +1,20 @@
|
||||
From d211d0b1843d4bea1502be6b3bd236ab893b19c2 Mon Sep 17 00:00:00 2001
|
||||
From 356adef44cc8267ae73cbbb6bc250ac8bc993e75 Mon Sep 17 00:00:00 2001
|
||||
From: Zebediah Figura <z.figura12@gmail.com>
|
||||
Date: Tue, 29 Jan 2019 21:44:23 -0600
|
||||
Subject: [PATCH 07/13] ntoskrnl.exe: Implement ExReleaseResourceLite().
|
||||
|
||||
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
|
||||
---
|
||||
dlls/ntoskrnl.exe/ntoskrnl.c | 8 --------
|
||||
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +-
|
||||
dlls/ntoskrnl.exe/sync.c | 13 +++++++++++++
|
||||
3 files changed, 14 insertions(+), 9 deletions(-)
|
||||
dlls/ntoskrnl.exe/ntoskrnl.c | 8 --------
|
||||
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +-
|
||||
dlls/ntoskrnl.exe/sync.c | 9 +++++++++
|
||||
3 files changed, 10 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
index 5ab4db12..556b2ae8 100644
|
||||
index e2a838cc..d310b7e4 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
@@ -3912,14 +3912,6 @@ NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG component, ULONG level)
|
||||
@@ -4048,14 +4048,6 @@ NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG component, ULONG level)
|
||||
return STATUS_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
@@ -30,23 +30,23 @@ index 5ab4db12..556b2ae8 100644
|
||||
* PsGetProcessWow64Process (NTOSKRNL.@)
|
||||
*/
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
index c32f4590..79db7ee8 100644
|
||||
index ea543025..f57352f2 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
@@ -9,7 +9,7 @@
|
||||
@ stdcall -arch=i386 -norelay ExInterlockedPushEntrySList (ptr ptr ptr) NTOSKRNL_ExInterlockedPushEntrySList
|
||||
@ stdcall -fastcall -arch=i386 ExInterlockedPushEntrySList (ptr ptr ptr) NTOSKRNL_ExInterlockedPushEntrySList
|
||||
@ stub ExReInitializeRundownProtection
|
||||
@ stdcall -norelay ExReleaseFastMutexUnsafe(ptr)
|
||||
@ stdcall -fastcall ExReleaseFastMutexUnsafe(ptr)
|
||||
-@ stdcall ExReleaseResourceLite(ptr)
|
||||
+@ stdcall -norelay ExReleaseResourceLite(ptr)
|
||||
+@ stdcall -fastcall ExReleaseResourceLite(ptr)
|
||||
@ stub ExReleaseRundownProtection
|
||||
@ stub ExReleaseRundownProtectionEx
|
||||
@ stub ExRundownCompleted
|
||||
diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c
|
||||
index 450e4417..0553db7f 100644
|
||||
index 540093d7..02f96c3c 100644
|
||||
--- a/dlls/ntoskrnl.exe/sync.c
|
||||
+++ b/dlls/ntoskrnl.exe/sync.c
|
||||
@@ -1006,3 +1006,16 @@ void WINAPI ExReleaseResourceForThreadLite( ERESOURCE *resource, ERESOURCE_THREA
|
||||
@@ -986,3 +986,12 @@ void WINAPI ExReleaseResourceForThreadLite( ERESOURCE *resource, ERESOURCE_THREA
|
||||
|
||||
KeReleaseSpinLock( &resource->SpinLock, irql );
|
||||
}
|
||||
@@ -54,12 +54,8 @@ index 450e4417..0553db7f 100644
|
||||
+/***********************************************************************
|
||||
+ * ExReleaseResourceLite (NTOSKRNL.EXE.@)
|
||||
+ */
|
||||
+#ifdef DEFINE_FASTCALL1_ENTRYPOINT
|
||||
+DEFINE_FASTCALL1_ENTRYPOINT( ExReleaseResourceLite )
|
||||
+void WINAPI DECLSPEC_HIDDEN __regs_ExReleaseResourceLite( ERESOURCE *resource )
|
||||
+#else
|
||||
+DEFINE_FASTCALL1_WRAPPER( ExReleaseResourceLite )
|
||||
+void WINAPI ExReleaseResourceLite( ERESOURCE *resource )
|
||||
+#endif
|
||||
+{
|
||||
+ ExReleaseResourceForThreadLite( resource, (ERESOURCE_THREAD)KeGetCurrentThread() );
|
||||
+}
|
||||
|
||||
Reference in New Issue
Block a user