From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 25 Apr 2015 10:56:22 +0000 (+0000)
Subject: [SHDOCVW] Sync with Wine Staging 1.7.37. CORE-9246
X-Git-Tag: backups/colins-printing-for-freedom@73041~220
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=b1253f2d044f774339f0e0cdbd1f876d683cde4a

[SHDOCVW] Sync with Wine Staging 1.7.37. CORE-9246

svn path=/trunk/; revision=67396
---

diff --git a/reactos/dll/win32/shdocvw/shdocvw.spec b/reactos/dll/win32/shdocvw/shdocvw.spec
index b710119e928..f298936b1a7 100644
--- a/reactos/dll/win32/shdocvw/shdocvw.spec
+++ b/reactos/dll/win32/shdocvw/shdocvw.spec
@@ -25,7 +25,7 @@
 125 stdcall -noname RunInstallUninstallStubs()
 126 stub DoAddToFavDlg
 127 stub DoAddToFavDlgW
-128 stub DoFileDownload
+128 stdcall DoFileDownload(wstr)
 129 stub DoFileDownloadEx
 130 stdcall -noname RunInstallUninstallStubs2()
 131 stub -noname SHCreateSplashScreen
diff --git a/reactos/dll/win32/shdocvw/shdocvw_main.c b/reactos/dll/win32/shdocvw/shdocvw_main.c
index e5a3a70e4ac..b36ffdf4be0 100644
--- a/reactos/dll/win32/shdocvw/shdocvw_main.c
+++ b/reactos/dll/win32/shdocvw/shdocvw_main.c
@@ -364,8 +364,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
     HRESULT hr;
     DWORD needed;
     DWORD len;
-    DWORD res = 0;
-
+    DWORD res;
 
     TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_w(url), out, plen, unknown,
             plen ? *plen : 0, unknown ? *unknown : 0);
@@ -391,10 +390,12 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
     needed = lstrlenW(buffer_out)+1;
     TRACE("got 0x%x with %s (need %d)\n", hr, debugstr_w(buffer_out), needed);
 
+    res = 0;
     if (*plen >= needed) {
         if (out != NULL) {
             lstrcpyW(out, buffer_out);
-            res++;
+            /* On success, 1 is returned for unicode version */
+            res = 1;
         }
         needed--;
     }
@@ -437,6 +438,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD
     if (*plen >= needed) {
         if (out != NULL) {
             WideCharToMultiByte(CP_ACP, 0, buffer, -1, out, *plen, NULL, NULL);
+            /* On success, string size including terminating 0 is returned for ansi version */
             res = needed;
         }
         needed--;
@@ -536,3 +538,12 @@ void WINAPI InstallReg_RunDLL(HWND hwnd, HINSTANCE handle, LPCSTR cmdline, INT s
 {
     FIXME("(%p %p %s %x)\n", hwnd, handle, debugstr_a(cmdline), show);
 }
+
+/******************************************************************
+ * DoFileDownload (SHDOCVW.@)
+ */
+BOOL WINAPI DoFileDownload(LPWSTR filename)
+{
+    FIXME("(%s) stub\n", debugstr_w(filename));
+    return FALSE;
+}
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 8c3ef26b25f..9ba5c829182 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -177,7 +177,7 @@ reactos/dll/win32/security            # Forked (different .spec)
 reactos/dll/win32/sensapi             # Synced to Wine-1.7.27
 reactos/dll/win32/setupapi            # Forked at Wine-20050524
 reactos/dll/win32/shdoclc             # Synced to Wine-1.7.27
-reactos/dll/win32/shdocvw             # Synced to Wine-1.7.27
+reactos/dll/win32/shdocvw             # Synced to WineStaging-1.7.37
 reactos/dll/win32/shell32             # Forked at Wine-20071011
 reactos/dll/win32/shfolder            # Synced to Wine-1.7.27
 reactos/dll/win32/shlwapi             # Synced to Wine-1.7.27