MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-10 21:33:38 +00:00
Code Issues Releases Wiki Activity

Added missing #ifdef around Windows Specific fixes

Browse Source
This commit is contained in:
Bryan Roe
2019-12-05 10:56:13 -08:00
parent eced5f2233
commit 8356cbf190
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
microscript/ILibDuktape_ChildProcess.c
View File

@@ -194,8 +194,9 @@ duk_ret_t ILibDuktape_ChildProcess_waitExit(duk_context *ctx)
duk_ret_t ILibDuktape_ChildProcess_SpawnedProcess_Finalizer(duk_context *ctx) duk_ret_t ILibDuktape_ChildProcess_SpawnedProcess_Finalizer(duk_context *ctx)
{ {
ILibDuktape_ChildProcess_SubProcess *retVal = (ILibDuktape_ChildProcess_SubProcess*)Duktape_GetBufferProperty(ctx, 0, ILibDuktape_ChildProcess_MemBuf); ILibDuktape_ChildProcess_SubProcess *retVal = (ILibDuktape_ChildProcess_SubProcess*)Duktape_GetBufferProperty(ctx, 0, ILibDuktape_ChildProcess_MemBuf);
#ifdef WIN32
ILibProcessPipe_Process_RemoveHandlers(retVal->childProcess); ILibProcessPipe_Process_RemoveHandlers(retVal->childProcess);
#endif
duk_get_prop_string(ctx, 0, "kill"); // [kill] duk_get_prop_string(ctx, 0, "kill"); // [kill]
duk_dup(ctx, 0); // [kill][this] duk_dup(ctx, 0); // [kill][this]
duk_call_method(ctx, 0); duk_call_method(ctx, 0);

2
microstack/ILibProcessPipe.c
View File

@@ -1628,6 +1628,7 @@ void ILibProcessPipe_Process_UpdateUserObject(ILibProcessPipe_Process module, vo
{ {
((ILibProcessPipe_Process_Object*)module)->userObject = userObj; ((ILibProcessPipe_Process_Object*)module)->userObject = userObj;
} }
#ifdef WIN32
void ILibProcessPipe_Process_RemoveHandlers(ILibProcessPipe_Process module) void ILibProcessPipe_Process_RemoveHandlers(ILibProcessPipe_Process module)
{ {
ILibProcessPipe_Process_Object* j = (ILibProcessPipe_Process_Object*)module; ILibProcessPipe_Process_Object* j = (ILibProcessPipe_Process_Object*)module;
@@ -1637,6 +1638,7 @@ void ILibProcessPipe_Process_RemoveHandlers(ILibProcessPipe_Process module)
ILibProcessPipe_WaitHandle_Remove(j->parent, j->hProcess); ILibProcessPipe_WaitHandle_Remove(j->parent, j->hProcess);
} }
} }
#endif
void ILibProcessPipe_Process_AddHandlers(ILibProcessPipe_Process module, int bufferSize, ILibProcessPipe_Process_ExitHandler exitHandler, ILibProcessPipe_Process_OutputHandler stdOut, ILibProcessPipe_Process_OutputHandler stdErr, ILibProcessPipe_Process_SendOKHandler sendOk, void *user) void ILibProcessPipe_Process_AddHandlers(ILibProcessPipe_Process module, int bufferSize, ILibProcessPipe_Process_ExitHandler exitHandler, ILibProcessPipe_Process_OutputHandler stdOut, ILibProcessPipe_Process_OutputHandler stdErr, ILibProcessPipe_Process_SendOKHandler sendOk, void *user)
{ {
ILibProcessPipe_Process_Object* j = (ILibProcessPipe_Process_Object*)module; ILibProcessPipe_Process_Object* j = (ILibProcessPipe_Process_Object*)module;

2
microstack/ILibProcessPipe.h
View File

@@ -80,7 +80,9 @@ ILibProcessPipe_Process ILibProcessPipe_Manager_SpawnProcessEx4(ILibProcessPipe_
#define ILibProcessPipe_Manager_SpawnProcessWithExtraPipeMemory(pipeManager, target, parameters, memorySize) ILibProcessPipe_Manager_SpawnProcessEx2(pipeManager, target, parameters, ILibProcessPipe_SpawnTypes_DEFAULT, memorySize) #define ILibProcessPipe_Manager_SpawnProcessWithExtraPipeMemory(pipeManager, target, parameters, memorySize) ILibProcessPipe_Manager_SpawnProcessEx2(pipeManager, target, parameters, ILibProcessPipe_SpawnTypes_DEFAULT, memorySize)
void ILibProcessPipe_Process_SoftKill(ILibProcessPipe_Process p); void ILibProcessPipe_Process_SoftKill(ILibProcessPipe_Process p);
void ILibProcessPipe_Process_AddHandlers(ILibProcessPipe_Process module, int bufferSize, ILibProcessPipe_Process_ExitHandler exitHandler, ILibProcessPipe_Process_OutputHandler stdOut, ILibProcessPipe_Process_OutputHandler stdErr, ILibProcessPipe_Process_SendOKHandler sendOk, void *user); void ILibProcessPipe_Process_AddHandlers(ILibProcessPipe_Process module, int bufferSize, ILibProcessPipe_Process_ExitHandler exitHandler, ILibProcessPipe_Process_OutputHandler stdOut, ILibProcessPipe_Process_OutputHandler stdErr, ILibProcessPipe_Process_SendOKHandler sendOk, void *user);
#ifdef WIN32
void ILibProcessPipe_Process_RemoveHandlers(ILibProcessPipe_Process module); void ILibProcessPipe_Process_RemoveHandlers(ILibProcessPipe_Process module);
#endif
void ILibProcessPipe_Process_UpdateUserObject(ILibProcessPipe_Process module, void *userObj); void ILibProcessPipe_Process_UpdateUserObject(ILibProcessPipe_Process module, void *userObj);
ILibTransport_DoneState ILibProcessPipe_Process_WriteStdIn(ILibProcessPipe_Process p, char* buffer, int bufferLen, ILibTransport_MemoryOwnership ownership); ILibTransport_DoneState ILibProcessPipe_Process_WriteStdIn(ILibProcessPipe_Process p, char* buffer, int bufferLen, ILibTransport_MemoryOwnership ownership);
void ILibProcessPipe_Process_CloseStdIn(ILibProcessPipe_Process p); void ILibProcessPipe_Process_CloseStdIn(ILibProcessPipe_Process p);