Skip to content

W
wine-winehq
Commit 1214dca4 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

msi/tests: Fix some test failures on Wow64.

parent 9f182396
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
dlls/msi/tests/action.c
View file @ 1214dca4
...@@ -2842,7 +2842,7 @@ currentuser: ...@@ -2842,7 +2842,7 @@ currentuser:
RegCloseKey(hkey); RegCloseKey(hkey);
machprod: 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); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST"); CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST");
...@@ -2856,7 +2856,7 @@ machprod: ...@@ -2856,7 +2856,7 @@ machprod:
CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0); CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0);
CHECK_DEL_REG_STR(hkey, "Clients", ":"); 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); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
lstrcpyA(path, "n;1;"); lstrcpyA(path, "n;1;");
...@@ -2864,7 +2864,7 @@ machprod: ...@@ -2864,7 +2864,7 @@ machprod:
CHECK_DEL_REG_STR(sourcelist, "LastUsedSource", path); CHECK_DEL_REG_STR(sourcelist, "LastUsedSource", path);
CHECK_DEL_REG_STR(sourcelist, "PackageName", "msitest.msi"); 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); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_DEL_REG_STR(net, "1", temp); CHECK_DEL_REG_STR(net, "1", temp);
...@@ -2872,7 +2872,7 @@ machprod: ...@@ -2872,7 +2872,7 @@ machprod:
RegDeleteKeyA(net, ""); RegDeleteKeyA(net, "");
RegCloseKey(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); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_DEL_REG_STR(media, "1", "DISK1;"); CHECK_DEL_REG_STR(media, "1", "DISK1;");
...@@ -2884,7 +2884,7 @@ machprod: ...@@ -2884,7 +2884,7 @@ machprod:
RegDeleteKeyA(hkey, ""); RegDeleteKeyA(hkey, "");
RegCloseKey(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); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL); CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL);
...@@ -2989,7 +2989,7 @@ static void test_publish_features(void) ...@@ -2989,7 +2989,7 @@ static void test_publish_features(void)
res = RegOpenKeyA(HKEY_CURRENT_USER, cupath, &hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, cupath, &hkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); 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); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_REG_STR(hkey, "feature", ""); CHECK_REG_STR(hkey, "feature", "");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment