Hans Leidekker : msi/tests: Fix some test failures on 64-bit.

[Alexandre Julliard]

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

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Wed Oct  6 15:45:16 2010 +0200

msi/tests: Fix some test failures on 64-bit.

---

 dlls/msi/tests/install.c |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index b69a21a..71dd168 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -10160,8 +10160,16 @@ static void test_remove_registry_values(void)
     ok(res == ERROR_SUCCESS, "key removed\n");
     RegCloseKey(key);
 
-    res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", 0, access, &key);
-    ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n");
+    if (is_64bit && !wow64)
+    {
+        res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wow6432Node\\Wine\\key2", 0, KEY_ALL_ACCESS, &key);
+        ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n");
+    }
+    else
+    {
+        res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", 0, KEY_ALL_ACCESS, &key);
+        ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n");
+    }
 
     res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", 0, NULL, 0, access, NULL, &key, NULL);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -10170,8 +10178,16 @@ static void test_remove_registry_values(void)
     r = MsiInstallProductA(msifile, "REMOVE=ALL");
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
 
-    res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", 0, access, &key);
-    ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n");
+    if (is_64bit && !wow64)
+    {
+        res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wow6432Node\\Wine\\key1", 0, KEY_ALL_ACCESS, &key);
+        ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n");
+    }
+    else
+    {
+        res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", 0, KEY_ALL_ACCESS, &key);
+        ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n");
+    }
 
     res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", 0, access, &key);
     ok(res == ERROR_SUCCESS, "key removed\n");
@@ -10181,8 +10197,16 @@ static void test_remove_registry_values(void)
     ok(res == ERROR_SUCCESS, "key removed\n");
     RegCloseKey(key);
 
-    res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyB", 0, access, &key);
-    ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n");
+    if (is_64bit && !wow64)
+    {
+        res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wow6432Node\\Wine\\keyB", 0, KEY_ALL_ACCESS, &key);
+        ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n");
+    }
+    else
+    {
+        res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyB", 0, KEY_ALL_ACCESS, &key);
+        ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n");
+    }
 
     delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyA", access);
     delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", access);