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 24b9203d3544001dd51894f1c1edd99819367198.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-01-28 09:08:29 +11:00
parent bcf5899a3c
commit 9692b2e5eb
10 changed files with 68 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From be9f0261d9afa05ea32eac251decf42bf5a83b6c Mon Sep 17 00:00:00 2001
From f1f8f1d85868f75ac182252335de1cd84cb4ba16 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.
@@ -23,7 +23,7 @@ index ed15c51339f..9a99c01bd7c 100644
time.c \
virtual.c
diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
index f739996c58c..d088a6ee64b 100644
index 266ec0d63eb..201fb92cc97 100644
--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
@@ -28,10 +28,6 @@
@@ -46,7 +46,7 @@ index f739996c58c..d088a6ee64b 100644
static NTSTATUS (WINAPI *pNtCreateSemaphore)( PHANDLE, ACCESS_MASK,const POBJECT_ATTRIBUTES,LONG,LONG );
static NTSTATUS (WINAPI *pNtOpenSemaphore)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES );
static NTSTATUS (WINAPI *pNtQuerySemaphore)( PHANDLE, SEMAPHORE_INFORMATION_CLASS, PVOID, ULONG, PULONG );
@@ -65,22 +59,12 @@ static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,U
@@ -65,23 +59,13 @@ static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,U
static NTSTATUS (WINAPI *pNtReleaseSemaphore)(HANDLE, ULONG, PULONG);
static NTSTATUS (WINAPI *pNtCreateKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, ULONG );
static NTSTATUS (WINAPI *pNtOpenKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES * );
@@ -60,6 +60,7 @@ index f739996c58c..d088a6ee64b 100644
-static void (WINAPI *pRtlWakeAddressAll)( const void * );
-static void (WINAPI *pRtlWakeAddressSingle)( const void * );
static NTSTATUS (WINAPI *pNtOpenProcess)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, const CLIENT_ID * );
static NTSTATUS (WINAPI *pNtCreateDebugObject)( HANDLE *, ACCESS_MASK, OBJECT_ATTRIBUTES *, ULONG );
static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG);
-#define KEYEDEVENT_WAIT 0x0001
@@ -69,7 +70,7 @@ index f739996c58c..d088a6ee64b 100644
#define ROUND_UP(value, alignment) (((value) + ((alignment) - 1)) & ~((alignment)-1))
static LPCSTR wine_dbgstr_us( const UNICODE_STRING *us )
@@ -1697,286 +1681,6 @@ static void test_type_mismatch(void)
@@ -1710,286 +1694,6 @@ static void test_type_mismatch(void)
pNtClose( h );
}
@@ -356,7 +357,7 @@ index f739996c58c..d088a6ee64b 100644
static void test_null_device(void)
{
OBJECT_ATTRIBUTES attr;
@@ -2050,119 +1754,6 @@ static void test_null_device(void)
@@ -2063,119 +1767,6 @@ static void test_null_device(void)
CloseHandle(ov.hEvent);
}
@@ -476,7 +477,7 @@ index f739996c58c..d088a6ee64b 100644
static void test_semaphore(void)
{
SEMAPHORE_BASIC_INFORMATION info;
@@ -2239,79 +1830,6 @@ static void test_semaphore(void)
@@ -2252,79 +1843,6 @@ static void test_semaphore(void)
NtClose( semaphore );
}
@@ -556,7 +557,7 @@ index f739996c58c..d088a6ee64b 100644
static void test_process(void)
{
OBJECT_ATTRIBUTES attr;
@@ -2375,13 +1893,7 @@ START_TEST(om)
@@ -2388,13 +1906,7 @@ START_TEST(om)
pNtCreateMailslotFile = (void *)GetProcAddress(hntdll, "NtCreateMailslotFile");
pNtCreateMutant = (void *)GetProcAddress(hntdll, "NtCreateMutant");
pNtOpenEvent = (void *)GetProcAddress(hntdll, "NtOpenEvent");
@@ -570,7 +571,7 @@ index f739996c58c..d088a6ee64b 100644
pNtOpenFile = (void *)GetProcAddress(hntdll, "NtOpenFile");
pNtClose = (void *)GetProcAddress(hntdll, "NtClose");
pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString");
@@ -2402,15 +1914,9 @@ START_TEST(om)
@@ -2415,15 +1927,9 @@ START_TEST(om)
pNtReleaseSemaphore = (void *)GetProcAddress(hntdll, "NtReleaseSemaphore");
pNtCreateKeyedEvent = (void *)GetProcAddress(hntdll, "NtCreateKeyedEvent");
pNtOpenKeyedEvent = (void *)GetProcAddress(hntdll, "NtOpenKeyedEvent");
@@ -584,9 +585,9 @@ index f739996c58c..d088a6ee64b 100644
- pRtlWakeAddressAll = (void *)GetProcAddress(hntdll, "RtlWakeAddressAll");
- pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle");
pNtOpenProcess = (void *)GetProcAddress(hntdll, "NtOpenProcess");
pNtCreateDebugObject = (void *)GetProcAddress(hntdll, "NtCreateDebugObject");
pNtQuerySystemInformation = (void *)GetProcAddress(hntdll, "NtQuerySystemInformation");
@@ -2423,11 +1929,7 @@ START_TEST(om)
@@ -2437,11 +1943,7 @@ START_TEST(om)
test_query_object();
test_query_object_types();
test_type_mismatch();