[SHDOCVW]
authorAmine Khaldi <amine.khaldi@reactos.org>
Wed, 8 Oct 2014 18:42:09 +0000 (18:42 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Wed, 8 Oct 2014 18:42:09 +0000 (18:42 +0000)
* Sync with Wine 1.7.27.
CORE-8540

svn path=/trunk/; revision=64603

reactos/dll/win32/shdocvw/shdocvw.spec
reactos/dll/win32/shdocvw/shdocvw_main.c
reactos/media/doc/README.WINE

index 2ca6d02..a569529 100644 (file)
@@ -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)
 @ 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)
index d03d59a..12d96ed 100644 (file)
@@ -519,3 +519,20 @@ BOOL WINAPI ImportPrivacySettings(LPCWSTR filename, BOOL *pGlobalPrefs, BOOL * p
 
     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);
+}
index 0d2e1e2..03d1d51 100644 (file)
@@ -182,7 +182,7 @@ reactos/dll/win32/security            # Forked (different .spec)
 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