Paul Vriens : setupapi/tests: Fix two failures on win98.

Alexandre Julliard julliard at winehq.org
Fri Sep 12 07:01:11 CDT 2008


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

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Thu Sep 11 14:43:18 2008 +0200

setupapi/tests: Fix two failures on win98.

---

 dlls/setupapi/tests/misc.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c
index a18fd37..bd3f1ce 100644
--- a/dlls/setupapi/tests/misc.c
+++ b/dlls/setupapi/tests/misc.c
@@ -166,8 +166,9 @@ static void test_SetupCopyOEMInf(void)
     SetLastError(0xdeadbeef);
     res = pSetupCopyOEMInfA("", NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL);
     ok(res == FALSE, "Expected FALSE, got %d\n", res);
-    ok(GetLastError() == ERROR_FILE_NOT_FOUND,
-       "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError());
+    ok(GetLastError() == ERROR_FILE_NOT_FOUND ||
+       GetLastError() == ERROR_BAD_PATHNAME, /* Win98 */
+       "Expected ERROR_FILE_NOT_FOUND or ERROR_BAD_PATHNAME, got %d\n", GetLastError());
 
     /* try a relative nonexistent SourceInfFileName */
     SetLastError(0xdeadbeef);
@@ -191,8 +192,9 @@ static void test_SetupCopyOEMInf(void)
     SetLastError(0xdeadbeef);
     res = pSetupCopyOEMInfA(toolong, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL);
     ok(res == FALSE, "Expected FALSE, got %d\n", res);
-    ok(GetLastError() == ERROR_FILE_NOT_FOUND,
-       "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError());
+    ok(GetLastError() == ERROR_FILE_NOT_FOUND ||
+       GetLastError() == ERROR_FILENAME_EXCED_RANGE, /* Win98 */
+       "Expected ERROR_FILE_NOT_FOUND or ERROR_FILENAME_EXCED_RANGE, got %d\n", GetLastError());
 
     get_temp_filename(tmpfile);
     create_inf_file(tmpfile);




More information about the wine-cvs mailing list