diff --git a/meshcore/KVM/Linux/linux_kvm.c b/meshcore/KVM/Linux/linux_kvm.c index 11f9a68..41ef6e9 100644 --- a/meshcore/KVM/Linux/linux_kvm.c +++ b/meshcore/KVM/Linux/linux_kvm.c @@ -1338,10 +1338,13 @@ void* kvm_relay_restart(int paused, void *processPipeMgr, ILibKVM_WriteHandler w close(slave2master[1]); close(master2slave[0]); logFile = fopen("/tmp/master", "w"); + char tmp[255]; + sprintf_s(tmp, sizeof(tmp), "Child KVM (pid=%d)", g_slavekvm); // We will asyncronously read from the pipe, so we can just return ILibProcessPipe_Pipe_AddPipeReadHandler(slave_out, 65535, kvm_relay_readSink); ILibProcessPipe_Pipe_SetBrokenPipeHandler(slave_out, kvm_relay_brokenPipeSink); + ILibProcessPipe_Pipe_ResetMetadata(slave_out, tmp); return(slave_out); } } diff --git a/microscript/ILibDuktape_ChildProcess.c b/microscript/ILibDuktape_ChildProcess.c index 7073b87..538fa58 100644 --- a/microscript/ILibDuktape_ChildProcess.c +++ b/microscript/ILibDuktape_ChildProcess.c @@ -295,8 +295,9 @@ ILibDuktape_ChildProcess_SubProcess* ILibDuktape_ChildProcess_SpawnedProcess_PUS #endif if (callback != NULL) { ILibDuktape_EventEmitter_AddOnce(emitter, "exit", callback); } - - ILibProcessPipe_Process_ResetMetadata(mProcess, "childProcess"); + char tmp[255]; + sprintf_s(tmp, sizeof(tmp), "childProcess (pid=%d)", ILibProcessPipe_Process_GetPID(mProcess)); + ILibProcessPipe_Process_ResetMetadata(mProcess, tmp); ILibProcessPipe_Process_AddHandlers(mProcess, 4096, ILibDuktape_ChildProcess_SubProcess_ExitHandler, ILibDuktape_ChildProcess_SubProcess_StdOutHandler, ILibDuktape_ChildProcess_SubProcess_StdErrHandler, diff --git a/microscript/ILibDuktape_Polyfills.c b/microscript/ILibDuktape_Polyfills.c index 485f108..ba854c9 100644 --- a/microscript/ILibDuktape_Polyfills.c +++ b/microscript/ILibDuktape_Polyfills.c @@ -2203,11 +2203,11 @@ void ILibDuktape_Polyfills_JS_Init(duk_context *ctx) free(_toaster); // notifybar-desktop, refer to modules/notifybar-desktop.js - char *_notifybardesktop = ILibMemory_Allocate(37242, 0, NULL, NULL); - memcpy_s(_notifybardesktop + 0, 21280, "/*
Copyright 2019 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 ptrsize = require('_GenericMarshal').PointerSize;
var ClientMessage = 33;


function windows_notifybar_check(title, tsid)
{
    if(require('user-sessions').getProcessOwnerName(process.pid).tsid == 0)
    {
        return (windows_notifybar_system(title, tsid));
    }
    else
    {
        return (windows_notifybar_local(title));
    }
}
function windows_notifybar_system(title, tsid)
{
    var ret = {};

    var script = Buffer.from("require('notifybar-desktop')('" + title + "').on('close', function(){process._exit();});").toString('base64');

    require('events').EventEmitter.call(ret, true)
        .createEvent('close')
        .addMethod('close', function close() { this.child.kill(); });

    ret.child = require('child_process').execFile(process.execPath, [process.execPath.split('\\').pop(), '-b64exec', script], { type: 1, uid: tsid });
    ret.child.parent = ret;
    ret.child.stdout.on('data', function (c) { });
    ret.child.stderr.on('data', function (c) { });
    ret.child.on('exit', function (code) { this.parent.emit('close', code); });

    return (ret);
}

function windows_notifybar_local(title)
{
    var MessagePump;
    var ret;

    MessagePump = require('win-message-pump');
    ret = { _ObjectID: 'notifybar-desktop.Windows', title: title, _pumps: [], _promise: require('monitor-info').getInfo() };

    ret._promise.notifybar = ret;
    require('events').EventEmitter.call(ret, true)
        .createEvent('close')
        .addMethod('close', function close()
        {
            for (var i = 0; i < this._pumps.length; ++i)
            {
                this._pumps[i].removeAllListeners('exit');
                this._pumps[i].close();
            }
            this._pumps = [];
        });

    ret._promise.then(function (m)
    {
        var offset;
        var barWidth, monWidth, offset, barHeight, monHeight;

        for (var i in m)
        {
            //console.log('Monitor: ' + i + ' = Width[' + (m[i].right - m[i].left) + ']');
            monWidth = (m[i].right - m[i].left);
            monHeight = (m[i].bottom - m[i].top);
            barWidth = Math.floor(monWidth * 0.30);
            barHeight = Math.floor(monHeight * 0.035);
            offset = Math.floor(monWidth * 0.50) - Math.floor(barWidth * 0.50);
            start = m[i].left + offset;
            var options =
                {
                    window:
                    {
                        winstyles: MessagePump.WindowStyles.WS_VISIBLE | MessagePump.WindowStyles.WS_BORDER | MessagePump.WindowStyles.WS_CAPTION | MessagePump.WindowStyles.WS_SYSMENU,
                        x: start, y: m[i].top, left: m[i].left, right: m[i].right, width: barWidth, height: barHeight, title: this.notifybar.title
                    }
                };
            
            this.notifybar._pumps.push(new MessagePump(options));
            this.notifybar._pumps.peek().notifybar = this.notifybar;
            this.notifybar._pumps.peek().on('hwnd', function (h)
            {
                this._HANDLE = h;
            });
            this.notifybar._pumps.peek().on('exit', function (h)
            {             
                for (var i = 0; i < this.notifybar._pumps.length; ++i)
                {
                    this.notifybar._pumps[i].removeAllListeners('exit');
                    this.notifybar._pumps[i].close();
                }
                this.notifybar.emit('close');
                this.notifybar._pumps = [];
            });
            this.notifybar._pumps.peek().on('message', function onWindowsMessage(msg)
            {
                if (msg.message == 133)
                {
                    //console.log("WM_NCPAINT");
                }
                if (msg.message == 70)   // We are intercepting WM_WINDOWPOSCHANGING to DISABLE moving the window
                {
                    if (this._HANDLE)
                    {
                        var flags = 0;
                        switch (ptrsize)
                        {
                            case 4:
                                flags = msg.lparam_raw.Deref(24, 4).toBuffer().readUInt32LE() | 0x0002; // Set SWP_NOMOVE
                                if (msg.lparam_raw.Deref(8, 4).toBuffer().readInt32LE() < this._options.window.left ||
                                    (msg.lparam_raw.Deref(8, 4).toBuffer().readInt32LE() + this._options.window.width) >= this._options.window.right)
                                {
                                    // Disallow this move, because it will go out of bounds of the current monitor
                                    msg.lparam_raw.Deref(24, 4).toBuffer().writeUInt32LE(flags);
                                }
                                else
                                {
                                    // Allow the move, but only on the X-axis
                                    msg.lparam_raw.Deref(12, 4).toBuffer().writeInt32LE(this._options.window.y);
                                }
                                break;
                            case 8:
                                flags = msg.lparam_raw.Deref(32, 4).toBuffer().readUInt32LE() | 0x0002  // Set SWP_NOMOVE
                                if (msg.lparam_raw.Deref(16, 4).toBuffer().readInt32LE() < this._options.window.left || 
                                    (msg.lparam_raw.Deref(16, 4).toBuffer().readInt32LE() + this._options.window.width) >= this._options.window.right)
                                {
                                    // Disallow this move, because it will go out of bounds of the current monitor
                                    msg.lparam_raw.Deref(32, 4).toBuffer().writeUInt32LE(flags);
                                }
                                else
                                {
                                    // Allow the move, but only on the X-axis
                                    msg.lparam_raw.Deref(20, 4).toBuffer().writeInt32LE(this._options.window.y);
                                }
                                break;
                        }
                    }
                }
            });
        }
    });

    return (ret);
}


function x_notifybar_check(title)
{
    var script = Buffer.from("require('notifybar-desktop')('" + title + "').on('close', function(){process.exit();});").toString('base64');

    var min = require('user-sessions').minUid();
    var uid = require('user-sessions').consoleUid();
    var self = require('user-sessions').Self();

    if (self != 0 || uid == 0)
    {
        return (x_notifybar(title)); // No Dispatching necessary
    }
    else
    {
        // We are root, so we should try to spawn a child into the user's desktop
        if (uid < min && uid != 0)
        {
            // Lets hook login event, so we can respawn the bars later
            var ret = { min: min };
            require('events').EventEmitter.call(ret, true)
                .createEvent('close')
                .addMethod('close', function close()
                {
                    require('user-sessions').removeListener('changed', this._changed);
                    this._close2();
                });
            ret._changed = function _changed()
            {
                var that = _changed.self;
                var uid = require('user-sessions').consoleUid();
                if (uid >= that.min)
                {
                    that._close2 = function ()
                    {
                        this.child.kill();
                    };
                    var xinfo = require('monitor-info').getXInfo(uid);
                    that.child = require('child_process').execFile(process.execPath, [process.execPath.split('/').pop(), '-b64exec', script], { uid: uid, env: xinfo.exportEnv() });
                    that.child.parent = that;
                    that.child.stdout.on('data', function (c) { });
                    that.child.stderr.on('data', function (c) { });
                    that.child.on('exit', function (code) { this.parent.emit('close', code); });
                }
            };
            ret._changed.self = ret;
            require('user-sessions').on('changed', ret._changed);
            ret._close2 = function _close2()
            {
                this.emit('close');
            };
            return (ret);
        }

        var xinfo = require('monitor-info').getXInfo(uid);
        if (!xinfo)
        {
            throw('XServer Initialization Error')
        }
        var ret = {};
        require('events').EventEmitter.call(ret, true)
            .createEvent('close')
            .addMethod('close', function close() { this.child.kill(); });

        ret.child = require('child_process').execFile(process.execPath, [process.execPath.split('/').pop(), '-b64exec', script], { uid: uid, env: xinfo.exportEnv() });
        ret.child.parent = ret;
        ret.child.stdout.on('data', function (c) { });
        ret.child.stderr.on('data', function (c) { });
        ret.child.on('exit', function (code) { this.parent.emit('close', code); });

        return (ret);
    }
}

function x_notifybar(title)
{
    ret = { _ObjectID: 'notifybar-desktop.X', title: title, _windows: [], _promise: require('monitor-info').getInfo(), monitors: [], workspaces: {} };

    ret._promise.notifybar = ret;
    require('events').EventEmitter.call(ret, true)
        .createEvent('close')
        .addMethod('close', function close()
        {
        });

    ret._promise.createBars = function (m)
    {
        for (var i in m)
        {
            monWidth = (m[i].right - m[i].left);
            monHeight = (m[i].bottom - m[i].top);
            barWidth = Math.floor(monWidth * 0.30);
            barHeight = Math.floor(monHeight * 0.035);
            offset = Math.floor(monWidth * 0.50) - Math.floor(barWidth * 0.50);
            start = m[i].left + offset;

            var white = require('monitor-info')._X11.XWhitePixel(m[i].display, m[i].screenId).Val;
            this.notifybar._windows.push({
                root: require('monitor-info')._X11.XRootWindow(m[i].display, m[i].screenId),
                display: m[i].display, id: m[i].screedId
            });

            this.notifybar._windows.peek().notifybar = require('monitor-info')._X11.XCreateSimpleWindow(m[i].display, this.notifybar._windows.peek().root, start, 0, barWidth, 1, 0, white, white);
            require('monitor-info')._X11.XStoreName(m[i].display, this.notifybar._windows.peek().notifybar, require('_GenericMarshal').CreateVariable(this.notifybar.title));

            require('monitor-info').setWindowSizeHints(m[i].display, this.notifybar._windows.peek().notifybar, start, 0, barWidth, 1, barWidth, 1, barWidth, 1);
            require('monitor-info').hideWindowIcon(m[i].display, this.notifybar._windows.peek().root, this.notifybar._windows.peek().notifybar);

            require('monitor-info').setAllowedActions(m[i].display, this.notifybar._windows.peek().notifybar, require('monitor-info').MOTIF_FLAGS.MWM_FUNC_CLOSE);
            require('monitor-info').setAlwaysOnTop(m[i].display, this.notifybar._windows.", 16000); - memcpy_s(_notifybardesktop + 16000, 5280, "cGVlaygpLnJvb3QsIHRoaXMubm90aWZ5YmFyLl93aW5kb3dzLnBlZWsoKS5ub3RpZnliYXIpOw0KDQoNCiAgICAgICAgICAgIHZhciB3bV9kZWxldGVfd2luZG93X2F0b20gPSByZXF1aXJlKCdtb25pdG9yLWluZm8nKS5fWDExLlhJbnRlcm5BdG9tKG1baV0uZGlzcGxheSwgcmVxdWlyZSgnX0dlbmVyaWNNYXJzaGFsJykuQ3JlYXRlVmFyaWFibGUoJ1dNX0RFTEVURV9XSU5ET1cnKSwgMCkuVmFsOw0KICAgICAgICAgICAgdmFyIGF0b21zID0gcmVxdWlyZSgnX0dlbmVyaWNNYXJzaGFsJykuQ3JlYXRlVmFyaWFibGUoNCk7DQogICAgICAgICAgICBhdG9tcy50b0J1ZmZlcigpLndyaXRlVUludDMyTEUod21fZGVsZXRlX3dpbmRvd19hdG9tKTsNCiAgICAgICAgICAgIHJlcXVpcmUoJ21vbml0b3ItaW5mbycpLl9YMTEuWFNldFdNUHJvdG9jb2xzKG1baV0uZGlzcGxheSwgdGhpcy5ub3RpZnliYXIuX3dpbmRvd3MucGVlaygpLm5vdGlmeWJhciwgYXRvbXMsIDEpOw0KDQogICAgICAgICAgICByZXF1aXJlKCdtb25pdG9yLWluZm8nKS5fWDExLlhNYXBXaW5kb3cobVtpXS5kaXNwbGF5LCB0aGlzLm5vdGlmeWJhci5fd2luZG93cy5wZWVrKCkubm90aWZ5YmFyKTsNCiAgICAgICAgICAgIHJlcXVpcmUoJ21vbml0b3ItaW5mbycpLl9YMTEuWEZsdXNoKG1baV0uZGlzcGxheSk7DQoNCiAgICAgICAgICAgIHRoaXMubm90aWZ5YmFyLl93aW5kb3dzLnBlZWsoKS5EZXNjcmlwdG9yRXZlbnQgPSByZXF1aXJlKCdEZXNjcmlwdG9yRXZlbnRzJykuYWRkRGVzY3JpcHRvcihyZXF1aXJlKCdtb25pdG9yLWluZm8nKS5fWDExLlhDb25uZWN0aW9uTnVtYmVyKG1baV0uZGlzcGxheSkuVmFsLCB7IHJlYWRzZXQ6IHRydWUgfSk7DQogICAgICAgICAgICB0aGlzLm5vdGlmeWJhci5fd2luZG93cy5wZWVrKCkuRGVzY3JpcHRvckV2ZW50LmF0b20gPSB3bV9kZWxldGVfd2luZG93X2F0b207DQogICAgICAgICAgICB0aGlzLm5vdGlmeWJhci5fd2luZG93cy5wZWVrKCkuRGVzY3JpcHRvckV2ZW50LnJldCA9IHRoaXMubm90aWZ5YmFyOw0KICAgICAgICAgICAgdGhpcy5ub3RpZnliYXIuX3dpbmRvd3MucGVlaygpLkRlc2NyaXB0b3JFdmVudC5fZGlzcGxheSA9IG1baV0uZGlzcGxheTsNCiAgICAgICAgICAgIHRoaXMubm90aWZ5YmFyLl93aW5kb3dzLnBlZWsoKS5EZXNjcmlwdG9yRXZlbnQub24oJ3JlYWRzZXQnLCBmdW5jdGlvbiAoZmQpDQogICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgdmFyIFhFID0gcmVxdWlyZSgnX0dlbmVyaWNNYXJzaGFsJykuQ3JlYXRlVmFyaWFibGUoMTAyNCk7DQogICAgICAgICAgICAgICAgd2hpbGUgKHJlcXVpcmUoJ21vbml0b3ItaW5mbycpLl9YMTEuWFBlbmRpbmcodGhpcy5fZGlzcGxheSkuVmFsKQ0KICAgICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAgcmVxdWlyZSgnbW9uaXRvci1pbmZvJykuX1gxMS5YTmV4dEV2ZW50U3luYyh0aGlzLl9kaXNwbGF5LCBYRSk7DQogICAgICAgICAgICAgICAgICAgIGlmIChYRS5EZXJlZigwLCA0KS50b0J1ZmZlcigpLnJlYWRVSW50MzJMRSgpID09IENsaWVudE1lc3NhZ2UpDQogICAgICAgICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAgICAgIHZhciBjbGllbnRUeXBlID0gWEUuRGVyZWYocmVxdWlyZSgnX0dlbmVyaWNNYXJzaGFsJykuUG9pbnRlclNpemUgPT0gOCA/IDU2IDogMjgsIDQpLnRvQnVmZmVyKCkucmVhZFVJbnQzMkxFKCk7DQogICAgICAgICAgICAgICAgICAgICAgICBpZiAoY2xpZW50VHlwZSA9PSB0aGlzLmF0b20pDQogICAgICAgICAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVxdWlyZSgnRGVzY3JpcHRvckV2ZW50cycpLnJlbW92ZURlc2NyaXB0b3IoZmQpOw0KICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlcXVpcmUoJ21vbml0b3ItaW5mbycpLl9YMTEuWENsb3NlRGlzcGxheSh0aGlzLl9kaXNwbGF5KTsNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXQuZW1pdCgnY2xvc2UnKTsNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXQuX3dpbmRvd3MuY2xlYXIoKTsNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsNCiAgICAgICAgICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgIH0pOw0KICAgICAgICB9DQogICAgfTsNCiAgICByZXQuX3Byb21pc2UudGhlbihmdW5jdGlvbiAobSkNCiAgICB7DQogICAgICAgIHZhciBvZmZzZXQ7DQogICAgICAgIHZhciBiYXJXaWR0aCwgbW9uV2lkdGgsIG9mZnNldCwgYmFySGVpZ2h0LCBtb25IZWlnaHQ7DQogICAgICAgIHRoaXMubm90aWZ5YmFyLm1vbml0b3JzID0gbTsNCiAgICAgICAgaWYgKG0ubGVuZ3RoID4gMCkNCiAgICAgICAgew0KICAgICAgICAgICAgdmFyIHdzID0gMDsNCiAgICAgICAgICAgIHRyeQ0KICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgIHdzID0gbVswXS5kaXNwbGF5LmdldEN1cnJlbnRXb3Jrc3BhY2UoKTsNCiAgICAgICAgICAgICAgICB0aGlzLm5vdGlmeWJhci53b3Jrc3BhY2VzW3dzXSA9IHRydWU7DQogICAgICAgICAgICAgICAgdGhpcy5jcmVhdGVCYXJzKG0pOw0KICAgICAgICAgICAgfSANCiAgICAgICAgICAgIGNhdGNoKHdleCkNCiAgICAgICAgICAgIHsNCiAgICAgICAgICAgIH0NCg0KICAgICAgICAgICAgbVswXS5kaXNwbGF5Ll9ub3RpZnlCYXIgPSB0aGlzLm5vdGlmeWJhcjsNCiAgICAgICAgICAgIG1bMF0uZGlzcGxheS5vbignd29ya3NwYWNlQ2hhbmdlZCcsIGZ1bmN0aW9uICh3KQ0KICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgIGlmKCF0aGlzLl9ub3RpZnlCYXIud29ya3NwYWNlc1t3XSkNCiAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgIHRoaXMuX25vdGlmeUJhci53b3Jrc3BhY2VzW3ddID0gdHJ1ZTsNCiAgICAgICAgICAgICAgICAgICAgdGhpcy5fbm90aWZ5QmFyLl9wcm9taXNlLmNyZWF0ZUJhcnModGhpcy5fbm90aWZ5QmFyLm1vbml0b3JzKTsNCiAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICB9KTsNCiAgICAgICAgfQ0KICAgICAgIA0KICAgIH0pOw0KICAgIHJldHVybiAocmV0KTsNCn0NCg0KZnVuY3Rpb24gbWFjb3NfbWVzc2FnZWJveCh0aXRsZSkNCnsNCiAgICB2YXIgcmV0ID0ge307DQogICAgcmVxdWlyZSgnZXZlbnRzJykuRXZlbnRFbWl0dGVyLmNhbGwocmV0LCB0cnVlKQ0KICAgICAgICAuY3JlYXRlRXZlbnQoJ2Nsb3NlJykNCiAgICAgICAgLmFkZE1ldGhvZCgnY2xvc2UnLCBmdW5jdGlvbiBjbG9zZSgpIHsgdGhpcy5fbWVzc2FnZUJveC5jbG9zZSgpOyB9KTsNCiAgICByZXQuX21lc3NhZ2VCb3ggPSByZXF1aXJlKCdtZXNzYWdlLWJveCcpLmNyZWF0ZSgnJywgdGl0bGUsIDAsIFsnRGlzY29ubmVjdCddKTsNCiAgICByZXQuX21lc3NhZ2VCb3gudGhhdCA9IHJldDsNCiAgICByZXQuX21lc3NhZ2VCb3gudGhlbihmdW5jdGlvbiAoKSB7IHRoaXMudGhhdC5lbWl0KCdjbG9zZScpOyB9LCBmdW5jdGlvbiAoKSB7IHRoaXMudGhhdC5lbWl0KCdjbG9zZScpOyB9KTsNCiAgICByZXR1cm4gKHJldCk7DQp9DQoNCnN3aXRjaChwcm9jZXNzLnBsYXRmb3JtKQ0Kew0KICAgIGNhc2UgJ3dpbjMyJzoNCiAgICAgICAgbW9kdWxlLmV4cG9ydHMgPSB3aW5kb3dzX25vdGlmeWJhcl9jaGVjazsNCiAgICAgICAgbW9kdWxlLmV4cG9ydHMuc3lzdGVtID0gd2luZG93c19ub3RpZnliYXJfc3lzdGVtOw0KICAgICAgICBicmVhazsNCiAgICBjYXNlICdsaW51eCc6DQogICAgY2FzZSAnZnJlZWJzZCc6DQogICAgICAgIG1vZHVsZS5leHBvcnRzID0geF9ub3RpZnliYXJfY2hlY2s7DQogICAgICAgIGJyZWFrOw0KICAgIGNhc2UgJ2Rhcndpbic6DQogICAgICAgIG1vZHVsZS5leHBvcnRzID0gbWFjb3NfbWVzc2FnZWJveDsNCiAgICAgICAgYnJlYWs7DQp9DQoNCg0K", 5280); - ILibBase64DecodeEx((unsigned char*)_notifybardesktop, 21280, (unsigned char*)_notifybardesktop + 21280); - duk_push_global_object(ctx); duk_get_prop_string(ctx, -1, "addModule"); duk_swap_top(ctx, -2); duk_push_string(ctx, "notifybar-desktop"); duk_push_string(ctx, _notifybardesktop + 21280); + char *_notifybardesktop = ILibMemory_Allocate(37690, 0, NULL, NULL); + memcpy_s(_notifybardesktop + 0, 21536, "/*
Copyright 2019 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 ptrsize = require('_GenericMarshal').PointerSize;
var ClientMessage = 33;


function windows_notifybar_check(title, tsid)
{
    if(require('user-sessions').getProcessOwnerName(process.pid).tsid == 0)
    {
        return (windows_notifybar_system(title, tsid));
    }
    else
    {
        return (windows_notifybar_local(title));
    }
}
function windows_notifybar_system(title, tsid)
{
    var ret = {};

    var script = Buffer.from("require('notifybar-desktop')('" + title + "').on('close', function(){process._exit();});").toString('base64');

    require('events').EventEmitter.call(ret, true)
        .createEvent('close')
        .addMethod('close', function close() { this.child.kill(); });

    ret.child = require('child_process').execFile(process.execPath, [process.execPath.split('\\').pop(), '-b64exec', script], { type: 1, uid: tsid });
    ret.child.descriptorMetadata = 'notifybar-desktop';
    ret.child.parent = ret;
    ret.child.stdout.on('data', function (c) { });
    ret.child.stderr.on('data', function (c) { });
    ret.child.on('exit', function (code) { this.parent.emit('close', code); });

    return (ret);
}

function windows_notifybar_local(title)
{
    var MessagePump;
    var ret;

    MessagePump = require('win-message-pump');
    ret = { _ObjectID: 'notifybar-desktop.Windows', title: title, _pumps: [], _promise: require('monitor-info').getInfo() };

    ret._promise.notifybar = ret;
    require('events').EventEmitter.call(ret, true)
        .createEvent('close')
        .addMethod('close', function close()
        {
            for (var i = 0; i < this._pumps.length; ++i)
            {
                this._pumps[i].removeAllListeners('exit');
                this._pumps[i].close();
            }
            this._pumps = [];
        });

    ret._promise.then(function (m)
    {
        var offset;
        var barWidth, monWidth, offset, barHeight, monHeight;

        for (var i in m)
        {
            //console.log('Monitor: ' + i + ' = Width[' + (m[i].right - m[i].left) + ']');
            monWidth = (m[i].right - m[i].left);
            monHeight = (m[i].bottom - m[i].top);
            barWidth = Math.floor(monWidth * 0.30);
            barHeight = Math.floor(monHeight * 0.035);
            offset = Math.floor(monWidth * 0.50) - Math.floor(barWidth * 0.50);
            start = m[i].left + offset;
            var options =
                {
                    window:
                    {
                        winstyles: MessagePump.WindowStyles.WS_VISIBLE | MessagePump.WindowStyles.WS_BORDER | MessagePump.WindowStyles.WS_CAPTION | MessagePump.WindowStyles.WS_SYSMENU,
                        x: start, y: m[i].top, left: m[i].left, right: m[i].right, width: barWidth, height: barHeight, title: this.notifybar.title
                    }
                };
            
            this.notifybar._pumps.push(new MessagePump(options));
            this.notifybar._pumps.peek().notifybar = this.notifybar;
            this.notifybar._pumps.peek().on('hwnd', function (h)
            {
                this._HANDLE = h;
            });
            this.notifybar._pumps.peek().on('exit', function (h)
            {             
                for (var i = 0; i < this.notifybar._pumps.length; ++i)
                {
                    this.notifybar._pumps[i].removeAllListeners('exit');
                    this.notifybar._pumps[i].close();
                }
                this.notifybar.emit('close');
                this.notifybar._pumps = [];
            });
            this.notifybar._pumps.peek().on('message', function onWindowsMessage(msg)
            {
                if (msg.message == 133)
                {
                    //console.log("WM_NCPAINT");
                }
                if (msg.message == 70)   // We are intercepting WM_WINDOWPOSCHANGING to DISABLE moving the window
                {
                    if (this._HANDLE)
                    {
                        var flags = 0;
                        switch (ptrsize)
                        {
                            case 4:
                                flags = msg.lparam_raw.Deref(24, 4).toBuffer().readUInt32LE() | 0x0002; // Set SWP_NOMOVE
                                if (msg.lparam_raw.Deref(8, 4).toBuffer().readInt32LE() < this._options.window.left ||
                                    (msg.lparam_raw.Deref(8, 4).toBuffer().readInt32LE() + this._options.window.width) >= this._options.window.right)
                                {
                                    // Disallow this move, because it will go out of bounds of the current monitor
                                    msg.lparam_raw.Deref(24, 4).toBuffer().writeUInt32LE(flags);
                                }
                                else
                                {
                                    // Allow the move, but only on the X-axis
                                    msg.lparam_raw.Deref(12, 4).toBuffer().writeInt32LE(this._options.window.y);
                                }
                                break;
                            case 8:
                                flags = msg.lparam_raw.Deref(32, 4).toBuffer().readUInt32LE() | 0x0002  // Set SWP_NOMOVE
                                if (msg.lparam_raw.Deref(16, 4).toBuffer().readInt32LE() < this._options.window.left || 
                                    (msg.lparam_raw.Deref(16, 4).toBuffer().readInt32LE() + this._options.window.width) >= this._options.window.right)
                                {
                                    // Disallow this move, because it will go out of bounds of the current monitor
                                    msg.lparam_raw.Deref(32, 4).toBuffer().writeUInt32LE(flags);
                                }
                                else
                                {
                                    // Allow the move, but only on the X-axis
                                    msg.lparam_raw.Deref(20, 4).toBuffer().writeInt32LE(this._options.window.y);
                                }
                                break;
                        }
                    }
                }
            });
        }
    });

    return (ret);
}


function x_notifybar_check(title)
{
    var script = Buffer.from("require('notifybar-desktop')('" + title + "').on('close', function(){process.exit();});").toString('base64');

    var min = require('user-sessions').minUid();
    var uid = require('user-sessions').consoleUid();
    var self = require('user-sessions').Self();

    if (self != 0 || uid == 0)
    {
        return (x_notifybar(title)); // No Dispatching necessary
    }
    else
    {
        // We are root, so we should try to spawn a child into the user's desktop
        if (uid < min && uid != 0)
        {
            // Lets hook login event, so we can respawn the bars later
            var ret = { min: min };
            require('events').EventEmitter.call(ret, true)
                .createEvent('close')
                .addMethod('close', function close()
                {
                    require('user-sessions').removeListener('changed', this._changed);
                    this._close2();
                });
            ret._changed = function _changed()
            {
                var that = _changed.self;
                var uid = require('user-sessions').consoleUid();
                if (uid >= that.min)
                {
                    that._close2 = function ()
                    {
                        this.child.kill();
                    };
                    var xinfo = require('monitor-info').getXInfo(uid);
                    that.child = require('child_process').execFile(process.execPath, [process.execPath.split('/').pop(), '-b64exec', script], { uid: uid, env: xinfo.exportEnv() });
                    that.child.descriptorMetadata = 'notifybar-desktop';
                    that.child.parent = that;
                    that.child.stdout.on('data', function (c) { });
                    that.child.stderr.on('data', function (c) { });
                    that.child.on('exit', function (code) { this.parent.emit('close', code); });
                }
            };
            ret._changed.self = ret;
            require('user-sessions').on('changed', ret._changed);
            ret._close2 = function _close2()
            {
                this.emit('close');
            };
            return (ret);
        }

        var xinfo = require('monitor-info').getXInfo(uid);
        if (!xinfo)
        {
            throw('XServer Initialization Error')
        }
        var ret = {};
        require('events').EventEmitter.call(ret, true)
            .createEvent('close')
            .addMethod('close', function close() { this.child.kill(); });

        ret.child = require('child_process').execFile(process.execPath, [process.execPath.split('/').pop(), '-b64exec', script], { uid: uid, env: xinfo.exportEnv() });
        ret.child.descriptorMetadata = 'notifybar-desktop';
        ret.child.parent = ret;
        ret.child.stdout.on('data', function (c) { });
        ret.child.stderr.on('data', function (c) { });
        ret.child.on('exit', function (code) { this.parent.emit('close', code); });

        return (ret);
    }
}

function x_notifybar(title)
{
    ret = { _ObjectID: 'notifybar-desktop.X', title: title, _windows: [], _promise: require('monitor-info').getInfo(), monitors: [], workspaces: {} };

    ret._promise.notifybar = ret;
    require('events').EventEmitter.call(ret, true)
        .createEvent('close')
        .addMethod('close', function close()
        {
        });

    ret._promise.createBars = function (m)
    {
        for (var i in m)
        {
            monWidth = (m[i].right - m[i].left);
            monHeight = (m[i].bottom - m[i].top);
            barWidth = Math.floor(monWidth * 0.30);
            barHeight = Math.floor(monHeight * 0.035);
            offset = Math.floor(monWidth * 0.50) - Math.floor(barWidth * 0.50);
            start = m[i].left + offset;

            var white = require('monitor-info')._X11.XWhitePixel(m[i].display, m[i].screenId).Val;
            this.notifybar._windows.push({
                root: require('monitor-info')._X11.XRootWindow(m[i].display, m[i].screenId),
                display: m[i].display, id: m[i].screedId
            });

            this.notifybar._windows.peek().notifybar = require('monitor-info')._X11.XCreateSimpleWindow(m[i].display, this.notifybar._windows.peek().root, start, 0, barWidth, 1, 0, white, white);
            require('monitor-info')._X11.XStoreName(m[i].display, this.notifybar._windows.peek().notifybar, require('_GenericMarshal').CreateVariable(this.notifybar.title));

            require('monitor-info').setWindowSizeHints(m[i].display, this.notifybar._windows.peek().notifybar, start, 0, barWidth, 1, barWidth, 1, barWidth, 1);
            require('monitor-info').hideWindowIcon(m[i].display, this.notifybar._windows.peek().root, this.notifybar._windows.peek().notifybar);

            require('monitor-info').setAllowedActions(m[i].di", 16000); + memcpy_s(_notifybardesktop + 16000, 5536, "c3BsYXksIHRoaXMubm90aWZ5YmFyLl93aW5kb3dzLnBlZWsoKS5ub3RpZnliYXIsIHJlcXVpcmUoJ21vbml0b3ItaW5mbycpLk1PVElGX0ZMQUdTLk1XTV9GVU5DX0NMT1NFKTsNCiAgICAgICAgICAgIHJlcXVpcmUoJ21vbml0b3ItaW5mbycpLnNldEFsd2F5c09uVG9wKG1baV0uZGlzcGxheSwgdGhpcy5ub3RpZnliYXIuX3dpbmRvd3MucGVlaygpLnJvb3QsIHRoaXMubm90aWZ5YmFyLl93aW5kb3dzLnBlZWsoKS5ub3RpZnliYXIpOw0KDQoNCiAgICAgICAgICAgIHZhciB3bV9kZWxldGVfd2luZG93X2F0b20gPSByZXF1aXJlKCdtb25pdG9yLWluZm8nKS5fWDExLlhJbnRlcm5BdG9tKG1baV0uZGlzcGxheSwgcmVxdWlyZSgnX0dlbmVyaWNNYXJzaGFsJykuQ3JlYXRlVmFyaWFibGUoJ1dNX0RFTEVURV9XSU5ET1cnKSwgMCkuVmFsOw0KICAgICAgICAgICAgdmFyIGF0b21zID0gcmVxdWlyZSgnX0dlbmVyaWNNYXJzaGFsJykuQ3JlYXRlVmFyaWFibGUoNCk7DQogICAgICAgICAgICBhdG9tcy50b0J1ZmZlcigpLndyaXRlVUludDMyTEUod21fZGVsZXRlX3dpbmRvd19hdG9tKTsNCiAgICAgICAgICAgIHJlcXVpcmUoJ21vbml0b3ItaW5mbycpLl9YMTEuWFNldFdNUHJvdG9jb2xzKG1baV0uZGlzcGxheSwgdGhpcy5ub3RpZnliYXIuX3dpbmRvd3MucGVlaygpLm5vdGlmeWJhciwgYXRvbXMsIDEpOw0KDQogICAgICAgICAgICByZXF1aXJlKCdtb25pdG9yLWluZm8nKS5fWDExLlhNYXBXaW5kb3cobVtpXS5kaXNwbGF5LCB0aGlzLm5vdGlmeWJhci5fd2luZG93cy5wZWVrKCkubm90aWZ5YmFyKTsNCiAgICAgICAgICAgIHJlcXVpcmUoJ21vbml0b3ItaW5mbycpLl9YMTEuWEZsdXNoKG1baV0uZGlzcGxheSk7DQoNCiAgICAgICAgICAgIHRoaXMubm90aWZ5YmFyLl93aW5kb3dzLnBlZWsoKS5EZXNjcmlwdG9yRXZlbnQgPSByZXF1aXJlKCdEZXNjcmlwdG9yRXZlbnRzJykuYWRkRGVzY3JpcHRvcihyZXF1aXJlKCdtb25pdG9yLWluZm8nKS5fWDExLlhDb25uZWN0aW9uTnVtYmVyKG1baV0uZGlzcGxheSkuVmFsLCB7IHJlYWRzZXQ6IHRydWUgfSk7DQogICAgICAgICAgICB0aGlzLm5vdGlmeWJhci5fd2luZG93cy5wZWVrKCkuRGVzY3JpcHRvckV2ZW50LmF0b20gPSB3bV9kZWxldGVfd2luZG93X2F0b207DQogICAgICAgICAgICB0aGlzLm5vdGlmeWJhci5fd2luZG93cy5wZWVrKCkuRGVzY3JpcHRvckV2ZW50LnJldCA9IHRoaXMubm90aWZ5YmFyOw0KICAgICAgICAgICAgdGhpcy5ub3RpZnliYXIuX3dpbmRvd3MucGVlaygpLkRlc2NyaXB0b3JFdmVudC5fZGlzcGxheSA9IG1baV0uZGlzcGxheTsNCiAgICAgICAgICAgIHRoaXMubm90aWZ5YmFyLl93aW5kb3dzLnBlZWsoKS5EZXNjcmlwdG9yRXZlbnQub24oJ3JlYWRzZXQnLCBmdW5jdGlvbiAoZmQpDQogICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgdmFyIFhFID0gcmVxdWlyZSgnX0dlbmVyaWNNYXJzaGFsJykuQ3JlYXRlVmFyaWFibGUoMTAyNCk7DQogICAgICAgICAgICAgICAgd2hpbGUgKHJlcXVpcmUoJ21vbml0b3ItaW5mbycpLl9YMTEuWFBlbmRpbmcodGhpcy5fZGlzcGxheSkuVmFsKQ0KICAgICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAgcmVxdWlyZSgnbW9uaXRvci1pbmZvJykuX1gxMS5YTmV4dEV2ZW50U3luYyh0aGlzLl9kaXNwbGF5LCBYRSk7DQogICAgICAgICAgICAgICAgICAgIGlmIChYRS5EZXJlZigwLCA0KS50b0J1ZmZlcigpLnJlYWRVSW50MzJMRSgpID09IENsaWVudE1lc3NhZ2UpDQogICAgICAgICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAgICAgIHZhciBjbGllbnRUeXBlID0gWEUuRGVyZWYocmVxdWlyZSgnX0dlbmVyaWNNYXJzaGFsJykuUG9pbnRlclNpemUgPT0gOCA/IDU2IDogMjgsIDQpLnRvQnVmZmVyKCkucmVhZFVJbnQzMkxFKCk7DQogICAgICAgICAgICAgICAgICAgICAgICBpZiAoY2xpZW50VHlwZSA9PSB0aGlzLmF0b20pDQogICAgICAgICAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVxdWlyZSgnRGVzY3JpcHRvckV2ZW50cycpLnJlbW92ZURlc2NyaXB0b3IoZmQpOw0KICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlcXVpcmUoJ21vbml0b3ItaW5mbycpLl9YMTEuWENsb3NlRGlzcGxheSh0aGlzLl9kaXNwbGF5KTsNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXQuZW1pdCgnY2xvc2UnKTsNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXQuX3dpbmRvd3MuY2xlYXIoKTsNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsNCiAgICAgICAgICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgIH0pOw0KICAgICAgICB9DQogICAgfTsNCiAgICByZXQuX3Byb21pc2UudGhlbihmdW5jdGlvbiAobSkNCiAgICB7DQogICAgICAgIHZhciBvZmZzZXQ7DQogICAgICAgIHZhciBiYXJXaWR0aCwgbW9uV2lkdGgsIG9mZnNldCwgYmFySGVpZ2h0LCBtb25IZWlnaHQ7DQogICAgICAgIHRoaXMubm90aWZ5YmFyLm1vbml0b3JzID0gbTsNCiAgICAgICAgaWYgKG0ubGVuZ3RoID4gMCkNCiAgICAgICAgew0KICAgICAgICAgICAgdmFyIHdzID0gMDsNCiAgICAgICAgICAgIHRyeQ0KICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgIHdzID0gbVswXS5kaXNwbGF5LmdldEN1cnJlbnRXb3Jrc3BhY2UoKTsNCiAgICAgICAgICAgICAgICB0aGlzLm5vdGlmeWJhci53b3Jrc3BhY2VzW3dzXSA9IHRydWU7DQogICAgICAgICAgICAgICAgdGhpcy5jcmVhdGVCYXJzKG0pOw0KICAgICAgICAgICAgfSANCiAgICAgICAgICAgIGNhdGNoKHdleCkNCiAgICAgICAgICAgIHsNCiAgICAgICAgICAgIH0NCg0KICAgICAgICAgICAgbVswXS5kaXNwbGF5Ll9ub3RpZnlCYXIgPSB0aGlzLm5vdGlmeWJhcjsNCiAgICAgICAgICAgIG1bMF0uZGlzcGxheS5vbignd29ya3NwYWNlQ2hhbmdlZCcsIGZ1bmN0aW9uICh3KQ0KICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgIGlmKCF0aGlzLl9ub3RpZnlCYXIud29ya3NwYWNlc1t3XSkNCiAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgIHRoaXMuX25vdGlmeUJhci53b3Jrc3BhY2VzW3ddID0gdHJ1ZTsNCiAgICAgICAgICAgICAgICAgICAgdGhpcy5fbm90aWZ5QmFyLl9wcm9taXNlLmNyZWF0ZUJhcnModGhpcy5fbm90aWZ5QmFyLm1vbml0b3JzKTsNCiAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICB9KTsNCiAgICAgICAgfQ0KICAgICAgIA0KICAgIH0pOw0KICAgIHJldHVybiAocmV0KTsNCn0NCg0KZnVuY3Rpb24gbWFjb3NfbWVzc2FnZWJveCh0aXRsZSkNCnsNCiAgICB2YXIgcmV0ID0ge307DQogICAgcmVxdWlyZSgnZXZlbnRzJykuRXZlbnRFbWl0dGVyLmNhbGwocmV0LCB0cnVlKQ0KICAgICAgICAuY3JlYXRlRXZlbnQoJ2Nsb3NlJykNCiAgICAgICAgLmFkZE1ldGhvZCgnY2xvc2UnLCBmdW5jdGlvbiBjbG9zZSgpIHsgdGhpcy5fbWVzc2FnZUJveC5jbG9zZSgpOyB9KTsNCiAgICByZXQuX21lc3NhZ2VCb3ggPSByZXF1aXJlKCdtZXNzYWdlLWJveCcpLmNyZWF0ZSgnJywgdGl0bGUsIDAsIFsnRGlzY29ubmVjdCddKTsNCiAgICByZXQuX21lc3NhZ2VCb3gudGhhdCA9IHJldDsNCiAgICByZXQuX21lc3NhZ2VCb3gudGhlbihmdW5jdGlvbiAoKSB7IHRoaXMudGhhdC5lbWl0KCdjbG9zZScpOyB9LCBmdW5jdGlvbiAoKSB7IHRoaXMudGhhdC5lbWl0KCdjbG9zZScpOyB9KTsNCiAgICByZXR1cm4gKHJldCk7DQp9DQoNCnN3aXRjaChwcm9jZXNzLnBsYXRmb3JtKQ0Kew0KICAgIGNhc2UgJ3dpbjMyJzoNCiAgICAgICAgbW9kdWxlLmV4cG9ydHMgPSB3aW5kb3dzX25vdGlmeWJhcl9jaGVjazsNCiAgICAgICAgbW9kdWxlLmV4cG9ydHMuc3lzdGVtID0gd2luZG93c19ub3RpZnliYXJfc3lzdGVtOw0KICAgICAgICBicmVhazsNCiAgICBjYXNlICdsaW51eCc6DQogICAgY2FzZSAnZnJlZWJzZCc6DQogICAgICAgIG1vZHVsZS5leHBvcnRzID0geF9ub3RpZnliYXJfY2hlY2s7DQogICAgICAgIGJyZWFrOw0KICAgIGNhc2UgJ2Rhcndpbic6DQogICAgICAgIG1vZHVsZS5leHBvcnRzID0gbWFjb3NfbWVzc2FnZWJveDsNCiAgICAgICAgYnJlYWs7DQp9DQoNCg0K", 5536); + ILibBase64DecodeEx((unsigned char*)_notifybardesktop, 21536, (unsigned char*)_notifybardesktop + 21536); + duk_push_global_object(ctx); duk_get_prop_string(ctx, -1, "addModule"); duk_swap_top(ctx, -2); duk_push_string(ctx, "notifybar-desktop"); duk_push_string(ctx, _notifybardesktop + 21536); duk_pcall_method(ctx, 2); duk_pop(ctx); free(_notifybardesktop); diff --git a/microstack/ILibParsers.c b/microstack/ILibParsers.c index 45fec54..264bc98 100644 --- a/microstack/ILibParsers.c +++ b/microstack/ILibParsers.c @@ -3029,6 +3029,8 @@ char *ILibChain_GetMetaDataFromDescriptorSetEx(void *chain, fd_set *inr, fd_set fd_set emptyset; FD_ZERO(&emptyset); int selectTimeout = UPNP_MAX_WAIT * 1000; int f; + size_t tmp; + while (node != NULL && (module = (ILibChain_Link*)ILibLinkedList_GetDataFromNode(node)) != NULL) { if (module->PreSelectHandler != NULL) @@ -3064,7 +3066,7 @@ char *ILibChain_GetMetaDataFromDescriptorSetEx(void *chain, fd_set *inr, fd_set } for (f = 0; f < scount; ++f) { - len += sprintf_s(retStr + len, ILibMemory_Size(retStr) - len, " FD[%d] (R: %d, W: %d, E: %d) => %s\n", (int)slist[f], FD_ISSET(slist[f], inr), FD_ISSET(slist[f], inw), FD_ISSET(slist[f], ine), ((ILibChain_Link*)module)->MetaData); + len += sprintf_s(retStr + len, ILibMemory_Size(retStr) - len, " FD[%d] (R: %d, W: %d, E: %d) => %s\n", (int)slist[f], FD_ISSET(slist[f], inr), FD_ISSET(slist[f], inw), FD_ISSET(slist[f], ine), ((ILibChain_Link*)module)->QueryHandler != NULL ? ((ILibChain_Link*)module)->QueryHandler(chain, module, (int)slist[f], &tmp) : ((ILibChain_Link*)module)->MetaData); } #else @@ -3072,7 +3074,7 @@ char *ILibChain_GetMetaDataFromDescriptorSetEx(void *chain, fd_set *inr, fd_set { if (FD_ISSET(f, &readset) || FD_ISSET(f, &writeset) || FD_ISSET(f, &errorset)) { - len += sprintf_s(retStr + len, ILibMemory_Size(retStr) - len, " FD[%d] (R: %d, W: %d, E: %d) => %s\n", f, FD_ISSET(f, inr), FD_ISSET(f, inw), FD_ISSET(f, ine), ((ILibChain_Link*)module)->MetaData); + len += sprintf_s(retStr + len, ILibMemory_Size(retStr) - len, " FD[%d] (R: %d, W: %d, E: %d) => %s\n", f, FD_ISSET(f, inr), FD_ISSET(f, inw), FD_ISSET(f, ine), ((ILibChain_Link*)module)->QueryHandler != NULL ? ((ILibChain_Link*)module)->QueryHandler(chain, module, f, &tmp) : ((ILibChain_Link*)module)->MetaData); } } #endif diff --git a/microstack/ILibParsers.h b/microstack/ILibParsers.h index a124292..51cdae5 100644 --- a/microstack/ILibParsers.h +++ b/microstack/ILibParsers.h @@ -342,6 +342,8 @@ int ILibIsRunningOnChainThread(void* chain); typedef void(*ILibChain_PreSelect)(void* object, fd_set *readset, fd_set *writeset, fd_set *errorset, int* blocktime); typedef void(*ILibChain_PostSelect)(void* object, int slct, fd_set *readset, fd_set *writeset, fd_set *errorset); typedef void(*ILibChain_Destroy)(void* object); + typedef char*(*ILibChain_QueryData)(void* chain, void *object, int fd, size_t *dataLen); + typedef void(*ILibChain_DestroyEvent)(void *chain, void *user); typedef void(*ILibChain_StartEvent)(void *chain, void *user); typedef void*(*ILibChain_Link_GetUserMemory)(void *ChainLinkObject, int *len); @@ -365,6 +367,7 @@ int ILibIsRunningOnChainThread(void* chain); ILibChain_PreSelect PreSelectHandler; ILibChain_PostSelect PostSelectHandler; ILibChain_Destroy DestroyHandler; + ILibChain_QueryData QueryHandler; void* ParentChain; void* ExtraMemoryPtr; char* MetaData; diff --git a/microstack/ILibProcessPipe.c b/microstack/ILibProcessPipe.c index 211c923..c174274 100644 --- a/microstack/ILibProcessPipe.c +++ b/microstack/ILibProcessPipe.c @@ -172,6 +172,30 @@ ILibProcessPipe_Pipe ILibProcessPipe_Process_GetStdOut(ILibProcessPipe_Process p BOOL ILibProcessPipe_Process_OnExit(void *chain, HANDLE event, ILibWaitHandle_ErrorStatus errors, void* user); #else void ILibProcessPipe_Process_ReadHandler(void* user); +int ILibProcessPipe_Manager_OnQuery_comparer(void *j1, void *j2) +{ + ILibProcessPipe_PipeObject *pj = (ILibProcessPipe_PipeObject*)j1; + int fd = (int)(uintptr_t)j2; + + if (pj->mPipe_ReadEnd == fd) { return(0); } + return(1); +} +char * ILibProcessPipe_Manager_OnQuery(void *chain, void *object, int fd, size_t *dataLen) +{ + ILibProcessPipe_Manager_Object *man = (ILibProcessPipe_Manager_Object*)object; + char *ret = ((ILibChain_Link*)object)->MetaData; + int i; + *dataLen = strnlen_s(((ILibChain_Link*)object)->MetaData, 1024); + + void *node = ILibLinkedList_GetNode_Search(man->ActivePipes, ILibProcessPipe_Manager_OnQuery_comparer, (void*)(uintptr_t)fd); + if (node != NULL) + { + ILibProcessPipe_PipeObject *pj = (ILibProcessPipe_PipeObject*)ILibLinkedList_GetDataFromNode(node); + *dataLen = strnlen_s(pj->metadata, 1024); + ret = pj->metadata; + } + return(ret); +} void ILibProcessPipe_Manager_OnPreSelect(void* object, fd_set *readset, fd_set *writeset, fd_set *errorset, int* blocktime) { ILibProcessPipe_Manager_Object *man = (ILibProcessPipe_Manager_Object*)object; @@ -241,6 +265,7 @@ ILibProcessPipe_Manager ILibProcessPipe_Manager_Create(void *chain) #ifndef WIN32 retVal->ChainLink.PreSelectHandler = &ILibProcessPipe_Manager_OnPreSelect; retVal->ChainLink.PostSelectHandler = &ILibProcessPipe_Manager_OnPostSelect; + retVal->ChainLink.QueryHandler = ILibProcessPipe_Manager_OnQuery; #endif retVal->ChainLink.DestroyHandler = &ILibProcessPipe_Manager_OnDestroy; diff --git a/modules/notifybar-desktop.js b/modules/notifybar-desktop.js index 5cfa0ee..4ce4198 100644 --- a/modules/notifybar-desktop.js +++ b/modules/notifybar-desktop.js @@ -40,6 +40,7 @@ function windows_notifybar_system(title, tsid) .addMethod('close', function close() { this.child.kill(); }); ret.child = require('child_process').execFile(process.execPath, [process.execPath.split('\\').pop(), '-b64exec', script], { type: 1, uid: tsid }); + ret.child.descriptorMetadata = 'notifybar-desktop'; ret.child.parent = ret; ret.child.stdout.on('data', function (c) { }); ret.child.stderr.on('data', function (c) { }); @@ -198,6 +199,7 @@ function x_notifybar_check(title) }; var xinfo = require('monitor-info').getXInfo(uid); that.child = require('child_process').execFile(process.execPath, [process.execPath.split('/').pop(), '-b64exec', script], { uid: uid, env: xinfo.exportEnv() }); + that.child.descriptorMetadata = 'notifybar-desktop'; that.child.parent = that; that.child.stdout.on('data', function (c) { }); that.child.stderr.on('data', function (c) { }); @@ -224,6 +226,7 @@ function x_notifybar_check(title) .addMethod('close', function close() { this.child.kill(); }); ret.child = require('child_process').execFile(process.execPath, [process.execPath.split('/').pop(), '-b64exec', script], { uid: uid, env: xinfo.exportEnv() }); + ret.child.descriptorMetadata = 'notifybar-desktop'; ret.child.parent = ret; ret.child.stdout.on('data', function (c) { }); ret.child.stderr.on('data', function (c) { });