[PATCH 2/5] reg.exe: Add path_get_key() to remove boilerplate
Jonathan Vollebregt
jnvsor at gmail.com
Mon Sep 1 08:05:31 CDT 2014
---
programs/reg/reg.c | 206 ++++++++++++++++++++++++++++-------------------------
1 file changed, 107 insertions(+), 99 deletions(-)
diff --git a/programs/reg/reg.c b/programs/reg/reg.c
index d299cbf..c57caa5 100644
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -20,6 +20,32 @@
#include <wine/unicode.h>
#include "reg.h"
+#define MAX_ROOT_KEY_NAME_LENGTH 20
+
+static const WCHAR short_HKEY_name[][5] = {
+ {'H','K','L','M',0},
+ {'H','K','C','U',0},
+ {'H','K','C','R',0},
+ {'H','K','U',0},
+ {'H','K','C','C',0},
+};
+
+static const WCHAR long_HKEY_name[][MAX_ROOT_KEY_NAME_LENGTH] = {
+ {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0},
+ {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0},
+ {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0},
+ {'H','K','E','Y','_','U','S','E','R','S',0},
+ {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0},
+};
+
+static const HKEY HKEYs[] = {
+ HKEY_LOCAL_MACHINE,
+ HKEY_CURRENT_USER,
+ HKEY_CLASSES_ROOT,
+ HKEY_USERS,
+ HKEY_CURRENT_CONFIG,
+};
+
static int reg_printfW(const WCHAR *msg, ...)
{
va_list va_args;
@@ -67,35 +93,70 @@ static int reg_message(int msg)
return reg_printfW(formatW, msg_buffer);
}
-static HKEY get_rootkey(LPWSTR key)
+static const WCHAR * path_get_rootkey_name(LPWSTR path)
+{
+ DWORD i;
+
+ for (i=0;i<5;i++)
+ {
+ if (
+ CompareStringW(CP_ACP,NORM_IGNORECASE,
+ path,strlenW(short_HKEY_name[i]),
+ short_HKEY_name[i],strlenW(short_HKEY_name[i]))==2 ||
+ CompareStringW(CP_ACP,NORM_IGNORECASE,
+ path,strlenW(long_HKEY_name[i]),
+ long_HKEY_name[i],strlenW(long_HKEY_name[i]))==2)
+ {
+ return long_HKEY_name[i];
+ }
+ }
+ return NULL;
+}
+
+static HKEY path_get_rootkey(LPWSTR path)
{
- static const WCHAR szHKLM[] = {'H','K','L','M',0};
- static const WCHAR szHKEY_LOCAL_MACHINE[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0};
- static const WCHAR szHKCU[] = {'H','K','C','U',0};
- static const WCHAR szHKEY_CURRENT_USER[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0};
- static const WCHAR szHKCR[] = {'H','K','C','R',0};
- static const WCHAR szHKEY_CLASSES_ROOT[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0};
- static const WCHAR szHKU[] = {'H','K','U',0};
- static const WCHAR szHKEY_USERS[] = {'H','K','E','Y','_','U','S','E','R','S',0};
- static const WCHAR szHKCC[] = {'H','K','C','C',0};
- static const WCHAR szHKEY_CURRENT_CONFIG[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0};
-
- if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKLM,4)==CSTR_EQUAL ||
- CompareStringW(CP_ACP,NORM_IGNORECASE,key,18,szHKEY_LOCAL_MACHINE,18)==CSTR_EQUAL)
- return HKEY_LOCAL_MACHINE;
- else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==CSTR_EQUAL ||
- CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CURRENT_USER,17)==CSTR_EQUAL)
- return HKEY_CURRENT_USER;
- else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==CSTR_EQUAL ||
- CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CLASSES_ROOT,17)==CSTR_EQUAL)
- return HKEY_CLASSES_ROOT;
- else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==CSTR_EQUAL ||
- CompareStringW(CP_ACP,NORM_IGNORECASE,key,10,szHKEY_USERS,10)==CSTR_EQUAL)
- return HKEY_USERS;
- else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==CSTR_EQUAL ||
- CompareStringW(CP_ACP,NORM_IGNORECASE,key,19,szHKEY_CURRENT_CONFIG,19)==CSTR_EQUAL)
- return HKEY_CURRENT_CONFIG;
- else return NULL;
+ if(path_get_rootkey_name(path))
+ {
+ return HKEYs[(path_get_rootkey_name(path) - &long_HKEY_name[0][0]) / 20];
+ }
+ else
+ {
+ return NULL;
+ }
+}
+
+static HKEY path_get_key(LPWSTR path)
+{
+ LPWSTR p = strchrW(path,'\\');
+ HKEY root = path_get_rootkey(path);
+ HKEY out;
+
+ if (path[0]=='\\' && path[1]=='\\')
+ {
+ reg_message(STRING_NO_REMOTE);
+ return NULL;
+ }
+
+ if (!p)
+ {
+ reg_message(STRING_INVALID_KEY);
+ return NULL;
+ }
+ p++;
+
+ if (!root)
+ {
+ reg_message(STRING_INVALID_KEY);
+ return NULL;
+ }
+
+ if(RegOpenKeyW(root,p,&out)!=ERROR_SUCCESS)
+ {
+ reg_message(STRING_CANNOT_FIND);
+ return NULL;
+ }
+
+ return out;
}
static DWORD get_regtype(LPWSTR type)
@@ -166,37 +227,10 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r
static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
WCHAR *type, WCHAR separator, WCHAR *data, BOOL force)
{
- static const WCHAR stubW[] = {'A','D','D',' ','-',' ','%','s',
- ' ','%','s',' ','%','d',' ','%','s',' ','%','s',' ','%','d','\n',0};
- LPWSTR p;
- HKEY root,subkey;
+ HKEY key = path_get_key(key_name);
- reg_printfW(stubW, key_name, value_name, value_empty, type, data, force);
-
- if (key_name[0]=='\\' && key_name[1]=='\\')
+ if(!key)
{
- reg_message(STRING_NO_REMOTE);
- return 1;
- }
-
- p = strchrW(key_name,'\\');
- if (!p)
- {
- reg_message(STRING_INVALID_KEY);
- return 1;
- }
- p++;
-
- root = get_rootkey(key_name);
- if (!root)
- {
- reg_message(STRING_INVALID_KEY);
- return 1;
- }
-
- if(RegCreateKeyW(root,p,&subkey)!=ERROR_SUCCESS)
- {
- reg_message(STRING_INVALID_KEY);
return 1;
}
@@ -208,7 +242,7 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
if (!force)
{
- if (RegQueryValueW(subkey,value_name,NULL,NULL)==ERROR_SUCCESS)
+ if (RegQueryValueW(key,value_name,NULL,NULL)==ERROR_SUCCESS)
{
/* FIXME: Prompt for overwrite */
}
@@ -217,7 +251,7 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
reg_type = get_regtype(type);
if (reg_type == -1)
{
- RegCloseKey(subkey);
+ RegCloseKey(key);
reg_message(STRING_INVALID_CMDLINE);
return 1;
}
@@ -225,11 +259,11 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
if (data)
reg_data = get_regdata(data,reg_type,separator,®_count);
- RegSetValueExW(subkey,value_name,0,reg_type,reg_data,reg_count);
+ RegSetValueExW(key,value_name,0,reg_type,reg_data,reg_count);
HeapFree(GetProcessHeap(),0,reg_data);
}
- RegCloseKey(subkey);
+ RegCloseKey(key);
reg_message(STRING_SUCCESS);
return 0;
@@ -238,34 +272,9 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
BOOL value_all, BOOL force)
{
- LPWSTR p;
- HKEY root,subkey;
-
- static const WCHAR stubW[] = {'D','E','L','E','T','E',
- ' ','-',' ','%','s',' ','%','s',' ','%','d',' ','%','d',' ','%','d','\n'
- ,0};
- reg_printfW(stubW, key_name, value_name, value_empty, value_all, force);
-
- if (key_name[0]=='\\' && key_name[1]=='\\')
- {
- reg_message(STRING_NO_REMOTE);
- return 1;
- }
-
- p = strchrW(key_name,'\\');
- if (!p)
- {
- reg_message(STRING_INVALID_KEY);
- return 1;
- }
- p++;
-
- root = get_rootkey(key_name);
- if (!root)
- {
- reg_message(STRING_INVALID_KEY);
- return 1;
- }
+ LPWSTR p = strchrW(key_name,'\\')+1;
+ HKEY root = path_get_rootkey(key_name);
+ HKEY key = path_get_key(key_name);
if (value_name && value_empty)
{
@@ -296,9 +305,8 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
return 0;
}
- if(RegOpenKeyW(root,p,&subkey)!=ERROR_SUCCESS)
+ if(!key)
{
- reg_message(STRING_CANNOT_FIND);
return 1;
}
@@ -309,12 +317,12 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
DWORD count;
LONG rc;
- rc = RegQueryInfoKeyW(subkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
&maxValue, NULL, NULL, NULL);
if (rc != ERROR_SUCCESS)
{
/* FIXME: failure */
- RegCloseKey(subkey);
+ RegCloseKey(key);
return 1;
}
maxValue++;
@@ -323,10 +331,10 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
while (1)
{
count = maxValue;
- rc = RegEnumValueW(subkey, 0, szValue, &count, NULL, NULL, NULL, NULL);
+ rc = RegEnumValueW(key, 0, szValue, &count, NULL, NULL, NULL, NULL);
if (rc == ERROR_SUCCESS)
{
- rc = RegDeleteValueW(subkey, szValue);
+ rc = RegDeleteValueW(key, szValue);
if (rc != ERROR_SUCCESS)
break;
}
@@ -339,19 +347,19 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
}
else if (value_name)
{
- if (RegDeleteValueW(subkey,value_name) != ERROR_SUCCESS)
+ if (RegDeleteValueW(key,value_name) != ERROR_SUCCESS)
{
- RegCloseKey(subkey);
+ RegCloseKey(key);
reg_message(STRING_CANNOT_FIND);
return 1;
}
}
else if (value_empty)
{
- RegSetValueExW(subkey,NULL,0,REG_SZ,NULL,0);
+ RegSetValueExW(key,NULL,0,REG_SZ,NULL,0);
}
- RegCloseKey(subkey);
+ RegCloseKey(key);
reg_message(STRING_SUCCESS);
return 0;
}
--
2.1.0
More information about the wine-patches
mailing list