Ge van Geldorp : msi/tests: Opening package with relative filename sometimes succeeds on Windows.
Alexandre Julliard
julliard at winehq.org
Mon Jan 12 10:41:01 CST 2009
Module: wine
Branch: master
Commit: f9f2e91198a456240af839930a24226e6358b94e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f2e91198a456240af839930a24226e6358b94e
Author: Ge van Geldorp <ge at gse.nl>
Date: Sun Jan 11 00:27:50 2009 +0100
msi/tests: Opening package with relative filename sometimes succeeds on Windows.
---
dlls/msi/tests/msi.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c
index 3396f5c..a52e011 100644
--- a/dlls/msi/tests/msi.c
+++ b/dlls/msi/tests/msi.c
@@ -1760,7 +1760,6 @@ static void test_MsiGetComponentPath(void)
RegDeleteKeyA(compkey, "");
RegCloseKey(prodkey);
RegCloseKey(compkey);
- RegCloseKey(installprop);
DeleteFileA("C:\\imapath");
lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\");
@@ -1923,9 +1922,6 @@ static void test_MsiGetProductCode(void)
RegDeleteKeyA(prodkey, "");
RegCloseKey(prodkey);
- RegDeleteKeyA(prodkey, "");
- RegCloseKey(prodkey);
-
lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Products\\");
lstrcatA(keypath, prod_squashed);
@@ -7368,9 +7364,12 @@ static void test_MsiOpenProduct(void)
/* LocalPackage has just the package name */
hprod = 0xdeadbeef;
r = MsiOpenProductA(prodcode, &hprod);
- ok(r == ERROR_INSTALL_PACKAGE_OPEN_FAILED,
- "Expected ERROR_INSTALL_PACKAGE_OPEN_FAILED, got %d\n", r);
- ok(hprod == 0xdeadbeef, "Expected hprod to be unchanged\n");
+ ok(r == ERROR_INSTALL_PACKAGE_OPEN_FAILED || r == ERROR_SUCCESS,
+ "Expected ERROR_INSTALL_PACKAGE_OPEN_FAILED or ERROR_SUCCESS, got %d\n", r);
+ if (r == ERROR_SUCCESS)
+ MsiCloseHandle(hprod);
+ else
+ ok(hprod == 0xdeadbeef, "Expected hprod to be unchanged\n");
lstrcpyA(val, path);
lstrcatA(val, "\\winetest.msi");
More information about the wine-cvs
mailing list