msi/tests: Opening package with relative filename sometimes succeeds on Windows.
This commit is contained in:
parent
07f9991062
commit
f9f2e91198
|
@ -1760,7 +1760,6 @@ static void test_MsiGetComponentPath(void)
|
||||||
RegDeleteKeyA(compkey, "");
|
RegDeleteKeyA(compkey, "");
|
||||||
RegCloseKey(prodkey);
|
RegCloseKey(prodkey);
|
||||||
RegCloseKey(compkey);
|
RegCloseKey(compkey);
|
||||||
RegCloseKey(installprop);
|
|
||||||
DeleteFileA("C:\\imapath");
|
DeleteFileA("C:\\imapath");
|
||||||
|
|
||||||
lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\");
|
lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\");
|
||||||
|
@ -1923,9 +1922,6 @@ static void test_MsiGetProductCode(void)
|
||||||
RegDeleteKeyA(prodkey, "");
|
RegDeleteKeyA(prodkey, "");
|
||||||
RegCloseKey(prodkey);
|
RegCloseKey(prodkey);
|
||||||
|
|
||||||
RegDeleteKeyA(prodkey, "");
|
|
||||||
RegCloseKey(prodkey);
|
|
||||||
|
|
||||||
lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Products\\");
|
lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Products\\");
|
||||||
lstrcatA(keypath, prod_squashed);
|
lstrcatA(keypath, prod_squashed);
|
||||||
|
|
||||||
|
@ -7368,9 +7364,12 @@ static void test_MsiOpenProduct(void)
|
||||||
/* LocalPackage has just the package name */
|
/* LocalPackage has just the package name */
|
||||||
hprod = 0xdeadbeef;
|
hprod = 0xdeadbeef;
|
||||||
r = MsiOpenProductA(prodcode, &hprod);
|
r = MsiOpenProductA(prodcode, &hprod);
|
||||||
ok(r == ERROR_INSTALL_PACKAGE_OPEN_FAILED,
|
ok(r == ERROR_INSTALL_PACKAGE_OPEN_FAILED || r == ERROR_SUCCESS,
|
||||||
"Expected ERROR_INSTALL_PACKAGE_OPEN_FAILED, got %d\n", r);
|
"Expected ERROR_INSTALL_PACKAGE_OPEN_FAILED or ERROR_SUCCESS, got %d\n", r);
|
||||||
ok(hprod == 0xdeadbeef, "Expected hprod to be unchanged\n");
|
if (r == ERROR_SUCCESS)
|
||||||
|
MsiCloseHandle(hprod);
|
||||||
|
else
|
||||||
|
ok(hprod == 0xdeadbeef, "Expected hprod to be unchanged\n");
|
||||||
|
|
||||||
lstrcpyA(val, path);
|
lstrcpyA(val, path);
|
||||||
lstrcatA(val, "\\winetest.msi");
|
lstrcatA(val, "\\winetest.msi");
|
||||||
|
|
Loading…
Reference in New Issue