mirror of
https://github.com/reactos/reactos.git
synced 2025-08-05 15:23:03 +00:00
merge WineHQ commit
svn path=/trunk/; revision=8504
This commit is contained in:
parent
9cd5e17f9f
commit
d6e2c152dd
1 changed files with 3 additions and 5 deletions
|
@ -1219,7 +1219,7 @@ BOOL WINAPI ShellExecuteExW32 (LPSHELLEXECUTEINFOW psei, SHELL_ExecuteW32 execfu
|
||||||
}
|
}
|
||||||
else if (PathIsURLW((LPWSTR)lpFile)) /* File not found, check for URL */
|
else if (PathIsURLW((LPWSTR)lpFile)) /* File not found, check for URL */
|
||||||
{
|
{
|
||||||
static const WCHAR wszShell[] = {'\\','s','h','e','l','l',0};
|
static const WCHAR wszShell[] = {'\\','s','h','e','l','l','\\',0};
|
||||||
static const WCHAR wCommand[] = {'\\','c','o','m','m','a','n','d',0};
|
static const WCHAR wCommand[] = {'\\','c','o','m','m','a','n','d',0};
|
||||||
LPWSTR lpstrRes;
|
LPWSTR lpstrRes;
|
||||||
INT iSize;
|
INT iSize;
|
||||||
|
@ -1346,16 +1346,14 @@ BOOL WINAPI ShellExecuteExA (LPSHELLEXECUTEINFOA sei)
|
||||||
|
|
||||||
ret = ShellExecuteExW32 (&seiW, SHELL_ExecuteW);
|
ret = ShellExecuteExW32 (&seiW, SHELL_ExecuteW);
|
||||||
|
|
||||||
|
sei->hInstApp = seiW.hInstApp;
|
||||||
|
|
||||||
if (wVerb) SHFree(wVerb);
|
if (wVerb) SHFree(wVerb);
|
||||||
if (wFile) SHFree(wFile);
|
if (wFile) SHFree(wFile);
|
||||||
if (wParameters) SHFree(wParameters);
|
if (wParameters) SHFree(wParameters);
|
||||||
if (wDirectory) SHFree(wDirectory);
|
if (wDirectory) SHFree(wDirectory);
|
||||||
if (wClass) SHFree(wClass);
|
if (wClass) SHFree(wClass);
|
||||||
|
|
||||||
sei->hInstApp = seiW.hInstApp;
|
|
||||||
|
|
||||||
TRACE("ShellExecuteExW(): ret=%d\n", ret);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue