From 243496067ba59600cc78b900af56d310fbfa3ae2 Mon Sep 17 00:00:00 2001 From: James Hawkins Date: Sun, 20 Apr 2008 03:07:15 -0500 Subject: [PATCH] * Fix a few tests that fail in win9x. --- dlls/msi/tests/install.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a85cdd4..fac57c3 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -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); -- 1.5.4.3