Piotr Caban : url: Add support for http protocol handling in FileProtocolHandlerA.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 6d47e09b913d0d42bbcec346778c6c6ac04b6c93
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6d47e09b913d0d42bbcec34677...

Author: Piotr Caban 
Date:   Thu Oct 17 12:54:31 2013 +0200

url: Add support for http protocol handling in FileProtocolHandlerA.

(cherry picked from commit f5ea78f6a1d67c68fb4cef89e0891933c72b624b)

---

dlls/url/url_main.c |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/dlls/url/url_main.c b/dlls/url/url_main.c
index b65aa02..8ad413b 100644
--- a/dlls/url/url_main.c
+++ b/dlls/url/url_main.c
@@ -88,8 +88,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;
@@ -97,12 +96,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);
 }

/***********************************************************************