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

SEBWIN-312: Improved process creation mechanism by only using p/invoke if necessary.

Browse source
This commit is contained in:
dbuechel 2019-11-22 08:57:57 +01:00
parent 8714320808
commit 8d0fe0086b
1 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
SafeExamBrowser.WindowsApi/ProcessFactory.cs
View file

@ -50,31 +50,47 @@ namespace SafeExamBrowser.WindowsApi
public IProcess StartNew(string path, params string[] args) public IProcess StartNew(string path, params string[] args)
{ {
var commandLine = $"{'"' + path + '"'} {String.Join(" ", args)}"; var raw = default(System.Diagnostics.Process);
logger.Info($"Attempting to start process '{path}'...");
if (StartupDesktop != default(IDesktop))
{
raw = StartOnDesktop(path, args);
}
else
{
raw = System.Diagnostics.Process.Start(path, string.Join(" ", args));
}
var process = new Process(raw, LoggerFor(raw));
logger.Info($"Successfully started process '{path}' with ID = {process.Id}.");
return process;
}
private System.Diagnostics.Process StartOnDesktop(string path, params string[] args)
{
var commandLine = $"{'"' + path + '"'} {string.Join(" ", args)}";
var processInfo = new PROCESS_INFORMATION(); var processInfo = new PROCESS_INFORMATION();
var startupInfo = new STARTUPINFO(); var startupInfo = new STARTUPINFO();
startupInfo.cb = Marshal.SizeOf(startupInfo); startupInfo.cb = Marshal.SizeOf(startupInfo);
startupInfo.lpDesktop = StartupDesktop?.Name; startupInfo.lpDesktop = StartupDesktop?.Name;
logger.Info($"Attempting to start process '{path}'...");
// TODO: Fails for certain processes, whereas Process.Start() does not -> use different API?! Use (declare?) CreateProcessW / CreateProcessA?
var success = Kernel32.CreateProcess(null, commandLine, IntPtr.Zero, IntPtr.Zero, true, Constant.NORMAL_PRIORITY_CLASS, IntPtr.Zero, null, ref startupInfo, ref processInfo); var success = Kernel32.CreateProcess(null, commandLine, IntPtr.Zero, IntPtr.Zero, true, Constant.NORMAL_PRIORITY_CLASS, IntPtr.Zero, null, ref startupInfo, ref processInfo);
if (!success) if (success)
{ {
logger.Error($"Failed to start process '{Path.GetFileName(path)}'!"); return System.Diagnostics.Process.GetProcessById(processInfo.dwProcessId);
throw new Win32Exception(Marshal.GetLastWin32Error());
} }
var raw = System.Diagnostics.Process.GetProcessById(processInfo.dwProcessId); var errorCode = Marshal.GetLastWin32Error();
var process = new Process(raw, LoggerFor(raw));
logger.Info($"Successfully started process '{Path.GetFileName(path)}' with ID = {process.Id}."); logger.Error($"Failed to start process '{path}' on desktop '{StartupDesktop}'! Error code: {errorCode}.");
return process; throw new Win32Exception(errorCode);
} }
public bool TryGetById(int id, out IProcess process) public bool TryGetById(int id, out IProcess process)