wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 04a9c9eba77f56d61d615f1147590c67b466bdf8.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-01-20 10:56:34 +11:00
parent caa2471e20
commit 6364ada0ad
6 changed files with 33 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/ntdll-NtAlertThreadByThreadId/0001-ntdll-tests-Move-some-tests-to-a-new-sync.c-file.patch
View File

@@ -1,4 +1,4 @@
From c17380797162d65051f0922c673c327506799bb7 Mon Sep 17 00:00:00 2001
From 8be256f9b12b42f5a5fef0b82d34aaacfa7c6115 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Thu, 9 Jan 2020 13:44:01 -0600
Subject: [PATCH] ntdll/tests: Move some tests to a new sync.c file.
@@ -24,7 +24,7 @@ index ed15c51339f..9a99c01bd7c 100644
time.c \
virtual.c
diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
index f78f42e0a88..f366a661a16 100644
index 120b093fa56..f366a661a16 100644
--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
@@ -28,10 +28,6 @@
@@ -413,13 +413,13 @@ index f78f42e0a88..f366a661a16 100644
-
- prev = 0xdeadbeef;
- status = pNtReleaseMutant(mutant, &prev);
- ok( status == STATUS_SUCCESS, "NtQueryRelease failed %08x\n", status );
- ok( prev == -1, "NtQueryRelease failed, expected -1, got %d\n", prev );
- ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08x\n", status );
- ok( prev == -1, "NtReleaseMutant failed, expected -1, got %d\n", prev );
-
- prev = 0xdeadbeef;
- status = pNtReleaseMutant(mutant, &prev);
- ok( status == STATUS_SUCCESS, "NtQueryRelease failed %08x\n", status );
- ok( prev == 0, "NtQueryRelease failed, expected 0, got %d\n", prev );
- ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08x\n", status );
- ok( prev == 0, "NtReleaseMutant failed, expected 0, got %d\n", prev );
-
- memset(&info, 0xcc, sizeof(info));
- status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL);

13
patches/ntdll-NtAlertThreadByThreadId/0013-ntdll-Reimplement-SRW-locks-on-top-of-Win32-futexes.patch
View File

@@ -1,4 +1,4 @@
From 978c8cad7a5f44402fc2daba9bccc32fa9ea64d4 Mon Sep 17 00:00:00 2001
From b29db29cb8eb0fa8ba0153438c777417f2b41387 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Sun, 22 Nov 2020 20:51:10 -0600
Subject: [PATCH] ntdll: Reimplement SRW locks on top of Win32 futexes.
@@ -798,10 +798,10 @@ index 0262e50d980..968d636f86e 100644
static FORCEINLINE HANDLE WINAPI GetCurrentProcess(void)
diff --git a/include/winnt.h b/include/winnt.h
index 200f67080a8..05093d525f1 100644
index ff1a6f4e90e..38f4f3e01a5 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -6907,20 +6907,29 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask)
@@ -6910,7 +6910,9 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask)
#pragma intrinsic(_InterlockedExchange)
#pragma intrinsic(_InterlockedExchangeAdd)
#pragma intrinsic(_InterlockedIncrement)
@@ -811,6 +811,9 @@ index 200f67080a8..05093d525f1 100644
long _InterlockedCompareExchange(long volatile*,long,long);
long long _InterlockedCompareExchange64(long long volatile*,long long,long long);
@@ -6918,15 +6920,22 @@ long long _InterlockedCompareExchange64(long long volatile*,long long,long long)
unsigned char _InterlockedCompareExchange128(volatile __int64 *, __int64, __int64, __int64 *);
#endif
long _InterlockedDecrement(long volatile*);
+short _InterlockedDecrement16(short volatile*);
long _InterlockedExchange(long volatile*,long);
@@ -831,7 +834,7 @@ index 200f67080a8..05093d525f1 100644
static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare )
{
return _InterlockedCompareExchange64( (long long volatile *)dest, compare, xchg );
@@ -6946,6 +6955,11 @@ static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest )
@@ -6959,6 +6968,11 @@ static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest )
return _InterlockedDecrement( (long volatile *)dest );
}
@@ -843,7 +846,7 @@ index 200f67080a8..05093d525f1 100644
#ifndef __i386__
#pragma intrinsic(_InterlockedCompareExchangePointer)
@@ -7010,11 +7024,21 @@ static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest )
@@ -7040,11 +7054,21 @@ static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest )
return __sync_add_and_fetch( dest, 1 );
}