Paul Vriens : shlwapi/tests: Fix some test failures on Win9x/WinMe.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fc47c7d1d7e2ef768304d2be5531f623be79e5ae
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fc47c7d1d7e2ef768304d2be55...

Author: Paul Vriens 
Date:   Fri Mar  5 11:45:40 2010 +0100

shlwapi/tests: Fix some test failures on Win9x/WinMe.

---

dlls/shlwapi/tests/ordinal.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index 17201b5..83aec78 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -1435,8 +1435,9 @@ static void test_SHSetWindowBits(void)
     SetLastError(0xdeadbeef);
     style = pSHSetWindowBits(NULL, GWL_STYLE, 0, 0);
     ok(style == 0, "expected 0 retval, got %d\n", style);
-    ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE,
-              "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError());
+    ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE ||
+        broken(GetLastError() == 0xdeadbeef), /* Win9x/WinMe */
+        "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError());

/* zero mask, zero flags */
     styleold = GetWindowLongA(hwnd, GWL_STYLE);
@@ -1532,7 +1533,9 @@ if (0)
     SetLastError(0xdeadbeef);
     ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff));
     ok(ret == lstrlenA(buff)+1, "got %d\n", ret);
-    ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError());
+    ok(GetLastError() == 0xdeadbeef ||
+        broken(GetLastError() == ERROR_INVALID_FLAGS), /* Win9x/WinMe */
+        "expected 0xdeadbeef, got %d\n", GetLastError());

/* now check returned strings */
     flags = FDTF_SHORTTIME;
@@ -1682,7 +1685,9 @@ if (0)
     SetLastError(0xdeadbeef);
     ret = pSHFormatDateTimeW(&filetime, &flags, buff, sizeof(buff)/sizeof(WCHAR));
     ok(ret == lstrlenW(buff)+1, "got %d\n", ret);
-    ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError());
+    ok(GetLastError() == 0xdeadbeef ||
+        broken(GetLastError() == ERROR_INVALID_FLAGS), /* Win9x/WinMe */
+        "expected 0xdeadbeef, got %d\n", GetLastError());

/* now check returned strings */
     flags = FDTF_SHORTTIME;