From 10a9e7226ecea2ea3b3360789e576340df8e99e5 Mon Sep 17 00:00:00 2001 From: Bryan Roe Date: Tue, 9 Jun 2020 19:37:37 -0700 Subject: [PATCH] 1. Added support for UTF8 wnvironment variables for window's child_process 2. Updated message-box and toaster to support UTF8 on Windows --- microscript/ILibDuktape_ChildProcess.c | 2 +- microscript/ILibDuktape_Polyfills.c | 10 ++++---- microstack/ILibParsers.h | 9 +++++-- microstack/ILibProcessPipe.c | 34 +++++++++++++++++++++++--- modules/toaster.js | 2 +- 5 files changed, 45 insertions(+), 12 deletions(-) diff --git a/microscript/ILibDuktape_ChildProcess.c b/microscript/ILibDuktape_ChildProcess.c index 52f83ad..f1759a6 100644 --- a/microscript/ILibDuktape_ChildProcess.c +++ b/microscript/ILibDuktape_ChildProcess.c @@ -489,7 +489,7 @@ duk_ret_t ILibDuktape_ChildProcess_execFile(duk_context *ctx) #endif #ifdef WIN32 - p = ILibProcessPipe_Manager_SpawnProcessEx3(manager, target, args, spawnType, (void*)(ILibPtrCAST)(uint64_t)(uid < 0 ? 0 : uid), 0); + p = ILibProcessPipe_Manager_SpawnProcessEx4(manager, target, args, spawnType, (void*)(ILibPtrCAST)(uint64_t)(uid < 0 ? 0 : uid), envargs, 0); #else p = ILibProcessPipe_Manager_SpawnProcessEx4(manager, target, args, spawnType, (void*)(ILibPtrCAST)(uint64_t)uid, envargs, 0); #endif diff --git a/microscript/ILibDuktape_Polyfills.c b/microscript/ILibDuktape_Polyfills.c index 08a745a..a1b6ad8 100644 --- a/microscript/ILibDuktape_Polyfills.c +++ b/microscript/ILibDuktape_Polyfills.c @@ -2227,11 +2227,11 @@ void ILibDuktape_Polyfills_JS_Init(duk_context *ctx) free(_messagebox); // toaster, refer to modules/toaster.js - char *_toaster = ILibMemory_Allocate(36142, 0, NULL, NULL); - memcpy_s(_toaster + 0, 20652, "/*
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 promise = require('promise');

if (process.platform == 'linux' || process.platform == 'darwin' || process.platform == 'freebsd')
{
    function findPath(app)
    {
        var child = require('child_process').execFile('/bin/sh', ['sh']);
        child.stdout.str = '';
        child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
        if (process.platform == 'linux' || process.platform == 'freebsd')
        {
            child.stdin.write("whereis " + app + " | awk '{ print $2 }'\nexit\n");
        }
        else
        {
            child.stdin.write("whereis " + app + "\nexit\n");
        }
        child.waitExit();
        child.stdout.str = child.stdout.str.trim();
        if (process.platform == 'freebsd' && child.stdout.str == '' && require('fs').existsSync('/usr/local/bin/' + app)) { return ('/usr/local/bin/' + app); }
        return (child.stdout.str == '' ? null : child.stdout.str);
    }
}

