Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 08:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EXPLORER] Fix auto startup behavior

Browse source 
Command line should be expanded only for REG_EXPAND_SZ values.

CORE-17168
This commit is contained in:
Stanislav Motylkov 2020-07-21 17:04:17 +03:00
parent 98bbe8358c
commit 6fe704b0f0
No known key found for this signature in database
GPG key ID: AFE513258CBA9E92
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
base/shell/explorer/startup.cpp
View file

@ -62,9 +62,6 @@ static int runCmd(LPWSTR cmdline, LPCWSTR dir, BOOL wait, BOOL minimized)
STARTUPINFOW si; STARTUPINFOW si;
PROCESS_INFORMATION info; PROCESS_INFORMATION info;
DWORD exit_code = 0; DWORD exit_code = 0;
WCHAR szCmdLineExp[MAX_PATH+1] = L"\0";
ExpandEnvironmentStringsW(cmdline, szCmdLineExp, _countof(szCmdLineExp));
memset(&si, 0, sizeof(si)); memset(&si, 0, sizeof(si));
si.cb = sizeof(si); si.cb = sizeof(si);
@ -75,7 +72,7 @@ static int runCmd(LPWSTR cmdline, LPCWSTR dir, BOOL wait, BOOL minimized)
} }
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
if (!CreateProcessW(NULL, szCmdLineExp, NULL, NULL, FALSE, 0, NULL, dir, &si, &info)) if (!CreateProcessW(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, dir, &si, &info))
{ {
TRACE("Failed to run command (%lu)\n", GetLastError()); TRACE("Failed to run command (%lu)\n", GetLastError());
@ -260,13 +257,21 @@ static BOOL ProcessRunKeys(HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete,
TRACE("Couldn't delete value - %lu, %ld. Running command anyways.\n", i, res); TRACE("Couldn't delete value - %lu, %ld. Running command anyways.\n", i, res);
} }
if (type != REG_SZ) if (type != REG_SZ && type != REG_EXPAND_SZ)
{ {
TRACE("Incorrect type of value #%lu (%lu)\n", i, type); TRACE("Incorrect type of value #%lu (%lu)\n", i, type);
continue; continue;
} }
if (type == REG_EXPAND_SZ)
{
WCHAR szCmdLineExp[MAX_PATH + 1] = L"\0";
if (ExpandEnvironmentStringsW(szCmdLine, szCmdLineExp, _countof(szCmdLineExp)))
StringCbCopyW(szCmdLine, cbMaxCmdLine, szCmdLineExp);
}
res = runCmd(szCmdLine, NULL, bSynchronous, FALSE); res = runCmd(szCmdLine, NULL, bSynchronous, FALSE);
if (res == INVALID_RUNCMD_RETURN) if (res == INVALID_RUNCMD_RETURN)
{ {