From 603822ca8bacb75bf69caffce0ce375c4a0893a5 Mon Sep 17 00:00:00 2001 From: James Hawkins Date: Sun, 20 Apr 2008 15:40:25 -0500 Subject: [PATCH] kernel32: Fix two tests that fail in win9x. --- dlls/kernel32/tests/change.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 7c90ccd3b81..cdba120e95d 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -98,7 +98,9 @@ static void test_FindFirstChangeNotification(void) /* pathetic checks */ change = FindFirstChangeNotificationA("not-a-file", FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); - ok(change == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND, + ok(change == INVALID_HANDLE_VALUE, "Expected INVALID_HANDLE_VALUE, got %p\n", change); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_NO_MORE_FILES, /* win95 */ "FindFirstChangeNotification error: %d\n", GetLastError()); if (0) /* This documents win2k behavior. It crashes on win98. */ @@ -152,17 +154,15 @@ static void test_FindFirstChangeNotification(void) thread = StartNotificationThread(dirname1, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = MoveFileA(dirname1, dirname2); ok(ret, "MoveFileA error: %d\n", GetLastError()); - ret = FinishNotificationThread(thread); - ok(!ret, "Unexpected notification\n"); + /* win9x and win2k behave differently here, don't check result */ + FinishNotificationThread(thread); /* What if we remove the directory we registered notification for? */ thread = StartNotificationThread(dirname2, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = RemoveDirectoryA(dirname2); ok(ret, "RemoveDirectoryA error: %d\n", GetLastError()); - - /* win98 and win2k behave differently here */ - ret = FinishNotificationThread(thread); - ok(ret || !ret, "You'll never read this\n"); + /* win9x and win2k behave differently here, don't check result */ + FinishNotificationThread(thread); /* functional checks */