<html>
<head>
<style><!--
.hmmessage P
{
margin:0px;
padding:0px
}
body.hmmessage
{
font-size: 12pt;
font-family:Calibri
}
--></style></head>
<body class='hmmessage'><div dir='ltr'><br><div><div dir="ltr"><div><span style="font-family:monospace;">---
<br> programs/reg/reg.c | 166 +++++++++++++++++++++++++++--------------------------
<br> 1 file changed, 86 insertions(+), 80 deletions(-)
<br>
<br>diff --git a/programs/reg/reg.c b/programs/reg/reg.c
<br>index 4ec25bc..cf6425e 100644
<br>--- a/programs/reg/reg.c
<br>+++ b/programs/reg/reg.c
<br>@@ -22,6 +22,32 @@
<br> <br> #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A))
<br> <br>+static const WCHAR short_hklm[] = {'H','K','L','M',0};
<br>+static const WCHAR short_hkcu[] = {'H','K','C','U',0};
<br>+static const WCHAR short_hkcr[] = {'H','K','C','R',0};
<br>+static const WCHAR short_hku[] = {'H','K','U',0};
<br>+static const WCHAR short_hkcc[] = {'H','K','C','C',0};
<br>+static const WCHAR long_hklm[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0};
<br>+static const WCHAR long_hkcu[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0};
<br>+static const WCHAR long_hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0};
<br>+static const WCHAR long_hku[] = {'H','K','E','Y','_','U','S','E','R','S',0};
<br>+static const WCHAR long_hkcc[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0};
<br>+
<br>+static const struct
<br>+{
<br>+ HKEY key;
<br>+ const WCHAR *short_name;
<br>+ const WCHAR *long_name;
<br>+}
<br>+root_rels[] =
<br>+{
<br>+ {HKEY_LOCAL_MACHINE, short_hklm, long_hklm},
<br>+ {HKEY_CURRENT_USER, short_hkcu, long_hkcu},
<br>+ {HKEY_CLASSES_ROOT, short_hkcr, long_hkcr},
<br>+ {HKEY_USERS, short_hku, long_hku},
<br>+ {HKEY_CURRENT_CONFIG, short_hkcc, long_hkcc},
<br>+};
<br>+
<br> static const WCHAR type_none[] = {'R','E','G','_','N','O','N','E',0};
<br> static const WCHAR type_sz[] = {'R','E','G','_','S','Z',0};
<br> static const WCHAR type_expand_sz[] = {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0};
<br>@@ -95,51 +121,56 @@ static int reg_message(int msg)
<br> return reg_printfW(formatW, msg_buffer);
<br> }
<br> <br>-static int reg_StrCmpNIW(LPCWSTR str, LPCWSTR comp, int len)
<br>+static inline BOOL path_rootname_cmp(const WCHAR *input_path, const WCHAR *rootkey_name)
<br> {
<br>- int i;
<br>+ DWORD length = strlenW(rootkey_name);
<br> <br>- for (i = 0; i < len; i++)
<br>+ return (!strncmpiW(input_path, rootkey_name, length) &&
<br>+ (input_path[length] == 0 || input_path[length] == '\\'));
<br>+}
<br>+
<br>+static HKEY path_get_rootkey(const WCHAR *path)
<br>+{
<br>+ DWORD i;
<br>+
<br>+ for (i = 0; i < ARRAY_SIZE(root_rels); i++)
<br> {
<br>- if (!str[i])
<br>- {
<br>- len = i + 1;
<br>- break;
<br>- }
<br>+ if (path_rootname_cmp(path, root_rels[i].short_name) ||
<br>+ path_rootname_cmp(path, root_rels[i].long_name))
<br>+ return root_rels[i].key;
<br> }
<br> <br>- return CompareStringW(CP_ACP, NORM_IGNORECASE, str, len, comp, len) - CSTR_EQUAL;
<br>+ return NULL;
<br> }
<br> <br>-static HKEY get_rootkey(LPWSTR key)
<br>+static HKEY path_open(const WCHAR *path, BOOL create)
<br> {
<br>- static const WCHAR szHKLM[] = {'H','K','L','M',0};
<br>- static const WCHAR szHKEY_LOCAL_MACHINE[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0};
<br>- static const WCHAR szHKCU[] = {'H','K','C','U',0};
<br>- static const WCHAR szHKEY_CURRENT_USER[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0};
<br>- static const WCHAR szHKCR[] = {'H','K','C','R',0};
<br>- static const WCHAR szHKEY_CLASSES_ROOT[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0};
<br>- static const WCHAR szHKU[] = {'H','K','U',0};
<br>- static const WCHAR szHKEY_USERS[] = {'H','K','E','Y','_','U','S','E','R','S',0};
<br>- static const WCHAR szHKCC[] = {'H','K','C','C',0};
<br>- static const WCHAR szHKEY_CURRENT_CONFIG[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0};
<br>-
<br>- if (!reg_StrCmpNIW(key, szHKLM, 4) ||
<br>- !reg_StrCmpNIW(key, szHKEY_LOCAL_MACHINE, 18))
<br>- return HKEY_LOCAL_MACHINE;
<br>- else if (!reg_StrCmpNIW(key, szHKCU, 4) ||
<br>- !reg_StrCmpNIW(key, szHKEY_CURRENT_USER, 17))
<br>- return HKEY_CURRENT_USER;
<br>- else if (!reg_StrCmpNIW(key, szHKCR, 4) ||
<br>- !reg_StrCmpNIW(key, szHKEY_CLASSES_ROOT, 17))
<br>- return HKEY_CLASSES_ROOT;
<br>- else if (!reg_StrCmpNIW(key, szHKU, 3) ||
<br>- !reg_StrCmpNIW(key, szHKEY_USERS, 10))
<br>- return HKEY_USERS;
<br>- else if (!reg_StrCmpNIW(key, szHKCC, 4) ||
<br>- !reg_StrCmpNIW(key, szHKEY_CURRENT_CONFIG, 19))
<br>- return HKEY_CURRENT_CONFIG;
<br>- else return NULL;
<br>+ LONG err;
<br>+ HKEY k;
<br>+
<br>+ k = path_get_rootkey(path);
<br>+ if (!k)
<br>+ {
<br>+ reg_message(STRING_INVALID_KEY);
<br>+ return NULL;
<br>+ }
<br>+
<br>+ path = strchrW(path, '\\');
<br>+ if (path)
<br>+ path++;
<br>+
<br>+ if (create)
<br>+ err = RegCreateKeyW(k, path, &k);
<br>+ else
<br>+ err = RegOpenKeyW(k, path, &k);
<br>+
<br>+ if (err != ERROR_SUCCESS)
<br>+ {
<br>+ reg_message(STRING_CANNOT_FIND);
<br>+ return NULL;
<br>+ }
<br>+
<br>+ return k;
<br> }
<br> <br> static DWORD wchar_get_type(const WCHAR *type_name)
<br>@@ -221,34 +252,16 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
<br> {
<br> static const WCHAR stubW[] = {'A','D','D',' ','-',' ','%','s',
<br> ' ','%','s',' ','%','d',' ','%','s',' ','%','s',' ','%','d','\n',0};
<br>- LPWSTR p;
<br>- HKEY root,subkey;
<br>+ HKEY subkey;
<br> <br> reg_printfW(stubW, key_name, value_name, value_empty, type, data, force);
<br> <br> if (!sane_path(key_name))
<br> return 1;
<br> <br>- p = strchrW(key_name,'\\');
<br>- if (!p)
<br>- {
<br>- reg_message(STRING_INVALID_KEY);
<br>- return 1;
<br>- }
<br>- p++;
<br>-
<br>- root = get_rootkey(key_name);
<br>- if (!root)
<br>- {
<br>- reg_message(STRING_INVALID_KEY);
<br>+ subkey = path_open(key_name, TRUE);
<br>+ if (!subkey)
<br> return 1;
<br>- }
<br>-
<br>- if(RegCreateKeyW(root,p,&subkey)!=ERROR_SUCCESS)
<br>- {
<br>- reg_message(STRING_INVALID_KEY);
<br>- return 1;
<br>- }
<br> <br> if (value_name || data)
<br> {
<br>@@ -288,8 +301,8 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
<br> static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
<br> BOOL value_all, BOOL force)
<br> {
<br>- LPWSTR p;
<br>- HKEY root,subkey;
<br>+ HKEY subkey;
<br>+ LONG err;
<br> <br> static const WCHAR stubW[] = {'D','E','L','E','T','E',
<br> ' ','-',' ','%','s',' ','%','s',' ','%','d',' ','%','d',' ','%','d','\n'
<br>@@ -299,20 +312,9 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
<br> if (!sane_path(key_name))
<br> return 1;
<br> <br>- p = strchrW(key_name,'\\');
<br>- if (!p)
<br>- {
<br>- reg_message(STRING_INVALID_KEY);
<br>- return 1;
<br>- }
<br>- p++;
<br>-
<br>- root = get_rootkey(key_name);
<br>- if (!root)
<br>- {
<br>- reg_message(STRING_INVALID_KEY);
<br>+ subkey = path_open(key_name, FALSE);
<br>+ if (!subkey)
<br> return 1;
<br>- }
<br> <br> if (value_name && value_empty)
<br> {
<br>@@ -334,7 +336,17 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
<br> /* Delete subtree only if no /v* option is given */
<br> if (!value_name && !value_empty && !value_all)
<br> {
<br>- if (RegDeleteTreeW(root,p)!=ERROR_SUCCESS)
<br>+ static const WCHAR empty_wstr[] = {0};
<br>+
<br>+ err = RegDeleteTreeW(subkey, NULL);
<br>+ if (err != ERROR_SUCCESS)
<br>+ {
<br>+ reg_message(STRING_CANNOT_FIND);
<br>+ return 1;
<br>+ }
<br>+
<br>+ err = RegDeleteKeyW(subkey, empty_wstr);
<br>+ if (err != ERROR_SUCCESS)
<br> {
<br> reg_message(STRING_CANNOT_FIND);
<br> return 1;
<br>@@ -343,12 +355,6 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
<br> return 0;
<br> }
<br> <br>- if(RegOpenKeyW(root,p,&subkey)!=ERROR_SUCCESS)
<br>- {
<br>- reg_message(STRING_CANNOT_FIND);
<br>- return 1;
<br>- }
<br>-
<br> if (value_all)
<br> {
<br> LPWSTR szValue;
<br>-- <br>2.5.0<br>
<br></span></div>
</div>
<br></div> </div></body>
</html>