Zebediah Figura : ntdll/tests: Add more tests for registry notifications.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3c72ad33a9390c9926b29b8ea8537c70a75174ec
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3c72ad33a9390c9926b29b8ea8537c70a75174ec

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Tue Jan 26 22:41:42 2021 -0600

ntdll/tests: Add more tests for registry notifications.

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

---

 dlls/ntdll/tests/reg.c | 61 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 17 deletions(-)

diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c
index 9335d9cc927..a619bc45cb8 100644
--- a/dlls/ntdll/tests/reg.c
+++ b/dlls/ntdll/tests/reg.c
@@ -1853,28 +1853,30 @@ static void test_notify(void)
     LARGE_INTEGER timeout;
     IO_STATUS_BLOCK iosb;
     UNICODE_STRING str;
-    HANDLE key, events[2], subkey;
+    HANDLE key, key2, events[4], subkey;
     NTSTATUS status;
+    unsigned int i;
 
     InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0);
     status = pNtOpenKey(&key, KEY_ALL_ACCESS, &attr);
     ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status);
+    status = pNtOpenKey(&key2, KEY_ALL_ACCESS, &attr);
+    ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status);
 
-    events[0] = CreateEventW(NULL, FALSE, TRUE, NULL);
-    ok(events[0] != NULL, "CreateEvent failed: %u\n", GetLastError());
-    events[1] = CreateEventW(NULL, FALSE, TRUE, NULL);
-    ok(events[1] != NULL, "CreateEvent failed: %u\n", GetLastError());
+    for (i = 0; i < ARRAY_SIZE(events); ++i)
+        events[i] = CreateEventW(NULL, TRUE, TRUE, NULL);
 
     status = pNtNotifyChangeKey(key, events[0], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE);
     ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status);
-    status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE);
+    status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE);
+    ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status);
+    status = pNtNotifyChangeKey(key2, events[2], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE);
+    ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status);
+    status = pNtNotifyChangeKey(key2, events[3], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE);
     ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status);
 
-    timeout.QuadPart = 0;
-    status = pNtWaitForSingleObject(events[0], FALSE, &timeout);
-    ok(status == STATUS_TIMEOUT, "NtWaitForSingleObject returned %x\n", status);
-    status = pNtWaitForSingleObject(events[1], FALSE, &timeout);
-    ok(status == STATUS_TIMEOUT, "NtWaitForSingleObject returned %x\n", status);
+    status = WaitForMultipleObjects(4, events, FALSE, 0);
+    ok(status == WAIT_TIMEOUT, "got %d\n", status);
 
     attr.RootDirectory = key;
     attr.ObjectName = &str;
@@ -1885,22 +1887,43 @@ static void test_notify(void)
     pRtlFreeUnicodeString(&str);
 
     status = pNtWaitForSingleObject(events[0], FALSE, &timeout);
-    todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status);
+    todo_wine ok(!status, "got %#x\n", status);
     status = pNtWaitForSingleObject(events[1], FALSE, &timeout);
-    ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status);
+    ok(!status, "got %#x\n", status);
+    status = pNtWaitForSingleObject(events[2], FALSE, &timeout);
+    ok(status == STATUS_TIMEOUT, "got %#x\n", status);
+    status = pNtWaitForSingleObject(events[3], FALSE, &timeout);
+    ok(status == STATUS_TIMEOUT, "got %#x\n", status);
 
     status = pNtNotifyChangeKey(key, events[0], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE);
     ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status);
+
+    status = pNtWaitForSingleObject(events[0], FALSE, &timeout);
+    ok(status == STATUS_TIMEOUT, "got %#x\n", status);
+    status = pNtWaitForSingleObject(events[1], FALSE, &timeout);
+    ok(!status, "got %#x\n", status);
+    status = pNtWaitForSingleObject(events[2], FALSE, &timeout);
+    ok(status == STATUS_TIMEOUT, "got %#x\n", status);
+    status = pNtWaitForSingleObject(events[3], FALSE, &timeout);
+    ok(status == STATUS_TIMEOUT, "got %#x\n", status);
+
     status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE);
     ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status);
 
+    status = WaitForMultipleObjects(4, events, FALSE, 0);
+    ok(status == WAIT_TIMEOUT, "got %d\n", status);
+
     status = pNtDeleteKey(subkey);
     ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status);
 
     status = pNtWaitForSingleObject(events[0], FALSE, &timeout);
-    todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status);
+    todo_wine ok(!status, "got %#x\n", status);
     status = pNtWaitForSingleObject(events[1], FALSE, &timeout);
-    ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status);
+    ok(!status, "got %#x\n", status);
+    status = pNtWaitForSingleObject(events[2], FALSE, &timeout);
+    ok(status == STATUS_TIMEOUT, "got %#x\n", status);
+    status = pNtWaitForSingleObject(events[3], FALSE, &timeout);
+    ok(status == STATUS_TIMEOUT, "got %#x\n", status);
 
     pNtClose(subkey);
 
@@ -1912,9 +1935,13 @@ static void test_notify(void)
     pNtClose(key);
 
     status = pNtWaitForSingleObject(events[0], FALSE, &timeout);
-    todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status);
+    todo_wine ok(!status, "got %#x\n", status);
     status = pNtWaitForSingleObject(events[1], FALSE, &timeout);
-    ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status);
+    ok(!status, "got %#x\n", status);
+    status = pNtWaitForSingleObject(events[2], FALSE, &timeout);
+    ok(status == STATUS_TIMEOUT, "got %#x\n", status);
+    status = pNtWaitForSingleObject(events[3], FALSE, &timeout);
+    ok(status == STATUS_TIMEOUT, "got %#x\n", status);
 
     if (pNtNotifyChangeMultipleKeys)
     {