[PATCH 3/3] Fix some test failures on Win98
Paul Vriens
Paul.Vriens.Wine at gmail.com
Fri Oct 9 02:00:30 CDT 2009
---
dlls/setupapi/tests/misc.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c
index f7ac6d1..a3abde4 100644
--- a/dlls/setupapi/tests/misc.c
+++ b/dlls/setupapi/tests/misc.c
@@ -197,7 +197,9 @@ static void test_SetupCopyOEMInf(void)
/* try a relative SourceInfFileName */
SetLastError(0xdeadbeef);
res = pSetupCopyOEMInfA(tmpfile, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL);
- ok(res == FALSE, "Expected FALSE, got %d\n", res);
+ ok(res == FALSE ||
+ broken(res == TRUE), /* Win98 */
+ "Expected FALSE, got %d\n", res);
if (GetLastError() == ERROR_WRONG_INF_TYPE || GetLastError() == ERROR_UNSUPPORTED_TYPE /* Win7 */)
{
/* FIXME:
@@ -209,7 +211,8 @@ static void test_SetupCopyOEMInf(void)
return;
}
- ok(GetLastError() == ERROR_FILE_NOT_FOUND,
+ ok(GetLastError() == ERROR_FILE_NOT_FOUND ||
+ broken(GetLastError() == ERROR_SUCCESS), /* Win98 */
"Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError());
ok(file_exists(tmpfile), "Expected tmpfile to exist\n");
--
1.6.2.5
--------------080107050906000106020707--
More information about the wine-patches
mailing list