[PATCH] reg.exe: comparing the names of registry keys (try 2)

[Mieczyslaw Nalewaj]

Second try of patch id 90580
-------------- next part --------------
diff --git a/programs/reg/reg.c b/programs/reg/reg.c
index 1b46661..46ce3d8 100644
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -67,6 +67,19 @@ static int reg_message(int msg)
     return reg_printfW(formatW, msg_buffer);
 }
 
+static BOOL is_subkey(LPWSTR str1, const WCHAR *str2)
+{
+    int len;
+    if (!str1 || !*str1)
+        return  !str2 || !*str2; 
+    if (!str2 || !*str2)
+        return FALSE;
+    len = strlenW(str2);
+    if (strlenW(str1)<len)
+        return FALSE;
+    return !strncmpiW(str1, str2, len) && (!str1[len] || str1[len] == '\\');
+}
+
 static HKEY get_rootkey(LPWSTR key)
 {
     static const WCHAR szHKLM[] = {'H','K','L','M',0};
@@ -80,20 +93,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 (is_subkey(key,szHKLM) || is_subkey(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 (is_subkey(key,szHKCU) || is_subkey(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 (is_subkey(key,szHKCR) || is_subkey(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 (is_subkey(key,szHKU) || is_subkey(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 (is_subkey(key,szHKCC) || is_subkey(key,szHKEY_CURRENT_CONFIG))
         return HKEY_CURRENT_CONFIG;
     else return NULL;
 }