From f188ff4af88e7f105b1737c303857bc21c93a099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 8 Dec 2019 02:26:26 +0100 Subject: [PATCH] [0.4.10][WINLOGON] Start the screensaver on the user desktop CORE-16548 since support for secure screensaver desktop is not completely implemented in Winlogon. This fixes a regression introduced between 0.4.10-dev-579-gc697f19 and 0.4.10-dev-582-g3270979 fix cherry picked from commit 0.4.14-dev-581-g 40db38571689131bb8692f7bde7e9c37215edbce --- base/system/winlogon/screensaver.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/base/system/winlogon/screensaver.c b/base/system/winlogon/screensaver.c index e56c688df8f..6bd681ca39e 100644 --- a/base/system/winlogon/screensaver.c +++ b/base/system/winlogon/screensaver.c @@ -329,7 +329,9 @@ StartScreenSaver( StartupInfo.cb = sizeof(STARTUPINFOW); StartupInfo.dwFlags = STARTF_SCREENSAVER; - /* FIXME: run the screen saver on the screen saver desktop */ + /* FIXME: Run the screen saver on the secure screen saver desktop if required */ + StartupInfo.lpDesktop = L"WinSta0\\Default"; + ret = CreateProcessW(szApplicationName, szCommandLine, NULL,