[ros-diffs] [akhaldi] 62925: [URL] * Sync with Wine 1.7.17. CORE-8080

Author: akhaldi
Date: Wed Apr 23 15:00:16 2014
New Revision: 62925

URL: http://svn.reactos.org/svn/reactos?rev=62925&view=rev
Log:
[URL]
* Sync with Wine 1.7.17.
CORE-8080

Modified:
    trunk/reactos/dll/win32/url/url_main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/url/url_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/url/url_main.c?r…
==============================================================================
--- trunk/reactos/dll/win32/url/url_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/url/url_main.c	[iso-8859-1] Wed Apr 23 15:00:16 2014
@@ -92,8 +92,7 @@
  * int nShowCmd - How to display the operation.
  */
 
-HRESULT WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl,
-        int nShowCmd)
+void WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl, int
nShowCmd)
 {
     CHAR pszPath[MAX_PATH];
     DWORD size = MAX_PATH;
@@ -101,12 +100,7 @@
 
     TRACE("(%p, %s, %d)\n",hWnd,debugstr_a(pszUrl),nShowCmd);
 
-    if(createpath != S_OK)
-        return E_FAIL;
-
-    ShellExecuteA(hWnd,NULL,pszPath,NULL,NULL,nShowCmd);
-
-    return S_OK;
+    ShellExecuteA(hWnd, NULL, createpath==S_OK ? pszPath : pszUrl, NULL, NULL,
nShowCmd);
 }
 
 /***********************************************************************

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Wed Apr 23 15:00:16 2014
@@ -194,7 +194,7 @@
 reactos/dll/win32/twain_32            # Synced to Wine-1.7.17
 reactos/dll/win32/unicows             # Synced to Wine-1.3.32 (Win9x only, why do we need
this?!)
 reactos/dll/win32/updspapi            # Synced to Wine-1.7.1
-reactos/dll/win32/url                 # Synced to Wine-1.7.1
+reactos/dll/win32/url                 # Synced to Wine-1.7.17
 reactos/dll/win32/urlmon              # Synced to Wine-1.7.1
 reactos/dll/win32/usp10               # Synced to Wine-1.7.14
 reactos/dll/win32/uxtheme             # Forked