Commit be3a4c26 authored by Hugh McMaster's avatar Hugh McMaster Committed by Alexandre Julliard

reg/tests: Add verify_reg_nonexist helper function.

parent eda5d61c
...@@ -81,6 +81,16 @@ static void verify_reg_(unsigned line, HKEY hkey, const char* value, ...@@ -81,6 +81,16 @@ static void verify_reg_(unsigned line, HKEY hkey, const char* value,
lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); lok(memcmp(data, exp_data, size) == 0, "got wrong data\n");
} }
#define verify_reg_nonexist(k,v) verify_reg_nonexist_(__LINE__,k,v)
static void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value)
{
LONG err;
err = RegQueryValueExA(hkey, value, NULL, NULL, NULL, NULL);
lok(err == ERROR_FILE_NOT_FOUND, "registry value '%s' shouldn't exist; got %d, expected 2\n",
value, err);
}
static void test_add(void) static void test_add(void)
{ {
HKEY hkey, subkey; HKEY hkey, subkey;
...@@ -499,18 +509,15 @@ static void test_delete(void) ...@@ -499,18 +509,15 @@ static void test_delete(void)
run_reg_exe("reg delete HKCU\\" KEY_BASE " /v bar /f", &r); run_reg_exe("reg delete HKCU\\" KEY_BASE " /v bar /f", &r);
ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
err = RegQueryValueExA(hkey, "bar", NULL, NULL, NULL, NULL); verify_reg_nonexist(hkey, "bar");
ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err);
run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /f", &r); run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /f", &r);
ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
err = RegQueryValueExA(hkey, "", NULL, NULL, NULL, NULL); verify_reg_nonexist(hkey, "");
ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err);
run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /f", &r); run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /f", &r);
ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
err = RegQueryValueExA(hkey, "foo", NULL, NULL, NULL, NULL); verify_reg_nonexist(hkey, "foo");
ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err);
err = RegOpenKeyExA(hkey, "subkey", 0, KEY_READ, &hsubkey); err = RegOpenKeyExA(hkey, "subkey", 0, KEY_READ, &hsubkey);
ok(err == ERROR_SUCCESS, "got %d\n", err); ok(err == ERROR_SUCCESS, "got %d\n", err);
RegCloseKey(hsubkey); RegCloseKey(hsubkey);
......
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