Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-10 12:24:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Forward CDefaultContextMenu::InvokeCommand parameters to ShellExecute (#7172)

Browse source
This commit is contained in:
Whindmar Saksit 2024-07-23 18:58:02 +02:00 • committed by GitHub
parent 876d1c2dc8
commit d5aca44042
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
dll/win32/shell32/CDefaultContextMenu.cpp
View file

@ -1302,6 +1302,9 @@ CDefaultContextMenu::TryToBrowse(
HRESULT HRESULT
CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFOEX lpcmi, LPCITEMIDLIST pidl, PStaticShellEntry pEntry) CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFOEX lpcmi, LPCITEMIDLIST pidl, PStaticShellEntry pEntry)
{ {
BOOL unicode = lpcmi->cbSize >= FIELD_OFFSET(CMINVOKECOMMANDINFOEX, ptInvoke) &&
(lpcmi->fMask & CMIC_MASK_UNICODE);
LPITEMIDLIST pidlFull = ILCombine(m_pidlFolder, pidl); LPITEMIDLIST pidlFull = ILCombine(m_pidlFolder, pidl);
if (pidlFull == NULL) if (pidlFull == NULL)
{ {
@ -1323,9 +1326,8 @@ CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFOEX lpcmi, LPCITEMIDLIST pid
*wszDir = UNICODE_NULL; *wszDir = UNICODE_NULL;
} }
SHELLEXECUTEINFOW sei; CComHeapPtr<WCHAR> pszParamsW;
ZeroMemory(&sei, sizeof(sei)); SHELLEXECUTEINFOW sei = { sizeof(sei) };
sei.cbSize = sizeof(sei);
sei.hwnd = lpcmi->hwnd; sei.hwnd = lpcmi->hwnd;
sei.nShow = SW_SHOWNORMAL; sei.nShow = SW_SHOWNORMAL;
sei.lpVerb = pEntry->Verb; sei.lpVerb = pEntry->Verb;
@ -1334,9 +1336,12 @@ CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFOEX lpcmi, LPCITEMIDLIST pid
sei.hkeyClass = pEntry->hkClass; sei.hkeyClass = pEntry->hkClass;
sei.fMask = SEE_MASK_CLASSKEY | SEE_MASK_IDLIST; sei.fMask = SEE_MASK_CLASSKEY | SEE_MASK_IDLIST;
if (bHasPath) if (bHasPath)
{
sei.lpFile = wszPath; sei.lpFile = wszPath;
}
if (unicode && !StrIsNullOrEmpty(lpcmi->lpParametersW))
sei.lpParameters = lpcmi->lpParametersW;
else if (!StrIsNullOrEmpty(lpcmi->lpParameters) && __SHCloneStrAtoW(&pszParamsW, lpcmi->lpParameters))
sei.lpParameters = pszParamsW;
ShellExecuteExW(&sei); ShellExecuteExW(&sei);

4
dll/win32/shell32/CShellLink.cpp
View file

@ -2602,7 +2602,7 @@ HRESULT CShellLink::DoOpen(LPCMINVOKECOMMANDINFO lpici)
if (unicode) if (unicode)
{ {
LPCMINVOKECOMMANDINFOEX iciex = (LPCMINVOKECOMMANDINFOEX)lpici; LPCMINVOKECOMMANDINFOEX iciex = (LPCMINVOKECOMMANDINFOEX)lpici;
if (iciex->lpParametersW && iciex->lpParametersW[0]) if (!StrIsNullOrEmpty(iciex->lpParametersW))
{ {
args += L' '; args += L' ';
args += iciex->lpParametersW; args += iciex->lpParametersW;
@ -2611,7 +2611,7 @@ HRESULT CShellLink::DoOpen(LPCMINVOKECOMMANDINFO lpici)
else else
{ {
CComHeapPtr<WCHAR> pszParams; CComHeapPtr<WCHAR> pszParams;
if (lpici->lpParameters && lpici->lpParameters[0] && __SHCloneStrAtoW(&pszParams, lpici->lpParameters)) if (!StrIsNullOrEmpty(lpici->lpParameters) && __SHCloneStrAtoW(&pszParams, lpici->lpParameters))
{ {
args += L' '; args += L' ';
args += pszParams; args += pszParams;

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

@ -1670,8 +1670,8 @@ static UINT_PTR SHELL_execute_class(LPCWSTR wszApplicationName, LPSHELLEXECUTEIN
TRACE("SEE_MASK_CLASSNAME->%s, doc->%s\n", debugstr_w(execCmd), debugstr_w(wszApplicationName)); TRACE("SEE_MASK_CLASSNAME->%s, doc->%s\n", debugstr_w(execCmd), debugstr_w(wszApplicationName));
wcmd[0] = '\0'; wcmd[0] = '\0';
done = SHELL_ArgifyW(wcmd, ARRAY_SIZE(wcmd), execCmd, wszApplicationName, (LPITEMIDLIST)psei->lpIDList, NULL, &resultLen, done = SHELL_ArgifyW(wcmd, ARRAY_SIZE(wcmd), execCmd, wszApplicationName, (LPITEMIDLIST)psei->lpIDList, psei->lpParameters,
(psei->lpDirectory && *psei->lpDirectory) ? psei->lpDirectory : NULL); &resultLen, (psei->lpDirectory && *psei->lpDirectory) ? psei->lpDirectory : NULL);
if (!done && wszApplicationName[0]) if (!done && wszApplicationName[0])
{ {
strcatW(wcmd, L" "); strcatW(wcmd, L" ");

3
sdk/include/reactos/shellutils.h
View file

@ -456,6 +456,9 @@ template<class B, class R> static HRESULT SHILCombine(B base, PCUIDLIST_RELATIVE
return r ? S_OK : E_OUTOFMEMORY; return r ? S_OK : E_OUTOFMEMORY;
} }
static inline bool StrIsNullOrEmpty(LPCSTR str) { return !str || !*str; }
static inline bool StrIsNullOrEmpty(LPCWSTR str) { return !str || !*str; }
HRESULT inline SHSetStrRet(LPSTRRET pStrRet, LPCSTR pstrValue) HRESULT inline SHSetStrRet(LPSTRRET pStrRet, LPCSTR pstrValue)
{ {
pStrRet->uType = STRRET_CSTR; pStrRet->uType = STRRET_CSTR;