Re: [PATCH 1/4] reg: Add path/key conversion functions

[Stefan Dösinger]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

Thanks for picking up this work!

Please submit patches with your real name. We need this for proper
copyright attribution. Since this is derived from Jonathan work please
mention this as well.

The patch doesn't apply for me, I suspect that this is because of the
no-break spaces instead of normal spaces. I highly recommend to use
git send-email to send the mail.

I haven't looked at the code itself. I hope I get around to look at it
later today or on Sunday and compare it to the last suggestions I gave
Jonathan. If you don't hear from me by Monday please ping me again.

Cheers,
Stefan

Am 2015-07-31 um 11:46 schrieb xantares 09:
> --- programs/reg/reg.c |  166
> +++++++++++++++++++++++++++------------------------- 1 file
> changed, 86 insertions(+), 80 deletions(-)
>
> diff --git a/programs/reg/reg.c b/programs/reg/reg.c index
> 4ec25bc..cf6425e 100644 --- a/programs/reg/reg.c +++
> b/programs/reg/reg.c @@ -22,6 +22,32 @@
>
> #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A))
>
> +static const WCHAR short_hklm[] = {'H','K','L','M',0}; +static
> const WCHAR short_hkcu[] = {'H','K','C','U',0}; +static const WCHAR
> short_hkcr[] = {'H','K','C','R',0}; +static const WCHAR short_hku[]
> = {'H','K','U',0}; +static const WCHAR short_hkcc[] =
> {'H','K','C','C',0}; +static const WCHAR long_hklm[] =
> {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','

E',0};
>

+static const WCHAR long_hkcu[] =
{'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0};
> +static const WCHAR long_hkcr[] =
> {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0

};
>

+static const WCHAR long_hku[] =
{'H','K','E','Y','_','U','S','E','R','S',0};
> +static const WCHAR long_hkcc[] =
> {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','

I','G',0};
>

+
> +static const struct +{ +    HKEY key; +    const WCHAR
> *short_name; +    const WCHAR *long_name; +} +root_rels[] = +{ +
> {HKEY_LOCAL_MACHINE, short_hklm, long_hklm}, +
> {HKEY_CURRENT_USER, short_hkcu, long_hkcu}, +
> {HKEY_CLASSES_ROOT, short_hkcr, long_hkcr}, +    {HKEY_USERS,
> short_hku, long_hku}, +    {HKEY_CURRENT_CONFIG, short_hkcc,
> long_hkcc}, +}; + static const WCHAR type_none[] =
> {'R','E','G','_','N','O','N','E',0}; static const WCHAR type_sz[] =
> {'R','E','G','_','S','Z',0}; static const WCHAR type_expand_sz[] =
> {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0}; @@ -95,51
> +121,56 @@ static int reg_message(int msg) return
> reg_printfW(formatW, msg_buffer); }
>
> -static int reg_StrCmpNIW(LPCWSTR str, LPCWSTR comp, int len) 
> +static inline BOOL path_rootname_cmp(const WCHAR *input_path,
> const WCHAR *rootkey_name) { -    int i; +    DWORD length =
> strlenW(rootkey_name);
> - for (i = 0; i < len; i++) +    return (!strncmpiW(input_path,
>
> rootkey_name, length) && +            (input_path[length] == 0 ||
> input_path[length] == '\')); +} + +static HKEY
> path_get_rootkey(const WCHAR *path) +{ +    DWORD i; + +    for (i
> = 0; i < ARRAY_SIZE(root_rels); i++) { -        if (!str[i]) -
> { -            len = i + 1; -            break; -        } +
> if (path_rootname_cmp(path, root_rels[i].short_name) || +
> path_rootname_cmp(path, root_rels[i].long_name)) +
> return root_rels[i].key; }
> - return CompareStringW(CP_ACP, NORM_IGNORECASE, str, len, comp,
>
> len) - CSTR_EQUAL; +    return NULL; }
>
> -static HKEY get_rootkey(LPWSTR key) +static HKEY path_open(const
> WCHAR *path, BOOL create) { -    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 (!reg_StrCmpNIW(key, szHKLM, 4) || -
>
> !reg_StrCmpNIW(key, szHKEY_LOCAL_MACHINE, 18)) -        return
> HKEY_LOCAL_MACHINE; -    else if (!reg_StrCmpNIW(key, szHKCU, 4)
> || -             !reg_StrCmpNIW(key, szHKEY_CURRENT_USER, 17)) -
> return HKEY_CURRENT_USER; -    else if (!reg_StrCmpNIW(key, szHKCR,
> 4) || -             !reg_StrCmpNIW(key, szHKEY_CLASSES_ROOT, 17)) -
> return HKEY_CLASSES_ROOT; -    else if (!reg_StrCmpNIW(key, szHKU,
> 3) || -             !reg_StrCmpNIW(key, szHKEY_USERS, 10)) -
> return HKEY_USERS; -    else if (!reg_StrCmpNIW(key, szHKCC, 4) ||
> -
>         !reg_StrCmpNIW(key, szHKEY_CURRENT_CONFIG, 19)) -
>
> return HKEY_CURRENT_CONFIG; -    else return NULL; +    LONG err; +
> HKEY k; + +    k = path_get_rootkey(path); +    if (!k) +    { +
> reg_message(STRING_INVALID_KEY); +        return NULL; +    } + +
> path = strchrW(path, '\'); +    if (path) +        path++; + +
> if (create) +        err = RegCreateKeyW(k, path, &k); +    else +
> err = RegOpenKeyW(k, path, &k); + +    if (err != ERROR_SUCCESS) +
> { +        reg_message(STRING_CANNOT_FIND); +        return NULL; +
> } + +    return k; }
>
> static DWORD wchar_get_type(const WCHAR *type_name) @@ -221,34
> +252,16 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name,
> BOOL value_empty, { static const WCHAR stubW[] = {'A','D','D','
> ','-',' ','%','s', ' ','%','s',' ','%','d',' ','%','s','
> ','%','s',' ','%','d','\n',0}; -    LPWSTR p; -    HKEY
> root,subkey; +    HKEY subkey;
>
> reg_printfW(stubW, key_name, value_name, value_empty, type, data,
> force);
>
> if (!sane_path(key_name)) 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); +    subkey = path_open(key_name,
> TRUE); +    if (!subkey) return 1; -    } - -
> if(RegCreateKeyW(root,p,&subkey)!=ERROR_SUCCESS) -    { -
> reg_message(STRING_INVALID_KEY); -        return 1; -    }
>
> if (value_name || data) { @@ -288,8 +301,8 @@ 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; +    HKEY subkey; +    LONG err;
>
> static const WCHAR stubW[] = {'D','E','L','E','T','E', ' ','-','
> ','%','s',' ','%','s',' ','%','d',' ','%','d',' ','%','d','\n' @@
> -299,20 +312,9 @@ static int reg_delete(WCHAR *key_name, WCHAR
> *value_name, BOOL value_empty, if (!sane_path(key_name)) 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); +    subkey = path_open(key_name,
> FALSE); +    if (!subkey) return 1; -    }
>
> if (value_name && value_empty) { @@ -334,7 +336,17 @@ static int
> reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, /*
> Delete subtree only if no /v* option is given */ if (!value_name &&
> !value_empty && !value_all) { -        if
> (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) +        static const WCHAR
> empty_wstr[] = {0}; + +        err = RegDeleteTreeW(subkey, NULL);
> -
>    if (err != ERROR_SUCCESS) +        { +
>
> reg_message(STRING_CANNOT_FIND); +            return 1; +        }
> -
> -
>    err = RegDeleteKeyW(subkey, empty_wstr); +        if
>
> (err != ERROR_SUCCESS) { reg_message(STRING_CANNOT_FIND); return
> 1; @@ -343,12 +355,6 @@ static int reg_delete(WCHAR *key_name,
> WCHAR *value_name, BOOL value_empty, return 0; }
> - if(RegOpenKeyW(root,p,&subkey)!=ERROR_SUCCESS) -    { -
>
> reg_message(STRING_CANNOT_FIND); -        return 1; -    } - if
> (value_all) { LPWSTR szValue;
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBAgAGBQJVu33xAAoJEN0/YqbEcdMw1MEP/RZYiu5ZzcuAxcOvzmu2LrqR
siZmDtSFzd+KN40tHl8IgrFB2kX2RePc0i4cNZJ1EUeMReS84HXoXSzUtDil5oy8
g0J9jFaZVv3xtznxKtQZDur2v3t+IYicjquhfbj7szheLpRbnfULwk3cs825QN1k
C/Nhpj9aeDST49fe/YSi84XC15n2OyVHcZtTRgd4IZFVgd76L5kQYKYzLmv4ttes
Mm5LGn5No72nehefRkW9YaFv2JAddgM/2jgz48+nd/pFhCB1NyXL2K6c5WPxT1OT
Ahyx3oatrP5vSgNDc1Q3g0qGgYlk+aJAfulbSYZ4aSxS/YFcVqMbjEqb8mpPGUzX
1viNVuxg4dcfxozINJYPLkyU/ef9DwlSLdG3HlN9HDy/WFK/0lW4L4TEV9DrPwA+
/OPB8I7Vkb3r6qjsBEH4c1yG9PVQ0TiP3vjpEZM20J/gsvlTnJ6g3PSm9hFjwBWH
bv5eBKJMUJKYiEJSoamfnermKEcxBcdOKsGbMApvRyVifcuUpY45+zv4bH0iVnKM
6pxb0EhWfizzbsDItSLDYNJZj1/XgMisgoKwnfUyxdmzRuzW9SipFmFqU6v8Sxpd
QQOFSVG0IzL1QED51V2rlS5H1kZxCjRp+mKAn0j6a6KGNuZHcSAqCanhkyVW8FY7
OiDRd7mrwc32lMRcxqS+
=Sn4W
-----END PGP SIGNATURE-----

[PATCH 1/4] reg: Add path/key conversion functions

[Stefan Dösinger]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

Am 2015-07-31 um 15:53 schrieb Stefan Dösinger:
> I haven't looked at the code itself. I hope I get around to look at
> it later today or on Sunday and compare it to the last suggestions
> I gave Jonathan. If you don't hear from me by Monday please ping me
> again.

I compared your version of patch 2 with the last one sent by Jonathan,
and they seem to be identical. Thus my last feedback for this patch
still applies:

https://www.winehq.org/pipermail/wine-devel/2015-March/106803.html

Cheers,
Stefan
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBAgAGBQJVv09CAAoJEN0/YqbEcdMwePIP/RhC6l5L/7K6rv5fWWefTj1l
OrASvJMNdIvJxiscyPryeYSJAk8JvjokDcPkGJgTMeQmWjJ88pD/EZo+QIkGpWYm
em11l9DTpe55iW9sZmZUoIePTZJUe5mu2u3q97j/jhO+glXSIRyJgixNXbmLUDCz
s3JU5z/U5pWQuDKllKdVzq6q+cnoZSkK6p52LLp2sne6f3UBIZPB5XLHugQxLwdN
lh032C5QfYdxFieveRFxLxqCBvTTosLCXnwVaHquE41MN1U4b7HTU2Mgk+IwVf6O
0X6aXfLFXzy0Rs2jUHouH/YQtGCvPRjpKTDJ2yu1Jd39dzfbKpD0GTplHzQJc7xp
peI0rXMq41U7XOTU8gFd8cbIOLWkDM1P6jB+f5umZe69J+XpdsM3nGeJgSbgggC1
xYpBVDT9oBNtFSRkaG9aX5RPBspF/YQg7JgGextKbpwoXzVJCDuk/h69w0IfEURk
9tJeNDbuouARJH+G7z5az2bSpNqkkB5Yo8f8zURlFyNZRuIcZixvvWAn3x7wwjHP
9DdIAP+9sxUTxHF/d5pRfcR4jOPKddlzGccEl6o3UPDJJ8fLM/SGp9tK5ToWeydw
qOjtUSRA6veeGWgTnwuoyJ70x6xPK7+Imkr9w/3mby4QyAqq8+L64W5NBw312Ej5
bnqwa+MrlxiVESuB8LiO
=1Ae0
-----END PGP SIGNATURE-----

[PATCH 1/4] reg: Add path/key conversion functions

[xantares 09]

Hi, thank you, I'll try to set up git over imap and split these patches.
> Subject: Re: [PATCH 1/4] reg: Add path/key conversion functions
> To: [e-mail]
> CC: [e-mail]
> From: [e-mail]
> Date: Mon, 3 Aug 2015 13:23:46 +0200
>
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi,
>
> Am 2015-07-31 um 15:53 schrieb Stefan Dösinger:
> > I haven't looked at the code itself. I hope I get around to look at
> > it later today or on Sunday and compare it to the last suggestions
> > I gave Jonathan. If you don't hear from me by Monday please ping me
> > again.
>
> I compared your version of patch 2 with the last one sent by Jonathan,
> and they seem to be identical. Thus my last feedback for this patch
> still applies:
>
> https://www.winehq.org/pipermail/wine-devel/2015-March/106803.html
>
> Cheers,
> Stefan
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v2
>
> iQIcBAEBAgAGBQJVv09CAAoJEN0/YqbEcdMwePIP/RhC6l5L/7K6rv5fWWefTj1l
> OrASvJMNdIvJxiscyPryeYSJAk8JvjokDcPkGJgTMeQmWjJ88pD/EZo+QIkGpWYm
> em11l9DTpe55iW9sZmZUoIePTZJUe5mu2u3q97j/jhO+glXSIRyJgixNXbmLUDCz
> s3JU5z/U5pWQuDKllKdVzq6q+cnoZSkK6p52LLp2sne6f3UBIZPB5XLHugQxLwdN
> lh032C5QfYdxFieveRFxLxqCBvTTosLCXnwVaHquE41MN1U4b7HTU2Mgk+IwVf6O
> 0X6aXfLFXzy0Rs2jUHouH/YQtGCvPRjpKTDJ2yu1Jd39dzfbKpD0GTplHzQJc7xp
> peI0rXMq41U7XOTU8gFd8cbIOLWkDM1P6jB+f5umZe69J+XpdsM3nGeJgSbgggC1
> xYpBVDT9oBNtFSRkaG9aX5RPBspF/YQg7JgGextKbpwoXzVJCDuk/h69w0IfEURk
> 9tJeNDbuouARJH+G7z5az2bSpNqkkB5Yo8f8zURlFyNZRuIcZixvvWAn3x7wwjHP
> 9DdIAP+9sxUTxHF/d5pRfcR4jOPKddlzGccEl6o3UPDJJ8fLM/SGp9tK5ToWeydw
> qOjtUSRA6veeGWgTnwuoyJ70x6xPK7+Imkr9w/3mby4QyAqq8+L64W5NBw312Ej5
> bnqwa+MrlxiVESuB8LiO
> =1Ae0
> -----END PGP SIGNATURE-----