smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore lpDesktop assignment in Windows daemon (#7326)

Browse source 
* Restore previous lpDesktop assignment

* Use static string buffer for desktop name

* Update ChangeLog

* Reword ChangeLog
This commit is contained in:
Nick Bolton 2024-01-15 17:53:57 +00:00 committed by GitHub
parent d34d9eef86
commit 668c3193e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -12,7 +12,7 @@ Enhancements:
- #7282 Improve error handling for thread jobs - #7282 Improve error handling for thread jobs
- #7284 Change session ID info log message to DEBUG2 - #7284 Change session ID info log message to DEBUG2
Build/CI: Tasks:
- #7283 Update all workflows and fix broken macOS workflows - #7283 Update all workflows and fix broken macOS workflows
- #7313 Fix CodeQL workflow: Failed to perl 404 Not Found - #7313 Fix CodeQL workflow: Failed to perl 404 Not Found
@ -24,6 +24,7 @@ Build/CI:
- #7322 Use C++20 and add Windows CMake preset - #7322 Use C++20 and add Windows CMake preset
- #7323 Add Linux and macOS CMake presets - #7323 Add Linux and macOS CMake presets
- #7325 Add timeout to all GitHub workflows - #7325 Add timeout to all GitHub workflows
- #7326 Restore lpDesktop assignment in Windows daemon
# 1.14.6 # 1.14.6

8
src/lib/platform/MSWindowsWatchdog.cpp
View file

@ -40,6 +40,9 @@
#define CURRENT_PROCESS_ID 0 #define CURRENT_PROCESS_ID 0
#define MAXIMUM_WAIT_TIME 3 #define MAXIMUM_WAIT_TIME 3
// TODO: maybe this should be \winlogon if we have logonui.exe?
static char g_desktopName[] = "winsta0\\Default";
namespace { namespace {
std::string std::string
trimDesktopName(const std::string& nameFromTraces) trimDesktopName(const std::string& nameFromTraces)
@ -398,12 +401,9 @@ MSWindowsWatchdog::startProcess()
void void
MSWindowsWatchdog::setStartupInfo(STARTUPINFO& si) MSWindowsWatchdog::setStartupInfo(STARTUPINFO& si)
{ {
// TODO: maybe this should be \winlogon if we have logonui.exe?
char desktop[] = "winsta0\\Default";
ZeroMemory(&si, sizeof(STARTUPINFO)); ZeroMemory(&si, sizeof(STARTUPINFO));
si.cb = sizeof(STARTUPINFO); si.cb = sizeof(STARTUPINFO);
si.lpDesktop = desktop; si.lpDesktop = g_desktopName;
si.hStdError = m_stdOutWrite; si.hStdError = m_stdOutWrite;
si.hStdOutput = m_stdOutWrite; si.hStdOutput = m_stdOutWrite;
si.dwFlags |= STARTF_USESTDHANDLES; si.dwFlags |= STARTF_USESTDHANDLES;