diff --git a/microscript/ILibDuktape_ChildProcess.c b/microscript/ILibDuktape_ChildProcess.c index 9ff7a00..93e63d5 100644 --- a/microscript/ILibDuktape_ChildProcess.c +++ b/microscript/ILibDuktape_ChildProcess.c @@ -203,7 +203,6 @@ duk_ret_t ILibDuktape_ChildProcess_waitExit(duk_context *ctx) duk_put_prop_string(ctx, -2, "\xFF_WaitExit"); // [spawnedProcess] #ifdef WIN32 - duk_thread_state ts; duk_ctx_context_data(ctx)->apc_flags = 1; while ((result=WaitForSingleObjectEx(eptr, duk_is_number(ctx, 0) ? duk_require_int(ctx, 0) : INFINITE, TRUE)) != WAIT_OBJECT_0 && result != WAIT_TIMEOUT); duk_ctx_context_data(ctx)->apc_flags = 0; diff --git a/microscript/ILibDuktape_ScriptContainer.c b/microscript/ILibDuktape_ScriptContainer.c index c0e6c9b..4251ed3 100644 --- a/microscript/ILibDuktape_ScriptContainer.c +++ b/microscript/ILibDuktape_ScriptContainer.c @@ -2204,7 +2204,10 @@ void ILibDuktape_ScriptContainer_OS_Push(duk_context *ctx, void *chain) winstr = require('win-registry').QueryKey(require('win-registry').HKEY.LocalMachine, 'SOFTWARE\\\\Microsoft\\\\Windows NT\\\\CurrentVersion', 'ProductName') + ' - ' +\ require('win-registry').QueryKey(require('win-registry').HKEY.LocalMachine, 'SOFTWARE\\\\Microsoft\\\\Windows NT\\\\CurrentVersion', 'ReleaseID') + ' ' + winstr.substring(winstr.indexOf('['));\ }\ - catch(xx) {}\ + catch(xx)\ + {\ + winstr = require('win-registry').QueryKey(require('win-registry').HKEY.LocalMachine, 'SOFTWARE\\\\Microsoft\\\\Windows NT\\\\CurrentVersion', 'ProductName') + ' ' + winstr.substring(winstr.indexOf('['));\ + }\ }\ ret = winstr;\ break;\ @@ -2282,7 +2285,10 @@ void ILibDuktape_ScriptContainer_OS_Push(duk_context *ctx, void *chain) winstr = require('win-registry').QueryKey(require('win-registry').HKEY.LocalMachine, 'SOFTWARE\\\\Microsoft\\\\Windows NT\\\\CurrentVersion', 'ProductName') + ' - ' +\ require('win-registry').QueryKey(require('win-registry').HKEY.LocalMachine, 'SOFTWARE\\\\Microsoft\\\\Windows NT\\\\CurrentVersion', 'ReleaseID') + ' ' + winstr.substring(winstr.indexOf('['));\ }\ - catch(xx) {}\ + catch(xx)\ + {\ + winstr = require('win-registry').QueryKey(require('win-registry').HKEY.LocalMachine, 'SOFTWARE\\\\Microsoft\\\\Windows NT\\\\CurrentVersion', 'ProductName') + ' ' + winstr.substring(winstr.indexOf('['));\ + }\ }\ this.promise._acc(winstr);\ break;\