[WSHOM.OCX] Sync with Wine Staging 1.7.55. CORE-10536

svn path=/trunk/; revision=69950

diff --git a/reactos/dll/win32/wshom.ocx/CMakeLists.txt b/reactos/dll/win32/wshom.ocx/CMakeLists.txt
index 39206a5..441ea56 100644 (file)
--- a/reactos/dll/win32/wshom.ocx/CMakeLists.txt
+++ b/reactos/dll/win32/wshom.ocx/CMakeLists.txt
@@ -28,7 +28,7 @@ list(APPEND wshom_rc_deps
 set_source_files_properties(wshom.rc PROPERTIES OBJECT_DEPENDS "${wshom_rc_deps}")
 set_module_type(wshom win32ocx)
 target_link_libraries(wshom uuid wine)
-add_importlibs(wshom oleaut32 ole32 shell32 advapi32 user32 msvcrt kernel32 ntdll)
+add_importlibs(wshom oleaut32 ole32 shell32 advapi32 advapi32_vista user32 msvcrt kernel32 ntdll)
 add_dependencies(wshom stdole2 wshom_idlheader)
 add_pch(wshom wshom_private.h SOURCE)
 add_cd_file(TARGET wshom DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/wshom.ocx/shell.c b/reactos/dll/win32/wshom.ocx/shell.c
index be491b9..462a795 100644 (file)
--- a/reactos/dll/win32/wshom.ocx/shell.c
+++ b/reactos/dll/win32/wshom.ocx/shell.c
@@ -25,25 +25,6 @@
 
 #include <wine/unicode.h>
 
-/* FIXME: Vista+*/
-LONG WINAPI RegSetKeyValueW( HKEY hkey, LPCWSTR subkey, LPCWSTR name, DWORD type, const void *data, DWORD len )
-{
-    HKEY hsubkey = NULL;
-    DWORD ret;
-
-    TRACE("(%p,%s,%s,%d,%p,%d)\n", hkey, debugstr_w(subkey), debugstr_w(name), type, data, len );
-
-    if (subkey && subkey[0])  /* need to create the subkey */
-    {
-        if ((ret = RegCreateKeyW( hkey, subkey, &hsubkey )) != ERROR_SUCCESS) return ret;
-        hkey = hsubkey;
-    }
-
-    ret = RegSetValueExW( hkey, name, 0, type, (const BYTE*)data, len );
-    if (hsubkey) RegCloseKey( hsubkey );
-    return ret;
-}
-
 static IWshShell3 WshShell3;
 
 typedef struct

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 3986182..7428785 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -216,7 +216,7 @@ reactos/dll/win32/wldap32             # Synced to WineStaging-1.7.47
 reactos/dll/win32/wmi                 # Synced to WineStaging-1.7.47
 reactos/dll/win32/wmiutils            # Synced to WineStaging-1.7.47
 reactos/dll/win32/wmvcore             # Synced to WineStaging-1.7.47
-reactos/dll/win32/wshom.ocx           # Synced to WineStaging-1.7.47
+reactos/dll/win32/wshom.ocx           # Synced to WineStaging-1.7.55
 reactos/dll/win32/wtsapi32            # Synced to WineStaging-1.7.47
 reactos/dll/win32/wuapi               # Synced to WineStaging-1.7.47
 reactos/dll/win32/xinput1_1           # Synced to WineStaging-1.7.47