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

Author: akhaldi
Date: Fri Nov 20 10:21:19 2015
New Revision: 69950

URL: http://svn.reactos.org/svn/reactos?rev=69950&view=rev
Log:
[WSHOM.OCX] Sync with Wine Staging 1.7.55. CORE-10536

Modified:
    trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt
    trunk/reactos/dll/win32/wshom.ocx/shell.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/CMakeL…
==============================================================================
--- trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt	[iso-8859-1] Fri Nov 20 10:21:19
2015
@@ -28,7 +28,7 @@
 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)

Modified: trunk/reactos/dll/win32/wshom.ocx/shell.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/shell.…
==============================================================================
--- trunk/reactos/dll/win32/wshom.ocx/shell.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wshom.ocx/shell.c	[iso-8859-1] Fri Nov 20 10:21:19 2015
@@ -24,25 +24,6 @@
 #include <winreg.h>
 
 #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;
 

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Fri Nov 20 10:21:19 2015
@@ -216,7 +216,7 @@
 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