Paul Vriens : setupapi/tests: Fix a test failure on Win98.

Alexandre Julliard julliard at winehq.org
Fri Apr 24 10:00:11 CDT 2009


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

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Fri Apr 24 11:56:10 2009 +0200

setupapi/tests: Fix a test failure on Win98.

---

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

diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c
index 726d1eb..e110e22 100644
--- a/dlls/setupapi/tests/misc.c
+++ b/dlls/setupapi/tests/misc.c
@@ -144,7 +144,7 @@ static void test_SetupCopyOEMInf(void)
     CHAR toolong[MAX_PATH * 2];
     CHAR path[MAX_PATH], dest[MAX_PATH];
     CHAR tmpfile[MAX_PATH], dest_save[MAX_PATH];
-    LPSTR inf;
+    LPSTR inf = NULL;
     DWORD size;
     BOOL res;
 
@@ -293,6 +293,9 @@ static void test_SetupCopyOEMInf(void)
     ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError());
     ok(lstrlen(dest) + 1 == size, "Expected sizes to match, got (%d, %d)\n", lstrlen(dest), size);
     ok(file_exists(dest), "Expected destination inf to exist\n");
+    ok((inf && inf[0] != 0) ||
+       broken(!inf), /* Win98 */
+       "Expected inf to point to the filename\n");
     ok(check_format(dest, inf), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest);
     ok(file_exists(path), "Expected source inf to exist\n");
     ok(size == lstrlen(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n");




More information about the wine-cvs mailing list