ntdll: Handle unaligned SRW locks when using keyed events.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Handle unaligned SRW locks when using keyed events.
28619e60 · Zebediah Figura · Alexandre Julliard · aceff210 · 28619e60
Commit 28619e60 authored Apr 13, 2020 by Zebediah Figura Committed by Alexandre Julliard Apr 14, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

sync.c dlls/ntdll/sync.c +4 -4

No files found.
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -1985,11 +1985,11 @@ static NTSTATUS fast_release_srw_shared( RTL_SRWLOCK *lock )
 #define SRWLOCK_RES_SHARED            0x00000001

 #ifdef WORDS_BIGENDIAN
-#define srwlock_key_exclusive(lock)   (&lock->Ptr)
-#define srwlock_key_shared(lock)      ((void *)((char *)&lock->Ptr + 2))
+#define srwlock_key_exclusive(lock)   ((void *)(((ULONG_PTR)&lock->Ptr + 1) & ~1))
+#define srwlock_key_shared(lock)      ((void *)(((ULONG_PTR)&lock->Ptr + 3) & ~1))
 #else
-#define srwlock_key_exclusive(lock)   ((void *)((char *)&lock->Ptr + 2))
-#define srwlock_key_shared(lock)      (&lock->Ptr)
+#define srwlock_key_exclusive(lock)   ((void *)(((ULONG_PTR)&lock->Ptr + 3) & ~1))
+#define srwlock_key_shared(lock)      ((void *)(((ULONG_PTR)&lock->Ptr + 1) & ~1))
 #endif

 static inline void srwlock_check_invalid( unsigned int val )