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

Author: akhaldi
Date: Sat Apr 25 10:56:22 2015
New Revision: 67396

URL: http://svn.reactos.org/svn/reactos?rev=67396&view=rev
Log:
[SHDOCVW] Sync with Wine Staging 1.7.37. CORE-9246

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.s...
==============================================================================
--- trunk/reactos/dll/win32/shdocvw/shdocvw.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shdocvw/shdocvw.spec	[iso-8859-1] Sat Apr 25 10:56:22 2015
@@ -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

Modified: trunk/reactos/dll/win32/shdocvw/shdocvw_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw_m...
==============================================================================
--- trunk/reactos/dll/win32/shdocvw/shdocvw_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shdocvw/shdocvw_main.c	[iso-8859-1] Sat Apr 25 10:56:22 2015
@@ -364,8 +364,7 @@
     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 @@
     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 @@
     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 @@
 {
     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;
+}

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sat Apr 25 10:56:22 2015
@@ -177,7 +177,7 @@
 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