Rebase against ca03802a456e7cf4efd834edfeddc483ac72e4b5.

This commit is contained in:
Alistair Leslie-Hughes
2021-04-30 09:12:29 +10:00
parent 977e5237da
commit 4d8896cc35
4 changed files with 29 additions and 21 deletions

View File

@@ -1,4 +1,4 @@
From b7328b5a416b09c66f37ba53cb010afe0266a12e Mon Sep 17 00:00:00 2001
From b2fef9e91f2625ccb700963ac87b47eeb3138a9a 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 1878a480cb8..77370fb5c4a 100644
index 7d9ca47be12..7759736ca1c 100644
--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
@@ -30,10 +30,6 @@
@@ -61,8 +61,8 @@ index 1878a480cb8..77370fb5c4a 100644
-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 );
@@ -1705,286 +1693,6 @@ static void test_type_mismatch(void)
static NTSTATUS (WINAPI *pNtGetNextThread)(HANDLE process, HANDLE thread, ACCESS_MASK access, ULONG attributes,
@@ -1722,286 +1710,6 @@ static void test_type_mismatch(void)
pNtClose( h );
}
@@ -349,7 +349,7 @@ index 1878a480cb8..77370fb5c4a 100644
static void test_null_device(void)
{
OBJECT_ATTRIBUTES attr;
@@ -2058,119 +1766,6 @@ static void test_null_device(void)
@@ -2075,119 +1783,6 @@ static void test_null_device(void)
CloseHandle(ov.hEvent);
}
@@ -469,7 +469,7 @@ index 1878a480cb8..77370fb5c4a 100644
static void test_semaphore(void)
{
SEMAPHORE_BASIC_INFORMATION info;
@@ -2247,79 +1842,6 @@ static void test_semaphore(void)
@@ -2264,79 +1859,6 @@ static void test_semaphore(void)
NtClose( semaphore );
}
@@ -549,7 +549,7 @@ index 1878a480cb8..77370fb5c4a 100644
static void test_process(void)
{
OBJECT_ATTRIBUTES attr;
@@ -2562,13 +2084,7 @@ START_TEST(om)
@@ -2668,13 +2190,7 @@ START_TEST(om)
pNtCreateMailslotFile = (void *)GetProcAddress(hntdll, "NtCreateMailslotFile");
pNtCreateMutant = (void *)GetProcAddress(hntdll, "NtCreateMutant");
pNtOpenEvent = (void *)GetProcAddress(hntdll, "NtOpenEvent");
@@ -563,7 +563,7 @@ index 1878a480cb8..77370fb5c4a 100644
pNtOpenFile = (void *)GetProcAddress(hntdll, "NtOpenFile");
pNtClose = (void *)GetProcAddress(hntdll, "NtClose");
pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString");
@@ -2589,15 +2105,9 @@ START_TEST(om)
@@ -2695,15 +2211,9 @@ START_TEST(om)
pNtReleaseSemaphore = (void *)GetProcAddress(hntdll, "NtReleaseSemaphore");
pNtCreateKeyedEvent = (void *)GetProcAddress(hntdll, "NtCreateKeyedEvent");
pNtOpenKeyedEvent = (void *)GetProcAddress(hntdll, "NtOpenKeyedEvent");
@@ -578,8 +578,8 @@ index 1878a480cb8..77370fb5c4a 100644
- pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle");
pNtOpenProcess = (void *)GetProcAddress(hntdll, "NtOpenProcess");
pNtCreateDebugObject = (void *)GetProcAddress(hntdll, "NtCreateDebugObject");
@@ -2609,12 +2119,8 @@ START_TEST(om)
pNtGetNextThread = (void *)GetProcAddress(hntdll, "NtGetNextThread");
@@ -2716,12 +2226,8 @@ START_TEST(om)
test_symboliclink();
test_query_object();
test_type_mismatch();
@@ -591,7 +591,7 @@ index 1878a480cb8..77370fb5c4a 100644
- test_wait_on_address();
test_process();
test_object_types();
}
test_get_next_thread();
diff --git a/dlls/ntdll/tests/sync.c b/dlls/ntdll/tests/sync.c
new file mode 100644
index 00000000000..3f41cdfeedd
@@ -1146,5 +1146,5 @@ index 00000000000..3f41cdfeedd
+ test_keyed_events();
+}
--
2.20.1
2.30.2