ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntoskrnl.exe/tests: Only count test driver load notify. 

Sometimes Windows loads other drivers when we don't expect it, and
this causes spurious failures.

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2021-07-05 11:38:23 +02:00 committed by Alexandre Julliard
parent e72c71d27d
commit 7c7e77da9d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/ntoskrnl.exe/tests/driver.c
View File

@ -313,8 +313,7 @@ static WCHAR test_load_image_name[MAX_PATH];
static void WINAPI test_load_image_notify_routine(UNICODE_STRING *image_name, HANDLE process_id, static void WINAPI test_load_image_notify_routine(UNICODE_STRING *image_name, HANDLE process_id,
IMAGE_INFO *image_info) IMAGE_INFO *image_info)
{ {
if (test_load_image_notify_count == -1 if (image_name->Buffer && wcsstr(image_name->Buffer, L".tmp"))
|| (image_name->Buffer && wcsstr(image_name->Buffer, L".tmp")))
{ {
++test_load_image_notify_count; ++test_load_image_notify_count;
test_image_info = *image_info; test_image_info = *image_info;
@ -380,7 +379,7 @@ static void test_load_driver(void)
|| !wcscmp(test_load_image_name, full_name->Name.Buffer), || !wcscmp(test_load_image_name, full_name->Name.Buffer),
"Expected image path name %ls, got %ls.\n", full_name->Name.Buffer, test_load_image_name); "Expected image path name %ls, got %ls.\n", full_name->Name.Buffer, test_load_image_name);
test_load_image_notify_count = -1; test_load_image_notify_count = 0;
ret = ZwLoadDriver(&name); ret = ZwLoadDriver(&name);
ok(ret == STATUS_IMAGE_ALREADY_LOADED, "got %#x\n", ret); ok(ret == STATUS_IMAGE_ALREADY_LOADED, "got %#x\n", ret);
@ -395,7 +394,7 @@ static void test_load_driver(void)
ret = PsRemoveLoadImageNotifyRoutine(test_load_image_notify_routine); ret = PsRemoveLoadImageNotifyRoutine(test_load_image_notify_routine);
ok(ret == STATUS_PROCEDURE_NOT_FOUND, "Got unexpected status %#x.\n", ret); ok(ret == STATUS_PROCEDURE_NOT_FOUND, "Got unexpected status %#x.\n", ret);
ok(test_load_image_notify_count == -1, "Got unexpected test_load_image_notify_count %u.\n", ok(test_load_image_notify_count == 0, "Got unexpected test_load_image_notify_count %u.\n",
test_load_image_notify_count); test_load_image_notify_count);
RtlFreeUnicodeString(&image_path); RtlFreeUnicodeString(&image_path);
} }