Nicolas Le Cam : msi/tests: Fix test when content indexing is disabled.

Alexandre Julliard julliard at winehq.org
Fri Apr 10 08:10:15 CDT 2009


Module: wine
Branch: master
Commit: 112bb084f1d6e144997eb64648ea5bfdc49214c3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=112bb084f1d6e144997eb64648ea5bfdc49214c3

Author: Nicolas Le Cam <niko.lecam at gmail.com>
Date:   Fri Apr 10 00:37:46 2009 +0200

msi/tests: Fix test when content indexing is disabled.

---

 dlls/msi/tests/install.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 768ece1..3500007 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -2295,6 +2295,7 @@ static void test_setpropertyfolder(void)
 {
     UINT r;
     CHAR path[MAX_PATH];
+    DWORD attr;
 
     lstrcpyA(path, PROG_FILES_DIR);
     lstrcatA(path, "\\msitest\\added");
@@ -2308,7 +2309,8 @@ static void test_setpropertyfolder(void)
 
     r = MsiInstallProductA(msifile, NULL);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
-    if (GetFileAttributesA(path) == FILE_ATTRIBUTE_DIRECTORY)
+    attr = GetFileAttributesA(path);
+    if (attr != INVALID_FILE_ATTRIBUTES && (attr & FILE_ATTRIBUTE_DIRECTORY))
     {
         ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n");
         ok(delete_pf("msitest\\added", FALSE), "File not installed\n");




More information about the wine-cvs mailing list