commit 3f3e29254b29088d396af1b8ddac81756af35c1e
author Bill Medland <billmedland@mercuryspeed.com> Thu Oct 14 00:25:29 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Oct 14 00:25:29 2004 +0000
tree e0700d25a1b89b34bb6271beb64ccaf58f18a70a
parent 5ec458fd41f5ed59a30bf3cc42c8c3825df7bffa

Fix SHDeleteKey so that it will handle deleting a key with more than
one subkey.  Also includes test.

dlls/shlwapi/tests/shreg.c

diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c
index 919d794..edfe974 100644
--- a/dlls/shlwapi/tests/shreg.c
+++ b/dlls/shlwapi/tests/shreg.c
@@ -271,6 +271,41 @@
 	RegCloseKey(hKeyDst);
 }
 
+static void test_SHDeleteKey()
+{
+    HKEY hKeyTest;
+    int sysfail=1;
+    if (!RegOpenKeyA(HKEY_CURRENT_USER, REG_TEST_KEY, &hKeyTest))
+    {
+        HKEY hKeyS;
+        if (!RegCreateKey(hKeyTest, "ODBC", &hKeyS))
+        {
+            HKEY hKeyO;
+            if (!RegCreateKey(hKeyS, "ODBC.INI", &hKeyO))
+            {
+                RegCloseKey (hKeyO);
+                if (!RegCreateKey(hKeyS, "ODBCINST.INI", &hKeyO))
+                {
+                    RegCloseKey (hKeyO);
+                    sysfail = 0;
+                }
+            }
+            RegCloseKey (hKeyS);
+        }
+        RegCloseKey (hKeyTest);
+    }
+    if (!sysfail)
+    {
+        HKEY hKeyS;
+        DWORD dwRet;
+        ok (!SHDeleteKey(HKEY_CURRENT_USER, REG_TEST_KEY "\\ODBC"), "SHDeleteKey failed\n");
+        ok ((dwRet = RegOpenKey(HKEY_CURRENT_USER, REG_TEST_KEY "\\ODBC", &hKeyS)) == ERROR_FILE_NOT_FOUND, "SHDeleteKey did not delete\n");
+        if (dwRet == ERROR_SUCCESS)
+            RegCloseKey (hKeyS);
+    }
+    else
+        ok (0, "Could not set up SHDeleteKey test\n");
+}
 
 START_TEST(shreg)
 {
@@ -285,5 +320,6 @@
 	test_SHQUeryValueEx();
 	test_SHGetRegPath();
 	test_SHCopyKey();
+        test_SHDeleteKey();
         delete_key( hkey );
 }