mirror of
https://github.com/reactos/reactos.git
synced 2024-06-10 14:35:31 +00:00
[0.4.14][SHELL32] Improve Start-Run Dialog Box Features (#3797) CORE-17351 CORE-16898
Improve performance of Start-Run Dialog Box Options This will fix: CORE-17351 'RunDlg fails calling URL without http' and CORE-16898 'RunCommand "iexplore" fails to open Wine IE' Both regressed by 0.4.10-dev-419-gbfcbda227f
Fix picked from 0.4.15-dev-2883-g33c7c91b36
This commit is contained in:
parent
7ce4d2a848
commit
6edd8cf961
|
@ -553,6 +553,7 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA
|
|||
INT ic;
|
||||
WCHAR *psz, *pszExpanded, *parent = NULL;
|
||||
DWORD cchExpand;
|
||||
SHELLEXECUTEINFOW sei;
|
||||
NMRUNFILEDLGW nmrfd;
|
||||
|
||||
ic = GetWindowTextLengthW(htxt);
|
||||
|
@ -562,6 +563,9 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
ZeroMemory(&sei, sizeof(sei));
|
||||
sei.cbSize = sizeof(sei);
|
||||
|
||||
/*
|
||||
* Allocate a new MRU entry, we need to add two characters
|
||||
* for the terminating "\\1" part, then the NULL character.
|
||||
|
@ -574,6 +578,9 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA
|
|||
}
|
||||
|
||||
GetWindowTextW(htxt, psz, ic + 1);
|
||||
sei.hwnd = hwnd;
|
||||
sei.nShow = SW_SHOWNORMAL;
|
||||
sei.lpFile = psz;
|
||||
StrTrimW(psz, L" \t");
|
||||
|
||||
if (wcschr(psz, L'%') != NULL)
|
||||
|
@ -602,11 +609,20 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA
|
|||
*/
|
||||
LPCWSTR pszStartDir;
|
||||
if (prfdp->lpstrDirectory)
|
||||
{
|
||||
sei.lpDirectory = prfdp->lpstrDirectory;
|
||||
pszStartDir = prfdp->lpstrDirectory;
|
||||
}
|
||||
else if (prfdp->uFlags & RFF_CALCDIRECTORY)
|
||||
{
|
||||
sei.lpDirectory = parent = RunDlg_GetParentDir(sei.lpFile);
|
||||
pszStartDir = parent = RunDlg_GetParentDir(pszExpanded);
|
||||
}
|
||||
else
|
||||
{
|
||||
sei.lpDirectory = NULL;
|
||||
pszStartDir = NULL;
|
||||
}
|
||||
|
||||
/* Hide the dialog for now on, we will show it up in case of retry */
|
||||
ShowWindow(hwnd, SW_HIDE);
|
||||
|
@ -636,10 +652,21 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA
|
|||
break;
|
||||
|
||||
case RF_OK:
|
||||
/* We use SECL_NO_UI because we don't want to see
|
||||
* errors here, but we will try again below and
|
||||
* there we will output our errors. */
|
||||
if (SUCCEEDED(ShellExecCmdLine(hwnd, pszExpanded, pszStartDir, SW_SHOWNORMAL, NULL,
|
||||
SECL_ALLOW_NONEXE)))
|
||||
SECL_ALLOW_NONEXE | SECL_NO_UI)))
|
||||
{
|
||||
/* Call again GetWindowText in case the contents of the edit box has changed? */
|
||||
/* Call GetWindowText again in case the contents of the edit box have changed. */
|
||||
GetWindowTextW(htxt, psz, ic + 1);
|
||||
FillList(htxt, psz, ic + 2 + 1, FALSE);
|
||||
EndDialog(hwnd, IDOK);
|
||||
break;
|
||||
}
|
||||
else if (SUCCEEDED(ShellExecuteExW(&sei)))
|
||||
{
|
||||
/* Call GetWindowText again in case the contents of the edit box have changed. */
|
||||
GetWindowTextW(htxt, psz, ic + 1);
|
||||
FillList(htxt, psz, ic + 2 + 1, FALSE);
|
||||
EndDialog(hwnd, IDOK);
|
||||
|
|
Loading…
Reference in a new issue