Module: wine Branch: master Commit: 3e35bf3889031e86f0ad5a6ed5470843353d056b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e35bf3889031e86f0ad5a6ed...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Mon May 11 18:23:43 2020 +0300
shlwapi: Forward SHRegDuplicateHKey() to shcore.dll.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/shcore/Makefile.in | 1 + dlls/shlwapi/Makefile.in | 2 +- dlls/shlwapi/reg.c | 20 -------------------- dlls/shlwapi/shlwapi.spec | 2 +- 4 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/dlls/shcore/Makefile.in b/dlls/shcore/Makefile.in index 2e33b3e135..f296e4a830 100644 --- a/dlls/shcore/Makefile.in +++ b/dlls/shcore/Makefile.in @@ -1,4 +1,5 @@ MODULE = shcore.dll +IMPORTLIB = shcore IMPORTS = user32 gdi32 ole32 advapi32
EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index 179fcad765..184d00dd5d 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_SHLWAPI_ MODULE = shlwapi.dll IMPORTLIB = shlwapi -IMPORTS = uuid user32 gdi32 advapi32 kernelbase +IMPORTS = uuid shcore user32 gdi32 advapi32 kernelbase DELAYIMPORTS = userenv oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version
EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index f89636b12a..fb57f1fa16 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -932,26 +932,6 @@ BOOL WINAPI UnregisterExtensionForMIMETypeW(LPCWSTR lpszType) return TRUE; }
-/************************************************************************* - * SHRegDuplicateHKey [SHLWAPI.@] - * - * Create a duplicate of a registry handle. - * - * PARAMS - * hKey [I] key to duplicate. - * - * RETURNS - * A new handle pointing to the same key as hKey. - */ -HKEY WINAPI SHRegDuplicateHKey(HKEY hKey) -{ - HKEY newKey = 0; - - RegOpenKeyExA(hKey, 0, 0, MAXIMUM_ALLOWED, &newKey); - TRACE("new key is %p\n", newKey); - return newKey; -} - /* * The following functions are ORDINAL ONLY: */ diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index f47f41aea4..99c17aa350 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -720,7 +720,7 @@ @ stdcall SHRegDeleteEmptyUSKeyW(long wstr long) @ stdcall SHRegDeleteUSValueA(long str long) @ stdcall SHRegDeleteUSValueW(long wstr long) -@ stdcall SHRegDuplicateHKey (long) +@ stdcall -import SHRegDuplicateHKey(long) @ stdcall SHRegEnumUSKeyA(long long str ptr long) @ stdcall SHRegEnumUSKeyW(long long wstr ptr long) @ stdcall SHRegEnumUSValueA(long long ptr ptr ptr ptr ptr long)