diff --git a/meshconsole/main.c b/meshconsole/main.c index 07bdb9c..5306165 100644 --- a/meshconsole/main.c +++ b/meshconsole/main.c @@ -114,6 +114,7 @@ int main(int argc, char **argv) int retCode = 0; int capabilities = 0; + #ifdef WIN32 int argvi, argvsz; char **argv = (char**)ILibMemory_SmartAllocate(argc * sizeof(void*)); diff --git a/meshcore/agentcore.c b/meshcore/agentcore.c index c075edd..3baddb8 100644 --- a/meshcore/agentcore.c +++ b/meshcore/agentcore.c @@ -2274,22 +2274,22 @@ void WritePipeResponse(AGENT_RECORD_TYPE recordType, JS_ENGINE_CONTEXT engineCon duk_context* ScriptEngine_Stop(MeshAgentHostContainer *agent, char *contextGUID) { - duk_context *oldCtx = agent->meshCoreCtx; - agent->meshCoreCtx = NULL; - SCRIPT_ENGINE_SETTINGS *settings = ILibDuktape_ScriptContainer_GetSettings(oldCtx); - duk_context *newCtx = ILibDuktape_ScriptContainer_InitializeJavaScriptEngineEx2(settings); - ILibDuktape_MeshAgent_Init(newCtx, agent->chain, agent); + SCRIPT_ENGINE_SETTINGS *settings = ILibDuktape_ScriptContainer_GetSettings(agent->meshCoreCtx); + Duktape_SafeDestroyHeap(agent->meshCoreCtx); - ILibDuktape_SetNativeUncaughtExceptionHandler(newCtx, settings->nExeptionHandler, settings->nExceptionUserObject); + agent->meshCoreCtx = ILibDuktape_ScriptContainer_InitializeJavaScriptEngineEx2(settings); + ILibDuktape_MeshAgent_Init(agent->meshCoreCtx, agent->chain, agent); + + ILibDuktape_SetNativeUncaughtExceptionHandler(agent->meshCoreCtx, settings->nExeptionHandler, settings->nExceptionUserObject); if (g_displayFinalizerMessages) { printf("\n\n==> Stopping JavaScript Engine\n"); } - duk_destroy_heap(oldCtx); - agent->meshCoreCtx = newCtx; + if (agent->proxyServer != NULL) { memcpy_s(&(ILibDuktape_GetNewGlobalTunnel(agent->meshCoreCtx)->proxyServer), sizeof(struct sockaddr_in6), agent->proxyServer, sizeof(struct sockaddr_in6)); } - return(newCtx); + ILibDuktape_ScriptContainer_FreeSettings(settings); + return(agent->meshCoreCtx); } char* ScriptEngine_Restart(MeshAgentHostContainer *agent, char *contextGUID, char *buffer, int bufferLen) { @@ -3770,10 +3770,10 @@ void MeshAgent_ChainEnd(void *chain, void *user) if (agent->meshCoreCtx != NULL) { if (g_displayFinalizerMessages) { printf("\n\n==> Stopping JavaScript Engine\n"); } - duk_destroy_heap(agent->meshCoreCtx); + Duktape_SafeDestroyHeap(agent->meshCoreCtx); if (agent->bootstrapCoreCtx != NULL) { - duk_destroy_heap(agent->bootstrapCoreCtx); + Duktape_SafeDestroyHeap(agent->bootstrapCoreCtx); agent->bootstrapCoreCtx = NULL; } } @@ -4009,7 +4009,7 @@ int MeshAgent_AgentMode(MeshAgentHostContainer *agentHost, int paramLen, char ** break; } - duk_destroy_heap(ctxx); + Duktape_SafeDestroyHeap(ctxx); } else { @@ -4141,7 +4141,7 @@ int MeshAgent_AgentMode(MeshAgentHostContainer *agentHost, int paramLen, char ** } } } - duk_destroy_heap(tmpCtx); + Duktape_SafeDestroyHeap(tmpCtx); // Load the mesh agent certificates if ((resetNodeId == 1 || agent_LoadCertificates(agentHost) != 0) && agent_GenerateCertificates(agentHost, NULL) != 0) { printf("Certificate error\r\n"); } diff --git a/meshservice/ServiceMain.c b/meshservice/ServiceMain.c index d846167..0fd52d6 100644 --- a/meshservice/ServiceMain.c +++ b/meshservice/ServiceMain.c @@ -125,7 +125,7 @@ void UpdateOwnerData() duk_peval_string_noresult(ctx, "global._noMessagePump=true;var key=require('win-registry').usernameToUserKey(require('user-sessions').getProcessOwnerName(process.pid).name);var reg=require('win-registry');reg.WriteKey(reg.HKEY.LocalMachine, 'SYSTEM\\\\CurrentControlSet\\\\Services\\\\Mesh Agent', '_InstalledBy', key);"); - duk_destroy_heap(ctx); + Duktape_SafeDestroyHeap(ctx); ILibChain_DestroyEx(chain); ILibMemory_Free(exePath); } diff --git a/microscript/ILibDuktapeModSearch.c b/microscript/ILibDuktapeModSearch.c index 59938a0..610250e 100644 --- a/microscript/ILibDuktapeModSearch.c +++ b/microscript/ILibDuktapeModSearch.c @@ -353,11 +353,7 @@ duk_ret_t ILibDuktape_ModSearch_setModulePath(duk_context *ctx) void ILibDuktape_ModSearch_Init(duk_context * ctx, void * chain, ILibSimpleDataStore mDB) { duk_module_duktape_init(ctx); - - duk_push_heap_stash(ctx); // [stash] - duk_push_pointer(ctx, chain); // [stash][chain] - duk_put_prop_string(ctx, -2, ILibDuktape_Context_Chain); // [stash] - duk_pop(ctx); // ... + if (duk_ctx_chain(ctx) == NULL) { duk_ctx_context_data(ctx)->chain = chain; } duk_get_global_string(ctx, "Duktape"); // [globalString] duk_push_c_function(ctx, mod_Search, 4); // [globalString][func] diff --git a/microscript/ILibDuktape_Debugger.c b/microscript/ILibDuktape_Debugger.c index edf5f3c..e374449 100644 --- a/microscript/ILibDuktape_Debugger.c +++ b/microscript/ILibDuktape_Debugger.c @@ -254,7 +254,7 @@ void ILibDuktape_Debugger_AsyncWaitConn(ILibDuktape_Debugger *dbg) void ILibDuktape_Debugger_DestroyEx(void *chain, void *user) { - duk_destroy_heap(DebugWebEngine_Context); + Duktape_SafeDestroyHeap(DebugWebEngine_Context); } void DebugWebEngine_RunEx(void *chain, void *user) diff --git a/microscript/ILibDuktape_GenericMarshal.c b/microscript/ILibDuktape_GenericMarshal.c index 800808f..5f17313 100644 --- a/microscript/ILibDuktape_GenericMarshal.c +++ b/microscript/ILibDuktape_GenericMarshal.c @@ -105,6 +105,7 @@ typedef struct Duktape_GlobalGeneric_DispatcherData typedef struct Duktape_GlobalGeneric_Data { ILibDuktape_EventEmitter *emitter; + uintptr_t ctxnonce; void *retVal; void *chain; sem_t contextWaiter; @@ -836,15 +837,16 @@ void ILibDuktape_GenericMarshal_MethodInvoke_ThreadSink_Return(void *chain, void } void ILibDuktape_GenericMarshal_MethodInvoke_ThreadSink(void *args) { + ILibDuktape_EventEmitter *e = (ILibDuktape_EventEmitter*)((void**)args)[0]; void *chain = ((void**)args)[1]; PTRSIZE *vars = (PTRSIZE*)((void**)args)[2]; int parms = (int)(PTRSIZE)((void**)args)[3]; void *fptr = ((void**)args)[4]; + uintptr_t nonce = (uintptr_t)((void**)args)[5]; PTRSIZE retVal = ILibDuktape_GenericMarshal_MethodInvoke_Native(parms, fptr, vars); ((void**)args)[3] = (void*)retVal; - ILibChain_RunOnMicrostackThreadEx(chain, ILibDuktape_GenericMarshal_MethodInvoke_ThreadSink_Return, args); - + Duktape_RunOnEventLoop(chain, nonce, e->ctx, ILibDuktape_GenericMarshal_MethodInvoke_ThreadSink_Return, NULL, args); } #define ILibDuktape_FFI_AsyncDataPtr "\xFF_FFI_AsyncDataPtr" @@ -927,7 +929,7 @@ void ILibDuktape_GenericMarshal_MethodInvokeAsync_WorkerRunLoop(void *arg) { if (data->waitingForResult == 0) { - ILibChain_RunOnMicrostackThread(data->chain, ILibDuktape_GenericMarshal_MethodInvokeAsync_ChainDispatch, data); + Duktape_RunOnEventLoop(data->chain, duk_ctx_nonce(data->ctx), data->ctx, ILibDuktape_GenericMarshal_MethodInvokeAsync_ChainDispatch, NULL, data); } else { @@ -1259,7 +1261,7 @@ duk_ret_t ILibDuktape_GenericMarshal_MethodInvoke(duk_context *ctx) duk_push_current_function(ctx); // [func] exposedName = Duktape_GetStringPropertyValue(ctx, -1, "_exposedName", NULL); int spawnThread = Duktape_GetBooleanProperty(ctx, -1, "_spawnThread", 0); - PTRSIZE *vars = spawnThread == 0 ? ILibMemory_AllocateA(sizeof(PTRSIZE)*parms) : ILibMemory_SmartAllocateEx(sizeof(PTRSIZE)*parms, 5 * sizeof(void*)); + PTRSIZE *vars = spawnThread == 0 ? ILibMemory_AllocateA(sizeof(PTRSIZE)*parms) : ILibMemory_SmartAllocateEx(sizeof(PTRSIZE)*parms, 6 * sizeof(void*)); duk_get_prop_string(ctx, -1, "_address"); // [func][addr] fptr = duk_to_pointer(ctx, -1); @@ -1319,6 +1321,7 @@ duk_ret_t ILibDuktape_GenericMarshal_MethodInvoke(duk_context *ctx) args[2] = vars; args[3] = (void*)(PTRSIZE)parms; args[4] = fptr; + args[5] = (void*)duk_ctx_nonce(ctx); void *thptr = ILibSpawnNormalThread(ILibDuktape_GenericMarshal_MethodInvoke_ThreadSink, args); duk_push_fixed_buffer(ctx, sizeof(void*)); // [ret][buffer] @@ -1591,6 +1594,7 @@ void* ILibDuktape_GlobalGenericCallback_Process(int numParms, ...) #endif sem_init(&(user->contextWaiter), 0, 0); user->chain = refList[i]->chain; + user->ctxnonce = refList[i]->ctxnonce; user->emitter = refList[i]->emitter; user->numArgs = numParms; if (numParms > 0) @@ -1603,7 +1607,7 @@ void* ILibDuktape_GlobalGenericCallback_Process(int numParms, ...) } va_end(vlist); } - ILibChain_RunOnMicrostackThreadEx3(refList[i]->chain, ILibDuktape_GlobalGenericCallback_ProcessEx, ILibDuktape_GlobalGenericCallback_ProcessEx_Abort, user); + Duktape_RunOnEventLoop(refList[i]->chain, refList[i]->ctxnonce, refList[i]->emitter->ctx, ILibDuktape_GlobalGenericCallback_ProcessEx, ILibDuktape_GlobalGenericCallback_ProcessEx_Abort, user); } else { @@ -1897,6 +1901,7 @@ duk_ret_t ILibDuktape_GenericMarshal_GetGlobalGenericCallback(duk_context *ctx) data = (Duktape_GlobalGeneric_Data*)ILibMemory_SmartAllocate(sizeof(Duktape_GlobalGeneric_Data)); data->emitter = ILibDuktape_EventEmitter_Create(ctx); + data->ctxnonce = duk_ctx_nonce(ctx); data->chain = Duktape_GetChain(ctx); ILibDuktape_EventEmitter_CreateEventEx(data->emitter, "GlobalCallback"); ILibDuktape_CreateInstanceMethod(ctx, "CallingThread", ILibDuktape_GenericMarshal_GlobalCallback_CallingThread, 0); diff --git a/microscript/ILibDuktape_HECI.c b/microscript/ILibDuktape_HECI.c index adeb9e8..3de354d 100644 --- a/microscript/ILibDuktape_HECI.c +++ b/microscript/ILibDuktape_HECI.c @@ -60,6 +60,7 @@ struct HECI_CONNECT_client_data #define ILibDuktape_HECI_IoctlWaitHandle "\xFF_HECI_IoctlWaitHandle" #define ILibDuktape_HECI_Child "\xFF_HECI_Child" #define ILibDuktape_HECI_Parent "\xFF_HECI_Parent" +#define ILibDuktape_HECI_Root "\xFF_HECI_Root" #define ILibDuktape_HECI_MaxBufferSize "\xFF_HECI_MaxBufSize" #define ILibDuktape_HECI_SessionMemPtr "\xFF_HECI_SessionMemPtr" #define ILibDuktape_HECI_Session_NoPipeline "\xFF_HECI_Session_NoPipeline" @@ -90,6 +91,7 @@ public: typedef struct ILibDuktape_HECI_ioctl_data { duk_context *ctx; + uintptr_t ctxnonce; void *heciObject; void *data; void *Q; @@ -263,9 +265,9 @@ duk_ret_t ILibDuktape_HECI_SessionFinalizer(duk_context *ctx) void ILibDuktape_HECI_Session_EmitErrorEvent(void *chain, void *session) { - if (ILibIsRunningOnChainThread(chain) == 0) { ILibChain_RunOnMicrostackThreadEx(chain, ILibDuktape_HECI_Session_EmitErrorEvent, session); return; } ILibDuktape_HECI_Session *s = (ILibDuktape_HECI_Session*)session; duk_context *ctx = s->stream->readableStream->ctx; + if (ILibIsRunningOnChainThread(chain) == 0) { Duktape_RunOnEventLoop(chain, duk_ctx_nonce(ctx), ctx, ILibDuktape_HECI_Session_EmitErrorEvent, NULL, session); return; } duk_push_heapptr(ctx, s->stream->ParentObject); // [session] duk_get_prop_string(ctx, -1, "emit"); // [session][emit] @@ -277,7 +279,7 @@ void ILibDuktape_HECI_Session_EmitErrorEvent(void *chain, void *session) } void ILibDuktape_HECI_Session_EmitStreamReady(void *chain, void *session) { - if (ILibIsRunningOnChainThread(chain) == 0) { ILibChain_RunOnMicrostackThreadEx(chain, ILibDuktape_HECI_Session_EmitStreamReady, session); return; } + if (ILibIsRunningOnChainThread(chain) == 0) { Duktape_RunOnEventLoop(chain, duk_ctx_nonce(((ILibDuktape_HECI_Session*)session)->stream->writableStream->ctx), ((ILibDuktape_HECI_Session*)session)->stream->writableStream->ctx, ILibDuktape_HECI_Session_EmitStreamReady, NULL, session); return; } ILibDuktape_DuplexStream_Ready(((ILibDuktape_HECI_Session*)session)->stream); } @@ -492,7 +494,7 @@ ILibTransport_DoneState ILibDuktape_HECI_Session_WriteSink(ILibDuktape_DuplexStr else { state->returnIgnored = 1; - ILibChain_RunOnMicrostackThreadEx(stream->readableStream->chain, (ILibChain_StartEvent)ILibDuktape_HECI_Session_WriteSink_NoPipeline, state); + Duktape_RunOnEventLoop(stream->readableStream->chain, duk_ctx_nonce(stream->readableStream->ctx), stream->readableStream->ctx, (Duktape_EventLoopDispatch)ILibDuktape_HECI_Session_WriteSink_NoPipeline, NULL, state); } } @@ -553,7 +555,7 @@ void ILibDuktape_HECI_Session_ResumeSink(ILibDuktape_DuplexStream *sender, void ILibDuktape_HECI_Session *session = (ILibDuktape_HECI_Session*)user; if (session->noPipelining != 0) { - ILibChain_RunOnMicrostackThread(sender->readableStream->chain, ILibDuktape_HECI_Session_ResumeSink_NoPipeline, session); + Duktape_RunOnEventLoop(sender->readableStream->chain, duk_ctx_nonce(sender->readableStream->ctx), sender->readableStream->ctx, ILibDuktape_HECI_Session_ResumeSink_NoPipeline, NULL, session); // Note: DO NOT 'return' here, because we still need to QueueUserAPC, to resume the stream on Windows } @@ -587,7 +589,7 @@ BOOL ILibDuktape_HECI_Session_ReceiveSink(HANDLE event, ILibWaitHandle_ErrorStat ILibDuktape_HECI_Session *session = (ILibDuktape_HECI_Session*)user; if (ILibMemory_CanaryOK(session)) { - if (GetOverlappedResult(session->descriptor, &(session->v), &(session->bytesRead), FALSE) == TRUE) { ILibChain_RunOnMicrostackThreadEx(session->chain, ILibDuktape_HECI_Session_ReceiveSink2, session); } + if (GetOverlappedResult(session->descriptor, &(session->v), &(session->bytesRead), FALSE) == TRUE) { Duktape_RunOnEventLoop(session->chain, duk_ctx_nonce(session->stream->readableStream->ctx), session->stream->readableStream->ctx, ILibDuktape_HECI_Session_ReceiveSink2, NULL, session); } } return(FALSE); } @@ -770,6 +772,11 @@ duk_ret_t ILibDuktape_HECI_Session_close(duk_context *ctx) } #endif + duk_push_this(ctx); // [Session] + duk_get_prop_string(ctx, -1, ILibDuktape_HECI_Root); // [Session][root] + ILibDuktape_Push_ObjectStash(ctx); // [Session][root][stash] + duk_del_prop_string(ctx, -1, Duktape_GetStashKey(duk_get_heapptr(ctx, -3))); + return(0); } duk_ret_t ILibDuktape_HECI_create(duk_context *ctx) @@ -779,8 +786,17 @@ duk_ret_t ILibDuktape_HECI_create(duk_context *ctx) ILibDuktape_HECI_Push(ctx, NULL); // [Session][HECI] duk_dup(ctx, -2); // [Session][HECI][Session] duk_put_prop_string(ctx, -2, ILibDuktape_HECI_Parent); // [Session][HECI] + duk_push_this(ctx); // [session][HECI][root] + duk_put_prop_string(ctx, -2, ILibDuktape_HECI_Root); // [session][HECI] duk_put_prop_string(ctx, -2, ILibDuktape_HECI_Child); // [Session] + duk_push_this(ctx); // [Session][root] + ILibDuktape_Push_ObjectStash(ctx); // [Session][root][stash] + duk_dup(ctx, -3); // [Session][root][stash][Session] + duk_put_prop_string(ctx, -2, Duktape_GetStashKey(duk_get_heapptr(ctx, -1))); // [Session][root][stash] + duk_pop(ctx); // [Session][root] + duk_put_prop_string(ctx, -2, ILibDuktape_HECI_Root); // [Session] + ILibDuktape_EventEmitter *emitter = ILibDuktape_EventEmitter_Create(ctx); ILibDuktape_EventEmitter_CreateEventEx(emitter, "connect"); ILibDuktape_EventEmitter_CreateEventEx(emitter, "error"); @@ -872,7 +888,7 @@ BOOL ILibDuktape_HECI_IoctlHandler(HANDLE h, ILibWaitHandle_ErrorStatus errors, return(FALSE); } - ILibChain_RunOnMicrostackThread(data->chain, ILibDuktape_HECI_IoctlHandler_Dispatch, data); + Duktape_RunOnEventLoop(data->chain, data->ctxnonce, data->ctx, ILibDuktape_HECI_IoctlHandler_Dispatch, NULL, data); if (ILibQueue_GetCount(Q) > 0) { @@ -961,6 +977,7 @@ duk_ret_t ILibDuktape_HECI_doIoctl(duk_context *ctx) duk_push_array(ctx); // [heci][stash][array] ILibDuktape_HECI_ioctl_data *data; data = (ILibDuktape_HECI_ioctl_data*)ILibMemory_SmartAllocate(bufferLen + sizeof(ILibDuktape_HECI_ioctl_data)); + data->ctxnonce = duk_ctx_nonce(ctx); if (ILibDuktape_HECI_Debug) { printf("-> Allocate HECI Ioctl Data [%p]\n", (void*)data); } data->reserved = Duktape_PushBuffer(ctx, sizeof(void*)); // [heci][stash][array][ptr] duk_put_prop_index(ctx, -2, 0); // [heci][stash][array] @@ -1058,7 +1075,7 @@ duk_ret_t ILibDuktape_HECI_Finalizer(duk_context *ctx) ILibQueue Q = (ILibQueue)Duktape_GetPointerProperty(ctx, 0, ILibDuktape_HECI_Q); duk_get_prop_string(ctx, 0, ILibDuktape_HECI_ChildProcess); ILibProcessPipe_Manager mgr = (ILibProcessPipe_Manager)Duktape_GetPointerProperty(ctx, -1, ILibDuktape_ChildProcess_Manager); - QueueUserAPC((PAPCFUNC)ILibDuktape_HECI_Finalizer2, ILibProcessPipe_Manager_GetWorkerThread(mgr), (ULONG_PTR)Q); + if (mgr != NULL) { QueueUserAPC((PAPCFUNC)ILibDuktape_HECI_Finalizer2, ILibProcessPipe_Manager_GetWorkerThread(mgr), (ULONG_PTR)Q); } #else duk_get_prop_string(ctx, 0, ILibDuktape_HECI_Q); ILibQueue_Destroy((ILibQueue)duk_get_pointer(ctx, -1)); diff --git a/microscript/ILibDuktape_Helpers.c b/microscript/ILibDuktape_Helpers.c index c2b9e78..31caae5 100644 --- a/microscript/ILibDuktape_Helpers.c +++ b/microscript/ILibDuktape_Helpers.c @@ -40,6 +40,56 @@ struct sockaddr_in6 duktape_internalAddress; #define ILibDuktape_UncaughtException_NativeHandler "\xFF_UncaughtNativeHandler" #define ILibDuktape_UncaughtException_NativeUser "\xFF_UncaughtNativeUser" +typedef struct Duktape_EventLoopDispatchData +{ + duk_context *ctx; + uintptr_t nonce; + Duktape_EventLoopDispatch handler; + Duktape_EventLoopDispatch abortHandler; + void *user; +}Duktape_EventLoopDispatchData; + +void Duktape_RunOnEventLoop_AbortSink(void *chain, void *user) +{ + Duktape_EventLoopDispatchData *tmp = (Duktape_EventLoopDispatchData*)user; + if (tmp->abortHandler == (Duktape_EventLoopDispatch)(uintptr_t)0x01) + { + if (tmp->user != NULL) { free(tmp->user); } + } + else if(tmp->abortHandler != NULL) + { + tmp->abortHandler(chain, tmp->user); + } + ILibMemory_Free(tmp); +} +void Duktape_RunOnEventLoop_Sink(void *chain, void *user) +{ + Duktape_EventLoopDispatchData *tmp = (Duktape_EventLoopDispatchData*)user; + if (duk_ctx_is_alive(tmp->ctx) && duk_ctx_is_valid(tmp->nonce, tmp->ctx)) + { + // duk_context matches the intended context + if (tmp->handler != NULL) { tmp->handler(chain, tmp->user); } + } + else + { + // duk_context does not match the intended context + Duktape_RunOnEventLoop_AbortSink(chain, user); + return; + } + ILibMemory_Free(tmp); +} +void Duktape_RunOnEventLoop(void *chain, uintptr_t nonce, duk_context *ctx, Duktape_EventLoopDispatch handler, Duktape_EventLoopDispatch abortHandler, void *user) +{ + Duktape_EventLoopDispatchData* tmp = (Duktape_EventLoopDispatchData*)ILibMemory_SmartAllocate(sizeof(Duktape_EventLoopDispatchData)); + tmp->ctx = ctx; + tmp->nonce = nonce; + tmp->handler = handler; + tmp->abortHandler = abortHandler; + tmp->user = user; + + ILibChain_RunOnMicrostackThreadEx3(chain, Duktape_RunOnEventLoop_Sink, Duktape_RunOnEventLoop_AbortSink, tmp); +} + int ILibDuktape_GetReferenceCount(duk_context *ctx, duk_idx_t i) { int retVal = -1; @@ -119,6 +169,21 @@ void *Duktape_GetBufferPropertyEx(duk_context *ctx, duk_idx_t i, char* propertyN } return(retVal); } +void *Duktape_Duplicate_GetBufferPropertyEx(duk_context *ctx, duk_idx_t i, char* propertyName, duk_size_t* bufferLen) +{ + duk_size_t sourceLen = 0; + void *retVal = NULL, *source; + if (bufferLen != NULL) { *bufferLen = 0; } + + source = Duktape_GetBufferPropertyEx(ctx, i, propertyName, &sourceLen); + if (sourceLen > 0) + { + retVal = ILibMemory_SmartAllocate(sourceLen); + memcpy_s(retVal, sourceLen, source, sourceLen); + if (bufferLen != NULL) { *bufferLen = sourceLen; } + } + return(retVal); +} void *Duktape_GetPointerProperty(duk_context *ctx, duk_idx_t i, char* propertyName) { void *retVal = NULL; @@ -146,6 +211,36 @@ char* Duktape_GetStringPropertyValueEx(duk_context *ctx, duk_idx_t i, char* prop } return retVal; } +char* Duktape_Duplicate_GetStringPropertyValueEx(duk_context *ctx, duk_idx_t i, char* propertyName, char* defaultValue, duk_size_t *len) +{ + char *ret = NULL; + if (len != NULL) { *len = 0; } + + duk_size_t sourceLen = 0; + char *source = Duktape_GetStringPropertyValueEx(ctx, i, propertyName, defaultValue, &sourceLen); + + if (sourceLen > 0) + { + if (len != NULL) { *len = sourceLen; } + ret = (char*)ILibMemory_SmartAllocate(sourceLen + 1); + memcpy_s(ret, sourceLen, source, sourceLen); + } + + return(ret); +} +char *Duktape_Duplicate_GetStringEx(duk_context *ctx, duk_idx_t i, duk_size_t *len) +{ + char *ret = NULL; + duk_size_t srcLen = 0; + char* src = (char*)duk_get_lstring(ctx, i, &srcLen); + if (len != NULL) { *len = srcLen; } + if (srcLen > 0) + { + ret = ILibMemory_SmartAllocate(srcLen); + memcpy_s(ret, srcLen, src, srcLen); + } + return(ret); +} int Duktape_GetIntPropertyValue(duk_context *ctx, duk_idx_t i, char* propertyName, int defaultValue) { int retVal = defaultValue; @@ -544,21 +639,26 @@ char* Duktape_GetContextGuidHex(duk_context *ctx, void *db) duk_pop(ctx); // ... return retVal; } +ILibDuktape_ContextData* ILibDuktape_GetContextData(duk_context *ctx) +{ + duk_memory_functions mfuncs; + memset(&mfuncs, 0, sizeof(duk_memory_functions)); + duk_get_memory_functions(ctx, &mfuncs); + return((ILibDuktape_ContextData*)mfuncs.udata); +} + +void Duktape_SafeDestroyHeap(duk_context *ctx) +{ + ILibDuktape_ContextData *ctxd = duk_ctx_context_data(ctx); + + ctxd->flags |= duk_destroy_heap_in_progress; + duk_destroy_heap(ctx); + ILibMemory_Free(ctxd); +} void *Duktape_GetChain(duk_context *ctx) { - void *retVal = NULL; - duk_push_heap_stash(ctx); // [stash] - if (duk_has_prop_string(ctx, -1, ILibDuktape_Context_Chain)) - { - duk_get_prop_string(ctx, -1, ILibDuktape_Context_Chain); // [stash][ptr] - retVal = duk_get_pointer(ctx, -1); - duk_pop_2(ctx); // ... - } - else - { - duk_pop(ctx); // ... - } - return retVal; + void *ret = duk_ctx_chain(ctx); + return(ret); } duk_ret_t ILibDuktape_ExternalEventEmitter(duk_context *ctx) { diff --git a/microscript/ILibDuktape_Helpers.h b/microscript/ILibDuktape_Helpers.h index 46c0213..8adf105 100644 --- a/microscript/ILibDuktape_Helpers.h +++ b/microscript/ILibDuktape_Helpers.h @@ -30,7 +30,6 @@ typedef void(*ILibDuktape_HelperEvent)(duk_context *ctx, void *user); #define ILibDuktape_MeshAgent_Cert_NonLeaf "\xFF_selfcert" #define ILibDuktape_MeshAgent_Cert_Server "\xFF_selftlscert" #define CONTEXT_GUID_BUFFER "_CONTEXT_GUID" -#define ILibDuktape_Context_Chain "\xFF_chainptr" #define ILibDuktape_OBJID "_ObjectID" #define ILibDuktape_CR2HTTP "\xFF_CR2HTTP" @@ -47,8 +46,29 @@ typedef enum ILibDuktape_LogTypes ILibDuktape_LogType_Info3 }ILibDuktape_LogTypes; +typedef struct ILibDuktape_ContextData +{ + uintptr_t nonce; + uint32_t flags; + void *chain; + void *user; +}ILibDuktape_ContextData; + +#define duk_destroy_heap_in_progress 0x01 +#define duk_ctx_context_data(ctx) ((ILibDuktape_ContextData*)(ILibMemory_CanaryOK(ctx)?((void**)ILibMemory_Extra(ctx))[0]:NULL)) +#define duk_ctx_nonce(ctx) (duk_ctx_context_data(ctx)->nonce) +#define duk_ctx_is_alive(ctx) (ILibMemory_CanaryOK(ctx)) +#define duk_ctx_is_valid(nvalue, ctx) (duk_ctx_is_alive(ctx) && duk_ctx_nonce(ctx) == nvalue) +#define duk_ctx_shutting_down(ctx) ((duk_ctx_context_data(ctx)->flags & duk_destroy_heap_in_progress)==duk_destroy_heap_in_progress) +#define duk_ctx_chain(ctx) (duk_ctx_is_alive(ctx)?duk_ctx_context_data(ctx)->chain:NULL) + +typedef void(*Duktape_EventLoopDispatch)(void *chain, void *user); +void Duktape_RunOnEventLoop(void *chain, uintptr_t nonce, duk_context *ctx, Duktape_EventLoopDispatch handler, Duktape_EventLoopDispatch abortHandler, void *user); +#define Duktape_RunOnEventLoopEx(chain, nonce, ctx, handler, user, freeOnShutdown) Duktape_RunOnEventLoop(chain, nonce, ctx, handler, (freeOnShutdown==0?NULL:(Duktape_EventLoopDispatch)(uintptr_t)0x01), user) + void ILibDuktape_Log_Object(duk_context *ctx, duk_idx_t i, char *meta); char* Duktape_GetContextGuidHex(duk_context *ctx, void *db); +void Duktape_SafeDestroyHeap(duk_context *ctx); void *Duktape_GetChain(duk_context *ctx); char *Duktape_GetStashKey(void* value); char* Duktape_GetBuffer(duk_context *ctx, duk_idx_t i, duk_size_t *bufLen); @@ -61,6 +81,14 @@ void *Duktape_GetPointerProperty(duk_context *ctx, duk_idx_t i, char* propertyNa void *Duktape_GetHeapptrProperty(duk_context *ctx, duk_idx_t i, char* propertyName); void *Duktape_GetBufferPropertyEx(duk_context *ctx, duk_idx_t i, char* propertyName, duk_size_t* bufferLen); #define Duktape_GetBufferProperty(ctx, i, propertyName) Duktape_GetBufferPropertyEx(ctx, i, propertyName, NULL) + +char* Duktape_Duplicate_GetStringPropertyValueEx(duk_context *ctx, duk_idx_t i, char* propertyName, char* defaultValue, duk_size_t *len); +#define Duktape_Duplicate_GetStringPropertyValue(ctx, i, propertyName, defaultValue) Duktape_Duplicate_GetStringPropertyValueEx(ctx, i, propertyName, defaultValue, NULL) +void *Duktape_Duplicate_GetBufferPropertyEx(duk_context *ctx, duk_idx_t i, char* propertyName, duk_size_t* bufferLen); +#define Duktape_Duplicate_GetBufferProperty(ctx, i, propertyName) Duktape_Duplicate_GetBufferPropertyEx(ctx, i, propertyName, NULL) +char *Duktape_Duplicate_GetStringEx(duk_context *ctx, duk_idx_t i, duk_size_t *len); +#define Duktape_Duplicate_GetString(ctx, i) Duktape_Duplicate_GetStringEx(ctx, i, NULL) + int Duktape_GetBooleanProperty(duk_context *ctx, duk_idx_t i, char *propertyName, int defaultValue); struct sockaddr_in6* Duktape_IPAddress4_FromString(char* address, unsigned short port); struct sockaddr_in6* Duktape_IPAddress6_FromString(char* address, unsigned short port); diff --git a/microscript/ILibDuktape_HttpStream.c b/microscript/ILibDuktape_HttpStream.c index 147f86f..9aab3b2 100644 --- a/microscript/ILibDuktape_HttpStream.c +++ b/microscript/ILibDuktape_HttpStream.c @@ -1894,7 +1894,7 @@ ILibTransport_DoneState ILibDuktape_HttpStream_WriteSink(ILibDuktape_DuplexStrea tmp->httpStream = data; tmp->bufferLen = bufferLen; memcpy_s(tmp->buffer, bufferLen, buffer, bufferLen); - ILibChain_RunOnMicrostackThread(data->chain, ILibDuktape_HttpStream_WriteSink_ChainSink, tmp); + Duktape_RunOnEventLoop(data->chain, duk_ctx_nonce(data->DS->readableStream->ctx), data->DS->readableStream->ctx, ILibDuktape_HttpStream_WriteSink_ChainSink, NULL, tmp); return(ILibTransport_DoneState_INCOMPLETE); } @@ -2195,8 +2195,8 @@ ILibTransport_DoneState ILibDuktape_HttpStream_ServerResponse_WriteSink(struct I buffered->endBytes = stream->endBytes; buffered->chunk = state->chunkSupported; if (bufferLen > 0) { memcpy_s(buffered->buffer, bufferLen, buffer, bufferLen); } - - ILibChain_RunOnMicrostackThreadEx(state->chain, ILibDuktape_HttpStream_ServerResponse_WriteImplicitHeaders, buffered); + + Duktape_RunOnEventLoop(state->chain, duk_ctx_nonce(state->ctx), state->ctx, ILibDuktape_HttpStream_ServerResponse_WriteImplicitHeaders, NULL, buffered); return(ILibTransport_DoneState_INCOMPLETE); } } @@ -2283,7 +2283,7 @@ ILibTransport_DoneState ILibDuktape_HttpStream_ServerResponse_WriteSink(struct I data->writeStream = state->writeStream; data->bufferLen = bufferLen; memcpy_s(data->buffer, bufferLen, buffer, bufferLen); - ILibChain_RunOnMicrostackThreadEx(state->chain, ILibDuktape_HttpStream_ServerResponse_WriteSink_Chain, data); + Duktape_RunOnEventLoop(state->chain, duk_ctx_nonce(state->ctx), state->ctx, ILibDuktape_HttpStream_ServerResponse_WriteSink_Chain, NULL, data); return(ILibTransport_DoneState_INCOMPLETE); } } @@ -2384,7 +2384,7 @@ void ILibDuktape_HttpStream_ServerResponse_EndSink(struct ILibDuktape_WritableSt else { // Need to context switch before sending Implicit Headers - ILibChain_RunOnMicrostackThreadEx(state->chain, ILibDuktape_HttpStream_ServerResponse_EndSink_Chain, stream); + Duktape_RunOnEventLoop(state->chain, duk_ctx_nonce(stream->ctx), stream->ctx, ILibDuktape_HttpStream_ServerResponse_EndSink_Chain, NULL, stream); } } else @@ -2396,7 +2396,7 @@ void ILibDuktape_HttpStream_ServerResponse_EndSink(struct ILibDuktape_WritableSt } else { - ILibChain_RunOnMicrostackThread(state->chain, ILibDuktape_HttpStream_ServerResponse_EndSink_ZeroChunk_Chain, state); + Duktape_RunOnEventLoop(state->chain, duk_ctx_nonce(stream->ctx), stream->ctx, ILibDuktape_HttpStream_ServerResponse_EndSink_ZeroChunk_Chain, NULL, state); } } } @@ -2890,6 +2890,10 @@ int ILibDuktape_HttpStream_IncomingMessage_UnshiftBytes(ILibDuktape_readableStre data->bodyStream_unshiftedBytes = unshiftBytes; return(unshiftBytes); } +void ILibDuktape_HttpStream_DispatchEnd_ABORT(void *chain, void *user) +{ + free(user); +} void ILibDuktape_HttpStream_DispatchEnd(void *chain, void *user) { if(ILibMemory_CanaryOK(((void**)user)[1])) @@ -2931,6 +2935,7 @@ void ILibDuktape_HttpStream_OnReceive(ILibWebClient_StateObject WebStateObject, { ILibDuktape_HttpStream_Data *data = (ILibDuktape_HttpStream_Data*)user1; duk_context *ctx = data->DS->writableStream->ctx; + uintptr_t ctxnonce = duk_ctx_nonce(ctx); if (data->bodyStream != NULL) { @@ -3170,7 +3175,7 @@ void ILibDuktape_HttpStream_OnReceive(ILibWebClient_StateObject WebStateObject, tmp[0] = ctx; tmp[1] = data->DS; tmp[2] = data; - ILibChain_RunOnMicrostackThread(data->chain, ILibDuktape_HttpStream_DispatchEnd, tmp); + Duktape_RunOnEventLoop(data->chain, ctxnonce, ctx, ILibDuktape_HttpStream_DispatchEnd, ILibDuktape_HttpStream_DispatchEnd_ABORT, tmp); } } } @@ -3221,7 +3226,6 @@ duk_ret_t ILibduktape_HttpStream_create(duk_context *ctx) duk_put_prop_string(ctx, -2, ILibDuktape_HTTPStream2Data); // [httpStream] data->maxHeaderSize = 4096; - ILibDuktape_EventEmitter_CreateEventEx(emitter, "end"); ILibDuktape_EventEmitter_CreateEventEx(emitter, "error"); ILibDuktape_EventEmitter_CreateEventEx(emitter, "parseError"); @@ -3972,7 +3976,7 @@ void ILibDuktape_httpStream_webSocket_EncodedPauseSink(ILibDuktape_DuplexStream } else { - ILibChain_RunOnMicrostackThreadEx(state->chain, ILibDuktape_httpStream_webSocket_EncodedPauseSink_Chain, state); + Duktape_RunOnEventLoop(state->chain, duk_ctx_nonce(state->ctx), state->ctx, ILibDuktape_httpStream_webSocket_EncodedPauseSink_Chain, NULL, state); } } } @@ -4007,7 +4011,7 @@ void ILibDuktape_httpStream_webSocket_EncodedResumeSink(ILibDuktape_DuplexStream } else { - ILibChain_RunOnMicrostackThreadEx(state->chain, ILibDuktape_httpStream_webSocket_EncodedResumeSink_Chain, state); + Duktape_RunOnEventLoop(state->chain, duk_ctx_nonce(state->ctx), state->ctx, ILibDuktape_httpStream_webSocket_EncodedResumeSink_Chain, NULL, state); } } } @@ -4064,7 +4068,7 @@ void ILibDuktape_httpStream_webSocket_DecodedPauseSink(ILibDuktape_DuplexStream } else { - ILibChain_RunOnMicrostackThreadEx(state->chain, ILibDuktape_httpStream_webSocket_DecodedPauseSink_Chain, state); + Duktape_RunOnEventLoop(state->chain, duk_ctx_nonce(state->ctx), state->ctx, ILibDuktape_httpStream_webSocket_DecodedPauseSink_Chain, NULL, state); } } } @@ -4102,7 +4106,7 @@ void ILibDuktape_httpStream_webSocket_DecodedResumeSink(ILibDuktape_DuplexStream } else { - ILibChain_RunOnMicrostackThreadEx(state->chain, ILibDuktape_httpStream_webSocket_DecodedResumeSink_Chain, state); + Duktape_RunOnEventLoop(state->chain, duk_ctx_nonce(state->ctx), state->ctx, ILibDuktape_httpStream_webSocket_DecodedResumeSink_Chain, NULL, state); } } } diff --git a/microscript/ILibDuktape_Polyfills.c b/microscript/ILibDuktape_Polyfills.c index 4142556..ef5b177 100644 --- a/microscript/ILibDuktape_Polyfills.c +++ b/microscript/ILibDuktape_Polyfills.c @@ -1187,7 +1187,7 @@ ILibTransport_DoneState ILibDuktape_DynamicBuffer_WriteSink(ILibDuktape_DuplexSt tmp->data = data; tmp->bufferLen = bufferLen; memcpy_s(tmp->buffer, bufferLen, buffer, bufferLen); - ILibChain_RunOnMicrostackThread(tmp->chain, ILibDuktape_DynamicBuffer_WriteSink_ChainThread, tmp); + Duktape_RunOnEventLoop(tmp->chain, duk_ctx_nonce(stream->readableStream->ctx), stream->readableStream->ctx, ILibDuktape_DynamicBuffer_WriteSink_ChainThread, NULL, tmp); return(ILibTransport_DoneState_INCOMPLETE); } @@ -1645,12 +1645,15 @@ void ILibDuktape_Stream_Init(duk_context *ctx, void *chain) } void ILibDuktape_Polyfills_debugGC2(duk_context *ctx, void ** args, int argsLen) { - if (g_displayFinalizerMessages) { printf("=> GC();\n"); } - duk_gc(ctx, 0); + if (duk_ctx_is_alive((duk_context*)args[1]) && duk_ctx_is_valid((uintptr_t)args[2], ctx)) + { + if (g_displayFinalizerMessages) { printf("=> GC();\n"); } + duk_gc(ctx, 0); + } } duk_ret_t ILibDuktape_Polyfills_debugGC(duk_context *ctx) { - ILibDuktape_Immediate(ctx, (void*[]) { NULL }, 0, ILibDuktape_Polyfills_debugGC2); + ILibDuktape_Immediate(ctx, (void*[]) { Duktape_GetChain(ctx), ctx, (void*)duk_ctx_nonce(ctx), NULL }, 3, ILibDuktape_Polyfills_debugGC2); return(0); } duk_ret_t ILibDuktape_Polyfills_debug(duk_context *ctx) @@ -2071,7 +2074,7 @@ void ILibDuktape_Polyfills_JS_Init(duk_context *ctx) duk_peval_string_noresult(ctx, "addModule('PE_Parser', Buffer.from('LyoKQ29weXJpZ2h0IDIwMTggSW50ZWwgQ29ycG9yYXRpb24KCkxpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwp5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCllvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAoKICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAoKVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQpkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLApXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZApsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKi8KCi8vIFJldHVybiBpbmZvcm1hdGlvbiBhYm91dCB0aGlzIGV4ZWN1dGFibGUKZnVuY3Rpb24gcGFyc2UoZXhlUGF0aCkKewogICAgdmFyIHJldFZhbCA9IHt9OwogICAgdmFyIGZzID0gcmVxdWlyZSgnZnMnKTsKICAgIHZhciBmZCA9IGZzLm9wZW5TeW5jKGV4ZVBhdGgsICdyYicpOwogICAgdmFyIGJ5dGVzUmVhZDsKICAgIHZhciBkb3NIZWFkZXIgPSBCdWZmZXIuYWxsb2MoNjQpOwogICAgdmFyIG50SGVhZGVyID0gQnVmZmVyLmFsbG9jKDI0KTsKICAgIHZhciBvcHRIZWFkZXI7CgogICAgLy8gUmVhZCB0aGUgRE9TIGhlYWRlcgogICAgYnl0ZXNSZWFkID0gZnMucmVhZFN5bmMoZmQsIGRvc0hlYWRlciwgMCwgNjQsIDApOwogICAgaWYgKGRvc0hlYWRlci5yZWFkVUludDE2TEUoMCkudG9TdHJpbmcoMTYpLnRvVXBwZXJDYXNlKCkgIT0gJzVBNEQnKQogICAgewogICAgICAgIHRocm93ICgndW5yZWNvZ25pemVkIGJpbmFyeSBmb3JtYXQnKTsKICAgIH0KCiAgICAvLyBSZWFkIHRoZSBOVCBoZWFkZXIKICAgIGJ5dGVzUmVhZCA9IGZzLnJlYWRTeW5jKGZkLCBudEhlYWRlciwgMCwgbnRIZWFkZXIubGVuZ3RoLCBkb3NIZWFkZXIucmVhZFVJbnQzMkxFKDYwKSk7CiAgICBpZiAobnRIZWFkZXIuc2xpY2UoMCwgNCkudG9TdHJpbmcoJ2hleCcpICE9ICc1MDQ1MDAwMCcpCiAgICB7CiAgICAgICAgdGhyb3cgKCdub3QgYSBQRSBmaWxlJyk7CiAgICB9CiAgICBzd2l0Y2ggKG50SGVhZGVyLnJlYWRVSW50MTZMRSg0KS50b1N0cmluZygxNikpCiAgICB7CiAgICAgICAgY2FzZSAnMTRjJzogLy8gMzIgYml0CiAgICAgICAgICAgIHJldFZhbC5mb3JtYXQgPSAneDg2JzsKICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgY2FzZSAnODY2NCc6IC8vIDY0IGJpdAogICAgICAgICAgICByZXRWYWwuZm9ybWF0ID0gJ3g2NCc7CiAgICAgICAgICAgIGJyZWFrOwogICAgICAgIGRlZmF1bHQ6IC8vIFVua25vd24KICAgICAgICAgICAgcmV0VmFsLmZvcm1hdCA9IHVuZGVmaW5lZDsKICAgICAgICAgICAgYnJlYWs7CiAgICB9CgogICAgcmV0VmFsLm9wdGlvbmFsSGVhZGVyU2l6ZSA9IG50SGVhZGVyLnJlYWRVSW50MTZMRSgyMCk7CiAgICByZXRWYWwub3B0aW9uYWxIZWFkZXJTaXplQWRkcmVzcyA9IGRvc0hlYWRlci5yZWFkVUludDMyTEUoNjApICsgMjA7CgogICAgLy8gUmVhZCB0aGUgb3B0aW9uYWwgaGVhZGVyCiAgICBvcHRIZWFkZXIgPSBCdWZmZXIuYWxsb2MobnRIZWFkZXIucmVhZFVJbnQxNkxFKDIwKSk7CiAgICBieXRlc1JlYWQgPSBmcy5yZWFkU3luYyhmZCwgb3B0SGVhZGVyLCAwLCBvcHRIZWFkZXIubGVuZ3RoLCBkb3NIZWFkZXIucmVhZFVJbnQzMkxFKDYwKSArIDI0KTsKICAgIHZhciBudW1SVkEgPSB1bmRlZmluZWQ7CgogICAgcmV0VmFsLkNoZWNrU3VtUG9zID0gZG9zSGVhZGVyLnJlYWRVSW50MzJMRSg2MCkgKyAyNCArIDY0OwogICAgcmV0VmFsLlNpemVPZkNvZGUgPSBvcHRIZWFkZXIucmVhZFVJbnQzMkxFKDQpOwogICAgcmV0VmFsLlNpemVPZkluaXRpYWxpemVkRGF0YSA9IG9wdEhlYWRlci5yZWFkVUludDMyTEUoOCk7CiAgICByZXRWYWwuU2l6ZU9mVW5Jbml0aWFsaXplZERhdGEgPSBvcHRIZWFkZXIucmVhZFVJbnQzMkxFKDEyKTsKCiAgICBzd2l0Y2ggKG9wdEhlYWRlci5yZWFkVUludDE2TEUoMCkudG9TdHJpbmcoMTYpLnRvVXBwZXJDYXNlKCkpCiAgICB7CiAgICAgICAgY2FzZSAnMTBCJzogLy8gMzIgYml0IGJpbmFyeQogICAgICAgICAgICBudW1SVkEgPSBvcHRIZWFkZXIucmVhZFVJbnQzMkxFKDkyKTsKICAgICAgICAgICAgcmV0VmFsLkNlcnRpZmljYXRlVGFibGVBZGRyZXNzID0gb3B0SGVhZGVyLnJlYWRVSW50MzJMRSgxMjgpOwogICAgICAgICAgICByZXRWYWwuQ2VydGlmaWNhdGVUYWJsZVNpemUgPSBvcHRIZWFkZXIucmVhZFVJbnQzMkxFKDEzMik7CiAgICAgICAgICAgIHJldFZhbC5DZXJ0aWZpY2F0ZVRhYmxlU2l6ZVBvcyA9IGRvc0hlYWRlci5yZWFkVUludDMyTEUoNjApICsgMjQgKyAxMzI7CiAgICAgICAgICAgIHJldFZhbC5ydmFTdGFydEFkZHJlc3MgPSBkb3NIZWFkZXIucmVhZFVJbnQzMkxFKDYwKSArIDI0ICsgOTY7CiAgICAgICAgICAgIGJyZWFrOwogICAgICAgIGNhc2UgJzIwQic6IC8vIDY0IGJpdCBiaW5hcnkKICAgICAgICAgICAgbnVtUlZBID0gb3B0SGVhZGVyLnJlYWRVSW50MzJMRSgxMDgpOwogICAgICAgICAgICByZXRWYWwuQ2VydGlmaWNhdGVUYWJsZUFkZHJlc3MgPSBvcHRIZWFkZXIucmVhZFVJbnQzMkxFKDE0NCk7CiAgICAgICAgICAgIHJldFZhbC5DZXJ0aWZpY2F0ZVRhYmxlU2l6ZSA9IG9wdEhlYWRlci5yZWFkVUludDMyTEUoMTQ4KTsKICAgICAgICAgICAgcmV0VmFsLkNlcnRpZmljYXRlVGFibGVTaXplUG9zID0gZG9zSGVhZGVyLnJlYWRVSW50MzJMRSg2MCkgKyAyNCArIDE0ODsKICAgICAgICAgICAgcmV0VmFsLnJ2YVN0YXJ0QWRkcmVzcyA9IGRvc0hlYWRlci5yZWFkVUludDMyTEUoNjApICsgMjQgKyAxMTI7CiAgICAgICAgICAgIGJyZWFrOwogICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgIHRocm93ICgnVW5rbm93biBWYWx1ZSBmb3VuZCBmb3IgT3B0aW9uYWwgTWFnaWM6ICcgKyBudEhlYWRlci5yZWFkVUludDE2TEUoMjQpLnRvU3RyaW5nKDE2KS50b1VwcGVyQ2FzZSgpKTsKICAgICAgICAgICAgYnJlYWs7CiAgICB9CiAgICByZXRWYWwucnZhQ291bnQgPSBudW1SVkE7CgogICAgaWYgKHJldFZhbC5DZXJ0aWZpY2F0ZVRhYmxlQWRkcmVzcykKICAgIHsKICAgICAgICAvLyBSZWFkIHRoZSBhdXRoZW50aWNvZGUgY2VydGlmaWNhdGUsIG9ubHkgb25lIGNlcnQgKG9ubHkgdGhlIGZpcnN0IGVudHJ5KQogICAgICAgIHZhciBoZHIgPSBCdWZmZXIuYWxsb2MoOCk7CiAgICAgICAgZnMucmVhZFN5bmMoZmQsIGhkciwgMCwgaGRyLmxlbmd0aCwgcmV0VmFsLkNlcnRpZmljYXRlVGFibGVBZGRyZXNzKTsKICAgICAgICByZXRWYWwuY2VydGlmaWNhdGUgPSBCdWZmZXIuYWxsb2MoaGRyLnJlYWRVSW50MzJMRSgwKSk7CiAgICAgICAgZnMucmVhZFN5bmMoZmQsIHJldFZhbC5jZXJ0aWZpY2F0ZSwgMCwgcmV0VmFsLmNlcnRpZmljYXRlLmxlbmd0aCwgcmV0VmFsLkNlcnRpZmljYXRlVGFibGVBZGRyZXNzICsgaGRyLmxlbmd0aCk7CiAgICAgICAgcmV0VmFsLmNlcnRpZmljYXRlID0gcmV0VmFsLmNlcnRpZmljYXRlLnRvU3RyaW5nKCdiYXNlNjQnKTsKICAgICAgICByZXRWYWwuY2VydGlmaWNhdGVEd0xlbmd0aCA9IGhkci5yZWFkVUludDMyTEUoMCk7CiAgICB9CiAgICBmcy5jbG9zZVN5bmMoZmQpOwogICAgcmV0dXJuIChyZXRWYWwpOwp9Cgptb2R1bGUuZXhwb3J0cyA9IHBhcnNlOwoKCv==', 'base64').toString());"); // Windows Message Pump, refer to modules/win-message-pump.js - duk_peval_string_noresult(ctx, "addModule('win-message-pump', Buffer.from('/*
Copyright 2018 Intel Corporation

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

