Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Pass and expand .lnk working directory (#7314)

Browse source
This commit is contained in:
Whindmar Saksit 2024-09-06 14:31:24 +02:00 committed by GitHub
parent 0707475f69
commit a509941786
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2617,9 +2617,11 @@ HRESULT CShellLink::DoOpen(LPCMINVOKECOMMANDINFO lpici)
} }
} }
WCHAR dir[MAX_PATH];
SHELLEXECUTEINFOW sei = { sizeof(sei) }; SHELLEXECUTEINFOW sei = { sizeof(sei) };
sei.fMask = SEE_MASK_HASLINKNAME | SEE_MASK_UNICODE | sei.fMask = SEE_MASK_HASLINKNAME | SEE_MASK_UNICODE | SEE_MASK_DOENVSUBST |
(lpici->fMask & (SEE_MASK_NOASYNC | SEE_MASK_ASYNCOK | SEE_MASK_FLAG_NO_UI)); (lpici->fMask & (SEE_MASK_NOASYNC | SEE_MASK_ASYNCOK | SEE_MASK_FLAG_NO_UI));
sei.lpDirectory = m_sWorkDir;
if (m_pPidl) if (m_pPidl)
{ {
sei.lpIDList = m_pPidl; sei.lpIDList = m_pPidl;
@ -2628,13 +2630,18 @@ HRESULT CShellLink::DoOpen(LPCMINVOKECOMMANDINFO lpici)
else else
{ {
sei.lpFile = m_sPath; sei.lpFile = m_sPath;
if (!(m_Header.dwFlags & SLDF_HAS_EXP_SZ))
{
sei.fMask &= ~SEE_MASK_DOENVSUBST; // The link does not want to expand lpFile
if (m_sWorkDir && ExpandEnvironmentStringsW(m_sWorkDir, dir, _countof(dir)) <= _countof(dir))
sei.lpDirectory = dir;
}
} }
sei.lpParameters = args; sei.lpParameters = args;
sei.lpClass = m_sLinkPath; sei.lpClass = m_sLinkPath;
sei.nShow = m_Header.nShowCommand; sei.nShow = m_Header.nShowCommand;
if (lpici->nShow != SW_SHOWNORMAL && lpici->nShow != SW_SHOW) if (lpici->nShow != SW_SHOWNORMAL && lpici->nShow != SW_SHOW)
sei.nShow = lpici->nShow; // Allow invoker to override .lnk show mode sei.nShow = lpici->nShow; // Allow invoker to override .lnk show mode
sei.lpDirectory = m_sWorkDir;
return (ShellExecuteExW(&sei) ? S_OK : E_FAIL); return (ShellExecuteExW(&sei) ? S_OK : E_FAIL);
} }

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

@ -1555,9 +1555,10 @@ static HRESULT ShellExecute_ContextMenuVerb(LPSHELLEXECUTEINFOW sei)
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
return hr; return hr;
CComHeapPtr<char> verb, parameters; CComHeapPtr<char> verb, parameters, dir;
__SHCloneStrWtoA(&verb, sei->lpVerb); __SHCloneStrWtoA(&verb, sei->lpVerb);
__SHCloneStrWtoA(&parameters, sei->lpParameters); __SHCloneStrWtoA(&parameters, sei->lpParameters);
__SHCloneStrWtoA(&dir, sei->lpDirectory);
BOOL fDefault = StrIsNullOrEmpty(sei->lpVerb); BOOL fDefault = StrIsNullOrEmpty(sei->lpVerb);
CMINVOKECOMMANDINFOEX ici = { sizeof(ici) }; CMINVOKECOMMANDINFOEX ici = { sizeof(ici) };
@ -1571,6 +1572,8 @@ static HRESULT ShellExecute_ContextMenuVerb(LPSHELLEXECUTEINFOW sei)
ici.hwnd = sei->hwnd; ici.hwnd = sei->hwnd;
ici.lpParameters = parameters; ici.lpParameters = parameters;
ici.lpParametersW = sei->lpParameters; ici.lpParametersW = sei->lpParameters;
ici.lpDirectory = dir;
ici.lpDirectoryW = sei->lpDirectory;
ici.dwHotKey = sei->dwHotKey; ici.dwHotKey = sei->dwHotKey;
ici.hIcon = sei->hIcon; ici.hIcon = sei->hIcon;
if (ici.fMask & (CMIC_MASK_HASLINKNAME | CMIC_MASK_HASTITLE)) if (ici.fMask & (CMIC_MASK_HASLINKNAME | CMIC_MASK_HASTITLE))