[1/6] msi: Fix some test failures on Windows.

Hans Leidekker hans at codeweavers.com
Thu Apr 29 02:37:44 CDT 2010


---
 dlls/msi/tests/package.c |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index e2a95c0..ce15c66 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -2007,7 +2007,7 @@ static void test_property_table(void)
     const char *query;
     UINT r;
     MSIHANDLE hpkg, hdb, hrec;
-    char buffer[MAX_PATH];
+    char buffer[MAX_PATH], package[10];
     DWORD sz;
     BOOL found;
 
@@ -2050,15 +2050,14 @@ static void test_property_table(void)
     r = run_query(hdb, query);
     ok(r == ERROR_SUCCESS, "failed to add column\n");
 
-    hpkg = package_from_db(hdb);
-    todo_wine
-    {
-        ok(!hpkg, "package should not be created\n");
-    }
+    sprintf(package, "#%i", hdb);
+    r = MsiOpenPackage(package, &hpkg);
+    todo_wine ok(r != ERROR_SUCCESS, "MsiOpenPackage succeeded\n");
+    if (r == ERROR_SUCCESS)
+        MsiCloseHandle(hpkg);
 
-    MsiCloseHandle(hdb);
-    MsiCloseHandle(hpkg);
-    DeleteFile(msifile);
+    r = MsiCloseHandle(hdb);
+    ok(r == ERROR_SUCCESS, "MsiCloseHandle failed %u\n", r);
 
     hdb = create_package_db();
     ok (hdb, "failed to create package database\n");
-- 
1.7.0.4







More information about the wine-patches mailing list