Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 03:28:20 +02:00
Code Activity

BfpProcess_WaitFor, BeefCon shutdown fix

Browse source
This commit is contained in:
Brian Fiete 2024-10-21 09:13:26 -04:00
parent 6a14bb55b5
commit c8dda5d1d9
5 changed files with 79 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

33
BeefTools/BeefCon/src/Program.bf
View file

@ -19,6 +19,17 @@ class Program
String mExecStr = new .() ~ delete _;
SpawnedProcess mSpawnedProcess ~ delete _;
[CLink, CallingConvention(.Stdcall)]
public static extern Windows.IntBool AttachConsole(int processId);
[CallingConvention(.Stdcall)]
function Windows.IntBool ConsoleCtrlHandler(int32 ctrlType);
[CLink, CallingConvention(.Stdcall)]
static extern Windows.IntBool SetConsoleCtrlHandler(ConsoleCtrlHandler handler, Windows.IntBool addHandler);
[CLink, CallingConvention(.Stdcall)]
static extern Windows.IntBool GenerateConsoleCtrlEvent(uint32 dwCtrlEvent, uint32 dwProcessGroupId);
public ~this()
{
if (mSpawnedProcess != null)
@ -165,13 +176,21 @@ class Program
// Check BeefIDE process
if ((mPid != 123) || (!Debug.IsDebuggerPresent))
{
bool isProcessOpen = false;
var process = Platform.BfpProcess_GetById(null, mPid, null);
if (process == null)
if (process != null)
{
if (!Platform.BfpProcess_WaitFor(process, 0, null, null))
isProcessOpen = true;
Platform.BfpProcess_Release(process);
}
if (!isProcessOpen)
{
Console.Error.WriteLine("Process closed");
return;
}
Platform.BfpProcess_Release(process);
}
MessageLoop();
@ -267,6 +286,16 @@ class Program
pg.mExecStr.Set(args[2]);
pg.Run();
}
else if (args.Count >= 2)
{
pg.mPid = int32.Parse(args[0]);
if (args[1] == "kill")
{
AttachConsole(pg.mPid);
SetConsoleCtrlHandler(default, true);
GenerateConsoleCtrlEvent(/*CTRL_C_EVENT*/0, 0);
}
}
else
{
pg.mPid = int32.Parse(args[0]);