From: Andrew Nguyen Subject: reg: Accept full names of the standard registry hives. Message-Id: <4D22FAB1.3020304@codeweavers.com> Date: Tue, 04 Jan 2011 04:47:13 -0600 --- programs/reg/reg.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index f65a3c8..0f8aa15 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -66,20 +66,30 @@ static int reg_message(int msg) static HKEY get_rootkey(LPWSTR key) { 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)==2) + if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKLM,4)==2 || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,18,szHKEY_LOCAL_MACHINE,18)==2) return HKEY_LOCAL_MACHINE; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==2 || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CURRENT_USER,17)==2) return HKEY_CURRENT_USER; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==2 || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CLASSES_ROOT,17)==2) return HKEY_CLASSES_ROOT; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==2 || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,10,szHKEY_USERS,10)==2) return HKEY_USERS; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==2 || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,19,szHKEY_CURRENT_CONFIG,19)==2) return HKEY_CURRENT_CONFIG; else return NULL; } -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJNIvrCAAoJEK/FbHgLAxL29GoP/RVW8w7FiUReqyQa0yN6eCUM dGJ2r7/v/Y9X+J0qWHtpxnr1mJXZIZwc/OVXHb4p8vVjdl4nhCcIuSNzxzrf/3uH sfiVWnwILB6HFLrg+fykZEDSm38ITSDqIQfwNqX85+oG+hPOOw2pkkSlXtzcCfQZ Ha+XPkeqq27ZkIOjry4mDzudpAseyhGeoFBtmplYofeg7zAXbRLbnplNnIUbaAdM R5Y9JOoRjvrZjyJ3xaLdvgnBVozaURIM2YkUST1J8cK5ApawQMCriN7CJkE4Herm eOgW2ekK52OLggr95DqiAaAJ61XP1ddDygO8PPIr4Gjx8FzM5REkwNYHHR4igZra vCjCAOFkANCZnY6I2zJAYMT7LGsLNEoTGKyjb5x94yC5nd4N1VyQaSt5q5eJnvID WZwqmx/P160vcXAkVrwlcM9aIOqS2CjZsCLOkXcs0JrjK2W2aefu2MynfN+o0C9k RByAhPrTQQn1nQlueZvbf/8tzw9QizKWuP1GQ+rsGz5Qt2W3Rx56ke5hE/97mHaj PY9K8JY9N8pPSMgvbQ+qt6IDkL9v7gaDF0dIV7sjVhds1qEfE73/g+D+T9QcHbkG 3gI/HtsE7plNrc9mNpN+JZvOWgNsqmo58RynmiqjUK2BysYU9RlRBDpkOXbJEUT2 VJ9Z2KOYgV/SPfDqkk83 =aDuO -----END PGP SIGNATURE-----