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

[Alexandre Julliard]

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

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

shlwapi: Forward SHRegGetIntW() to shcore.

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

---

dlls/shlwapi/reg.c        | 31 -------------------------------
 dlls/shlwapi/shlwapi.spec |  2 +-
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c
index e59d162..fa091ab 100644
--- a/dlls/shlwapi/reg.c
+++ b/dlls/shlwapi/reg.c
@@ -2132,37 +2132,6 @@ DWORD WINAPI SHCopyKeyW(HKEY hKeySrc, LPCWSTR lpszSrcSubKey, HKEY hKeyDst, DWORD
  */

/*************************************************************************
- *      @     [SHLWAPI.280]
- *
- * Read an integer value from the registry, falling back to a default.
- *
- * PARAMS
- *  hKey      [I] Registry key to read from
- *  lpszValue [I] Value name to read
- *  iDefault  [I] Default value to return
- *
- * RETURNS
- *  The value contained in the given registry value if present, otherwise
- *  iDefault.
- */
-int WINAPI SHRegGetIntW(HKEY hKey, LPCWSTR lpszValue, int iDefault)
-{
-  TRACE("(%p,%s,%d)\n", hKey, debugstr_w(lpszValue), iDefault);
-
-  if (hKey)
-  {
-    WCHAR szBuff[32];
-    DWORD dwSize = sizeof(szBuff);
-    szBuff[0] = '\0';
-    SHQueryValueExW(hKey, lpszValue, 0, 0, szBuff, &dwSize);
-
-    if(*szBuff >= '0' && *szBuff <= '9')
-      return StrToIntW(szBuff);
-  }
-  return iDefault;
-}
-
-/*************************************************************************
  *      @	[SHLWAPI.343]
  *
  * Create or open an explorer ClassId Key.
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec
index 37ca328..4c31724 100644
--- a/dlls/shlwapi/shlwapi.spec
+++ b/dlls/shlwapi/shlwapi.spec
@@ -277,7 +277,7 @@
 277 stub -noname SHDialogBox
 278 stdcall -noname SHCreateWorkerWindowW(ptr ptr long long ptr long)
 279 stdcall -noname SHInvokeDefaultCommand(ptr ptr ptr)
-280 stdcall -ordinal SHRegGetIntW(ptr wstr long)
+280 stdcall -ordinal SHRegGetIntW(ptr wstr long) shcore.SHRegGetIntW
 281 stdcall -noname SHPackDispParamsV(ptr ptr long ptr)
 282 varargs -noname SHPackDispParams(ptr ptr long)
 283 stdcall -noname IConnectionPoint_InvokeWithCancel(ptr long long long long)