zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-524: Fixed possible deadlock in graceful termination mechanism for kiosk mode Disable Explorer Shell.

Browse source
This commit is contained in:
Damian Büchel 2021-12-22 12:30:34 +01:00
parent 9b092f98de
commit e522a68ead
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SafeExamBrowser.WindowsApi/ExplorerShell.cs
View file

@ -104,7 +104,7 @@ namespace SafeExamBrowser.WindowsApi
nativeMethods.PostCloseMessageToShell(); nativeMethods.PostCloseMessageToShell();
logger.Debug("Waiting for explorer shell to terminate..."); logger.Debug("Waiting for explorer shell to terminate...");
while (nativeMethods.GetShellWindowHandle() != IntPtr.Zero) for (var elapsed = 0; nativeMethods.GetShellWindowHandle() != IntPtr.Zero && elapsed < THREE_SECONDS; elapsed += 20)
{ {
Thread.Sleep(20); Thread.Sleep(20);
} }
@ -141,7 +141,7 @@ namespace SafeExamBrowser.WindowsApi
var process = new System.Diagnostics.Process(); var process = new System.Diagnostics.Process();
var taskkillPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "taskkill.exe"); var taskkillPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "taskkill.exe");
logger.Warn("Failed to gracefully terminate, attempting forceful termination..."); logger.Warn("Failed to gracefully terminate explorer shell, attempting forceful termination...");
process.StartInfo.Arguments = $"/F /PID {processId}"; process.StartInfo.Arguments = $"/F /PID {processId}";
process.StartInfo.CreateNoWindow = true; process.StartInfo.CreateNoWindow = true;