var WH_CALLWNDPROC = 4;
var WM_QUIT =  0x0012;
var WM_CLOSE = 0x0010;
var GM = require('_GenericMarshal');

function WindowsMessagePump(options)
{
    this._ObjectID = 'win-message-pump';
    this._options = options;
    var emitterUtils = require('events').inherits(this);
    emitterUtils.createEvent('hwnd');
    emitterUtils.createEvent('error');
    emitterUtils.createEvent('message');
    emitterUtils.createEvent('exit');

    this._msg = GM.CreateVariable(GM.PointerSize == 4 ? 28 : 48);
    this._kernel32 = GM.CreateNativeProxy('Kernel32.dll');
    this._kernel32.mp = this;
    this._kernel32.CreateMethod('GetLastError');
    this._kernel32.CreateMethod('GetModuleHandleA');

    this._user32 = GM.CreateNativeProxy('User32.dll');
    this._user32.mp = this;
    this._user32.CreateMethod('CreateWindowExA');
    this._user32.CreateMethod('DefWindowProcA');
    this._user32.CreateMethod('DestroyWindow');
    this._user32.CreateMethod('DispatchMessageA');
    this._user32.CreateMethod('GetMessageA');
    this._user32.CreateMethod('PostMessageA');
    this._user32.CreateMethod('RegisterClassExA');
    this._user32.CreateMethod('SetWindowPos');
    this._user32.CreateMethod('ShowWindow');
    this._user32.CreateMethod('TranslateMessage');


    this.wndclass = GM.CreateVariable(GM.PointerSize == 4 ? 48 : 80);
    this.wndclass.mp = this;
    this.wndclass.hinstance = this._kernel32.GetModuleHandleA(0);
    this.wndclass.cname = GM.CreateVariable('MainWWWClass');
    this.wndclass.wndproc = GM.GetGenericGlobalCallback(4);
    this.wndclass.wndproc.mp = this;
    this.wndclass.toBuffer().writeUInt32LE(this.wndclass._size);
    this.wndclass.cname.pointerBuffer().copy(this.wndclass.Deref(GM.PointerSize == 4 ? 40 : 64, GM.PointerSize).toBuffer());
    this.wndclass.wndproc.pointerBuffer().copy(this.wndclass.Deref(8, GM.PointerSize).toBuffer());
    this.wndclass.hinstance.pointerBuffer().copy(this.wndclass.Deref(GM.PointerSize == 4 ? 20 : 24, GM.PointerSize).toBuffer());
    this.wndclass.wndproc.on('GlobalCallback', function onWndProc(xhwnd, xmsg, wparam, lparam)
    {
        if (this.mp._hwnd != null && this.mp._hwnd.Val == xhwnd.Val)
        {
            // This is for us
            var d = this.StartDispatcher();
            this.mp.emit('message', { message: xmsg.Val, wparam: wparam.Val, lparam: lparam.Val, lparam_hex: lparam.pointerBuffer().toString('hex'), lparam_raw: lparam, hwnd: xhwnd, dispatcher: d });

            var msgRet = this.mp.emit_returnValue('message');
            if (msgRet == null)
            {
                // We need to call DefWindowProcA, becuase this message was not handled
                var p = this.mp._user32.DefWindowProcA.async(d, xhwnd, xmsg, wparam, lparam);
                p.dispatcher = this;
                p.then(function (ret)
                {
                    this.dispatcher.EndDispatcher(ret);
                });
            }
            else
            {
                var r = GM.CreatePointer();
                r.Val = msgRet;
                this.EndDispatcher(r);
            }
        }
        else if(this.mp._hwnd == null && this.CallingThread() == this.mp._user32.RegisterClassExA.async.threadId())
        {
            // This message was generated from our CreateWindowExA method
            var d = this.StartDispatcher();

            this.mp.emit('message', { message: xmsg.Val, wparam: wparam.Val, lparam: lparam.Val, lparam_hex: lparam.pointerBuffer().toString('hex'), hwnd: xhwnd, dispatcher: d });

            var msgRet = this.mp.emit_returnValue('message');
            if (msgRet == null)
{
                // We need to call DefWindowProcA, becuase this message was not handled
                var p = this.mp._user32.DefWindowProcA.async(d, xhwnd, xmsg, wparam, lparam);
                p.dispatcher = this;
                p.then(function (ret)
                {
                    this.dispatcher.EndDispatcher(ret);
                });
            }
            else
            {
                var r = GM.CreatePointer();
                r.Val = msgRet;
                this.EndDispatcher(r);
            }
        }

        _debugGC();
    });

    this._user32.RegisterClassExA.async(this.wndclass).then(function ()
    {
        if (!this.nativeProxy.mp._options)  {   this.nativeProxy.mp._options = {};  }
        if (!this.nativeProxy.mp._options.window) { this.nativeProxy.mp._options.window = {}; }
        if (this.nativeProxy.mp._options.window.exstyles == null) { this.nativeProxy.mp._options.window.exstyles = 0x00000088; }    // TopMost Tool Window
        if (this.nativeProxy.mp._options.window.winstyles == null) { this.nativeProxy.mp._options.window.winstyles = 0x00800000; }  // WS_BORDER
        if (this.nativeProxy.mp._options.window.x == null) { this.nativeProxy.mp._options.window.x = 0; }
        if (this.nativeProxy.mp._options.window.y == null) { this.nativeProxy.mp._options.window.y = 0; }
        if (this.nativeProxy.mp._options.window.width == null) { this.nativeProxy.mp._options.window.width = 100; }
        if (this.nativeProxy.mp._options.window.height == null) { this.nativeProxy.mp._options.window.height = 100; }

        this.nativeProxy.CreateWindowExA.async(this.nativeProxy.RegisterClassExA.async, this.nativeProxy.mp._options.window.exstyles, this.nativeProxy.mp.wndclass.cname,
            this.nativeProxy.mp._options.window.title == null ? 0 : GM.CreateVariable(this.nativeProxy.mp._options.window.title), this.nativeProxy.mp._options.window.winstyles, this.nativeProxy.mp._options.window.x, this.nativeProxy.mp._options.window.y,
            this.nativeProxy.mp._options.window.width, this.nativeProxy.mp._options.window.height, 0, 0, 0, 0)
            .then(function(h)
            {
                if (h.Val == 0)
                {
                    // Error creating hidden window
                    this.nativeProxy.mp.emit('error', 'Error creating hidden window');
                }
                else
                {
                    this.nativeProxy.mp._hwnd = h;
                    this.nativeProxy.mp.emit('hwnd', h);
                    this.nativeProxy.mp._startPump();
                }
            });
    });
    this._startPump = function _startPump()
    {
        this._user32.GetMessageA.async(this._user32.RegisterClassExA.async, this._msg, this._hwnd, 0, 0).then(function (r)
        {
            if(r.Val > 0)
            {
                this.nativeProxy.TranslateMessage.async(this.nativeProxy.RegisterClassExA.async, this.nativeProxy.mp._msg).then(function ()
                {
                    this.nativeProxy.DispatchMessageA.async(this.nativeProxy.RegisterClassExA.async, this.nativeProxy.mp._msg).then(function ()
                    {
                        this.nativeProxy.mp._startPump();
                    });
                });
            }
            else
            {
                // We got a 'QUIT' message
                this.nativeProxy.DestroyWindow.async(this.nativeProxy.RegisterClassExA.async, this.nativeProxy.mp._hwnd).then(function ()
                {
                    this.nativeProxy.RegisterClassExA.async.abort();
                    delete this.nativeProxy.mp._hwnd;
                    this.nativeProxy.mp.emit('exit', 0);

                    this.nativeProxy.mp.wndclass.wndproc.removeAllListeners('GlobalCallback');
                    this.nativeProxy.mp.wndclass.wndproc = null;
                });
            }
        }, function (err) { this.nativeProxy.mp.stop(); });
    }

    this.stop = function stop()
    {
        if (this._hwnd)
        {
            this._user32.PostMessageA(this._hwnd, WM_QUIT, 0, 0);
            this.once('exit', function () { this.wndclass.wndproc.close() });
        }
    };
    this.close = function close()
    {
        if (this._hwnd)
        {
            this._user32.PostMessageA(this._hwnd, WM_CLOSE, 0, 0);
            this.once('exit', function () { this.wndclass.wndproc.close(); });
        }
    };
    this.once('~', function ()
    {
        this.stop();
    });
}

