Author: akhaldi
Date: Wed Oct 8 18:42:09 2014
New Revision: 64603
URL: http://svn.reactos.org/svn/reactos?rev=64603&view=rev
Log:
[SHDOCVW]
* Sync with Wine 1.7.27.
CORE-8540
Modified:
trunk/reactos/dll/win32/shdocvw/shdocvw.spec
trunk/reactos/dll/win32/shdocvw/shdocvw_main.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.spec?rev=64603&r1=64602&r2=64603&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shdocvw/shdocvw.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shdocvw/shdocvw.spec [iso-8859-1] Wed Oct 8
18:42:09 2014
@@ -46,7 +46,7 @@
161 stub shdocvw_161 # CSearchAssistantOC::OnDraw
162 stub -noname CDDEAuto_Navigate
163 stub SHAddSubscribeFavorite
-164 stub -noname ResetProfileSharing
+164 stdcall -noname ResetProfileSharing(long)
165 stub -noname URLSubstitution
167 stub -noname IsIEDefaultBrowser
169 stdcall -noname ParseURLFromOutsideSourceA(str ptr ptr ptr)
@@ -121,7 +121,7 @@
@ stub IEAboutBox
@ stub IEWriteErrorLog
@ stdcall ImportPrivacySettings(wstr ptr ptr)
-@ stub InstallReg_RunDLL
+@ stdcall InstallReg_RunDLL(long long str long)
@ stdcall OpenURL(long long str long) ieframe.OpenURL
@ stub SHGetIDispatchForFolder
@ stdcall SetQueryNetSessionCount(long)
Modified: trunk/reactos/dll/win32/shdocvw/shdocvw_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw_main.c?rev=64603&r1=64602&r2=64603&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shdocvw/shdocvw_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shdocvw/shdocvw_main.c [iso-8859-1] Wed Oct 8
18:42:09 2014
@@ -519,3 +519,20 @@
return TRUE;
}
+
+/******************************************************************
+ * ResetProfileSharing (SHDOCVW.164)
+ */
+HRESULT WINAPI ResetProfileSharing(HWND hwnd)
+{
+ FIXME("(%p) stub\n", hwnd);
+ return E_NOTIMPL;
+}
+
+/******************************************************************
+ * InstallReg_RunDLL (SHDOCVW.@)
+ */
+void WINAPI InstallReg_RunDLL(HWND hwnd, HINSTANCE handle, LPCSTR cmdline, INT
show)
+{
+ FIXME("(%p %p %s %x)\n", hwnd, handle, debugstr_a(cmdline), show);
+}
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=64603&r1=64602&r2=64603&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Oct 8 18:42:09 2014
@@ -182,7 +182,7 @@
reactos/dll/win32/sensapi # Synced to Wine-1.7.17
reactos/dll/win32/setupapi # Forked at Wine-20050524
reactos/dll/win32/shdoclc # Synced to Wine-1.7.17
-reactos/dll/win32/shdocvw # Synced to Wine-1.7.17
+reactos/dll/win32/shdocvw # Synced to Wine-1.7.27
reactos/dll/win32/shell32 # Forked at Wine-20071011
reactos/dll/win32/shfolder # Synced to Wine-1.7.17
reactos/dll/win32/shlwapi # Synced to Wine-1.7.27
