commit 1214dca41237dcf401f3548cf0538b0748df6426
author Hans Leidekker <hans@codeweavers.com> Fri Dec 10 16:46:43 2010 +0100
committer Alexandre Julliard <julliard@winehq.org> Fri Dec 10 17:09:37 2010 +0100
tree 78905b80f9bbd74d697acd2b7572d63671818d42
parent 9f182396fb600c550e26d6b03d6d88d7d6ceb29b

msi/tests: Fix some test failures on Wow64.

dlls/msi/tests/action.c

diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c
index 504291a..0032222 100644
--- a/dlls/msi/tests/action.c
+++ b/dlls/msi/tests/action.c
@@ -2842,7 +2842,7 @@
     RegCloseKey(hkey);
 
 machprod:
-    res = RegOpenKeyA(HKEY_CLASSES_ROOT, machprod, &hkey);
+    res = RegOpenKeyExA(HKEY_CLASSES_ROOT, machprod, 0, access, &hkey);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST");
@@ -2856,7 +2856,7 @@
     CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0);
     CHECK_DEL_REG_STR(hkey, "Clients", ":");
 
-    res = RegOpenKeyA(hkey, "SourceList", &sourcelist);
+    res = RegOpenKeyExA(hkey, "SourceList", 0, access, &sourcelist);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     lstrcpyA(path, "n;1;");
@@ -2864,7 +2864,7 @@
     CHECK_DEL_REG_STR(sourcelist, "LastUsedSource", path);
     CHECK_DEL_REG_STR(sourcelist, "PackageName", "msitest.msi");
 
-    res = RegOpenKeyA(sourcelist, "Net", &net);
+    res = RegOpenKeyExA(sourcelist, "Net", 0, access, &net);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     CHECK_DEL_REG_STR(net, "1", temp);
@@ -2872,7 +2872,7 @@
     RegDeleteKeyA(net, "");
     RegCloseKey(net);
 
-    res = RegOpenKeyA(sourcelist, "Media", &media);
+    res = RegOpenKeyExA(sourcelist, "Media", 0, access, &media);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     CHECK_DEL_REG_STR(media, "1", "DISK1;");
@@ -2884,7 +2884,7 @@
     RegDeleteKeyA(hkey, "");
     RegCloseKey(hkey);
 
-    res = RegOpenKeyA(HKEY_CLASSES_ROOT, machup, &hkey);
+    res = RegOpenKeyExA(HKEY_CLASSES_ROOT, machup, 0, access, &hkey);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL);
@@ -2989,7 +2989,7 @@
     res = RegOpenKeyA(HKEY_CURRENT_USER, cupath, &hkey);
     ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
 
-    res = RegOpenKeyA(HKEY_LOCAL_MACHINE, classfeat, &hkey);
+    res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, classfeat, 0, access, &hkey);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     CHECK_REG_STR(hkey, "feature", "");