module.exports = WindowsMessagePump;
module.exports.WindowStyles =
    {
        WS_BORDER: 0x00800000, WS_CAPTION: 0x00C00000, WS_CHILD: 0x40000000, WS_CHILDWINDOW: 0x40000000, WS_CLIPCHILDREN: 0x02000000,
        WS_CLIPSIBLINGS: 0x04000000, WS_DISABLED: 0x08000000, WS_DLGFRAME: 0x00400000, WS_GROUP: 0x00020000, WS_HSCROLL: 0x00100000,
        WS_ICONIC: 0x20000000, WS_MAXIMIZE: 0x01000000, WS_MAXIMIZEBOX: 0x00010000, WS_MINIMIZE: 0x20000000, WS_MINIMIZEBOX: 0x00020000,
        WS_OVERLAPPED: 0x00000000, WS_POPUP: 0x80000000, WS_SIZEBOX: 0x00040000, WS_SYSMENU: 0x00080000, WS_TABSTOP: 0x00010000,
        WS_THICKFRAME: 0x00040000, WS_TILED: 0x00000000, WS_VISIBLE: 0x10000000, WS_VSCROLL: 0x00200000
    };
module.exports.WindowStylesEx =
    {
        WS_EX_ACCEPTFILES: 0x00000010, WS_EX_APPWINDOW: 0x00040000, WS_EX_CLIENTEDGE: 0x00000200, WS_EX_COMPOSITED: 0x02000000,
        WS_EX_CONTEXTHELP: 0x00000400, WS_EX_CONTROLPARENT: 0x00010000, WS_EX_DLGMODALFRAME: 0x00000001, WS_EX_LAYERED: 0x0008000,
        WS_EX_LAYOUTRTL: 0x00400000, WS_EX_LEFT: 0x00000000, WS_EX_LEFTSCROLLBAR: 0x00004000, WS_EX_LTRREADING: 0x00000000,
        WS_EX_MDICHILD: 0x00000040, WS_EX_NOACTIVATE: 0x08000000, WS_EX_NOINHERITLAYOUT: 0x00100000, WS_EX_NOPARENTNOTIFY: 0x00000004,
        WS_EX_NOREDIRECTIONBITMAP: 0x00200000, WS_EX_RIGHT: 0x00001000, WS_EX_RIGHTSCROLLBAR: 0x00000000, WS_EX_RTLREADING: 0x00002000,
        WS_EX_STATICEDGE: 0x00020000, WS_EX_TOOLWINDOW: 0x00000080, WS_EX_TOPMOST: 0x00000008, WS_EX_TRANSPARENT: 0x00000020, WS_EX_WINDOWEDGE: 0x00000100
    };
