Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-21 13:31:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32] Ensure OpenAs_RunDLL does not loop to infinity and beyond.

Browse source 
This should fix a timeout on the apitests.
This commit is contained in:
Mark Jansen 2018-07-06 21:43:57 +02:00
parent ed4eb9c7c3
commit 3904fd6257
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
2 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
dll/win32/shell32/COpenWithMenu.cpp
View file

@ -1035,7 +1035,7 @@ VOID COpenWithDialog::Accept()
if (m_pInfo->oaifInFlags & OAIF_EXEC)
m_pAppList->Execute(pApp, m_pInfo->pcszFile);
DestroyWindow(m_hDialog);
EndDialog(m_hDialog, 1);
}
}
@ -1066,7 +1066,7 @@ INT_PTR CALLBACK COpenWithDialog::DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wPa
return TRUE;
}
case IDCANCEL: /* cancel */
DestroyWindow(hwndDlg);
EndDialog(hwndDlg, 0);
return TRUE;
default:
break;
@ -1085,7 +1085,7 @@ INT_PTR CALLBACK COpenWithDialog::DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wPa
}
break;
case WM_CLOSE:
DestroyWindow(hwndDlg);
EndDialog(hwndDlg, 0);
return TRUE;
default:
break;
@ -1427,8 +1427,7 @@ COpenWithMenu::Initialize(LPCITEMIDLIST pidlFolder,
HRESULT WINAPI
SHOpenWithDialog(HWND hwndParent, const OPENASINFO *poainfo)
{
MSG msg;
HWND hwnd;
INT_PTR ret;
TRACE("SHOpenWithDialog hwndParent %p poainfo %p\n", hwndParent, poainfo);
@ -1439,25 +1438,16 @@ SHOpenWithDialog(HWND hwndParent, const OPENASINFO *poainfo)
COpenWithDialog pDialog(poainfo);
hwnd = CreateDialogParam(shell32_hInstance, MAKEINTRESOURCE(IDD_OPEN_WITH), hwndParent, COpenWithDialog::DialogProc, (LPARAM)&pDialog);
if (hwnd == NULL)
{
ERR("Failed to create dialog\n");
return E_FAIL;
}
if (pDialog.IsNoOpen(hwndParent))
return S_OK;
ShowWindow(hwnd, SW_SHOWNORMAL);
ret = DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCE(IDD_OPEN_WITH), hwndParent,
COpenWithDialog::DialogProc, (LPARAM)&pDialog);
while (GetMessage(&msg, NULL, 0, 0) && IsWindow(hwnd))
if (ret == (INT_PTR)-1)
{
if (!IsDialogMessage(hwnd, &msg))
{
TranslateMessage(&msg);
DispatchMessage(&msg);
}
ERR("Failed to create dialog: %u\n", GetLastError());
return E_FAIL;
}
return S_OK;

3
dll/win32/shell32/shlexec.cpp
View file

@ -2314,7 +2314,8 @@ OpenAs_RunDLLA(HWND hwnd, HINSTANCE hinst, LPCSTR cmdline, int cmdshow)
LPWSTR pszCmdLineW = NULL;
TRACE("%p, %p, %s, %d\n", hwnd, hinst, debugstr_a(cmdline), cmdshow);
__SHCloneStrAtoW(&pszCmdLineW, cmdline);
if (cmdline)
__SHCloneStrAtoW(&pszCmdLineW, cmdline);
OpenAs_RunDLLW(hwnd, hinst, pszCmdLineW, cmdshow);
SHFree(pszCmdLineW);
}