lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-05 19:43:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32] Expand .lnk working directory string before checking if it's valid (#7710)

Browse Source 
Handles the case where SEE_MASK_DOENVSUBST will expand it later inside ShellExeute.

CORE-19987
This commit is contained in:
Whindmar Saksit
2025-02-09 20:07:17 +01:00
committed by GitHub
parent 364d6e0346
commit e4216bd015
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dll/win32/shell32/CShellLink.cpp
View File

@@ -216,6 +216,22 @@ static LPWSTR __inline strdupW(LPCWSTR src)
return dest;
}
static BOOL PathEnvSubstIsDirectory(LPCWSTR pszPath)
{
// Note: Don't call SHExpandEnvironmentStringsW here, we need the required length
WCHAR szStack[MAX_PATH];
DWORD cch = ExpandEnvironmentStringsW(pszPath, szStack, _countof(szStack));
if (cch <= _countof(szStack))
return cch && PathIsDirectory(szStack);
PWSTR szHeap = (PWSTR)SHAlloc(cch);
if (!szHeap)
return FALSE;
BOOL bResult = ExpandEnvironmentStringsW(pszPath, szHeap, cch) && PathIsDirectory(szHeap);
SHFree(szHeap);
return bResult;
}
// TODO: Use it for constructor & destructor too
VOID CShellLink::Reset()
{
@@ -2667,7 +2683,7 @@ HRESULT CShellLink::DoOpen(LPCMINVOKECOMMANDINFO lpici)
sei.nShow = lpici->nShow; // Allow invoker to override .lnk show mode
// Use the invoker specified working directory if the link did not specify one
if (StrIsNullOrEmpty(sei.lpDirectory) || !PathIsDirectoryW(sei.lpDirectory))
if (StrIsNullOrEmpty(sei.lpDirectory) || !PathEnvSubstIsDirectory(sei.lpDirectory))
{
LPCSTR pszDirA = lpici->lpDirectory;
if (unicode && !StrIsNullOrEmpty(iciex->lpDirectoryW))