Module: wine Branch: master Commit: f535341d2ba9c18cdacb561a38152d3215af305f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f535341d2ba9c18cdacb561a38...
Author: Hugh McMaster hugh.mcmaster@outlook.com Date: Fri Jun 16 13:06:31 2017 +0000
regedit: Use a case insensitive comparison when parsing registry classes from registry file versions 4 and 5.
Signed-off-by: Hugh McMaster hugh.mcmaster@outlook.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
programs/regedit/regproc.c | 2 +- programs/regedit/tests/regedit.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 416938d..2ce77c4 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -392,7 +392,7 @@ static HKEY parse_key_name(WCHAR *key_name, WCHAR **key_path) for (i = 0; i < ARRAY_SIZE(reg_class_keys); i++) { int len = lstrlenW(reg_class_namesW[i]); - if (!strncmpW(key_name, reg_class_namesW[i], len) && + if (!strncmpiW(key_name, reg_class_namesW[i], len) && (key_name[len] == 0 || key_name[len] == '\')) { return reg_class_keys[i]; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 254073b..49e2396 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1231,20 +1231,20 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[hkey_CURRENT_user\" KEY_BASE "\Subkey3a]\n\n" "[HkEy_CuRrEnT_uSeR\" KEY_BASE "\SuBkEy3b]\n\n"); - todo_wine verify_key_exist(hkey, "Subkey3a"); - todo_wine verify_key_exist(hkey, "Subkey3b"); + verify_key_exist(hkey, "Subkey3a"); + verify_key_exist(hkey, "Subkey3b");
exec_import_str("REGEDIT4\n\n" "[-HKEY_current_USER\" KEY_BASE "\sUBKEY3A]\n\n" "[-hKeY_cUrReNt_UsEr\" KEY_BASE "\sUbKeY3B]\n\n"); verify_key_nonexist(hkey, "Subkey3a"); - verify_key_nonexist(hkey, "Subkey3b"); + todo_wine verify_key_nonexist(hkey, "Subkey3b");
lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);
lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); }
static void test_value_deletion(void) @@ -1296,7 +1296,7 @@ static void test_value_deletion(void) ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);
lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); }
START_TEST(regedit)