regedit/tests: Use the verify_key*() functions where possible.
Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
f0e21863c9
commit
73af2479c7
|
@ -550,7 +550,7 @@ static void test_basic_import_31(void)
|
||||||
static void test_invalid_import(void)
|
static void test_invalid_import(void)
|
||||||
{
|
{
|
||||||
LONG lr;
|
LONG lr;
|
||||||
HKEY hkey, subkey;
|
HKEY hkey;
|
||||||
|
|
||||||
lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
|
lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
|
||||||
ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr);
|
ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr);
|
||||||
|
@ -725,14 +725,12 @@ static void test_invalid_import(void)
|
||||||
exec_import_str("REGEDIT4\n\n"
|
exec_import_str("REGEDIT4\n\n"
|
||||||
"[HKEY_CURRENT_USER\\" KEY_BASE "\\\n"
|
"[HKEY_CURRENT_USER\\" KEY_BASE "\\\n"
|
||||||
"Subkey1]\n");
|
"Subkey1]\n");
|
||||||
lr = RegOpenKeyExA(hkey, "Subkey1", 0, KEY_READ, &subkey);
|
verify_key_nonexist(hkey, "Subkey1");
|
||||||
ok(lr == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", lr);
|
|
||||||
|
|
||||||
exec_import_str("REGEDIT4\n\n"
|
exec_import_str("REGEDIT4\n\n"
|
||||||
"[HKEY_CURRENT_USER\\" KEY_BASE "\n"
|
"[HKEY_CURRENT_USER\\" KEY_BASE "\n"
|
||||||
"\\Subkey2]\n");
|
"\\Subkey2]\n");
|
||||||
lr = RegOpenKeyExA(hkey, "Subkey2", 0, KEY_READ, &subkey);
|
verify_key_nonexist(hkey, "Subkey2");
|
||||||
ok(lr == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", lr);
|
|
||||||
|
|
||||||
exec_import_str("REGEDIT4\n\n"
|
exec_import_str("REGEDIT4\n\n"
|
||||||
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
|
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
|
||||||
|
|
Loading…
Reference in New Issue