function Toaster()
{
    this._ObjectID = 'toaster';
    this.Toast = function Toast(title, caption, tsid)
    {
        var retVal = new promise(function (res, rej) { this._res = res; this._rej = rej; });
        retVal.title = title;
        retVal.caption = caption;

        switch (process.platform)
        {
            case 'win32':
                {
                    var cid;
                    retVal.options = { };
                    try
                    {
                        retVal.options.uid = tsid == null ? require('user-sessions').consoleUid() : tsid;
                        if (retVal.options.uid == (cid = require('user-sessions').getProcessOwnerName(process.pid).tsid))
                        {
                            delete retVal.options.uid;
                        }
                        else
                        {
                            if(tsid != null && cid != 0)
                            {
                                retVal._rej('Insufficient permission to display toast as uid: ' + tsid);
                                return (retVal);
                            }
                            retVal.options.type = require('child_process').SpawnTypes.USER;
                        }
                    }
                    catch (ee)
                    {
                        retVal._rej('Cannot display user notification when a user is not logged in');
                        return (retVal);
                    }

                    retVal.child = require('child_process').execFile(process.env['windir'] + '\\System32\\WindowsPowerShell\\v1.0\\powershell.exe', ['powershell', '-noprofile', '-nologo', '-command', '-'], retVal.options);
                    retVal.child.descriptorMetadata = 'toaster';
                    retVal.child.toast = retVal;
                    retVal.child.stdout.stdin = retVal.child.stdin;
                    retVal.child.stderr.stdin = retVal.child.stdin;
                    retVal.child.stdout.on('data', function (c) { if (c.toString().includes('<DISMISSED>')) { this.stdin.write('exit\n'); } });
                    retVal.child.stderr.once('data', function (c) { this.stdin.write('$objBalloon.dispose();exit\n'); });
                    retVal.child.stdin.write('[System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms")\r\n');
                    retVal.child.stdin.write('$objBalloon = New-Object System.Windows.Forms.NotifyIcon\r\n');
                    retVal.child.stdin.write('$objBalloon.Icon = [System.Drawing.SystemIcons]::Information\r\n');
                    retVal.child.stdin.write('$objBalloon.Visible = $True\r\n');
                    retVal.child.stdin.write('Register-ObjectEvent -InputObject $objBalloon -EventName BalloonTipClosed -Action { $objBalloon.dispose();Write-Host "<`DISMISSED`>" }')
                    retVal.child.stdin.write('$objBalloon.ShowBalloonTip(10000,"' + title + '", "' + caption + '", 0)\r\n');
                    retVal.child.timeout = setTimeout(function (c)
                    {
                        c.timeout = null;
                        c.stdin.write('$objBalloon.dispose();exit\n');
                    }, 10000, retVal.child);
                    retVal.child.on('exit', function ()
                    {
                        if (this.timeout != null) { clearTimeout(this.timeout); }
                        this.toast._res('DISMISSED');
                    });
                    
                    return (retVal);
                }
                break;
	        case 'freebsd':
            case 'linux':
                {
                    try
                    {
                        retVal.consoleUid = require('user-sessions').consoleUid();
                        retVal.xinfo = require('monitor-info').getXInfo(retVal.consoleUid);
			            retVal.username = require('user-sessions').getUsername(retVal.consoleUid);
                    }
                    catch (xxe)
                    {
                        retVal._rej(xxe);
                        return (retVal);
                    }

                    if (require('message-box').zenity)
                    {
                        if (process.platform == 'linux' && !require('linux-dbus').hasService('org.freedesktop.Notifications'))
                        {
                            // No D-Bus service to handle notifications, so we must fake a notification with ZENITY --info
                            if (require('message-box').zenity.timeout)
                            {
                                // Timeout Supported
                                retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--info', '--title=' + retVal.title, '--text=' + retVal.caption, '--timeout=5'], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });
                            }
                            else
                            {
                                // No Timeout Support, so we must fake it
                                retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--info', '--title=' + retVal.title, '--text=' + retVal.caption], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });
                                retVal.child.timeout = setTimeout(function (c) { c.timeout = null; c.kill(); }, 5000, retVal.child);
                            }
                            retVal.child.descriptorMetadata = 'toaster (zenity/messagebox)'
                        }                        
                        else if (require('message-box').zenity.version[0] < 3 || (require('message-box').zenity.version[0] == 3 && require('message-box').zenity.version[1] < 10))
                        {
                            // ZENITY Notification is broken
                            if (require('message-box').notifysend)
                            {
                                // Using notify-send
                                if (require('user-sessions').whoami() == 'root')
                                {
                                    // We're root, so we must run in correct context
                                    retVal.child = require('child_process').execFile('/bin/sh', ['sh']);
                                    retVal.child.stdin.write('su - ' + retVal.username + ' -c "DISPLAY=\'' + retVal.xinfo.display + '\' notify-send \'' + retVal.title + '\' \'' + retVal.caption + '\'"\nexit\n');
                                }
                                else
                                {
                                    // We're a regular user, so we don't need to do anything special
                                    retVal.child = require('child_process').execFile(require('message-box').notifysend.path, ['notify-send', retVal.title, retVal.caption]);
                                }
                                retVal.child.descriptorMetadata = 'toaster (notify-send)'
                            }
                            else
                            {
                                // Faking notification with ZENITY --info
                                if (require('message-box').zenity.timeout)
                                {
                                    // Timeout Supported
                                    retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--info', '--title=' + retVal.title, '--text=' + retVal.caption, '--timeout=5'], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });
                                }
                                else
                                {
                                    // No Timeout Support, so we must fake it
                                    retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--info', '--title=' + retVal.title, '--text=' + retVal.caption], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });
                                    retVal.child.timeout = setTimeout(function (c) { c.timeout = null; c.kill(); }, 5000, retVal.child);
                                }
                                retVal.child.descriptorMetadata = 'toaster (zenity/messagebox)'
                            }
                        }
                        else
                        {
                            // Use ZENITY Notification
                            retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--notification', '--title=' + title, '--text=' + caption, '--timeout=5'], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });                   
                            retVal.child.descriptorMetadata = 'toaster (zenity/notification)'
                        }
                        retVal.child.parent = retVal;
                        retVal.child.stderr.str = '';
                        retVal.child.stderr.on('data', function (chunk) { this.str += chunk.toString();  });
                        retVal.child.stdout.on('data', function (chunk) { });
                        retVal.child.on('exit', function (code)
                        {
                            if (this.timeout) { clearTimeout(this.timeout); }
                            this.parent._res('DISMISSED');
                        });
                    }
                    else
                    {
                        util = findPath('kdialog');
                        if (util) 
			            {
                            // use KDIALOG
                            var xdg = require('user-sessions').findEnv(retVal.consoleUid, 'XDG_RUNTIME_DIR'); if (xdg == null) { xdg = ''; }
                            if (!retVal.xinfo || !retVal.xinfo.display || !retVal.xinfo.xauthority)
                            {
                                retVal._rej('Internal Error');
                        ", 16000); - memcpy_s(_toaster + 16000, 4652, "ICAgICAgICByZXR1cm4gKHJldFZhbCk7DQogICAgICAgICAgICAgICAgICAgICAgICAgICAgfQ0KCQkNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXRWYWwuX25vdGlmeSA9IHJlcXVpcmUoJ2NoaWxkX3Byb2Nlc3MnKS5leGVjRmlsZSh1dGlsLCBbJ2tkaWFsb2cnLCAnLS10aXRsZScsIHJldFZhbC50aXRsZSwgJy0tcGFzc2l2ZXBvcHVwJywgcmV0VmFsLmNhcHRpb24sICc1J10sIHsgdWlkOiByZXRWYWwuY29uc29sZVVpZCwgZW52OiB7IERJU1BMQVk6IHJldFZhbC54aW5mby5kaXNwbGF5LCBYQVVUSE9SSVRZOiByZXRWYWwueGluZm8ueGF1dGhvcml0eSwgWERHX1JVTlRJTUVfRElSOiB4ZGcgfSB9KTsNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXRWYWwuX25vdGlmeS5kZXNjcmlwdG9yTWV0YWRhdGEgPSAndG9hc3RlciAoa2RpYWxvZyknDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0VmFsLl9ub3RpZnkucGFyZW50ID0gcmV0VmFsOw0KICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldFZhbC5fbm90aWZ5LnN0ZG91dC5vbignZGF0YScsIGZ1bmN0aW9uIChjaHVuaykgeyB9KTsNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXRWYWwuX25vdGlmeS5zdGRlcnIub24oJ2RhdGEnLCBmdW5jdGlvbiAoY2h1bmspIHsgfSk7DQogICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0VmFsLl9ub3RpZnkub24oJ2V4aXQnLCBmdW5jdGlvbiAoY29kZSkgeyB0aGlzLnBhcmVudC5fcmVzKCdESVNNSVNTRUQnKTsgfSk7DQogICAgICAgICAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgICAgICAgICBlbHNlDQogICAgICAgICAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHJlcXVpcmUoJ21lc3NhZ2UtYm94JykueG1lc3NhZ2UpDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXRWYWwuX21iID0gcmVxdWlyZSgnbWVzc2FnZS1ib3gnKS5jcmVhdGUodGl0bGUsIGNhcHRpb24sIDUsICdPSycpOw0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXRWYWwuX21iLnJldCA9IHJldFZhbDsNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0VmFsLl9tYi50aGVuKGZ1bmN0aW9uICgpIHsgdGhpcy5yZXQuX3JlcygnRElTTUlTU0VEJyk7IH0sIGZ1bmN0aW9uICgpIHsgdGhpcy5yZXQuX3JlcygnRElTTUlTU0VEJyk7IH0pOw0KICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbHNlDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXRWYWwuX3JlaignWmVuaXR5L0tEaWFsb2cveG1lc3NhZ2Ugbm90IGZvdW5kJyk7DQogICAgICAgICAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgIGJyZWFrOw0KICAgICAgICAgICAgY2FzZSAnZGFyd2luJzoNCiAgICAgICAgICAgICAgICByZXRWYWwuX3RvYXN0ID0gcmVxdWlyZSgnbWVzc2FnZS1ib3gnKS5ub3RpZnkodGl0bGUsIGNhcHRpb24pOw0KICAgICAgICAgICAgICAgIHJldFZhbC5fdG9hc3QucGFyZW50ID0gcmV0VmFsOw0KICAgICAgICAgICAgICAgIHJldFZhbC5fdG9hc3QudGhlbihmdW5jdGlvbiAodikgeyB0aGlzLnBhcmVudC5fcmVzKHYpOyB9LCBmdW5jdGlvbiAoZSkgeyB0aGlzLnBhcmVudC5fcmVqKGUpOyB9KTsNCiAgICAgICAgICAgICAgICBicmVhazsNCiAgICAgICAgfQ0KDQogICAgICAgIHJldHVybiAocmV0VmFsKTsNCiAgICB9Ow0KICAgIGlmKHByb2Nlc3MucGxhdGZvcm0gPT0gJ3dpbjMyJykNCiAgICB7DQogICAgICAgIHRoaXMuX2NvbnRhaW5lclRvYXN0ID0gZnVuY3Rpb24gX2NvbnRhaW5lclRvYXN0KGNhcHRpb24sIHRpdGxlKQ0KICAgICAgICB7DQogICAgICAgICAgICB2YXIgdG9hc3Q7DQogICAgICAgICAgICB2YXIgYmFsbG9vbjsNCg0KICAgICAgICAgICAgdHJ5DQogICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgdG9hc3QgPSByZXF1aXJlKCd3aW4tY29uc29sZScpOw0KICAgICAgICAgICAgICAgIGJhbGxvb24gPSB0b2FzdC5TZXRUcmF5SWNvbih7IHN6SW5mbzogY2FwdGlvbiwgc3pJbmZvVGl0bGU6IHRpdGxlLCBiYWxsb29uT25seTogdHJ1ZSB9KTsNCiAgICAgICAgICAgICAgICBiYWxsb29uLm9uKCdUb2FzdERpc21pc3NlZCcsIGZ1bmN0aW9uICgpIHsgcHJvY2Vzcy5leGl0KCk7IH0pOw0KICAgICAgICAgICAgfQ0KICAgICAgICAgICAgY2F0Y2goZSkNCiAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICBwcm9jZXNzLmV4aXQoKTsNCiAgICAgICAgICAgIH0NCiAgICAgICAgICAgIHRyeQ0KICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgIHJlcXVpcmUoJ2NoaWxkLWNvbnRhaW5lcicpLm1lc3NhZ2UoeyBzdGF0dXM6ICdvaycsIHBpZDogcHJvY2Vzcy5waWR9KTsNCiAgICAgICAgICAgIH0NCiAgICAgICAgICAgIGNhdGNoKGVlKQ0KICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgIHByb2Nlc3MuZXhpdCgpOw0KICAgICAgICAgICAgfQ0KICAgICAgICAgICAgdmFyIHQgPSBzZXRUaW1lb3V0KGZ1bmN0aW9uIChiKSB7IGIucmVtb3ZlKCk7IHByb2Nlc3MuZXhpdCgpOyB9LCA3MDAwLCBiYWxsb29uKTsNCiAgICAgICAgfQ0KICAgIH0NCn0NCg0KbW9kdWxlLmV4cG9ydHMgPSBuZXcgVG9hc3RlcigpOw0KaWYgKHByb2Nlc3MucGxhdGZvcm0gPT0gJ2xpbnV4JyAmJiAhcmVxdWlyZSgnbGludXgtZGJ1cycpLmhhc1NlcnZpY2UpDQp7DQogICAgcmVxdWlyZSgnbGludXgtZGJ1cycpLmhhc1NlcnZpY2UgPSBmdW5jdGlvbiBoYXNTZXJ2aWNlKG5hbWUpDQogICAgew0KICAgICAgICB2YXIgY2hpbGQgPSByZXF1aXJlKCdjaGlsZF9wcm9jZXNzJykuZXhlY0ZpbGUoJy9iaW4vc2gnLCBbJ3NoJ10pOw0KICAgICAgICBjaGlsZC5zdGRlcnIuc3RyID0gJyc7IGNoaWxkLnN0ZGVyci5vbignZGF0YScsIGZ1bmN0aW9uIChjKSB7IHRoaXMuc3RyICs9IGMudG9TdHJpbmcoKTsgfSk7DQogICAgICAgIGNoaWxkLnN0ZG91dC5zdHIgPSAnJzsgY2hpbGQuc3Rkb3V0Lm9uKCdkYXRhJywgZnVuY3Rpb24gKGMpIHsgdGhpcy5zdHIgKz0gYy50b1N0cmluZygpOyB9KTsNCiAgICAgICAgY2hpbGQuc3RkaW4ud3JpdGUoJ2NhdCAvdXNyL3NoYXJlL2RidXMtMS9zZXJ2aWNlcy8qLnNlcnZpY2UgfCBncmVwICInICsgbmFtZSArICciIHwgYXdrIC1GPSBcJ3sgaWYoICQyPT0iJyArIG5hbWUgKyAnIiApIHsgcHJpbnQgJDI7IH0gfVwnXG5leGl0XG4nKTsNCiAgICAgICAgY2hpbGQud2FpdEV4aXQoKTsNCiAgICAgICAgcmV0dXJuIChjaGlsZC5zdGRvdXQuc3RyLnRyaW0oKSAhPSAnJyk7DQogICAgfTsNCn0=", 4652); - ILibBase64DecodeEx((unsigned char*)_toaster, 20652, (unsigned char*)_toaster + 20652); - duk_push_global_object(ctx); duk_get_prop_string(ctx, -1, "addModule"); duk_swap_top(ctx, -2); duk_push_string(ctx, "toaster"); duk_push_string(ctx, _toaster + 20652); + char *_toaster = ILibMemory_Allocate(36240, 0, NULL, NULL); + memcpy_s(_toaster + 0, 20708, "/*
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 promise = require('promise');

if (process.platform == 'linux' || process.platform == 'darwin' || process.platform == 'freebsd')
{
    function findPath(app)
    {
        var child = require('child_process').execFile('/bin/sh', ['sh']);
        child.stdout.str = '';
        child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
        if (process.platform == 'linux' || process.platform == 'freebsd')
        {
            child.stdin.write("whereis " + app + " | awk '{ print $2 }'\nexit\n");
        }
        else
        {
            child.stdin.write("whereis " + app + "\nexit\n");
        }
        child.waitExit();
        child.stdout.str = child.stdout.str.trim();
        if (process.platform == 'freebsd' && child.stdout.str == '' && require('fs').existsSync('/usr/local/bin/' + app)) { return ('/usr/local/bin/' + app); }
        return (child.stdout.str == '' ? null : child.stdout.str);
    }
}

function Toaster()
{
    this._ObjectID = 'toaster';
    this.Toast = function Toast(title, caption, tsid)
    {
        var retVal = new promise(function (res, rej) { this._res = res; this._rej = rej; });
        retVal.title = title;
        retVal.caption = caption;

        switch (process.platform)
        {
            case 'win32':
                {
                    var cid;
                    retVal.options = { env: { _title: title, _caption: caption } };
                    try
                    {
                        retVal.options.uid = tsid == null ? require('user-sessions').consoleUid() : tsid;
                        if (retVal.options.uid == (cid = require('user-sessions').getProcessOwnerName(process.pid).tsid))
                        {
                            delete retVal.options.uid;
                        }
                        else
                        {
                            if(tsid != null && cid != 0)
                            {
                                retVal._rej('Insufficient permission to display toast as uid: ' + tsid);
                                return (retVal);
                            }
                            retVal.options.type = require('child_process').SpawnTypes.USER;
                        }
                    }
                    catch (ee)
                    {
                        retVal._rej('Cannot display user notification when a user is not logged in');
                        return (retVal);
                    }

                    retVal.child = require('child_process').execFile(process.env['windir'] + '\\System32\\WindowsPowerShell\\v1.0\\powershell.exe', ['powershell', '-noprofile', '-nologo', '-command', '-'], retVal.options);
                    retVal.child.descriptorMetadata = 'toaster';
                    retVal.child.toast = retVal;
                    retVal.child.stdout.stdin = retVal.child.stdin;
                    retVal.child.stderr.stdin = retVal.child.stdin;
                    retVal.child.stdout.on('data', function (c) { if (c.toString().includes('<DISMISSED>')) { this.stdin.write('exit\n'); } });
                    retVal.child.stderr.once('data', function (c) { this.stdin.write('$objBalloon.dispose();exit\n'); });
                    retVal.child.stdin.write('[System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms")\r\n');
                    retVal.child.stdin.write('$objBalloon = New-Object System.Windows.Forms.NotifyIcon\r\n');
                    retVal.child.stdin.write('$objBalloon.Icon = [System.Drawing.SystemIcons]::Information\r\n');
                    retVal.child.stdin.write('$objBalloon.Visible = $True\r\n');
                    retVal.child.stdin.write('Register-ObjectEvent -InputObject $objBalloon -EventName BalloonTipClosed -Action { $objBalloon.dispose();Write-Host "<`DISMISSED`>" }')
                    retVal.child.stdin.write('$objBalloon.ShowBalloonTip(10000,"' + title + '", "' + caption + '", 0)\r\n');
                    retVal.child.timeout = setTimeout(function (c)
                    {
                        c.timeout = null;
                        c.stdin.write('$objBalloon.dispose();exit\n');
                    }, 10000, retVal.child);
                    retVal.child.on('exit', function ()
                    {
                        if (this.timeout != null) { clearTimeout(this.timeout); }
                        this.toast._res('DISMISSED');
                    });
                    
                    return (retVal);
                }
                break;
	        case 'freebsd':
            case 'linux':
                {
                    try
                    {
                        retVal.consoleUid = require('user-sessions').consoleUid();
                        retVal.xinfo = require('monitor-info').getXInfo(retVal.consoleUid);
			            retVal.username = require('user-sessions').getUsername(retVal.consoleUid);
                    }
                    catch (xxe)
                    {
                        retVal._rej(xxe);
                        return (retVal);
                    }

                    if (require('message-box').zenity)
                    {
                        if (process.platform == 'linux' && !require('linux-dbus').hasService('org.freedesktop.Notifications'))
                        {
                            // No D-Bus service to handle notifications, so we must fake a notification with ZENITY --info
                            if (require('message-box').zenity.timeout)
                            {
                                // Timeout Supported
                                retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--info', '--title=' + retVal.title, '--text=' + retVal.caption, '--timeout=5'], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });
                            }
                            else
                            {
                                // No Timeout Support, so we must fake it
                                retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--info', '--title=' + retVal.title, '--text=' + retVal.caption], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });
                                retVal.child.timeout = setTimeout(function (c) { c.timeout = null; c.kill(); }, 5000, retVal.child);
                            }
                            retVal.child.descriptorMetadata = 'toaster (zenity/messagebox)'
                        }                        
                        else if (require('message-box').zenity.version[0] < 3 || (require('message-box').zenity.version[0] == 3 && require('message-box').zenity.version[1] < 10))
                        {
                            // ZENITY Notification is broken
                            if (require('message-box').notifysend)
                            {
                                // Using notify-send
                                if (require('user-sessions').whoami() == 'root')
                                {
                                    // We're root, so we must run in correct context
                                    retVal.child = require('child_process').execFile('/bin/sh', ['sh']);
                                    retVal.child.stdin.write('su - ' + retVal.username + ' -c "DISPLAY=\'' + retVal.xinfo.display + '\' notify-send \'' + retVal.title + '\' \'' + retVal.caption + '\'"\nexit\n');
                                }
                                else
                                {
                                    // We're a regular user, so we don't need to do anything special
                                    retVal.child = require('child_process').execFile(require('message-box').notifysend.path, ['notify-send', retVal.title, retVal.caption]);
                                }
                                retVal.child.descriptorMetadata = 'toaster (notify-send)'
                            }
                            else
                            {
                                // Faking notification with ZENITY --info
                                if (require('message-box').zenity.timeout)
                                {
                                    // Timeout Supported
                                    retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--info', '--title=' + retVal.title, '--text=' + retVal.caption, '--timeout=5'], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });
                                }
                                else
                                {
                                    // No Timeout Support, so we must fake it
                                    retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--info', '--title=' + retVal.title, '--text=' + retVal.caption], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });
                                    retVal.child.timeout = setTimeout(function (c) { c.timeout = null; c.kill(); }, 5000, retVal.child);
                                }
                                retVal.child.descriptorMetadata = 'toaster (zenity/messagebox)'
                            }
                        }
                        else
                        {
                            // Use ZENITY Notification
                            retVal.child = require('child_process').execFile(require('message-box').zenity.path, ['zenity', '--notification', '--title=' + title, '--text=' + caption, '--timeout=5'], { uid: retVal.consoleUid, env: { XAUTHORITY: retVal.xinfo.xauthority, DISPLAY: retVal.xinfo.display } });                   
                            retVal.child.descriptorMetadata = 'toaster (zenity/notification)'
                        }
                        retVal.child.parent = retVal;
                        retVal.child.stderr.str = '';
                        retVal.child.stderr.on('data', function (chunk) { this.str += chunk.toString();  });
                        retVal.child.stdout.on('data', function (chunk) { });
                        retVal.child.on('exit', function (code)
                        {
                            if (this.timeout) { clearTimeout(this.timeout); }
                            this.parent._res('DISMISSED');
                        });
                    }
                    else
                    {
                        util = findPath('kdialog');
                        if (util) 
			            {
                            // use KDIALOG
                            var xdg = require('user-sessions').findEnv(retVal.consoleUid, 'XDG_RUNTIME_DIR'); if (xdg == null) { xdg = ''; }
                            if (!retVal.xinfo || !retVal.xinfo.display || !retVal.xinfo.xauthority)
                            {
                                retVal._rej('I", 16000); + memcpy_s(_toaster + 16000, 4708, "bnRlcm5hbCBFcnJvcicpOw0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gKHJldFZhbCk7DQogICAgICAgICAgICAgICAgICAgICAgICAgICAgfQ0KCQkNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXRWYWwuX25vdGlmeSA9IHJlcXVpcmUoJ2NoaWxkX3Byb2Nlc3MnKS5leGVjRmlsZSh1dGlsLCBbJ2tkaWFsb2cnLCAnLS10aXRsZScsIHJldFZhbC50aXRsZSwgJy0tcGFzc2l2ZXBvcHVwJywgcmV0VmFsLmNhcHRpb24sICc1J10sIHsgdWlkOiByZXRWYWwuY29uc29sZVVpZCwgZW52OiB7IERJU1BMQVk6IHJldFZhbC54aW5mby5kaXNwbGF5LCBYQVVUSE9SSVRZOiByZXRWYWwueGluZm8ueGF1dGhvcml0eSwgWERHX1JVTlRJTUVfRElSOiB4ZGcgfSB9KTsNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXRWYWwuX25vdGlmeS5kZXNjcmlwdG9yTWV0YWRhdGEgPSAndG9hc3RlciAoa2RpYWxvZyknDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0VmFsLl9ub3RpZnkucGFyZW50ID0gcmV0VmFsOw0KICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldFZhbC5fbm90aWZ5LnN0ZG91dC5vbignZGF0YScsIGZ1bmN0aW9uIChjaHVuaykgeyB9KTsNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXRWYWwuX25vdGlmeS5zdGRlcnIub24oJ2RhdGEnLCBmdW5jdGlvbiAoY2h1bmspIHsgfSk7DQogICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0VmFsLl9ub3RpZnkub24oJ2V4aXQnLCBmdW5jdGlvbiAoY29kZSkgeyB0aGlzLnBhcmVudC5fcmVzKCdESVNNSVNTRUQnKTsgfSk7DQogICAgICAgICAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgICAgICAgICBlbHNlDQogICAgICAgICAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHJlcXVpcmUoJ21lc3NhZ2UtYm94JykueG1lc3NhZ2UpDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXRWYWwuX21iID0gcmVxdWlyZSgnbWVzc2FnZS1ib3gnKS5jcmVhdGUodGl0bGUsIGNhcHRpb24sIDUsICdPSycpOw0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXRWYWwuX21iLnJldCA9IHJldFZhbDsNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0VmFsLl9tYi50aGVuKGZ1bmN0aW9uICgpIHsgdGhpcy5yZXQuX3JlcygnRElTTUlTU0VEJyk7IH0sIGZ1bmN0aW9uICgpIHsgdGhpcy5yZXQuX3JlcygnRElTTUlTU0VEJyk7IH0pOw0KICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbHNlDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXRWYWwuX3JlaignWmVuaXR5L0tEaWFsb2cveG1lc3NhZ2Ugbm90IGZvdW5kJyk7DQogICAgICAgICAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgIGJyZWFrOw0KICAgICAgICAgICAgY2FzZSAnZGFyd2luJzoNCiAgICAgICAgICAgICAgICByZXRWYWwuX3RvYXN0ID0gcmVxdWlyZSgnbWVzc2FnZS1ib3gnKS5ub3RpZnkodGl0bGUsIGNhcHRpb24pOw0KICAgICAgICAgICAgICAgIHJldFZhbC5fdG9hc3QucGFyZW50ID0gcmV0VmFsOw0KICAgICAgICAgICAgICAgIHJldFZhbC5fdG9hc3QudGhlbihmdW5jdGlvbiAodikgeyB0aGlzLnBhcmVudC5fcmVzKHYpOyB9LCBmdW5jdGlvbiAoZSkgeyB0aGlzLnBhcmVudC5fcmVqKGUpOyB9KTsNCiAgICAgICAgICAgICAgICBicmVhazsNCiAgICAgICAgfQ0KDQogICAgICAgIHJldHVybiAocmV0VmFsKTsNCiAgICB9Ow0KICAgIGlmKHByb2Nlc3MucGxhdGZvcm0gPT0gJ3dpbjMyJykNCiAgICB7DQogICAgICAgIHRoaXMuX2NvbnRhaW5lclRvYXN0ID0gZnVuY3Rpb24gX2NvbnRhaW5lclRvYXN0KGNhcHRpb24sIHRpdGxlKQ0KICAgICAgICB7DQogICAgICAgICAgICB2YXIgdG9hc3Q7DQogICAgICAgICAgICB2YXIgYmFsbG9vbjsNCg0KICAgICAgICAgICAgdHJ5DQogICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgdG9hc3QgPSByZXF1aXJlKCd3aW4tY29uc29sZScpOw0KICAgICAgICAgICAgICAgIGJhbGxvb24gPSB0b2FzdC5TZXRUcmF5SWNvbih7IHN6SW5mbzogY2FwdGlvbiwgc3pJbmZvVGl0bGU6IHRpdGxlLCBiYWxsb29uT25seTogdHJ1ZSB9KTsNCiAgICAgICAgICAgICAgICBiYWxsb29uLm9uKCdUb2FzdERpc21pc3NlZCcsIGZ1bmN0aW9uICgpIHsgcHJvY2Vzcy5leGl0KCk7IH0pOw0KICAgICAgICAgICAgfQ0KICAgICAgICAgICAgY2F0Y2goZSkNCiAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICBwcm9jZXNzLmV4aXQoKTsNCiAgICAgICAgICAgIH0NCiAgICAgICAgICAgIHRyeQ0KICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgIHJlcXVpcmUoJ2NoaWxkLWNvbnRhaW5lcicpLm1lc3NhZ2UoeyBzdGF0dXM6ICdvaycsIHBpZDogcHJvY2Vzcy5waWR9KTsNCiAgICAgICAgICAgIH0NCiAgICAgICAgICAgIGNhdGNoKGVlKQ0KICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgIHByb2Nlc3MuZXhpdCgpOw0KICAgICAgICAgICAgfQ0KICAgICAgICAgICAgdmFyIHQgPSBzZXRUaW1lb3V0KGZ1bmN0aW9uIChiKSB7IGIucmVtb3ZlKCk7IHByb2Nlc3MuZXhpdCgpOyB9LCA3MDAwLCBiYWxsb29uKTsNCiAgICAgICAgfQ0KICAgIH0NCn0NCg0KbW9kdWxlLmV4cG9ydHMgPSBuZXcgVG9hc3RlcigpOw0KaWYgKHByb2Nlc3MucGxhdGZvcm0gPT0gJ2xpbnV4JyAmJiAhcmVxdWlyZSgnbGludXgtZGJ1cycpLmhhc1NlcnZpY2UpDQp7DQogICAgcmVxdWlyZSgnbGludXgtZGJ1cycpLmhhc1NlcnZpY2UgPSBmdW5jdGlvbiBoYXNTZXJ2aWNlKG5hbWUpDQogICAgew0KICAgICAgICB2YXIgY2hpbGQgPSByZXF1aXJlKCdjaGlsZF9wcm9jZXNzJykuZXhlY0ZpbGUoJy9iaW4vc2gnLCBbJ3NoJ10pOw0KICAgICAgICBjaGlsZC5zdGRlcnIuc3RyID0gJyc7IGNoaWxkLnN0ZGVyci5vbignZGF0YScsIGZ1bmN0aW9uIChjKSB7IHRoaXMuc3RyICs9IGMudG9TdHJpbmcoKTsgfSk7DQogICAgICAgIGNoaWxkLnN0ZG91dC5zdHIgPSAnJzsgY2hpbGQuc3Rkb3V0Lm9uKCdkYXRhJywgZnVuY3Rpb24gKGMpIHsgdGhpcy5zdHIgKz0gYy50b1N0cmluZygpOyB9KTsNCiAgICAgICAgY2hpbGQuc3RkaW4ud3JpdGUoJ2NhdCAvdXNyL3NoYXJlL2RidXMtMS9zZXJ2aWNlcy8qLnNlcnZpY2UgfCBncmVwICInICsgbmFtZSArICciIHwgYXdrIC1GPSBcJ3sgaWYoICQyPT0iJyArIG5hbWUgKyAnIiApIHsgcHJpbnQgJDI7IH0gfVwnXG5leGl0XG4nKTsNCiAgICAgICAgY2hpbGQud2FpdEV4aXQoKTsNCiAgICAgICAgcmV0dXJuIChjaGlsZC5zdGRvdXQuc3RyLnRyaW0oKSAhPSAnJyk7DQogICAgfTsNCn0=", 4708); + ILibBase64DecodeEx((unsigned char*)_toaster, 20708, (unsigned char*)_toaster + 20708); + duk_push_global_object(ctx); duk_get_prop_string(ctx, -1, "addModule"); duk_swap_top(ctx, -2); duk_push_string(ctx, "toaster"); duk_push_string(ctx, _toaster + 20708); duk_pcall_method(ctx, 2); duk_pop(ctx); free(_toaster); diff --git a/microstack/ILibParsers.h b/microstack/ILibParsers.h index f38902e..23fd558 100644 --- a/microstack/ILibParsers.h +++ b/microstack/ILibParsers.h @@ -173,10 +173,15 @@ static inline void ignore_result(uintptr_t result) { (void)result; } #ifdef WIN32 char *ILibWideToUTF8Ex(WCHAR* wstr, int wstrCharacterLen, char *buffer, int bufferLen); #define ILibWideToUTF8(wstr, wstrCharacterLen) ILibWideToUTF8Ex(wstr, wstrCharacterLen, NULL, 0) -char *ILibWideToUTF8_stupidEx(WCHAR* wstr, int wstrBYTESIZE, char *buffer, int bufferLen); -#define ILibWideToUTF8_stupid(wstr, wstrBYTESIZE) ILibWideToUTF8_stupidEx(wstr, wstrBYTESIZE, NULL, 0) WCHAR* ILibUTF8ToWideEx(char* str, int len, WCHAR* buffer, int bufferCharacterSize); #define ILibUTF8ToWide(utf8string, len) ILibUTF8ToWideEx(utf8string, len, NULL, 0) +#define ILibUTF8ToWideCount(utf8string) MultiByteToWideChar(CP_UTF8, 0, (LPCCH)utf8string, -1, NULL, 0) +#define ILibUTF8ToWideCountEx(utf8string, outBuffer, outBufferLen) MultiByteToWideChar(CP_UTF8, 0, (LPCCH)utf8string, -1, outBuffer, outBufferLen) + +// The following two methods are for the special case, when only the bytes count is known, not the character count. +char *ILibWideToUTF8_stupidEx(WCHAR* wstr, int wstrBYTESIZE, char *buffer, int bufferLen); +#define ILibWideToUTF8_stupid(wstr, wstrBYTESIZE) ILibWideToUTF8_stupidEx(wstr, wstrBYTESIZE, NULL, 0) + #else #define ILibWideToUTF8(wstr, len) (wstr) #define ILibWideToUTF8Ex(wstr, len, buffer, sz) (wstr) diff --git a/microstack/ILibProcessPipe.c b/microstack/ILibProcessPipe.c index 1b85b0d..9e525e1 100644 --- a/microstack/ILibProcessPipe.c +++ b/microstack/ILibProcessPipe.c @@ -578,9 +578,36 @@ ILibProcessPipe_Process ILibProcessPipe_Manager_SpawnProcessEx4(ILibProcessPipe_ info.dwFlags |= STARTF_USESTDHANDLES; } - if (((spawnType == ILibProcessPipe_SpawnTypes_DEFAULT || spawnType == ILibProcessPipe_SpawnTypes_DETACHED) && !CreateProcessW(ILibUTF8ToWideEx(target, -1, tmp1, (int)sizeof(tmp1)/2), ILibUTF8ToWideEx(parms, -1, tmp2, (int)sizeof(tmp2)/2), NULL, NULL, spawnType == ILibProcessPipe_SpawnTypes_DETACHED ? FALSE: TRUE, CREATE_NO_WINDOW | (needSetSid !=0? (DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP) : 0x00), envvars, NULL, &info, &processInfo)) || - (spawnType != ILibProcessPipe_SpawnTypes_DEFAULT && !CreateProcessAsUserW(userToken, ILibUTF8ToWideEx(target, -1, tmp1, (int)sizeof(tmp1)/2), ILibUTF8ToWideEx(parms, -1, tmp2, (int)sizeof(tmp2)/2), NULL, NULL, TRUE, CREATE_NO_WINDOW | (needSetSid != 0 ? (DETACHED_PROCESS| CREATE_NEW_PROCESS_GROUP) : 0x00), envvars, NULL, &info, &processInfo))) + if (envvars != NULL) { + WCHAR *wideEnv; + int tmpCnt; + int envCount = 0; + void *envCurrent = envvars; + while (envCurrent != NULL && ((char**)envCurrent)[0] != NULL) + { + envCount += (ILibUTF8ToWideCount(((char**)envCurrent)[0]) + ILibUTF8ToWideCount(((char**)envCurrent)[1]) + ILibUTF8ToWideCount("=")); + envCurrent = (void*)((char*)envCurrent + 2 * sizeof(char*)); + } + wideEnv = (WCHAR*)ILibMemory_SmartAllocate(2* envCount); + tmpCnt = 0; + + envCurrent = envvars; + while (envCurrent != NULL && ((char**)envCurrent)[0] != NULL) + { + tmpCnt += (ILibUTF8ToWideCountEx(((char**)envCurrent)[0], wideEnv + tmpCnt, (int)ILibMemory_Size(wideEnv) / 2) - 1); + tmpCnt += (ILibUTF8ToWideCountEx("=", wideEnv + tmpCnt, ((int)ILibMemory_Size(wideEnv) / 2) - tmpCnt) - 1); + tmpCnt += ILibUTF8ToWideCountEx(((char**)envCurrent)[1], wideEnv + tmpCnt, ((int)ILibMemory_Size(wideEnv) / 2) - tmpCnt); + envCurrent = (void*)((char*)envCurrent + 2 * sizeof(char*)); + } + envvars = wideEnv; + } + + + if (((spawnType == ILibProcessPipe_SpawnTypes_DEFAULT || spawnType == ILibProcessPipe_SpawnTypes_DETACHED) && !CreateProcessW(ILibUTF8ToWideEx(target, -1, tmp1, (int)sizeof(tmp1)/2), ILibUTF8ToWideEx(parms, -1, tmp2, (int)sizeof(tmp2)/2), NULL, NULL, spawnType == ILibProcessPipe_SpawnTypes_DETACHED ? FALSE: TRUE, CREATE_UNICODE_ENVIRONMENT | CREATE_NO_WINDOW | (needSetSid !=0? (DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP) : 0x00), envvars, NULL, &info, &processInfo)) || + (spawnType != ILibProcessPipe_SpawnTypes_DEFAULT && !CreateProcessAsUserW(userToken, ILibUTF8ToWideEx(target, -1, tmp1, (int)sizeof(tmp1)/2), ILibUTF8ToWideEx(parms, -1, tmp2, (int)sizeof(tmp2)/2), NULL, NULL, TRUE, CREATE_UNICODE_ENVIRONMENT | CREATE_NO_WINDOW | (needSetSid != 0 ? (DETACHED_PROCESS| CREATE_NEW_PROCESS_GROUP) : 0x00), envvars, NULL, &info, &processInfo))) + { + int ll = GetLastError(); if (spawnType != ILibProcessPipe_SpawnTypes_DETACHED) { ILibProcessPipe_FreePipe(retVal->stdErr); @@ -591,10 +618,11 @@ ILibProcessPipe_Process ILibProcessPipe_Manager_SpawnProcessEx4(ILibProcessPipe_ ILibMemory_Free(retVal); if (token != NULL) { CloseHandle(token); } if (userToken != NULL) { CloseHandle(userToken); } + if (envvars != NULL) { ILibMemory_Free(envvars); } return(NULL); } - + if (envvars != NULL) { ILibMemory_Free(envvars); } if (allocParms != 0) { free(parms); } if (spawnType != ILibProcessPipe_SpawnTypes_DETACHED) { diff --git a/modules/toaster.js b/modules/toaster.js index 7d495bb..cd6cb93 100644 --- a/modules/toaster.js +++ b/modules/toaster.js @@ -52,7 +52,7 @@ function Toaster() case 'win32': { var cid; - retVal.options = { }; + retVal.options = { env: { _title: title, _caption: caption } }; try { retVal.options.uid = tsid == null ? require('user-sessions').consoleUid() : tsid;