Alexandre Julliard : msi/tests: Check the x86 program directory first for installed files.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Fri Jul  2 14:14:44 2010 +0200

msi/tests: Check the x86 program directory first for installed files.

---

dlls/msi/tests/automation.c |    3 ++-
 dlls/msi/tests/install.c    |    3 ++-
 dlls/msi/tests/patch.c      |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c
index c7c8926..bad4882 100644
--- a/dlls/msi/tests/automation.c
+++ b/dlls/msi/tests/automation.c
@@ -308,7 +308,8 @@ static BOOL get_program_files_dir(LPSTR buf)
         return FALSE;

size = MAX_PATH;
-    if (RegQueryValueEx(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)buf, &size))
+    if (RegQueryValueEx(hkey, "ProgramFilesDir (x86)", 0, &type, (LPBYTE)buf, &size) &&
+        RegQueryValueEx(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)buf, &size))
         return FALSE;

RegCloseKey(hkey);
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 6702f13..365c8a6 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -3246,7 +3246,8 @@ static BOOL get_system_dirs(void)
         return FALSE;

size = MAX_PATH;
-    if (RegQueryValueExA(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)PROG_FILES_DIR, &size)) {
+    if (RegQueryValueExA(hkey, "ProgramFilesDir (x86)", 0, &type, (LPBYTE)PROG_FILES_DIR, &size) &&
+        RegQueryValueExA(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)PROG_FILES_DIR, &size)) {
         RegCloseKey(hkey);
         return FALSE;
     }
diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c
index 3a35e35..4e10505 100644
--- a/dlls/msi/tests/patch.c
+++ b/dlls/msi/tests/patch.c
@@ -159,7 +159,8 @@ static BOOL get_program_files_dir( char *buf, char *buf2 )
         return FALSE;

size = MAX_PATH;
-    if (RegQueryValueExA( hkey, "ProgramFilesDir", 0, &type, (LPBYTE)buf, &size ))
+    if (RegQueryValueExA( hkey, "ProgramFilesDir (x86)", 0, &type, (LPBYTE)buf, &size ) &&
+        RegQueryValueExA( hkey, "ProgramFilesDir", 0, &type, (LPBYTE)buf, &size ))
     {
         RegCloseKey( hkey );
         return FALSE;