[PATCH 1/5] bcrypt/tests: Workaround RegGetValueW not being present in XP
Bruno Jesus
00cpxxx at gmail.com
Fri Dec 2 12:09:39 CST 2016
Current XP testbox timeout the test due to a dialog box saying RegGetValueW was not found.
https://testbot.winehq.org/JobDetails.pl?Key=27050&scrshot_101=1&log_101=1#k101
Signed-off-by: Bruno Jesus <00cpxxx at gmail.com>
---
dlls/bcrypt/tests/bcrypt.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
index 5cdb065..4466179 100644
--- a/dlls/bcrypt/tests/bcrypt.c
+++ b/dlls/bcrypt/tests/bcrypt.c
@@ -75,18 +75,19 @@ static void test_BCryptGetFipsAlgorithmMode(void)
'L','s','a',0};
static const WCHAR policyValueXPW[] = {
'F','I','P','S','A','l','g','o','r','i','t','h','m','P','o','l','i','c','y',0};
+ HKEY hkey = NULL;
BOOLEAN expected;
BOOLEAN enabled;
DWORD value, count[2] = {sizeof(value), sizeof(value)};
NTSTATUS ret;
- if (!RegGetValueW(HKEY_LOCAL_MACHINE, policyKeyVistaW, policyValueVistaW,
- RRF_RT_REG_DWORD, NULL, &value, &count[0]))
+ if (RegOpenKeyW(HKEY_LOCAL_MACHINE, policyKeyVistaW, &hkey) == ERROR_SUCCESS &&
+ RegQueryValueExW(hkey, policyValueVistaW, NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS)
{
expected = !!value;
}
- else if (!RegGetValueW(HKEY_LOCAL_MACHINE, policyKeyXPW, policyValueXPW,
- RRF_RT_REG_DWORD, NULL, &value, &count[1]))
+ else if (RegOpenKeyW(HKEY_LOCAL_MACHINE, policyKeyXPW, &hkey) == ERROR_SUCCESS &&
+ RegQueryValueExW(hkey, policyValueXPW, NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS)
{
expected = !!value;
}
@@ -96,6 +97,7 @@ static void test_BCryptGetFipsAlgorithmMode(void)
todo_wine
ok(0, "Neither XP or Vista key is present\n");
}
+ RegCloseKey(hkey);
ret = BCryptGetFipsAlgorithmMode(&enabled);
ok(ret == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got 0x%x\n", ret);
--
2.9.3
More information about the wine-patches
mailing list