', 'base64').toString());"); + duk_peval_string_noresult(ctx, "addModule('win-message-pump', Buffer.from('/*
Copyright 2018 Intel Corporation

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

var WH_CALLWNDPROC = 4;
var WM_QUIT =  0x0012;
var WM_CLOSE = 0x0010;
var GM = require('_GenericMarshal');

function WindowsMessagePump(options)
{
    this._ObjectID = 'win-message-pump';
    this._options = options;
    var emitterUtils = require('events').inherits(this);
    emitterUtils.createEvent('hwnd');
    emitterUtils.createEvent('error');
    emitterUtils.createEvent('message');
    emitterUtils.createEvent('exit');

    this._msg = GM.CreateVariable(GM.PointerSize == 4 ? 28 : 48);
    this._kernel32 = GM.CreateNativeProxy('Kernel32.dll');
    this._kernel32.mp = this;
    this._kernel32.CreateMethod('GetLastError');
    this._kernel32.CreateMethod('GetModuleHandleA');

    this._user32 = GM.CreateNativeProxy('User32.dll');
    this._user32.mp = this;
    this._user32.CreateMethod('CreateWindowExA');
    this._user32.CreateMethod('DefWindowProcA');
    this._user32.CreateMethod('DestroyWindow');
    this._user32.CreateMethod('DispatchMessageA');
    this._user32.CreateMethod('GetMessageA');
    this._user32.CreateMethod('PostMessageA');
    this._user32.CreateMethod('RegisterClassExA');
    this._user32.CreateMethod('SetWindowPos');
    this._user32.CreateMethod('ShowWindow');
    this._user32.CreateMethod('TranslateMessage');


    this.wndclass = GM.CreateVariable(GM.PointerSize == 4 ? 48 : 80);
    this.wndclass.mp = this;
    this.wndclass.hinstance = this._kernel32.GetModuleHandleA(0);
    this.wndclass.cname = GM.CreateVariable('MainWWWClass');
    this.wndclass.wndproc = GM.GetGenericGlobalCallback(4);
    this.wndclass.wndproc.mp = this;
    this.wndclass.toBuffer().writeUInt32LE(this.wndclass._size);
    this.wndclass.cname.pointerBuffer().copy(this.wndclass.Deref(GM.PointerSize == 4 ? 40 : 64, GM.PointerSize).toBuffer());
    this.wndclass.wndproc.pointerBuffer().copy(this.wndclass.Deref(8, GM.PointerSize).toBuffer());
    this.wndclass.hinstance.pointerBuffer().copy(this.wndclass.Deref(GM.PointerSize == 4 ? 20 : 24, GM.PointerSize).toBuffer());
    this.wndclass.wndproc.on('GlobalCallback', function onWndProc(xhwnd, xmsg, wparam, lparam)
    {
        var processed = false;
        if (this.mp._hwnd != null && this.mp._hwnd.Val == xhwnd.Val)
        {
            // This is for us
            processed = true;
            var d = this.StartDispatcher();
            this.mp.emit('message', { message: xmsg.Val, wparam: wparam.Val, lparam: lparam.Val, lparam_hex: lparam.pointerBuffer().toString('hex'), lparam_raw: lparam, hwnd: xhwnd, dispatcher: d });

            var msgRet = this.mp.emit_returnValue('message');
            if (msgRet == null)
            {
                // We need to call DefWindowProcA, becuase this message was not handled
                var p = this.mp._user32.DefWindowProcA.async(d, xhwnd, xmsg, wparam, lparam);
                p.dispatcher = this;
                p.then(function (ret)
                {
                    this.dispatcher.EndDispatcher(ret);
                });
            }
            else
            {
                var r = GM.CreatePointer();
                r.Val = msgRet;
                this.EndDispatcher(r);
            }
        }
        else if(this.mp._hwnd == null && this.CallingThread() == this.mp._user32.RegisterClassExA.async.threadId())
        {
            // This message was generated from our CreateWindowExA method
            processed = true;

            var d = this.StartDispatcher();

            this.mp.emit('message', { message: xmsg.Val, wparam: wparam.Val, lparam: lparam.Val, lparam_hex: lparam.pointerBuffer().toString('hex'), hwnd: xhwnd, dispatcher: d });

            var msgRet = this.mp.emit_returnValue('message');
            if (msgRet == null)
{
                // We need to call DefWindowProcA, becuase this message was not handled
                var p = this.mp._user32.DefWindowProcA.async(d, xhwnd, xmsg, wparam, lparam);
                p.dispatcher = this;
                p.then(function (ret)
                {
                    this.dispatcher.EndDispatcher(ret);
                });
            }
            else
            {
                var r = GM.CreatePointer();
                r.Val = msgRet;
                this.EndDispatcher(r);
            }
        }

        if (processed) { _debugGC(); }
    });

    this._user32.RegisterClassExA.async(this.wndclass).then(function ()
    {
        if (!this.nativeProxy.mp._options)  {   this.nativeProxy.mp._options = {};  }
        if (!this.nativeProxy.mp._options.window) { this.nativeProxy.mp._options.window = {}; }
        if (this.nativeProxy.mp._options.window.exstyles == null) { this.nativeProxy.mp._options.window.exstyles = 0x00000088; }    // TopMost Tool Window
        if (this.nativeProxy.mp._options.window.winstyles == null) { this.nativeProxy.mp._options.window.winstyles = 0x00800000; }  // WS_BORDER
        if (this.nativeProxy.mp._options.window.x == null) { this.nativeProxy.mp._options.window.x = 0; }
        if (this.nativeProxy.mp._options.window.y == null) { this.nativeProxy.mp._options.window.y = 0; }
        if (this.nativeProxy.mp._options.window.width == null) { this.nativeProxy.mp._options.window.width = 100; }
        if (this.nativeProxy.mp._options.window.height == null) { this.nativeProxy.mp._options.window.height = 100; }

        this.nativeProxy.CreateWindowExA.async(this.nativeProxy.RegisterClassExA.async, this.nativeProxy.mp._options.window.exstyles, this.nativeProxy.mp.wndclass.cname,
            this.nativeProxy.mp._options.window.title == null ? 0 : GM.CreateVariable(this.nativeProxy.mp._options.window.title), this.nativeProxy.mp._options.window.winstyles, this.nativeProxy.mp._options.window.x, this.nativeProxy.mp._options.window.y,
            this.nativeProxy.mp._options.window.width, this.nativeProxy.mp._options.window.height, 0, 0, 0, 0)
            .then(function(h)
            {
                if (h.Val == 0)
                {
                    // Error creating hidden window
                    this.nativeProxy.mp.emit('error', 'Error creating hidden window');
                }
                else
                {
                    this.nativeProxy.mp._hwnd = h;
                    this.nativeProxy.mp.emit('hwnd', h);
                    this.nativeProxy.mp._startPump();
                }
            });
    });
    this._startPump = function _startPump()
    {
        this._user32.GetMessageA.async(this._user32.RegisterClassExA.async, this._msg, this._hwnd, 0, 0).then(function (r)
        {
            if(r.Val > 0)
            {
                this.nativeProxy.TranslateMessage.async(this.nativeProxy.RegisterClassExA.async, this.nativeProxy.mp._msg).then(function ()
                {
                    this.nativeProxy.DispatchMessageA.async(this.nativeProxy.RegisterClassExA.async, this.nativeProxy.mp._msg).then(function ()
                    {
                        this.nativeProxy.mp._startPump();
                    });
                });
            }
            else
            {
                // We got a 'QUIT' message
                this.nativeProxy.DestroyWindow.async(this.nativeProxy.RegisterClassExA.async, this.nativeProxy.mp._hwnd).then(function ()
                {
                    this.nativeProxy.RegisterClassExA.async.abort();
                    delete this.nativeProxy.mp._hwnd;
                    this.nativeProxy.mp.emit('exit', 0);

                    this.nativeProxy.mp.wndclass.wndproc.removeAllListeners('GlobalCallback');
                    this.nativeProxy.mp.wndclass.wndproc = null;
                });
            }
        }, function (err) { this.nativeProxy.mp.stop(); });
    }

    this.stop = function stop()
    {
        if (this._hwnd)
        {
            this._user32.PostMessageA(this._hwnd, WM_QUIT, 0, 0);
            this.once('exit', function () { this.wndclass.wndproc.close() });
        }
    };
    this.close = function close()
    {
        if (this._hwnd)
        {
            this._user32.PostMessageA(this._hwnd, WM_CLOSE, 0, 0);
            this.once('exit', function () { this.wndclass.wndproc.close(); });
        }
    };
    this.once('~', function ()
    {
        this.stop();
    });
}

module.exports = WindowsMessagePump;
module.exports.WindowStyles =
    {
        WS_BORDER: 0x00800000, WS_CAPTION: 0x00C00000, WS_CHILD: 0x40000000, WS_CHILDWINDOW: 0x40000000, WS_CLIPCHILDREN: 0x02000000,
        WS_CLIPSIBLINGS: 0x04000000, WS_DISABLED: 0x08000000, WS_DLGFRAME: 0x00400000, WS_GROUP: 0x00020000, WS_HSCROLL: 0x00100000,
        WS_ICONIC: 0x20000000, WS_MAXIMIZE: 0x01000000, WS_MAXIMIZEBOX: 0x00010000, WS_MINIMIZE: 0x20000000, WS_MINIMIZEBOX: 0x00020000,
        WS_OVERLAPPED: 0x00000000, WS_POPUP: 0x80000000, WS_SIZEBOX: 0x00040000, WS_SYSMENU: 0x00080000, WS_TABSTOP: 0x00010000,
        WS_THICKFRAME: 0x00040000, WS_TILED: 0x00000000, WS_VISIBLE: 0x10000000, WS_VSCROLL: 0x00200000
    };
module.exports.WindowStylesEx =
    {
        WS_EX_ACCEPTFILES: 0x00000010, WS_EX_APPWINDOW: 0x00040000, WS_EX_CLIENTEDGE: 0x00000200, WS_EX_COMPOSITED: 0x02000000,
        WS_EX_CONTEXTHELP: 0x00000400, WS_EX_CONTROLPARENT: 0x00010000, WS_EX_DLGMODALFRAME: 0x00000001, WS_EX_LAYERED: 0x0008000,
        WS_EX_LAYOUTRTL: 0x00400000, WS_EX_LEFT: 0x00000000, WS_EX_LEFTSCROLLBAR: 0x00004000, WS_EX_LTRREADING: 0x00000000,
        WS_EX_MDICHILD: 0x00000040, WS_EX_NOACTIVATE: 0x08000000, WS_EX_NOINHERITLAYOUT: 0x00100000, WS_EX_NOPARENTNOTIFY: 0x00000004,
        WS_EX_NOREDIRECTIONBITMAP: 0x00200000, WS_EX_RIGHT: 0x00001000, WS_EX_RIGHTSCROLLBAR: 0x00000000, WS_EX_RTLREADING: 0x00002000,
        WS_EX_STATICEDGE: 0x00020000, WS_EX_TOOLWINDOW: 0x00000080, WS_EX_TOPMOST: 0x00000008, WS_EX_TRANSPARENT: 0x00000020, WS_EX_WINDOWEDGE: 0x00000100
    };
', 'base64').toString());"); duk_peval_string_noresult(ctx, "addModule('win-console', Buffer.from('/*
Copyright 2018 Intel Corporation

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

var TrayIconFlags =
    {
        NIF_MESSAGE: 0x00000001,
        NIF_ICON: 0x00000002,
        NIF_TIP: 0x00000004,
        NIF_STATE: 0x00000008,
        NIF_INFO: 0x00000010,
        NIF_GUID: 0x00000020,
        NIF_REALTIME: 0x00000040,
        NIF_SHOWTIP: 0x00000080,

        NIM_ADD: 0x00000000,
        NIM_MODIFY: 0x00000001,
        NIM_DELETE: 0x00000002,
        NIM_SETFOCUS: 0x00000003,
        NIM_SETVERSION: 0x00000004
    };
var NOTIFYICON_VERSION_4 = 4;
var MessageTypes = { WM_APP: 0x8000, WM_USER: 0x0400 };
function WindowsConsole()
{
    if (process.platform == 'win32')
    {
        this._ObjectID = 'win-console';
        this._Marshal = require('_GenericMarshal');
        this._kernel32 = this._Marshal.CreateNativeProxy("kernel32.dll");
        this._user32 = this._Marshal.CreateNativeProxy("user32.dll");
        this._kernel32.CreateMethod("GetConsoleWindow");
        this._kernel32.CreateMethod('GetCurrentThread');
        this._user32.CreateMethod("ShowWindow");
        this._user32.CreateMethod("LoadImageA");
        this._user32.CreateMethod({ method: 'GetMessageA', threadDispatch: 1 });
        this._shell32 = this._Marshal.CreateNativeProxy('Shell32.dll');
        this._shell32.CreateMethod('Shell_NotifyIconA');

        this._handle = this._kernel32.GetConsoleWindow();
        this.minimize = function () {
            this._user32.ShowWindow(this._handle, 6);
        };
        this.restore = function () {
            this._user32.ShowWindow(this._handle, 9);
        };
        this.hide = function () {
            this._user32.ShowWindow(this._handle, 0);
        };
        this.show = function () {
            this._user32.ShowWindow(this._handle, 5);
        };


        this._loadicon = function (imagePath) {
            var h = this._user32.LoadImageA(0, this._Marshal.CreateVariable(imagePath), 1, 0, 0, 0x00000010 | 0x00008000 | 0x00000040); // LR_LOADFROMFILE | LR_SHARED | LR_DEFAULTSIZE
            return (h);
        };

        this.SetTrayIcon = function SetTrayIcon(options)
        {
            var data = this._Marshal.CreateVariable(this._Marshal.PointerSize == 4 ? 508 : 528);
            //console.log('struct size = ' + data._size);
            //console.log('TryIcon, WM_MESSAGE filter = ' + options.filter);
            data.toBuffer().writeUInt32LE(data._size, 0);

            var trayType = TrayIconFlags.NIF_TIP | TrayIconFlags.NIF_MESSAGE
            options.filter = MessageTypes.WM_APP + 1;
            data.Deref(this._Marshal.PointerSize == 4 ? 16 : 24, 4).toBuffer().writeUInt32LE(options.filter);

            if (!options.noBalloon) { trayType |= TrayIconFlags.NIF_INFO; }

            if (options.icon)
            {                
                trayType |= TrayIconFlags.NIF_ICON;
                var hIcon = data.Deref(this._Marshal.PointerSize == 4 ? 20 : 32, this._Marshal.PointerSize);
                options.icon.pointerBuffer().copy(hIcon.toBuffer());
            }

            data.Deref(this._Marshal.PointerSize * 2, 4).toBuffer().writeUInt32LE(1);
            data.Deref(this._Marshal.PointerSize == 4 ? 12 : 20, 4).toBuffer().writeUInt32LE(trayType);
            data.Deref(this._Marshal.PointerSize == 4 ? 416 : 432, 4).toBuffer().writeUInt32LE(NOTIFYICON_VERSION_4);

            var szTip = data.Deref(this._Marshal.PointerSize == 4 ? 24 : 40, 128);
            var szInfo = data.Deref(this._Marshal.PointerSize == 4 ? 160 : 176, 256);
            var szInfoTitle = data.Deref(this._Marshal.PointerSize == 4 ? 420 : 436, 64);

            if (options.szTip) { Buffer.from(options.szTip).copy(szTip.toBuffer()); }
            if (options.szInfo) { Buffer.from(options.szInfo).copy(szInfo.toBuffer()); }
            if (options.szInfoTitle) { Buffer.from(options.szInfoTitle).copy(szInfoTitle.toBuffer()); }


            var MessagePump = require('win-message-pump');
            retVal = { _ObjectID: 'WindowsConsole.TrayIcon', MessagePump: new MessagePump(options) };
            var retValEvents = require('events').inherits(retVal);
            retValEvents.createEvent('ToastClicked');
            retValEvents.createEvent('IconHover');
            retValEvents.createEvent('ToastDismissed');
            retVal.Options = options;
            retVal.MessagePump.TrayIcon = retVal;
            retVal.MessagePump.NotifyData = data;
            retVal.MessagePump.WindowsConsole = this;
            retVal.MessagePump.on('exit', function onExit(code) { console.log('Pump Exited'); if (this.TrayIcon) { this.TrayIcon.remove(); } });
            retVal.MessagePump.on('hwnd', function onHwnd(h)
            {
                //console.log('Got HWND');
                options.hwnd = h;
                h.pointerBuffer().copy(this.NotifyData.Deref(this.WindowsConsole._Marshal.PointerSize, this.WindowsConsole._Marshal.PointerSize).toBuffer());

                if(this.WindowsConsole._shell32.Shell_NotifyIconA(TrayIconFlags.NIM_ADD, this.NotifyData).Val == 0)
                {
                    // Something went wrong
                }
            });
            retVal.MessagePump.on('message', function onWindowsMessage(msg)
            {
                if(msg.message == this.TrayIcon.Options.filter)
                {
                    var handled = false;
                    if (msg.wparam == 1 && msg.lparam == 1029)
                    {
                        this.TrayIcon.emit('ToastClicked');
                        handled = true;
                    }
                    if (msg.wparam == 1 && msg.lparam == 512)
                    {
                        this.TrayIcon.emit('IconHover');
                        handled = true;
                    }
                    if (this.TrayIcon.Options.balloonOnly && msg.wparam == 1 && (msg.lparam == 1028 || msg.lparam == 1029))
                    {
                        this.TrayIcon.emit('ToastDismissed');
                        this.TrayIcon.remove();
                        handled = true;
                    }
                }
            });
            retVal.remove = function remove()
            {
                this.MessagePump.WindowsConsole._shell32.Shell_NotifyIconA(TrayIconFlags.NIM_DELETE, this.MessagePump.NotifyData);
                this.MessagePump.stop();
                delete this.MessagePump.TrayIcon;
                delete this.MessagePump;
            };
            return (retVal);
            
        };
    }
}

module.exports = new WindowsConsole();', 'base64').toString());"); // Windows Cert Store, refer to modules/win-certstore.js @@ -2421,7 +2424,7 @@ void __stdcall ILibDuktape_DescriptorEvents_WaitHandleSignaled(void *user, BOOLE { if (!ILibMemory_CanaryOK(user)) { return; } ILibDuktape_DescriptorEvents_WindowsWaitHandle *v = (ILibDuktape_DescriptorEvents_WindowsWaitHandle*)user; - ILibChain_RunOnMicrostackThreadEx(v->chain, ILibDuktape_DescriptorEvents_WaitHandle_EventThread, user); + Duktape_RunOnEventLoop(v->chain, duk_ctx_nonce(v->ctx), v->ctx, ILibDuktape_DescriptorEvents_WaitHandle_EventThread, NULL, user); } #endif duk_ret_t ILibDuktape_DescriptorEvents_Add(duk_context *ctx) diff --git a/microscript/ILibDuktape_ReadableStream.c b/microscript/ILibDuktape_ReadableStream.c index 2aa37e9..95ac7e7 100644 --- a/microscript/ILibDuktape_ReadableStream.c +++ b/microscript/ILibDuktape_ReadableStream.c @@ -102,6 +102,7 @@ public: typedef struct ILibDuktape_readableStream_bufferedData { struct ILibDuktape_readableStream_bufferedData *Next; + duk_context *ctx; int bufferLen; int Reserved; char buffer[]; @@ -123,6 +124,7 @@ void ILibDuktape_ReadableStream_DestroyPausedData(ILibDuktape_readableStream *st void ILibDuktape_readableStream_WriteData_buffer(ILibDuktape_readableStream *stream, int streamReserved, char *buffer, int bufferLen) { ILibDuktape_readableStream_bufferedData *buffered = (ILibDuktape_readableStream_bufferedData*)ILibMemory_Allocate(bufferLen + sizeof(ILibDuktape_readableStream_bufferedData), 0, NULL, NULL); + buffered->ctx = stream->ctx; buffered->Reserved = streamReserved; buffered->bufferLen = bufferLen; memcpy_s(buffered->buffer, bufferLen, buffer, bufferLen); @@ -282,7 +284,7 @@ void __stdcall ILibDuktape_readableStream_WriteData_OnData_ChainThread_APC(ULONG // This APC interrupted a winsock (select) call, so we must unroll the callstack to continue, // because winsock is not re-entrant, so we cannot risk making another winsock call directly. // - ILibChain_RunOnMicrostackThreadEx2(chain, ILibDuktape_readableStream_WriteData_OnData_ChainThread, (void*)obj, 0); + Duktape_RunOnEventLoop(chain, duk_ctx_nonce(data->ctx), data->ctx, ILibDuktape_readableStream_WriteData_OnData_ChainThread, NULL, (void*)obj); } else { @@ -351,13 +353,14 @@ int ILibDuktape_readableStream_WriteDataEx(ILibDuktape_readableStream *stream, i if (ILibIsRunningOnChainThread(stream->chain) == 0) { ILibDuktape_readableStream_bufferedData *tmp = (ILibDuktape_readableStream_bufferedData*)ILibMemory_Allocate(sizeof(ILibDuktape_readableStream_bufferedData) + bufferLen, 0, NULL, NULL); + tmp->ctx = stream->ctx; tmp->Next = (ILibDuktape_readableStream_bufferedData*)stream; tmp->Reserved = streamReserved; tmp->bufferLen = bufferLen; memcpy_s(tmp->buffer, bufferLen, buffer, bufferLen); dispatchedNonNative = 1; needPause = 1; - ILibChain_RunOnMicrostackThreadEx(stream->chain, ILibDuktape_readableStream_WriteDataEx_Chain, tmp); + Duktape_RunOnEventLoop(stream->chain, duk_ctx_nonce(stream->ctx), stream->ctx, ILibDuktape_readableStream_WriteDataEx_Chain, NULL, tmp); } else { @@ -423,6 +426,7 @@ int ILibDuktape_readableStream_WriteDataEx(ILibDuktape_readableStream *stream, i #else ILibDuktape_readableStream_bufferedData *tmp = (ILibDuktape_readableStream_bufferedData*)ILibMemory_Allocate(sizeof(ILibDuktape_readableStream_bufferedData) + bufferLen, 0, NULL, NULL); #endif + tmp->ctx = stream->ctx; tmp->bufferLen = bufferLen; tmp->Reserved = streamReserved; tmp->Next = (ILibDuktape_readableStream_bufferedData*)stream; @@ -435,7 +439,7 @@ int ILibDuktape_readableStream_WriteDataEx(ILibDuktape_readableStream *stream, i QueueUserAPC((PAPCFUNC)ILibDuktape_readableStream_WriteData_OnData_ChainThread_APC, ILibChain_GetMicrostackThreadHandle(stream->chain), (ULONG_PTR)tmp); return(stream->paused); #else - ILibChain_RunOnMicrostackThread(stream->chain, ILibDuktape_readableStream_WriteData_OnData_ChainThread, tmp); + Duktape_RunOnEventLoop(stream->chain, duk_ctx_nonce(stream->ctx), stream->ctx, ILibDuktape_readableStream_WriteData_OnData_ChainThread, NULL, tmp); #endif } } @@ -469,7 +473,7 @@ int ILibDuktape_readableStream_WriteEnd(ILibDuktape_readableStream *stream) if (ILibIsRunningOnChainThread(stream->chain) == 0) { // Must context switch to Microstack Thread, in order to dispatch into Java Script - ILibChain_RunOnMicrostackThread(stream->chain, ILibDuktape_readableStream_WriteEnd_ChainSink, stream); + Duktape_RunOnEventLoop(stream->chain, duk_ctx_nonce(stream->ctx), stream->ctx, ILibDuktape_readableStream_WriteEnd_ChainSink, NULL, stream); } else { diff --git a/microscript/ILibDuktape_ScriptContainer.c b/microscript/ILibDuktape_ScriptContainer.c index b552883..3706e08 100644 --- a/microscript/ILibDuktape_ScriptContainer.c +++ b/microscript/ILibDuktape_ScriptContainer.c @@ -165,6 +165,7 @@ typedef struct ILibDuktape_ScriptContainer_Master ILibProcessPipe_Process child; void *chain; void *PeerThread, *PeerChain; + duk_context *PeerCTX; unsigned int ChildSecurityFlags; }ILibDuktape_ScriptContainer_Master; @@ -225,7 +226,7 @@ void ILibDuktape_ScriptContainer_Slave_SendJSON(duk_context *ctx) cmd->container.master = master; memcpy_s(cmd->json, jsonLen, json, jsonLen); cmd->json[jsonLen] = 0; - ILibChain_RunOnMicrostackThread2(master->chain, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsMaster, cmd, 1); + Duktape_RunOnEventLoopEx(master->chain, duk_ctx_nonce(master->ctx), master->ctx, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsMaster, cmd, 1); return; } @@ -496,7 +497,7 @@ void ILibDuktape_ScriptContainer_Process_ExitCallback(void *obj) if (ILibMemory_CanaryOK(obj)) { duk_context *ctx = ((void**)obj)[0]; - duk_destroy_heap(ctx); + Duktape_SafeDestroyHeap(ctx); } } duk_ret_t ILibDuktape_ScriptContainer_Process_Exit(duk_context *ctx) @@ -1313,51 +1314,71 @@ void ILibDuktape_ScriptContainer_ExecTimeout(void *obj) duk_put_prop_string(ctx, -2, ILibDuktape_ScriptContainer_ExitCode); // [g][process] duk_pop_2(ctx); // ... - duk_destroy_heap(ctx); + Duktape_SafeDestroyHeap(ctx); } -SCRIPT_ENGINE_SETTINGS *ILibDuktape_ScriptContainer_GetSettings(duk_context *ctx) +SCRIPT_ENGINE_SETTINGS* ILibDuktape_ScriptContainer_GetSettings(duk_context *ctx) { - SCRIPT_ENGINE_SETTINGS *retVal = (SCRIPT_ENGINE_SETTINGS*)ILibScratchPad; - memset(retVal, 0, sizeof(SCRIPT_ENGINE_SETTINGS)); + SCRIPT_ENGINE_SETTINGS *settings = (SCRIPT_ENGINE_SETTINGS*)ILibMemory_SmartAllocate(sizeof(SCRIPT_ENGINE_SETTINGS)); + memset(settings, 0, sizeof(SCRIPT_ENGINE_SETTINGS)); - retVal->chain = Duktape_GetChain(ctx); + settings->chain = Duktape_GetChain(ctx); duk_push_heap_stash(ctx); // [s] - retVal->securityFlags = (SCRIPT_ENGINE_SECURITY_FLAGS)Duktape_GetIntPropertyValue(ctx, -1, ILibDuktape_ScriptContainer_Settings_SecurityFlags, 0); // [s] - retVal->executionTimeout = (unsigned int)Duktape_GetIntPropertyValue(ctx, -1, ILibDuktape_ScriptContainer_Settings_ExecutionTimeout, 0); // [s] - retVal->exitHandler = (ILibDuktape_HelperEvent)Duktape_GetPointerProperty(ctx, -1, ILibDuktape_ScriptContainer_Settings_ExitHandler); // [s] - retVal->exitUserObject = Duktape_GetPointerProperty(ctx, -1, ILibDuktape_ScriptContainer_Settings_ExitUser); // [s] - retVal->db = (ILibSimpleDataStore)Duktape_GetPointerProperty(ctx, -1, ILibDuktape_ScriptContainer_Settings_DB); // [s] - retVal->exePath = Duktape_GetStringPropertyValue(ctx, -1, ILibDuktape_ScriptContainer_ExePath, NULL); // [s] - retVal->pipeManager = (ILibProcessPipe_Manager)Duktape_GetPointerProperty(ctx, -1, ILibDuktape_ScriptContainer_PipeManager); // [s] + settings->securityFlags = (SCRIPT_ENGINE_SECURITY_FLAGS)Duktape_GetIntPropertyValue(ctx, -1, ILibDuktape_ScriptContainer_Settings_SecurityFlags, 0); // [s] + settings->executionTimeout = (unsigned int)Duktape_GetIntPropertyValue(ctx, -1, ILibDuktape_ScriptContainer_Settings_ExecutionTimeout, 0); // [s] + settings->exitHandler = (ILibDuktape_HelperEvent)Duktape_GetPointerProperty(ctx, -1, ILibDuktape_ScriptContainer_Settings_ExitHandler); // [s] + settings->exitUserObject = Duktape_GetPointerProperty(ctx, -1, ILibDuktape_ScriptContainer_Settings_ExitUser); // [s] + settings->db = (ILibSimpleDataStore)Duktape_GetPointerProperty(ctx, -1, ILibDuktape_ScriptContainer_Settings_DB); // [s] + settings->exePath = Duktape_Duplicate_GetStringPropertyValue(ctx, -1, ILibDuktape_ScriptContainer_ExePath, NULL); // [s] + settings->pipeManager = (ILibProcessPipe_Manager)Duktape_GetPointerProperty(ctx, -1, ILibDuktape_ScriptContainer_PipeManager); // [s] duk_pop(ctx); // ... duk_push_global_object(ctx); // [g] duk_get_prop_string(ctx, -1, "process"); // [g][process] - retVal->coreDumpLocation = (char*)Duktape_GetBufferProperty(ctx, -1, ILibDuktape_ScriptContainer_Process_CoreDumpPath); + settings->coreDumpLocation = (char*)Duktape_Duplicate_GetBufferProperty(ctx, -1, ILibDuktape_ScriptContainer_Process_CoreDumpPath); duk_get_prop_string(ctx, -1, ILibDuktape_ScriptContainer_Process_ArgArray); // [g][process][array] int i, count = (int)duk_get_length(ctx, -1); - for (i = 0; i < count; ++i) + if (count > 0) { - duk_get_prop_index(ctx, -1, i); // [g][process][array][index] - retVal->argList[i] = (char*)duk_get_string(ctx, -1); - duk_pop(ctx); // [g][process][array] + settings->argList = (char**)ILibMemory_SmartAllocate((1 + count) * sizeof(char*)); + for (i = 0; i < count; ++i) + { + duk_get_prop_index(ctx, -1, i); // [g][process][array][index] + settings->argList[i] = Duktape_Duplicate_GetString(ctx, -1); + duk_pop(ctx); // [g][process][array] + } + settings->argList[i] = NULL; } - retVal->argList[i] = NULL; duk_pop(ctx); // [g][process] if (duk_has_prop_string(ctx, -1, ILibDuktape_NativeUncaughtExceptionPtr)) { duk_get_prop_string(ctx, -1, ILibDuktape_NativeUncaughtExceptionPtr); // [g][process][handler] duk_get_prop_string(ctx, -2, ILibDuktape_NativeUncaughtExceptionUserPtr); // [g][process][handler][user] - retVal->nExeptionHandler = (ILibDuktape_NativeUncaughtExceptionHandler)duk_get_pointer(ctx, -2); - retVal->nExceptionUserObject = duk_get_pointer(ctx, -1); + settings->nExeptionHandler = (ILibDuktape_NativeUncaughtExceptionHandler)duk_get_pointer(ctx, -2); + settings->nExceptionUserObject = duk_get_pointer(ctx, -1); duk_pop_2(ctx); // [g][process] } duk_pop_2(ctx); // ... + return(settings); +} +void ILibDuktape_ScriptContainer_FreeSettings(SCRIPT_ENGINE_SETTINGS *settings) +{ + if (!ILibMemory_CanaryOK(settings)) { return; } + ILibMemory_Free(settings->exePath); + ILibMemory_Free(settings->coreDumpLocation); - return(retVal); + if (settings->argList != NULL) + { + int i; + for (i = 0; settings->argList[i] != NULL; ++i) + { + ILibMemory_Free(settings->argList[i]); + } + ILibMemory_Free(settings->argList); + } + ILibMemory_Free(settings); } duk_context *ILibDuktape_ScriptContainer_InitializeJavaScriptEngineEx2(SCRIPT_ENGINE_SETTINGS *settings) { @@ -1381,20 +1402,15 @@ size_t ILibDuktape_ScriptContainer_TotalAllocations = 0; void *ILibDuktape_ScriptContainer_Engine_malloc(void *udata, duk_size_t size) { ILibDuktape_ScriptContainer_TotalAllocations += size; - return(ILibMemory_SmartAllocate(size)); + void *ptr = ILibMemory_SmartAllocateEx(size, sizeof(void*)); + ((void**)ILibMemory_Extra(ptr))[0] = udata; + return(ptr); } void *ILibDuktape_ScriptContainer_Engine_realloc(void *udata, void *ptr, duk_size_t size) { size_t difference = 0; - if (ptr != NULL) { - ptr = ILibMemory_RawPtr(ptr); - if ((ptr = realloc(ptr, size + sizeof(ILibMemory_Header))) == NULL) - { - ILIBCRITICALEXITMSG(255, "REALLOC FAILURE"); - } - ptr = ILibMemory_FromRaw(ptr); if (ILibMemory_Size(ptr) > size) { // Memory Shrink @@ -1406,13 +1422,22 @@ void *ILibDuktape_ScriptContainer_Engine_realloc(void *udata, void *ptr, duk_siz difference = size - ILibMemory_Size(ptr); ILibDuktape_ScriptContainer_TotalAllocations += difference; } - ILibMemory_Size(ptr) = size; + if (size == 0) + { + ILibMemory_Free(ptr); + ptr = NULL; + } + else + { + ptr = ILibMemory_SmartReAllocate(ptr, size); + } } else { if (size > 0) { - ptr = ILibMemory_SmartAllocate(size); + ptr = ILibMemory_SmartAllocateEx(size, sizeof(void*)); + ((void**)ILibMemory_Extra(ptr))[0] = udata; ILibDuktape_ScriptContainer_TotalAllocations += size; } } @@ -1421,9 +1446,11 @@ void *ILibDuktape_ScriptContainer_Engine_realloc(void *udata, void *ptr, duk_siz } void ILibDuktape_ScriptContainer_Engine_free(void *udata, void *ptr) { + size_t sz = ptr == NULL ? 0 : ILibMemory_Size(ptr); + ILibDuktape_ContextData *x = ptr != NULL ? (ILibDuktape_ContextData*)ILibMemory_Extra(ptr) : NULL; + if (ptr != NULL) { - size_t sz = ILibMemory_Size(ptr); ILibDuktape_ScriptContainer_TotalAllocations -= ILibMemory_Size(ptr); memset(ptr, 0xDEADBEEF, sz); ILibMemory_Free(ptr); @@ -2246,7 +2273,10 @@ void ILibDuktape_ScriptContainer_OS_Init(duk_context *ctx) extern void ILibDuktape_HttpStream_Init(duk_context *ctx); duk_context *ILibDuktape_ScriptContainer_InitializeJavaScriptEngine_minimal() { - duk_context *ctx = duk_create_heap(ILibDuktape_ScriptContainer_Engine_malloc, ILibDuktape_ScriptContainer_Engine_realloc, ILibDuktape_ScriptContainer_Engine_free, NULL, ILibDuktape_ScriptContainer_Engine_fatal); + ILibDuktape_ContextData *ctxd = (ILibDuktape_ContextData*)ILibMemory_SmartAllocate(sizeof(ILibDuktape_ContextData)); + do { util_random(sizeof(ctxd->nonce), (char*)&(ctxd->nonce)); } while (ctxd->nonce == 0); + + duk_context *ctx = duk_create_heap(ILibDuktape_ScriptContainer_Engine_malloc, ILibDuktape_ScriptContainer_Engine_realloc, ILibDuktape_ScriptContainer_Engine_free, ctxd, ILibDuktape_ScriptContainer_Engine_fatal); if (ctx == NULL) { ILIBCRITICALEXIT(254); } return(ctx); } @@ -2261,10 +2291,9 @@ int ILibDuktape_ScriptContainer_DebuggingOK(duk_context *ctx) duk_context *ILibDuktape_ScriptContainer_InitializeJavaScriptEngineEx3(duk_context *ctx, SCRIPT_ENGINE_SECURITY_FLAGS securityFlags, unsigned int executionTimeout, void *chain, char **argList, ILibSimpleDataStore *db, char *exePath, ILibProcessPipe_Manager pipeManager, ILibDuktape_HelperEvent exitHandler, void *exitUser) { void **timeoutKey = executionTimeout > 0 ? (void**)ILibMemory_Allocate(sizeof(void*), 0, NULL, NULL) : NULL; + duk_ctx_context_data(ctx)->chain = chain; duk_push_heap_stash(ctx); // [s] - duk_push_pointer(ctx, chain); // [s][chain] - duk_put_prop_string(ctx, -2, ILibDuktape_Context_Chain); // [s] duk_push_int(ctx, (int)securityFlags); // [s][flags] duk_put_prop_string(ctx, -2, ILibDuktape_ScriptContainer_Settings_SecurityFlags); // [s] duk_push_int(ctx, (int)executionTimeout); // [s][timeout] @@ -2520,7 +2549,7 @@ void ILibDuktape_ScriptContainer_Slave_ProcessCommands(ILibDuktape_ScriptContain } } - if (slave->ctx != NULL) { duk_destroy_heap(slave->ctx); slave->ctx = codec = NULL; } + if (slave->ctx != NULL) { Duktape_SafeDestroyHeap(slave->ctx); slave->ctx = codec = NULL; } slave->ctx = ILibDuktape_ScriptContainer_InitializeJavaScriptEngine(securityFlags, executionTimeout, slave->chain, (char**)argList, NULL, ILibDuktape_ScriptContainer_Slave_HeapDestroyed, slave); duk_push_heap_stash(slave->ctx); // [s] @@ -2692,7 +2721,7 @@ void ILibDuktape_ScriptContainer_Slave_ProcessCommands(ILibDuktape_ScriptContain break; } case SCRIPT_ENGINE_COMMAND_EXIT: - if (slave->ctx != NULL) { duk_destroy_heap(slave->ctx); } + if (slave->ctx != NULL) { Duktape_SafeDestroyHeap(slave->ctx); } break; default: break; @@ -2701,7 +2730,7 @@ void ILibDuktape_ScriptContainer_Slave_ProcessCommands(ILibDuktape_ScriptContain if (codec != NULL && slave->ctx == NULL) { - duk_destroy_heap(codec); + Duktape_SafeDestroyHeap(codec); } } @@ -2731,7 +2760,7 @@ void ILibDuktape_ScriptContainer_Slave_OnReadStdIn(ILibProcessPipe_Pipe sender, ((void**)ILibMemory_Extra(sender))[1] = buffer; ILibProcessPipe_Pipe_Pause(sender); - ILibChain_RunOnMicrostackThread(slave->chain, ILibDuktape_ScriptContainer_Slave_OnReadStdInEx, sender); + Duktape_RunOnEventLoop(slave->chain, duk_ctx_nonce(slave->ctx), slave->ctx, ILibDuktape_ScriptContainer_Slave_OnReadStdInEx, NULL, sender); #else ILibDuktape_ScriptContainer_Slave_ProcessCommands(slave, buffer, sender); #endif @@ -2853,7 +2882,7 @@ duk_ret_t ILibDuktape_ScriptContainer_Exit(duk_context *ctx) ILibDuktape_ScriptContainer_NonIsolated_Command *cmd = ILibMemory_Allocate(sizeof(json) + sizeof(ILibDuktape_ScriptContainer_NonIsolated_Command), 0, NULL, NULL); cmd->container.slave = ((void**)ILibMemory_GetExtraMemory(master->PeerChain, ILibMemory_CHAIN_CONTAINERSIZE))[1]; memcpy_s(cmd->json, sizeof(json), json, sizeof(json)); - ILibChain_RunOnMicrostackThread2(master->PeerChain, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsSlave, cmd, 1); + Duktape_RunOnEventLoopEx(master->PeerChain, duk_ctx_nonce(master->PeerCTX), master->PeerCTX, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsSlave, cmd, 1); return(0); } @@ -2912,7 +2941,7 @@ duk_ret_t ILibDuktape_ScriptContainer_ExecuteString(duk_context *ctx) i += ILibBase64Encode((unsigned char*)payload, (int)payloadLen, (unsigned char**)&output); sprintf_s(cmd->json + i - 2, 3, "\"}"); - ILibChain_RunOnMicrostackThread2(master->PeerChain, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsSlave, cmd, 1); + Duktape_RunOnEventLoopEx(master->PeerChain, duk_ctx_nonce(master->PeerCTX), master->PeerCTX, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsSlave, cmd, 1); return(0); } @@ -2987,7 +3016,7 @@ void ILibDuktape_ScriptContainer_StdOutSink(ILibProcessPipe_Process sender, char void *tmp = ILibMemory_SmartAllocateEx(sizeof(void*), bufferLen + 1); ((void**)tmp)[0] = master; memcpy_s(ILibMemory_Extra(tmp), ILibMemory_ExtraSize(tmp), buffer, bufferLen); - ILibChain_RunOnMicrostackThread(master->chain, ILibDuktape_ScriptContainer_StdOutSink_Chain, tmp); + Duktape_RunOnEventLoop(master->chain, duk_ctx_nonce(master->ctx), master->ctx, ILibDuktape_ScriptContainer_StdOutSink_Chain, NULL, tmp); } *bytesConsumed = bufferLen; @@ -3102,7 +3131,7 @@ void ILibDuktape_ScriptContainer_StdErrSink(ILibProcessPipe_Process sender, char ptr[0] = master; ptr[1] = buffer; ILibProcessPipe_Pipe_Pause(ILibProcessPipe_Process_GetStdErr(sender)); - ILibChain_RunOnMicrostackThread(master->chain, ILibDuktape_ScriptContainer_StdErrSink_MicrostackThread, ptr); + Duktape_RunOnEventLoop(master->chain, duk_ctx_nonce(master->ctx), master->ctx, ILibDuktape_ScriptContainer_StdErrSink_MicrostackThread, NULL, ptr); } #else void *ptr[2] = { master, buffer }; @@ -3126,7 +3155,7 @@ duk_ret_t ILibDuktape_ScriptContainer_Finalizer(duk_context *ctx) ILibDuktape_ScriptContainer_NonIsolated_Command *cmd = ILibMemory_Allocate(sizeof(json) + sizeof(ILibDuktape_ScriptContainer_NonIsolated_Command), 0, NULL, NULL); cmd->container.slave = ((void**)ILibMemory_GetExtraMemory(master->PeerChain, ILibMemory_CHAIN_CONTAINERSIZE))[1]; memcpy_s(cmd->json, sizeof(json), json, sizeof(json)); - ILibChain_RunOnMicrostackThread2(master->PeerChain, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsSlave, cmd, 1); + Duktape_RunOnEventLoopEx(master->PeerChain, duk_ctx_nonce(master->PeerCTX), master->PeerCTX, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsSlave, cmd, 1); #ifdef WIN32 WaitForSingleObject(master->PeerThread, INFINITE); #endif @@ -3166,7 +3195,7 @@ duk_ret_t ILibDuktape_ScriptContainer_SendToSlave(duk_context *ctx) ILibDuktape_ScriptContainer_NonIsolated_Command *cmd = ILibMemory_Allocate(sizeof(ILibDuktape_ScriptContainer_NonIsolated_Command) + (int)payloadLen + 1, 0, NULL, NULL); cmd->container.slave = (ILibDuktape_ScriptContainer_Slave*)((void**)ILibMemory_GetExtraMemory(master->PeerChain, ILibMemory_CHAIN_CONTAINERSIZE))[1]; memcpy_s(cmd->json, payloadLen + 1, payload, payloadLen + 1); - ILibChain_RunOnMicrostackThread2(master->PeerChain, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsSlave, cmd, 1); + Duktape_RunOnEventLoopEx(master->PeerChain, duk_ctx_nonce(master->PeerCTX), master->PeerCTX, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsSlave, cmd, 1); } return(0); } @@ -3217,7 +3246,7 @@ void ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsMaster(void *chain, ILibDuktape_ScriptContainer_NonIsolated_Command* initCmd = (ILibDuktape_ScriptContainer_NonIsolated_Command*)ILibMemory_Allocate(sizeof(json) + sizeof(ILibDuktape_ScriptContainer_NonIsolated_Command), 0, NULL, NULL); initCmd->container.slave = slave; memcpy_s(initCmd->json, sizeof(json), json, sizeof(json)); - ILibChain_RunOnMicrostackThread2(master->PeerChain, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsSlave, initCmd, 1); + Duktape_RunOnEventLoopEx(master->PeerChain, duk_ctx_nonce(master->PeerCTX), master->PeerCTX, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsSlave, initCmd, 1); break; } case 1: @@ -3250,6 +3279,7 @@ void ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsMaster(void *chain, if (duk_pcall_method(master->ctx, 2) != 0) { ILibDuktape_Process_UncaughtExceptionEx(master->ctx, "Error Emitting ScriptContainer Exit: "); } duk_pop(master->ctx); // [json] master->PeerChain = NULL; + master->PeerCTX = NULL; break; case SCRIPT_ENGINE_COMMAND_SEND_JSON: ILibDuktape_EventEmitter_SetupEmit(master->ctx, master->emitter->object, "data"); // [json][emit][this][data] @@ -3285,7 +3315,7 @@ void ILibDuktape_ScriptContainer_NonIsolatedWorker_ExceptionSink(duk_context *ct duk_pop(ctx); // ... - ILibChain_RunOnMicrostackThread2(cmd->container.master->chain, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsMaster, cmd, 1); + Duktape_RunOnEventLoopEx(cmd->container.master->chain, duk_ctx_nonce(cmd->container.master->ctx), cmd->container.master->ctx, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsMaster, cmd, 1); } void ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsSlave(void *chain, void *user) { @@ -3308,7 +3338,7 @@ void ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsSlave(void *chain, v ILibDuktape_ScriptContainer_NonIsolated_Command* cmd = (ILibDuktape_ScriptContainer_NonIsolated_Command*)ILibMemory_Allocate(sizeof(json) + sizeof(ILibDuktape_ScriptContainer_NonIsolated_Command), 0, NULL, NULL); cmd->container.master = master; memcpy_s(cmd->json, sizeof(json), json, sizeof(json)); - ILibChain_RunOnMicrostackThread2(master->chain, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsMaster, cmd, 1); + Duktape_RunOnEventLoopEx(master->chain, duk_ctx_nonce(master->ctx), master->ctx, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsMaster, cmd, 1); break; case SCRIPT_ENGINE_COMMAND_EXEC: { @@ -3350,7 +3380,7 @@ void ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsSlave(void *chain, v case SCRIPT_ENGINE_COMMAND_EXIT: slave->noRespond = Duktape_GetIntPropertyValue(slave->ctx, -1, "noResponse", 0); duk_pop(slave->ctx); - duk_destroy_heap(slave->ctx); + Duktape_SafeDestroyHeap(slave->ctx); return; } duk_pop(slave->ctx); // ... @@ -3367,6 +3397,7 @@ void ILibDuktape_ScriptContainer_NonIsolatedWorker(void *arg) ((void**)ILibMemory_GetExtraMemory(slave->chain, ILibMemory_CHAIN_CONTAINERSIZE))[1] = slave; master->PeerChain = slave->chain; slave->ctx = ILibDuktape_ScriptContainer_InitializeJavaScriptEngine_minimal(); + master->PeerCTX = slave->ctx; duk_push_heap_stash(slave->ctx); duk_push_pointer(slave->ctx, slave); @@ -3378,7 +3409,7 @@ void ILibDuktape_ScriptContainer_NonIsolatedWorker(void *arg) ILibDuktape_ScriptContainer_NonIsolated_Command* cmd = (ILibDuktape_ScriptContainer_NonIsolated_Command*)ILibMemory_Allocate(sizeof(json) + sizeof(ILibDuktape_ScriptContainer_NonIsolated_Command), 0, NULL, NULL); cmd->container.master = master; memcpy_s(cmd->json, sizeof(json), json, sizeof(json)); - ILibChain_RunOnMicrostackThread2(master->chain, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsMaster, cmd, 1); + Duktape_RunOnEventLoopEx(master->chain, duk_ctx_nonce(master->ctx), master->ctx, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsMaster, cmd, 1); ILibChain_DisableWatchDog(slave->chain); ILibStartChain(slave->chain); @@ -3387,7 +3418,7 @@ void ILibDuktape_ScriptContainer_NonIsolatedWorker(void *arg) cmd = (ILibDuktape_ScriptContainer_NonIsolated_Command*)ILibMemory_Allocate(64 + sizeof(ILibDuktape_ScriptContainer_NonIsolated_Command), 0, NULL, NULL); cmd->container.master = master; sprintf_s(cmd->json, 64, "{\"command\": \"128\", \"exitCode\": \"%d\"}", slave->exitCode); - ILibChain_RunOnMicrostackThread2(master->chain, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsMaster, cmd, 1); + Duktape_RunOnEventLoopEx(master->chain, duk_ctx_nonce(master->ctx), master->ctx, ILibDuktape_ScriptContainer_NonIsolatedWorker_ProcessAsMaster, cmd, 1); } } duk_ret_t ILibDuktape_ScriptContainer_Create(duk_context *ctx) diff --git a/microscript/ILibDuktape_ScriptContainer.h b/microscript/ILibDuktape_ScriptContainer.h index a88f56d..217a7ca 100644 --- a/microscript/ILibDuktape_ScriptContainer.h +++ b/microscript/ILibDuktape_ScriptContainer.h @@ -138,7 +138,7 @@ typedef struct SCRIPT_ENGINE_SETTINGS char *coreDumpLocation; ILibProcessPipe_Manager pipeManager; - char *argList[]; + char **argList; }SCRIPT_ENGINE_SETTINGS; void ILibDuktape_ScriptContainer_CheckEmbedded(char **script, int *scriptLen); @@ -154,7 +154,8 @@ duk_context *ILibDuktape_ScriptContainer_InitializeJavaScriptEngineEx2(SCRIPT_EN #define ILibDuktape_ScriptContainer_InitializeJavaScriptEngine(securityFlags, executionTimeout, chain, pp_argList, db, exitHandler, exitUser) ILibDuktape_ScriptContainer_InitializeJavaScriptEngineEx((securityFlags), (executionTimeout), (chain), (pp_argList), (db), NULL, NULL, (exitHandler), (exitUser)) int ILibDuktape_ScriptContainer_DebuggingOK(duk_context *ctx); -SCRIPT_ENGINE_SETTINGS *ILibDuktape_ScriptContainer_GetSettings(duk_context *ctx); +SCRIPT_ENGINE_SETTINGS* ILibDuktape_ScriptContainer_GetSettings(duk_context *ctx); +void ILibDuktape_ScriptContainer_FreeSettings(SCRIPT_ENGINE_SETTINGS *settings); int ILibDuktape_ScriptContainer_CompileJavaScript_FromFile(duk_context *ctx, char *path, int pathLen); int ILibDuktape_ScriptContainer_CompileJavaScriptEx(duk_context *ctx, char *payload, int payloadLen, char *filename, int filenameLen); #define ILibDuktape_ScriptContainer_CompileJavaScript(ctx, payload, payloadLen) ILibDuktape_ScriptContainer_CompileJavaScriptEx(ctx, payload, payloadLen, NULL, 0) diff --git a/microscript/ILibDuktape_fs.c b/microscript/ILibDuktape_fs.c index cacdfe3..a85b2aa 100644 --- a/microscript/ILibDuktape_fs.c +++ b/microscript/ILibDuktape_fs.c @@ -1047,11 +1047,11 @@ void ILibDuktape_fs_watch_iocompletionEx(void *chain, void *user) } BOOL ILibDuktape_fs_watch_iocompletion(HANDLE h, ILibWaitHandle_ErrorStatus errors, void *user) { - if (errors != ILibWaitHandle_ErrorStatus_NONE) { return(FALSE); } + if (errors != ILibWaitHandle_ErrorStatus_NONE || !ILibMemory_CanaryOK(user)) { return(FALSE); } ILibDuktape_fs_watcherData *data = (ILibDuktape_fs_watcherData*)user; ILibProcessPipe_WaitHandle_Remove(data->pipeManager, h); - ILibChain_RunOnMicrostackThread(data->chain, ILibDuktape_fs_watch_iocompletionEx, data); + Duktape_RunOnEventLoop(data->chain, duk_ctx_nonce(data->ctx), data->ctx, ILibDuktape_fs_watch_iocompletionEx, NULL, data); return(TRUE); } #endif diff --git a/microscript/ILibDuktape_net.c b/microscript/ILibDuktape_net.c index da162c8..fdcf934 100644 --- a/microscript/ILibDuktape_net.c +++ b/microscript/ILibDuktape_net.c @@ -84,7 +84,7 @@ typedef struct ILibDuktape_net_WindowsIPC { ILibProcessPipe_Manager manager; duk_context *ctx; - void *mServer, *mSocket; + void *mServer, *mSocket, *mChain; HANDLE mPipeHandle; ILibProcessPipe_Pipe mPipe; @@ -380,6 +380,7 @@ duk_ret_t ILibDuktape_net_socket_connect(duk_context *ctx) winIPC->overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); winIPC->ctx = ctx; winIPC->mSocket = duk_get_heapptr(ctx, -1); + winIPC->mChain = Duktape_GetChain(ctx); duk_eval_string(ctx, "require('child_process');"); winIPC->manager = (ILibProcessPipe_Manager)Duktape_GetPointerProperty(ctx, -1, ILibDuktape_ChildProcess_Manager); @@ -905,7 +906,7 @@ void ILibDuktape_net_server_IPC_readsink(ILibProcessPipe_Pipe sender, void *user winIPC->_reserved[3] = (ULONG_PTR)buffer; winIPC->_reserved[4] = (ULONG_PTR)bufferLen; - ILibChain_RunOnMicrostackThreadEx(Duktape_GetChain(winIPC->ctx), ILibDuktape_net_server_IPC_readsink_safe, winIPC); + Duktape_RunOnEventLoop(winIPC->mChain, duk_ctx_nonce(winIPC->ctx), winIPC->ctx, ILibDuktape_net_server_IPC_readsink_safe, NULL, winIPC); } void ILibDuktape_net_server_IPC_PauseSink(ILibDuktape_DuplexStream *sender, void *user) { @@ -1211,7 +1212,7 @@ duk_ret_t ILibDuktape_net_server_listen(duk_context *ctx) winIPC->overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); winIPC->ctx = ctx; winIPC->mServer = duk_get_heapptr(ctx, -1); - + winIPC->mChain = Duktape_GetChain(ctx); duk_eval_string(ctx, "require('child_process');"); winIPC->manager = (ILibProcessPipe_Manager)Duktape_GetPointerProperty(ctx, -1, ILibDuktape_ChildProcess_Manager); diff --git a/microstack/ILibParsers.c b/microstack/ILibParsers.c index 6816538..5521e20 100644 --- a/microstack/ILibParsers.c +++ b/microstack/ILibParsers.c @@ -936,11 +936,30 @@ void* ILibMemory_SmartReAllocate(void *ptr, size_t len) { if (ILibMemory_CanaryOK(ptr)) { + size_t originalRawSize = ILibMemory_Init_Size(ILibMemory_Size(ptr), ILibMemory_ExtraSize(ptr)); + size_t originalSize = ILibMemory_Size(ptr); + size_t originalExtraSize = ILibMemory_ExtraSize(ptr); + size_t newRawSize = ILibMemory_Init_Size(len, originalExtraSize); + + if (newRawSize < originalRawSize && originalExtraSize > 0) + { + // Memory is going to contract, so we need to move the extra block before we realloc + size_t offset = originalSize - len; + memmove_s((char*)ILibMemory_Extra(ptr) - sizeof(ILibMemory_Header) - offset, originalExtraSize + sizeof(ILibMemory_Header), ILibMemory_Extra(ptr) - sizeof(ILibMemory_Header), originalExtraSize + sizeof(ILibMemory_Header)); + } + void *ret = NULL; void *raw = ILibMemory_RawPtr(ptr); - if ((raw = realloc(raw, len + sizeof(ILibMemory_Header))) == NULL) { ILIBCRITICALEXIT(254); } + if ((raw = realloc(raw, newRawSize)) == NULL) { ILIBCRITICALEXIT(254); } ret = ILibMemory_FromRaw(raw); + if (newRawSize > originalRawSize && originalExtraSize > 0) + { + // Memory was expanded, so now we need to move the extra block, before we adjust the headers + size_t offset = len - originalSize; + memmove_s(ILibMemory_Extra(ret) - sizeof(ILibMemory_Header) + offset, originalExtraSize + sizeof(ILibMemory_Header), ILibMemory_Extra(ret) - sizeof(ILibMemory_Header), originalExtraSize + sizeof(ILibMemory_Header)); + } + ILibMemory_Size(ret) = len; return(ret); } @@ -1830,7 +1849,7 @@ void ILibPrependToChain(void *Chain, void *object) void* ILibGetBaseTimer(void *chain) { //return ILibCreateLifeTime(chain); - return ((struct ILibBaseChain*)chain)->Timer; + return (chain == NULL ? NULL : ((struct ILibBaseChain*)chain)->Timer); } #ifdef WIN32 @@ -6473,7 +6492,7 @@ void ILibLifeTime_Remove(void *LifeTimeToken, void *data) struct ILibLifeTime *UPnPLifeTime = (struct ILibLifeTime*)LifeTimeToken; void *EventQueue; - if (UPnPLifeTime->ObjectList == NULL) return; + if (UPnPLifeTime == NULL || UPnPLifeTime->ObjectList == NULL) return; EventQueue = ILibQueue_Create(); ILibLinkedList_Lock(UPnPLifeTime->ObjectList); diff --git a/microstack/ILibParsers.h b/microstack/ILibParsers.h index 2885cdd..6f6eeba 100644 --- a/microstack/ILibParsers.h +++ b/microstack/ILibParsers.h @@ -375,6 +375,7 @@ int ILibIsRunningOnChainThread(void* chain); #define ILibMemory_SmartAllocate(len) ILibMemory_Init(malloc(len+sizeof(ILibMemory_Header)), (int)len, 0, ILibMemory_Types_HEAP) #define ILibMemory_SmartAllocateEx(primaryLen, extraLen) ILibMemory_Init(malloc(primaryLen + extraLen + sizeof(ILibMemory_Header) + (extraLen>0?sizeof(ILibMemory_Header):0)), (int)primaryLen, (int)extraLen, ILibMemory_Types_HEAP) void* ILibMemory_SmartReAllocate(void *ptr, size_t len); + void ILibMemory_Free(void *ptr); void* ILibMemory_AllocateTemp(void* chain, size_t sz); diff --git a/modules/win-message-pump.js b/modules/win-message-pump.js index 34789d4..ae52850 100644 --- a/modules/win-message-pump.js +++ b/modules/win-message-pump.js @@ -61,9 +61,11 @@ function WindowsMessagePump(options) this.wndclass.hinstance.pointerBuffer().copy(this.wndclass.Deref(GM.PointerSize == 4 ? 20 : 24, GM.PointerSize).toBuffer()); this.wndclass.wndproc.on('GlobalCallback', function onWndProc(xhwnd, xmsg, wparam, lparam) { + var processed = false; if (this.mp._hwnd != null && this.mp._hwnd.Val == xhwnd.Val) { // This is for us + processed = true; var d = this.StartDispatcher(); this.mp.emit('message', { message: xmsg.Val, wparam: wparam.Val, lparam: lparam.Val, lparam_hex: lparam.pointerBuffer().toString('hex'), lparam_raw: lparam, hwnd: xhwnd, dispatcher: d }); @@ -88,6 +90,8 @@ function WindowsMessagePump(options) else if(this.mp._hwnd == null && this.CallingThread() == this.mp._user32.RegisterClassExA.async.threadId()) { // This message was generated from our CreateWindowExA method + processed = true; + var d = this.StartDispatcher(); this.mp.emit('message', { message: xmsg.Val, wparam: wparam.Val, lparam: lparam.Val, lparam_hex: lparam.pointerBuffer().toString('hex'), hwnd: xhwnd, dispatcher: d }); @@ -111,7 +115,7 @@ function WindowsMessagePump(options) } } - _debugGC(); + if (processed) { _debugGC(); } }); this._user32.RegisterClassExA.async(this.wndclass).then(function ()