James Hawkins : msi: Fix a failing test in win9x.
Alexandre Julliard
julliard at winehq.org
Fri Oct 24 08:12:53 CDT 2008
Module: wine
Branch: master
Commit: acfc9159149afdae4ede87d601b0bf6c03b067dd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfc9159149afdae4ede87d601b0bf6c03b067dd
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Fri Oct 24 07:14:52 2008 -0500
msi: Fix a failing test in win9x.
---
dlls/msi/tests/db.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index afee033..961aa5a 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -6864,7 +6864,12 @@ static void test_dbmerge(void)
GetCurrentDirectoryA(MAX_PATH, buf);
r = MsiDatabaseImportA(hdb, buf, "codepage.idt");
- todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+ todo_wine
+ {
+ ok(r == ERROR_SUCCESS ||
+ broken(r == ERROR_FUNCTION_FAILED), /* win9x */
+ "Expected ERROR_SUCCESS, got %d\n", r);
+ }
query = "DROP TABLE `One`";
r = run_query(hdb, 0, query);
More information about the wine-cvs
mailing list