Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
svn path=/trunk/; revision=69950
This commit is contained in:
Amine Khaldi 2015-11-20 10:21:19 +00:00
parent 2552bcb15f
commit a589d61364
3 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/wshom.ocx/CMakeLists.txt
View file

@ -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)

19
reactos/dll/win32/wshom.ocx/shell.c
View file

@ -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

2
reactos/media/doc/README.WINE
View file

@ -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