From b1c702a97ed8decaf631b7b80cd3c27146e2cd73 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov@codeweavers.com>
Date: Mon, 11 May 2020 18:23:44 +0300
Subject: [PATCH] shlwapi: Forward SHRegGetPath() to shcore.dll.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 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 fb57f1fa16d..f8af8b3065a 100644
--- a/dlls/shlwapi/reg.c
+++ b/dlls/shlwapi/reg.c
@@ -47,51 +47,6 @@ static const WCHAR szExtensionW[] = { 'E', 'x', 't','e','n','s','i','o','n','\0'
 INT     WINAPI SHStringFromGUIDW(REFGUID,LPWSTR,INT);
 HRESULT WINAPI SHRegGetCLSIDKeyW(REFGUID,LPCWSTR,BOOL,BOOL,PHKEY);
 
-
-/*************************************************************************
- * SHRegGetPathA   [SHLWAPI.@]
- *
- * Get a path from the registry.
- *
- * PARAMS
- *   hKey       [I] Handle to registry key
- *   lpszSubKey [I] Name of sub key containing path to get
- *   lpszValue  [I] Name of value containing path to get
- *   lpszPath   [O] Buffer for returned path
- *   dwFlags    [I] Reserved
- *
- * RETURNS
- *   Success: ERROR_SUCCESS. lpszPath contains the path.
- *   Failure: An error code from RegOpenKeyExA() or SHQueryValueExA().
- */
-DWORD WINAPI SHRegGetPathA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue,
-                           LPSTR lpszPath, DWORD dwFlags)
-{
-  DWORD dwSize = MAX_PATH;
-
-  TRACE("(hkey=%p,%s,%s,%p,%d)\n", hKey, debugstr_a(lpszSubKey),
-        debugstr_a(lpszValue), lpszPath, dwFlags);
-
-  return SHGetValueA(hKey, lpszSubKey, lpszValue, 0, lpszPath, &dwSize);
-}
-
-/*************************************************************************
- * SHRegGetPathW   [SHLWAPI.@]
- *
- * See SHRegGetPathA.
- */
-DWORD WINAPI SHRegGetPathW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue,
-                           LPWSTR lpszPath, DWORD dwFlags)
-{
-  DWORD dwSize = MAX_PATH;
-
-  TRACE("(hkey=%p,%s,%s,%p,%d)\n", hKey, debugstr_w(lpszSubKey),
-        debugstr_w(lpszValue), lpszPath, dwFlags);
-
-  return SHGetValueW(hKey, lpszSubKey, lpszValue, 0, lpszPath, &dwSize);
-}
-
-
 /*************************************************************************
  * SHRegSetPathA   [SHLWAPI.@]
  *
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec
index 99c17aa350e..a76046783e9 100644
--- a/dlls/shlwapi/shlwapi.spec
+++ b/dlls/shlwapi/shlwapi.spec
@@ -727,8 +727,8 @@
 @ stdcall SHRegEnumUSValueW(long long ptr ptr ptr ptr ptr long)
 @ stdcall SHRegGetBoolUSValueA(str str long long)
 @ stdcall SHRegGetBoolUSValueW(wstr wstr long long)
-@ stdcall SHRegGetPathA(long str str ptr long)
-@ stdcall SHRegGetPathW(long wstr wstr ptr long)
+@ stdcall -import SHRegGetPathA(long str str ptr long)
+@ stdcall -import SHRegGetPathW(long wstr wstr ptr long)
 @ stdcall SHRegGetUSValueA ( str str ptr ptr ptr long ptr long )
 @ stdcall SHRegGetUSValueW ( wstr wstr ptr ptr ptr long ptr long )
 @ stdcall SHRegGetValueA ( long str str long ptr ptr ptr ) advapi32.RegGetValueA