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

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue May 12 22:41:09 2020 +0300

shlwapi: Forward SHDeleteValueW() to shcore.dll.

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

---

 .../api-ms-win-downlevel-shlwapi-l2-1-0.spec       |  2 +-
 dlls/shlwapi/reg.c                                 | 51 ----------------------
 dlls/shlwapi/shlwapi.spec                          |  4 +-
 3 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec
index 3ee015b675..21fbbb00ab 100644
--- a/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec
+++ b/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec
@@ -23,7 +23,7 @@
 @ stdcall SHDeleteEmptyKeyW(long wstr) shlwapi.SHDeleteEmptyKeyW
 @ stdcall SHDeleteKeyA(long str) shlwapi.SHDeleteKeyA
 @ stdcall SHDeleteKeyW(long wstr) shlwapi.SHDeleteKeyW
-@ stdcall SHDeleteValueA(long  str  str) shlwapi.SHDeleteValueA
+@ stdcall SHDeleteValueA(long str str) shlwapi.SHDeleteValueA
 @ stdcall SHDeleteValueW(long wstr wstr) shlwapi.SHDeleteValueW
 @ stdcall SHEnumKeyExA(long long str ptr) shlwapi.SHEnumKeyExA
 @ stdcall SHEnumKeyExW(long long wstr ptr) shlwapi.SHEnumKeyExW
diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c
index 83d83d3cb2..0c982384b3 100644
--- a/dlls/shlwapi/reg.c
+++ b/dlls/shlwapi/reg.c
@@ -342,57 +342,6 @@ DWORD WINAPI SHDeleteOrphanKeyW(HKEY hKey, LPCWSTR lpszSubKey)
   return dwRet;
 }
 
-/*************************************************************************
- * SHDeleteValueA   [SHLWAPI.@]
- *
- * Delete a value from the registry.
- *
- * PARAMS
- *   hKey       [I] Handle to registry key
- *   lpszSubKey [I] Name of sub key containing value to delete
- *   lpszValue  [I] Name of value to delete
- *
- * RETURNS
- *   Success: ERROR_SUCCESS. The value is deleted.
- *   Failure: An error code from RegOpenKeyExA() or RegDeleteValueA().
- */
-DWORD WINAPI SHDeleteValueA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue)
-{
-  DWORD dwRet;
-  HKEY hSubKey;
-
-  TRACE("(hkey=%p,%s,%s)\n", hKey, debugstr_a(lpszSubKey), debugstr_a(lpszValue));
-
-  dwRet = RegOpenKeyExA(hKey, lpszSubKey, 0, KEY_SET_VALUE, &hSubKey);
-  if (!dwRet)
-  {
-    dwRet = RegDeleteValueA(hSubKey, lpszValue);
-    RegCloseKey(hSubKey);
-  }
-  return dwRet;
-}
-
-/*************************************************************************
- * SHDeleteValueW   [SHLWAPI.@]
- *
- * See SHDeleteValueA.
- */
-DWORD WINAPI SHDeleteValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue)
-{
-  DWORD dwRet;
-  HKEY hSubKey;
-
-  TRACE("(hkey=%p,%s,%s)\n", hKey, debugstr_w(lpszSubKey), debugstr_w(lpszValue));
-
-  dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_SET_VALUE, &hSubKey);
-  if (!dwRet)
-  {
-    dwRet = RegDeleteValueW(hSubKey, lpszValue);
-    RegCloseKey(hSubKey);
-  }
-  return dwRet;
-}
-
 /*************************************************************************
  * @   [SHLWAPI.205]
  *
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec
index 98a3ab7d99..de25ed58c1 100644
--- a/dlls/shlwapi/shlwapi.spec
+++ b/dlls/shlwapi/shlwapi.spec
@@ -694,8 +694,8 @@
 @ stdcall SHDeleteKeyW(long wstr) shcore.SHDeleteKeyW
 @ stdcall SHDeleteOrphanKeyA(long str)
 @ stdcall SHDeleteOrphanKeyW(long wstr)
-@ stdcall SHDeleteValueA(long  str  str)
-@ stdcall SHDeleteValueW(long wstr wstr)
+@ stdcall -import SHDeleteValueA(long str str)
+@ stdcall -import SHDeleteValueW(long wstr wstr)
 @ 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