* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62925
This commit is contained in:
Amine Khaldi 2014-04-23 15:00:16 +00:00
parent b6102b8d1d
commit 3291fa7253
2 changed files with 3 additions and 9 deletions

View file

@ -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);
}
/***********************************************************************

View file

@ -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