int reg_add(int argc, WCHAR *argvW[])
{
HKEY root;
- WCHAR *path, *key_name, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0';
+ WCHAR *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0';
BOOL value_empty = FALSE, force = FALSE;
int i;
- if (!parse_registry_key(argvW[2], &root, &path, &key_name))
+ if (!parse_registry_key(argvW[2], &root, &path))
return 1;
for (i = 3; i < argc; i++)
BOOL value_all = FALSE, value_empty = FALSE, force = FALSE;
int i;
- if (!parse_registry_key(argvW[2], &root, &path, &key_name))
+ if (!parse_registry_key(argvW[2], &root, &path))
return 1;
for (i = 3; i < argc; i++)
if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all))
goto invalid;
+ key_name = get_long_key(root, path);
+
return run_delete(root, path, key_name, value_name, value_empty, value_all, force);
invalid:
int reg_export(int argc, WCHAR *argvW[])
{
HKEY root, hkey;
- WCHAR *path, *long_key;
+ WCHAR *path, *key_name;
BOOL overwrite_file = FALSE;
HANDLE hFile;
int i, ret;
if (argc < 4) goto invalid;
- if (!parse_registry_key(argvW[2], &root, &path, &long_key))
+ if (!parse_registry_key(argvW[2], &root, &path))
return 1;
for (i = 4; i < argc; i++)
return 1;
}
+ key_name = get_long_key(root, path);
+
hFile = get_file_handle(argvW[3], overwrite_file);
export_file_header(hFile);
- ret = export_registry_data(hFile, hkey, long_key);
+ ret = export_registry_data(hFile, hkey, key_name);
export_newline(hFile);
CloseHandle(hFile);
BOOL value_empty = FALSE, recurse = FALSE;
int i;
- if (!parse_registry_key(argvW[2], &root, &path, &key_name))
+ if (!parse_registry_key(argvW[2], &root, &path))
return 1;
for (i = 3; i < argc; i++)
if (value_name && value_empty)
goto invalid;
+ key_name = get_long_key(root, path);
+
return run_query(root, path, key_name, value_name, value_empty, recurse);
invalid:
return subkey_path;
}
-static WCHAR *get_long_key(HKEY root, WCHAR *path)
+WCHAR *get_long_key(HKEY root, WCHAR *path)
{
DWORD i, array_size = ARRAY_SIZE(root_rels), len;
WCHAR *long_key;
return long_key;
}
-BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key)
+BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path)
{
if (!sane_path(key))
return FALSE;
return FALSE;
}
- *long_key = get_long_key(*root, *path);
-
return TRUE;
}
BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info);
HKEY path_get_rootkey(const WCHAR *path);
WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len);
-BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key);
+WCHAR *get_long_key(HKEY root, WCHAR *path);
+BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path);
BOOL is_char(const WCHAR s, const WCHAR c);
BOOL is_switch(const WCHAR *s, const WCHAR c);
files:
programs/reg/resource.h: base/applications/cmdutils/reg/resource.h
tags:
- wine: 2c7d74594f2bd421f6d904f334171a198a13c66e
+ wine: 07fdd5036ca40fd4f0475583b6e410192576d804