Nikolay Sivov : shlwapi: Forward SHEnumKeyEx() to shcore.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8bda7744e05e764bed39543d06241a86afd90d71
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8bda7744e05e764bed39543d06241a86afd90d71

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Dec  4 08:02:51 2018 +0300

shlwapi: Forward SHEnumKeyEx() to shcore.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/shlwapi/reg.c        | 36 ------------------------------------
 dlls/shlwapi/shlwapi.spec |  4 ++--
 2 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c
index ffc1c30..e59d162 100644
--- a/dlls/shlwapi/reg.c
+++ b/dlls/shlwapi/reg.c
@@ -1631,42 +1631,6 @@ DWORD WINAPI SHDeleteValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue)
 }
 
 /*************************************************************************
- * SHEnumKeyExA   [SHLWAPI.@]
- *
- * Enumerate sub keys in a registry key.
- *
- * PARAMS
- *   hKey       [I] Handle to registry key
- *   dwIndex    [I] Index of key to enumerate
- *   lpszSubKey [O] Pointer updated with the subkey name
- *   pwLen      [O] Pointer updated with the subkey length
- *
- * RETURNS
- *   Success: ERROR_SUCCESS. lpszSubKey and pwLen are updated.
- *   Failure: An error code from RegEnumKeyExA().
- */
-LONG WINAPI SHEnumKeyExA(HKEY hKey, DWORD dwIndex, LPSTR lpszSubKey,
-                         LPDWORD pwLen)
-{
-  TRACE("(hkey=%p,%d,%s,%p)\n", hKey, dwIndex, debugstr_a(lpszSubKey), pwLen);
-
-  return RegEnumKeyExA(hKey, dwIndex, lpszSubKey, pwLen, NULL, NULL, NULL, NULL);
-}
-
-/*************************************************************************
- * SHEnumKeyExW   [SHLWAPI.@]
- *
- * See SHEnumKeyExA.
- */
-LONG WINAPI SHEnumKeyExW(HKEY hKey, DWORD dwIndex, LPWSTR lpszSubKey,
-                         LPDWORD pwLen)
-{
-  TRACE("(hkey=%p,%d,%s,%p)\n", hKey, dwIndex, debugstr_w(lpszSubKey), pwLen);
-
-  return RegEnumKeyExW(hKey, dwIndex, lpszSubKey, pwLen, NULL, NULL, NULL, NULL);
-}
-
-/*************************************************************************
  * @   [SHLWAPI.205]
  *
  * Get a value from the registry.
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec
index 31fb6ad..37ca328 100644
--- a/dlls/shlwapi/shlwapi.spec
+++ b/dlls/shlwapi/shlwapi.spec
@@ -696,8 +696,8 @@
 @ stdcall SHDeleteOrphanKeyW(long wstr)
 @ stdcall SHDeleteValueA(long  str  str)
 @ stdcall SHDeleteValueW(long wstr wstr)
-@ stdcall SHEnumKeyExA(long long str ptr)
-@ stdcall SHEnumKeyExW(long long wstr ptr)
+@ stdcall SHEnumKeyExA(long long str ptr) shcore.SHEnumKeyExA
+@ stdcall SHEnumKeyExW(long long wstr ptr) shcore.SHEnumKeyExW
 @ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) shcore.SHEnumValueA
 @ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) shcore.SHEnumValueW
 @ stdcall SHGetInverseCMAP ( ptr long )