Sebastian Lackner : advapi32: Fix RegDeleteTreeW when an empty string is passed.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Mar 2 11:26:10 CST 2016
Module: wine
Branch: master
Commit: 2ddcd97bb13b22e369e168ed344215f7bb650501
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ddcd97bb13b22e369e168ed344215f7bb650501
Author: Sebastian Lackner <sebastian at fds-team.de>
Date: Wed Mar 2 07:37:27 2016 +0100
advapi32: Fix RegDeleteTreeW when an empty string is passed.
Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/advapi32/registry.c | 6 +++---
dlls/advapi32/tests/registry.c | 14 ++++++++++++++
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
index 172423b..aa451b1 100644
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -3030,7 +3030,7 @@ LSTATUS WINAPI RegDeleteTreeW( HKEY hkey, const WCHAR *subkey )
TRACE( "(%p, %s)\n", hkey, debugstr_w(subkey) );
- if (subkey)
+ if (subkey && *subkey)
{
ret = RegOpenKeyExW( hkey, subkey, 0, KEY_READ, &hkey );
if (ret) return ret;
@@ -3060,7 +3060,7 @@ LSTATUS WINAPI RegDeleteTreeW( HKEY hkey, const WCHAR *subkey )
}
/* Delete the key itself */
- if (subkey)
+ if (subkey && *subkey)
{
ret = RegDeleteKeyW( hkey, emptyW );
goto cleanup;
@@ -3081,7 +3081,7 @@ LSTATUS WINAPI RegDeleteTreeW( HKEY hkey, const WCHAR *subkey )
cleanup:
heap_free( name_buf );
- if (subkey)
+ if (subkey && *subkey)
RegCloseKey( hkey );
return ret;
}
diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
index d37042f..c2b0e12 100644
--- a/dlls/advapi32/tests/registry.c
+++ b/dlls/advapi32/tests/registry.c
@@ -2246,6 +2246,20 @@ static void test_reg_delete_tree(void)
dwsize = MAX_PATH;
ok(RegQueryValueExA(subkey, "value", NULL, &type, (BYTE *)buffer, &dwsize),
"Value is still present\n");
+ ret = RegCloseKey(subkey);
+ ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
+
+ ret = RegOpenKeyA(hkey_main, "subkey", &subkey);
+ ok(ret == ERROR_SUCCESS, "subkey was deleted\n");
+ ret = pRegDeleteTreeA(subkey, "");
+ ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
+ ret = RegCloseKey(subkey);
+ ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
+
+ ret = RegOpenKeyA(hkey_main, "subkey", &subkey);
+ ok(ret == ERROR_SUCCESS, "subkey was deleted\n");
+ ret = RegCloseKey(subkey);
+ ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
ret = pRegDeleteTreeA(hkey_main, "not-here");
ok(ret == ERROR_FILE_NOT_FOUND,
More information about the wine-cvs
mailing list