Rebase against a5f787ac445a682ea7ced5dd78c3516d4b8b9311.

This commit is contained in:
Alistair Leslie-Hughes
2021-07-24 10:32:46 +10:00
parent b57bf86ec0
commit dc38777093
9 changed files with 53 additions and 51 deletions

View File

@@ -1,4 +1,4 @@
From 68c31664972be60b93397bf7d8a9cfab11baf046 Mon Sep 17 00:00:00 2001
From 4a177b109c83201a0f5015880af3f4bc221d7972 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 7ad39e0992c..8c6a86fb965 100644
time.c \
virtual.c \
diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
index 81be7de00f6..9a9536f4639 100644
index af5e014f069..77eb58a23b5 100644
--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
@@ -30,10 +30,6 @@
@@ -66,7 +66,7 @@ index 81be7de00f6..9a9536f4639 100644
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 *pNtGetNextThread)(HANDLE process, HANDLE thread, ACCESS_MASK access, ULONG attributes,
@@ -1722,286 +1709,6 @@ static void test_type_mismatch(void)
@@ -1939,286 +1926,6 @@ static void test_type_mismatch(void)
pNtClose( h );
}
@@ -353,7 +353,7 @@ index 81be7de00f6..9a9536f4639 100644
static void test_null_device(void)
{
OBJECT_ATTRIBUTES attr;
@@ -2075,269 +1782,6 @@ static void test_null_device(void)
@@ -2292,269 +1999,6 @@ static void test_null_device(void)
CloseHandle(ov.hEvent);
}
@@ -623,7 +623,7 @@ index 81be7de00f6..9a9536f4639 100644
static void test_process(void)
{
OBJECT_ATTRIBUTES attr;
@@ -2669,13 +2113,7 @@ START_TEST(om)
@@ -2957,13 +2401,7 @@ START_TEST(om)
pNtCreateMailslotFile = (void *)GetProcAddress(hntdll, "NtCreateMailslotFile");
pNtCreateMutant = (void *)GetProcAddress(hntdll, "NtCreateMutant");
pNtOpenEvent = (void *)GetProcAddress(hntdll, "NtOpenEvent");
@@ -637,7 +637,7 @@ index 81be7de00f6..9a9536f4639 100644
pNtOpenFile = (void *)GetProcAddress(hntdll, "NtOpenFile");
pNtClose = (void *)GetProcAddress(hntdll, "NtClose");
pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString");
@@ -2687,7 +2125,6 @@ START_TEST(om)
@@ -2975,7 +2413,6 @@ START_TEST(om)
pNtQuerySymbolicLinkObject = (void *)GetProcAddress(hntdll, "NtQuerySymbolicLinkObject");
pNtCreateSemaphore = (void *)GetProcAddress(hntdll, "NtCreateSemaphore");
pNtOpenSemaphore = (void *)GetProcAddress(hntdll, "NtOpenSemaphore");
@@ -645,7 +645,7 @@ index 81be7de00f6..9a9536f4639 100644
pNtCreateTimer = (void *)GetProcAddress(hntdll, "NtCreateTimer");
pNtOpenTimer = (void *)GetProcAddress(hntdll, "NtOpenTimer");
pNtCreateSection = (void *)GetProcAddress(hntdll, "NtCreateSection");
@@ -2696,15 +2133,9 @@ START_TEST(om)
@@ -2984,15 +2421,9 @@ START_TEST(om)
pNtReleaseSemaphore = (void *)GetProcAddress(hntdll, "NtReleaseSemaphore");
pNtCreateKeyedEvent = (void *)GetProcAddress(hntdll, "NtCreateKeyedEvent");
pNtOpenKeyedEvent = (void *)GetProcAddress(hntdll, "NtOpenKeyedEvent");
@@ -661,7 +661,7 @@ index 81be7de00f6..9a9536f4639 100644
pNtOpenProcess = (void *)GetProcAddress(hntdll, "NtOpenProcess");
pNtCreateDebugObject = (void *)GetProcAddress(hntdll, "NtCreateDebugObject");
pNtGetNextThread = (void *)GetProcAddress(hntdll, "NtGetNextThread");
@@ -2717,12 +2148,7 @@ START_TEST(om)
@@ -3009,12 +2440,7 @@ START_TEST(om)
test_symboliclink();
test_query_object();
test_type_mismatch();
@@ -672,8 +672,8 @@ index 81be7de00f6..9a9536f4639 100644
test_null_device();
- test_wait_on_address();
test_process();
test_object_types();
test_get_next_thread();
test_token();
test_duplicate_object();
diff --git a/dlls/ntdll/tests/sync.c b/dlls/ntdll/tests/sync.c
new file mode 100644
index 00000000000..3d6b6a3a04d