ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Fix a few tests that fail in win9x.

This commit is contained in:
James Hawkins 2008-04-20 03:07:15 -05:00 committed by Alexandre Julliard
parent 6c4d9448a9
commit a5d15b3b60
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/msi/tests/install.c
View File

@ -1956,8 +1956,9 @@ static void test_concurrentinstall(void)
r = MsiInstallProductA(msifile, NULL);
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\\augustus", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n");
DeleteFile(path);
@ -1978,6 +1979,10 @@ static void test_concurrentinstall(void)
static void test_setpropertyfolder(void)
{
UINT r;
CHAR path[MAX_PATH];
lstrcpyA(path, PROG_FILES_DIR);
lstrcatA(path, "\\msitest\\added");
CreateDirectoryA("msitest", NULL);
create_file("msitest\\maximus", 500);
@ -1988,9 +1993,18 @@ static void test_setpropertyfolder(void)
r = MsiInstallProductA(msifile, NULL);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
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");
if (GetFileAttributesA(path) == FILE_ATTRIBUTE_DIRECTORY)
{
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 */
DeleteFile(msifile);