[URL]

* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62925

diff --git a/reactos/dll/win32/url/url_main.c b/reactos/dll/win32/url/url_main.c
index 3c5df00..79eaca1 100644 (file)
--- a/reactos/dll/win32/url/url_main.c
+++ b/reactos/dll/win32/url/url_main.c
@@ -92,8 +92,7 @@ BOOL WINAPI InetIsOffline(DWORD flags)
  * 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 @@ HRESULT WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl,
 
     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);
 }
 
 /***********************************************************************

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index e1fb3bf..a8bde4e 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -194,7 +194,7 @@ reactos/dll/win32/traffic             # Synced to Wine-1.7.1
 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