[PATCH] reg.exe: comparing the names of registry keys

[Mieczyslaw Nalewaj]

Comparing the names of registry keys - patch.
-------------- next part --------------
diff --git a/programs/reg/reg.c b/programs/reg/reg.c
index 1b46661..29c70a6 100644
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -67,6 +67,24 @@ static int reg_message(int msg)
     return reg_printfW(formatW, msg_buffer);
 }
 
+static BOOL strings_equal(LPWSTR lpString1, const WCHAR *lpString2)
+{
+    int cchCount;
+    if ((!lpString1 || !*lpString1) && (!lpString2 || !*lpString2)) /* both empty */
+        return TRUE;
+    if ( !lpString1 || !*lpString1 || !lpString2 || !*lpString2 ) /* one empty */
+        return FALSE;
+    cchCount = strlenW(lpString2);
+    if (strlenW(lpString1)<cchCount) /* too short */
+        return FALSE;
+
+    if ( (CompareStringW(CP_ACP,NORM_IGNORECASE,lpString1,cchCount,lpString2,cchCount)==CSTR_EQUAL)
+     && ((lpString1[cchCount] == 0) || (lpString1[cchCount] == (WCHAR){'\\'})))
+        return TRUE;
+    else
+        return FALSE;
+}
+
 static HKEY get_rootkey(LPWSTR key)
 {
     static const WCHAR szHKLM[] = {'H','K','L','M',0};
@@ -80,20 +98,15 @@ static HKEY get_rootkey(LPWSTR key)
     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)
+    if (strings_equal(key,szHKLM) || strings_equal(key,szHKEY_LOCAL_MACHINE))
         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)
+    else if (strings_equal(key,szHKCU) || strings_equal(key,szHKEY_CURRENT_USER))
         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)
+    else if (strings_equal(key,szHKCR) || strings_equal(key,szHKEY_CLASSES_ROOT))
         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)
+    else if (strings_equal(key,szHKU) || strings_equal(key,szHKEY_USERS))
         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)
+    else if (strings_equal(key,szHKCC) || strings_equal(key,szHKEY_CURRENT_CONFIG))
         return HKEY_CURRENT_CONFIG;
     else return NULL;
 }