Commit a5d15b3b authored by James Hawkins's avatar James Hawkins Committed by Alexandre Julliard

msi: Fix a few tests that fail in win9x.

parent 6c4d9448
...@@ -1956,8 +1956,9 @@ static void test_concurrentinstall(void) ...@@ -1956,8 +1956,9 @@ static void test_concurrentinstall(void)
r = MsiInstallProductA(msifile, NULL); r = MsiInstallProductA(msifile, NULL);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
if (!delete_pf("msitest\\augustus", TRUE))
trace("concurrent installs not supported\n");
ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n");
ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
DeleteFile(path); DeleteFile(path);
...@@ -1978,6 +1979,10 @@ static void test_concurrentinstall(void) ...@@ -1978,6 +1979,10 @@ static void test_concurrentinstall(void)
static void test_setpropertyfolder(void) static void test_setpropertyfolder(void)
{ {
UINT r; UINT r;
CHAR path[MAX_PATH];
lstrcpyA(path, PROG_FILES_DIR);
lstrcatA(path, "\\msitest\\added");
CreateDirectoryA("msitest", NULL); CreateDirectoryA("msitest", NULL);
create_file("msitest\\maximus", 500); create_file("msitest\\maximus", 500);
...@@ -1988,9 +1993,18 @@ static void test_setpropertyfolder(void) ...@@ -1988,9 +1993,18 @@ static void test_setpropertyfolder(void)
r = MsiInstallProductA(msifile, NULL); r = MsiInstallProductA(msifile, NULL);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n"); if (GetFileAttributesA(path) == FILE_ATTRIBUTE_DIRECTORY)
ok(delete_pf("msitest\\added", FALSE), "File not installed\n"); {
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n");
ok(delete_pf("msitest\\added", FALSE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n");
}
else
{
trace("changing folder property not supported\n");
ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n");
}
/* Delete the files in the temp (current) folder */ /* Delete the files in the temp (current) folder */
DeleteFile(msifile); DeleteFile(msifile);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment