[PATCH 2/3] ntoskrnl.exe: Don't signal the remove lock event unless the lock is in the removed state.

Zebediah Figura z.figura12 at gmail.com
Tue Aug 20 22:05:54 CDT 2019


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/ntoskrnl.exe/sync.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c
index 7aed1d0483..365ddc069f 100644
--- a/dlls/ntoskrnl.exe/sync.c
+++ b/dlls/ntoskrnl.exe/sync.c
@@ -1234,7 +1234,7 @@ void WINAPI IoReleaseRemoveLockEx( IO_REMOVE_LOCK *lock, void *tag, ULONG size )
 
     TRACE("lock %p, tag %p, size %u.\n", lock, tag, size);
 
-    if (!(count = InterlockedDecrement( &lock->Common.IoCount )))
+    if (!(count = InterlockedDecrement( &lock->Common.IoCount )) && lock->Common.Removed)
         KeSetEvent( &lock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE );
     else if (count < 0)
         ERR("Lock %p is not acquired!\n", lock);
@@ -1251,10 +1251,10 @@ void WINAPI IoReleaseRemoveLockAndWaitEx( IO_REMOVE_LOCK *lock, void *tag, ULONG
 
     lock->Common.Removed = TRUE;
 
-    if (!(count = InterlockedDecrement( &lock->Common.IoCount )))
+    if (!(count = InterlockedDecrement( &lock->Common.IoCount )) && lock->Common.Removed)
         KeSetEvent( &lock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE );
     else if (count < 0)
         ERR("Lock %p is not acquired!\n", lock);
-    else
+    else if (count > 0)
         KeWaitForSingleObject( &lock->Common.RemoveEvent, Executive, KernelMode, FALSE, NULL );
 }
-- 
2.22.0




More information about the wine-devel mailing list