[PATCH 0/1] MR1188: ntoskrnl.exe: Implement KeInitializeGuardedMutex.

[Etaash Mathamsetty (＠etaash.mathamsetty)]

wine bug: https://bugs.winehq.org/show_bug.cgi?id=49091

[PATCH 1/1] ntoskrnl.exe: Implement KeInitializeGuardedMutex.

[Etaash Mathamsetty]

From: Etaash Mathamsetty

---
 dlls/ntoskrnl.exe/ntoskrnl.exe.spec |  1 +
 dlls/ntoskrnl.exe/sync.c            | 12 ++++++++++++
 include/ddk/wdm.h                   | 17 +++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
index 8f8edcac7a0..d3910c380df 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -577,6 +577,7 @@
 @ stub KeInitializeInterrupt
 @ stub KeInitializeMutant
 @ stdcall KeInitializeMutex(ptr long)
+@ stdcall KeInitializeGuardedMutex(ptr)
 @ stub KeInitializeQueue
 @ stdcall KeInitializeSemaphore(ptr long long)
 @ stdcall KeInitializeSpinLock(ptr) NTOSKRNL_KeInitializeSpinLock
diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c
index ada468c73dc..d9b5726b920 100644
--- a/dlls/ntoskrnl.exe/sync.c
+++ b/dlls/ntoskrnl.exe/sync.c
@@ -427,6 +427,18 @@ LONG WINAPI KeReleaseMutex( PRKMUTEX mutex, BOOLEAN wait )
     return ret;
 }

+/***********************************************************************
+ *           KeInitializeGuardedMutex   (NTOSKRNL.EXE.@)
+ */
+void WINAPI KeInitializeGuardedMutex(PKGUARDED_MUTEX mutex)
+{
+    TRACE("mutex %p.\n", mutex);
+    mutex->Count = FM_LOCK_BIT;
+    mutex->Owner = NULL;
+    mutex->Contention = 0;
+    KeInitializeEvent(&mutex->Event, SynchronizationEvent, FALSE);
+}
+
 static void CALLBACK ke_timer_complete_proc(PTP_CALLBACK_INSTANCE instance, void *timer_, PTP_TIMER tp_timer)
 {
     KTIMER *timer = timer_;
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index 0aad83ade8c..bd6ddbd67c5 100644
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -253,6 +253,23 @@ typedef struct _FAST_MUTEX
     ULONG OldIrql;
 } FAST_MUTEX, *PFAST_MUTEX;

+typedef struct _KGUARDED_MUTEX
+{
+     LONG Count;
+     PKTHREAD Owner;
+     ULONG Contention;
+     KEVENT Event;
+     union
+     {
+          struct
+          {
+               SHORT KernelApcDisable;
+               SHORT SpecialApcDisable;
+          };
+          ULONG CombinedApcDisable;
+     };
+} KGUARDED_MUTEX, *PKGUARDED_MUTEX;
+
 #define MAXIMUM_VOLUME_LABEL_LENGTH       (32 * sizeof(WCHAR))

typedef struct _VPB {

[Etaash Mathamsetty (＠etaash.mathamsetty)]

the pipeline's tests seem to have failed for some reason, but it's not related to my patch (I think)