Skip to content

W
wine-cw
Commit 714abcb7 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard
Browse files
Options

wshom/tests: Use RegQueryValueEx so that the tests run on Win 2k and XP.

parent 9327e476
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
dlls/wshom.ocx/tests/wshom.c
View file @ 714abcb7
...@@ -223,7 +223,8 @@ if (0) /* crashes on native */ ...@@ -223,7 +223,8 @@ if (0) /* crashes on native */
SysFreeString(str); SysFreeString(str);
hr = IWshShell3_put_CurrentDirectory(sh3, NULL); hr = IWshShell3_put_CurrentDirectory(sh3, NULL);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(hr == E_INVALIDARG ||
broken(hr == HRESULT_FROM_WIN32(ERROR_NOACCESS)), "got 0x%08x\n", hr);
str = SysAllocString(emptyW); str = SysAllocString(emptyW);
hr = IWshShell3_put_CurrentDirectory(sh3, str); hr = IWshShell3_put_CurrentDirectory(sh3, str);
...@@ -490,7 +491,7 @@ static void test_registry(void) ...@@ -490,7 +491,7 @@ static void test_registry(void)
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
type = REG_NONE; type = REG_NONE;
ret = RegGetValueA(root, NULL, "regsz", RRF_RT_ANY, &type, NULL, NULL); ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL);
ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(ret == ERROR_SUCCESS, "got %d\n", ret);
ok(type == REG_SZ, "got %d\n", type); ok(type == REG_SZ, "got %d\n", type);
...@@ -503,7 +504,7 @@ static void test_registry(void) ...@@ -503,7 +504,7 @@ static void test_registry(void)
VariantClear(&value); VariantClear(&value);
type = REG_NONE; type = REG_NONE;
ret = RegGetValueA(root, NULL, "regsz", RRF_RT_ANY, &type, NULL, NULL); ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL);
ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(ret == ERROR_SUCCESS, "got %d\n", ret);
ok(type == REG_SZ, "got %d\n", type); ok(type == REG_SZ, "got %d\n", type);
...@@ -516,7 +517,7 @@ static void test_registry(void) ...@@ -516,7 +517,7 @@ static void test_registry(void)
VariantClear(&value); VariantClear(&value);
type = REG_NONE; type = REG_NONE;
ret = RegGetValueA(root, NULL, "regsz", RRF_RT_ANY, &type, NULL, NULL); ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL);
ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(ret == ERROR_SUCCESS, "got %d\n", ret);
ok(type == REG_SZ, "got %d\n", type); ok(type == REG_SZ, "got %d\n", type);
......
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