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

[Alexandre Julliard]

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

Author: Nikolay Sivov 
Date:   Tue Dec  4 08:02:50 2018 +0300

shlwapi: Forward SHEnumValue() to shcore.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

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

diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c
index 5faad4a..ffc1c30 100644
--- a/dlls/shlwapi/reg.c
+++ b/dlls/shlwapi/reg.c
@@ -1667,51 +1667,6 @@ LONG WINAPI SHEnumKeyExW(HKEY hKey, DWORD dwIndex, LPWSTR lpszSubKey,
 }

/*************************************************************************
- * SHEnumValueA   [SHLWAPI.@]
- *
- * Enumerate values in a registry key.
- *
- * PARAMS
- *   hKey      [I] Handle to registry key
- *   dwIndex   [I] Index of key to enumerate
- *   lpszValue [O] Pointer updated with the values name
- *   pwLen     [O] Pointer updated with the values length
- *   pwType    [O] Pointer updated with the values type
- *   pvData    [O] Pointer updated with the values data
- *   pcbData   [O] Pointer updated with the values size
- *
- * RETURNS
- *   Success: ERROR_SUCCESS. Output parameters are updated.
- *   Failure: An error code from RegEnumValueA().
- */
-LONG WINAPI SHEnumValueA(HKEY hKey, DWORD dwIndex, LPSTR lpszValue,
-                         LPDWORD pwLen, LPDWORD pwType,
-                         LPVOID pvData, LPDWORD pcbData)
-{
-  TRACE("(hkey=%p,%d,%s,%p,%p,%p,%p)\n", hKey, dwIndex,
-        debugstr_a(lpszValue), pwLen, pwType, pvData, pcbData);
-
-  return RegEnumValueA(hKey, dwIndex, lpszValue, pwLen, NULL,
-                       pwType, pvData, pcbData);
-}
-
-/*************************************************************************
- * SHEnumValueW   [SHLWAPI.@]
- *
- * See SHEnumValueA.
- */
-LONG WINAPI SHEnumValueW(HKEY hKey, DWORD dwIndex, LPWSTR lpszValue,
-                         LPDWORD pwLen, LPDWORD pwType,
-                         LPVOID pvData, LPDWORD pcbData)
-{
-  TRACE("(hkey=%p,%d,%s,%p,%p,%p,%p)\n", hKey, dwIndex,
-        debugstr_w(lpszValue), pwLen, pwType, pvData, pcbData);
-
-  return RegEnumValueW(hKey, dwIndex, lpszValue, pwLen, NULL,
-                       pwType, pvData, pcbData);
-}
-
-/*************************************************************************
  * @   [SHLWAPI.205]
  *
  * Get a value from the registry.
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec
index f8ffd36..31fb6ad 100644
--- a/dlls/shlwapi/shlwapi.spec
+++ b/dlls/shlwapi/shlwapi.spec
@@ -698,8 +698,8 @@
 @ stdcall SHDeleteValueW(long wstr wstr)
 @ stdcall SHEnumKeyExA(long long str ptr)
 @ stdcall SHEnumKeyExW(long long wstr ptr)
-@ stdcall SHEnumValueA(long long str ptr ptr ptr ptr)
-@ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr)
+@ 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 )
 @ stdcall SHGetThreadRef(ptr) shcore.SHGetThreadRef
 @ stdcall SHGetValueA ( long str str ptr ptr ptr )