Nikolay Sivov : shlwapi: Forward SHQueryInfoKey() to shcore.dll.

[Alexandre Julliard]

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

Author: Nikolay Sivov 
Date:   Tue May 12 22:41:08 2020 +0300

shlwapi: Forward SHQueryInfoKey() to shcore.dll.

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

---

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

diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c
index f33047ab38..83d83d3cb2 100644
--- a/dlls/shlwapi/reg.c
+++ b/dlls/shlwapi/reg.c
@@ -120,37 +120,6 @@ DWORD WINAPI SHSetValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue,
   return dwRet;
 }

-/*************************************************************************
- * SHQueryInfoKeyA   [SHLWAPI.@]
- *
- * Get information about a registry key. See RegQueryInfoKeyA().
- *
- * RETURNS
- *  The result of calling RegQueryInfoKeyA().
- */
-LONG WINAPI SHQueryInfoKeyA(HKEY hKey, LPDWORD pwSubKeys, LPDWORD pwSubKeyMax,
-                            LPDWORD pwValues, LPDWORD pwValueMax)
-{
-  TRACE("(hkey=%p,%p,%p,%p,%p)\n", hKey, pwSubKeys, pwSubKeyMax,
-        pwValues, pwValueMax);
-  return RegQueryInfoKeyA(hKey, NULL, NULL, NULL, pwSubKeys, pwSubKeyMax,
-                          NULL, pwValues, pwValueMax, NULL, NULL, NULL);
-}
-
-/*************************************************************************
- * SHQueryInfoKeyW   [SHLWAPI.@]
- *
- * See SHQueryInfoKeyA.
- */
-LONG WINAPI SHQueryInfoKeyW(HKEY hKey, LPDWORD pwSubKeys, LPDWORD pwSubKeyMax,
-                            LPDWORD pwValues, LPDWORD pwValueMax)
-{
-  TRACE("(hkey=%p,%p,%p,%p,%p)\n", hKey, pwSubKeys, pwSubKeyMax,
-        pwValues, pwValueMax);
-  return RegQueryInfoKeyW(hKey, NULL, NULL, NULL, pwSubKeys, pwSubKeyMax,
-                          NULL, pwValues, pwValueMax, NULL, NULL, NULL);
-}
-
 /*************************************************************************
  * SHQueryValueExA   [SHLWAPI.@]
  *
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec
index a0782607a7..98a3ab7d99 100644
--- a/dlls/shlwapi/shlwapi.spec
+++ b/dlls/shlwapi/shlwapi.spec
@@ -709,8 +709,8 @@
 @ stdcall SHOpenRegStream2W(long wstr wstr long) shcore.SHOpenRegStream2W
 @ stdcall SHOpenRegStreamA(long str str long) shcore.SHOpenRegStreamA
 @ stdcall SHOpenRegStreamW(long wstr wstr long) shcore.SHOpenRegStreamW
-@ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr)
-@ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr)
+@ stdcall -import SHQueryInfoKeyA(long ptr ptr ptr ptr)
+@ stdcall -import SHQueryInfoKeyW(long ptr ptr ptr ptr)
 @ stdcall SHQueryValueExA(long str ptr ptr ptr ptr)
 @ stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr)
 @ stdcall SHRegCloseUSKey(ptr)