ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reg.exe: Fix incorrect usage of CompareString in get_rootkey.

This commit is contained in:
Sebastian Lackner 2014-11-19 08:54:41 +01:00 committed by Alexandre Julliard
parent 735e2cd774
commit f6b552324e
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
programs/reg/reg.c
View File

@ -67,6 +67,22 @@ static int reg_message(int msg)
return reg_printfW(formatW, msg_buffer); return reg_printfW(formatW, msg_buffer);
} }
static int reg_StrCmpNIW(LPCWSTR str, LPCWSTR comp, int len)
{
int i;
for (i = 0; i < len; i++)
{
if (!str[i])
{
len = i + 1;
break;
}
}
return CompareStringW(CP_ACP, NORM_IGNORECASE, str, len, comp, len) - CSTR_EQUAL;
}
static HKEY get_rootkey(LPWSTR key) static HKEY get_rootkey(LPWSTR key)
{ {
static const WCHAR szHKLM[] = {'H','K','L','M',0}; static const WCHAR szHKLM[] = {'H','K','L','M',0};
@ -80,20 +96,20 @@ static HKEY get_rootkey(LPWSTR key)
static const WCHAR szHKCC[] = {'H','K','C','C',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}; 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 || if (!reg_StrCmpNIW(key, szHKLM, 4) ||
CompareStringW(CP_ACP,NORM_IGNORECASE,key,18,szHKEY_LOCAL_MACHINE,18)==CSTR_EQUAL) !reg_StrCmpNIW(key, szHKEY_LOCAL_MACHINE, 18))
return HKEY_LOCAL_MACHINE; return HKEY_LOCAL_MACHINE;
else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==CSTR_EQUAL || else if (!reg_StrCmpNIW(key, szHKCU, 4) ||
CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CURRENT_USER,17)==CSTR_EQUAL) !reg_StrCmpNIW(key, szHKEY_CURRENT_USER, 17))
return HKEY_CURRENT_USER; return HKEY_CURRENT_USER;
else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==CSTR_EQUAL || else if (!reg_StrCmpNIW(key, szHKCR, 4) ||
CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CLASSES_ROOT,17)==CSTR_EQUAL) !reg_StrCmpNIW(key, szHKEY_CLASSES_ROOT, 17))
return HKEY_CLASSES_ROOT; return HKEY_CLASSES_ROOT;
else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==CSTR_EQUAL || else if (!reg_StrCmpNIW(key, szHKU, 3) ||
CompareStringW(CP_ACP,NORM_IGNORECASE,key,10,szHKEY_USERS,10)==CSTR_EQUAL) !reg_StrCmpNIW(key, szHKEY_USERS, 10))
return HKEY_USERS; return HKEY_USERS;
else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==CSTR_EQUAL || else if (!reg_StrCmpNIW(key, szHKCC, 4) ||
CompareStringW(CP_ACP,NORM_IGNORECASE,key,19,szHKEY_CURRENT_CONFIG,19)==CSTR_EQUAL) !reg_StrCmpNIW(key, szHKEY_CURRENT_CONFIG, 19))
return HKEY_CURRENT_CONFIG; return HKEY_CURRENT_CONFIG;
else return NULL; else return NULL;
} }