From b9ab7d3ca3f479c27ecceb6a6521a24a6dc6a5ad Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Fri, 9 Jul 2021 12:34:15 -0700 Subject: [PATCH 1/5] Fixed privacy bar movement limitation. --- microscript/ILibDuktape_Commit.h | 6 ++--- microscript/ILibDuktape_Polyfills.c | 2 +- modules/notifybar-desktop.js | 42 ++++++++++++++++------------- 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/microscript/ILibDuktape_Commit.h b/microscript/ILibDuktape_Commit.h index 6216015..d223993 100644 --- a/microscript/ILibDuktape_Commit.h +++ b/microscript/ILibDuktape_Commit.h @@ -1,3 +1,3 @@ -// This file is auto-generated, any edits may be overwritten -#define SOURCE_COMMIT_DATE "2020-Oct-13 18:14:15-0700" -#define SOURCE_COMMIT_HASH "78b65edc4e326bc239cf3fbac6b769bc207057ba" +// This file is auto-generated, any edits may be overwritten +#define SOURCE_COMMIT_DATE "2021-Jul-6 14:07:36-0700" +#define SOURCE_COMMIT_HASH "1f5022ed166093f3781ce05814d4e1a5d6b3b625" diff --git a/microscript/ILibDuktape_Polyfills.c b/microscript/ILibDuktape_Polyfills.c index 3d6cca3..067c6be 100644 --- a/microscript/ILibDuktape_Polyfills.c +++ b/microscript/ILibDuktape_Polyfills.c @@ -2372,7 +2372,7 @@ void ILibDuktape_Polyfills_JS_Init(duk_context *ctx) duk_peval_string_noresult(ctx, "addCompressedModule('toaster', Buffer.from('eJztW+tz2zYS/xzP+H9ANJmSavWwk+ncjV2348ROq0liZyy5aRtlXIiEJMQUwQNBS2ri//12QVIiKb5kO9feTPDBFvFYLBaL3d/i0f12d+eF8JaST6aKPN3b/zfpuYo55IWQnpBUceHu7uzuvOYWc31mk8C1mSRqysixRy34F5W0yK9M+lCbPO3sERMrNKKiRvNwd2cpAjKjS+IKRQKfAQXukzF3GGELi3mKcJdYYuY5nLoWI3OuprqXiEZnd+f3iIIYKQqVKVT34GucrEaoQm4JpKlS3kG3O5/PO1Rz2hFy0nXCen73de/F6Vn/tA3cYotL12G+TyT7T8AlDHO0JNQDZiw6AhYdOidCEjqRDMqUQGbnkivuTlrEF2M1p5Lt7tjcV5KPApWSU8wajDdZASRFXdI47pNev0GeH/d7/dbuzrve4JfzywF5d3xxcXw26J32yfkFeXF+dtIb9M7P4OslOT77nbzqnZ20CAMpQS9s4UnkHljkKEFmg7j6jKW6H4uQHd9jFh9zCwblTgI6YWQibph0YSzEY3LGfZxFH5izd3ccPuNKK4G/OSLo5NsuCu+GSuJJAU0ZOYplaBpRloHTv7vDx8SEHAsY7XgOVcDPjBwdEcPhbrAwyOfPJLfYpnLO3eLyMczJyLeN5u7Op3Dmx4FrIcugXq79lqqpCVPZDMuiKpiQa2vKHTvJs864ijoymh22YNZL0FLT6I642/WnRou8N+DfBxxVTEq36vjKFoGCfxIoGkZRuXBNGJSiQGnFqWlNA/e6ST7pdaFJfHdEdGZHiT4ojTsxm4fkNtnrXSWakFhMKiGWFL/c7aCeM7MxB0VjoMIN8h2uDPjbIJ8JnV8T4xN0w11Fnjwlt8bQZQuuhm4jyent+idzfHbPfqu6CKnMKVenUM+smKhsVgeEPTNryTkWJPnmmxzKqANYstKtcahQYAP8/tK1QKUCX3YdYVFHK5cRDrGJaiCZCiToRVGdw+SA48oFPPxE3MBxyMEGj/EggdQtLtGVOg4E9RWT5npNabW8Oh99ZJbqnaB+q7BOrOa6gm4HhWlCpuLKAQdhUQ8zW0T53M5fjzCSX6kDFFw2j02KuV4lYOVaUOfjaqFcQY5evv7hKuOjzviYs1g0H1oob5g/fcFcJaljaGJyiX/D8vWMYbXjCdSDiQPbDZO/PKMzBqRhMMqaEnOBrW/Jbex1oumAQXRiavr/4UZxJA3UwPDXYZKGDw4Q6Wf1rmTNUrC+BpjKZ0+Ng3RRTu2k0C1uH+aXRqwKL/QARzBW5t4cwL8rPaoDEk3tVTSGg3gwKJMCouiITN3vPkNHGg8RKDfzWxTwvskh0ngPZD8AqwmyOquAm9v8bFCI+/IScPQsqOuocnoJ/rRWLcBAsg1ARDtbUC8L/gmHXXLbbMJSxWYFHGNCbc7r7giMAE85tGw/E6behpI5n7tMojqvlQyWZUcvzoKJqBAAJps5TLEcWZSMpmAOMKXdxZa88LGpxf84Ej+a6fBzr2SANQhjikaIBsc0eq4fjAFUcbAVCRSFUDGyG0TbS0IBR3H7gKAd15IuEUuiJ23ewx6rWpQIM8F2PDFq6bEy/NP36NwdQCW/c9k/vdh+EguyI/PJ2J2XfCj4F9TFiCIWMmo7hhgIcDVsJYAfMFbQBQAjsLIjJhMA4AAqy2RZT+opw5/DZX2AmbRXaMZtLo0PoCXGcNhfgqedPXs6HL6DfDH334o5k/0pc5zh8Ga/szccepjjYw5S1CB1nQWfRtsV0AMGXNEXSEHonxB1zQDs69/Gh1ZGQ4oGnhxfx2a+JbmnhHzDFEVwm4MQSimoCDmEmXVarGAMgMVVw04CQdYkwqS8P5FiXI/4AK21lcDxHe5aTgBCM40fTnr9N71+//TkR6OZwP9rBGyEYNdAyJeGNFWjEhBIF7G02c0TMfr4nDqOEK7GOgKQV/Mw0Xndrtck34eK27lgY4fp3jvHvs9mI2f54eDgtaD2Owhg31KpOHW0J2pELSI977wEyOM3mkM5LF6sxf0nhgSTe8bm7RDAkrxeOmdoNpY9cMT3766DZKDPWAInksKSnnTCTyz0QQI9FyGdtlMP0OWv3OcjjTifDGTA7kjxgk04rtpIVKc36NHaPdcLVCS8pFTbuhynjkRZA+69cATuFLWPQ4X7RPJV6x122P5FwLpv/PDnah38+WMDwsgCt1BPEv2pmK/ZMff3ILXIE4SuVxFgDT9WEcneFiqm+IzBegc5+0wNwg8zuby29mhWgiYClRKvZG21aAt8VotEIkmOq9bY0cYh9ZRB2X7AOhhDCxSPO0JoaJksh1EZizVZKR3zZlNYE72IDgpNY6VQxXIoKigURAUgyGFvJBm9hqqP4owwTIt3DjKBWlgYbt/Uj+HuEauso46ymCEZm5QjJqS54GDWkuRmwuUADdqYH0Ygv6HlMzd4QOKPHj3KoYkcuWhlyiOby6haPuk8nsvh6WJxT3yKBL4cxgyjwFjKIAk6Ye2RWIAw/mIg8+XdVmbZniKEUI9XXeq8tj0KUPxT6veZvOGIOYScdFDFAeJcK+GFrjVC5FD37tFlt0vOBDlpPw98sL66N4yxpoBfwfMlgb+PG/NkzsgsAAczptcMooB0ZIBHDH+cnvUGv5O2Vs6qaLJC2itDde/YEoYZWUDSDzxPSMXs2hFp/ZCjfDQeVVOMI8JPHR6ES1j/0n70CMPY5HZXWMQWKlmy8rK6mR7W0fcYaXwKY+GNxdqKd5l+O74c/HJ+ATN0kLIunQUN1FSAD1y2CBj6t6+PszXiiLAEM8epImIu34LAVG9GQXEzk7qpolz930/zP2des8KqRm4IP7JYDHKuuePo05cW+b42bopTvf2YGnE0McMp6kbTCLPYNEr2Y4oKyjfbapi5kRTXzMXjpfJ6N+GB8Pu9D+QH8gzrVxBONACX8yx1eFLaYB972N+rcCyVriVyBklvhXtG4Xjv7By001n6zLUfxDFc+nhSGxJtI9XqVinmsrBpPhV0xs2m9vJSCFUUe23JasTuO2ZIRpBuytrJwA1P/KXEmBJsBJqTelTx7GBhT8qwIJ78nro3mzgQLNdvJz9fXVyeDXpvTq9Oehe4t4EC0hTXYUjYgWGUBh3JtLVZLj1RrttTOhz0A9ImCZO8gs3fQW7bIg22QL8Tm9ak9U5bV6h/SKLKGXnpRigdXSehh2RoZP2E3r400gXxAZEuWp3llm7FxqnGTFQ7a0zbqi8F5ieBA3qHEo0V2RauoYgbXQmxBaHuEsJQWJ36jgV1vpDiVNqZlU9PzI7RynjwjNd+IPlv484S3JU5sho9PxREe0mvV8b1rmECpocKFWpyHnF/h5ABUxyvzkapoD3FtSUZVauwOleDABu1yP6WNgw6rbf1X9Z+ytwEilvtbhdtBiGMW1dnNepvMagtDuow/Q0W7aHCEExfQ5EtQpGswP6ecATTA9vxrcKSiv6/1FUADZxZHsKvH559IQ1Pepuspueo+N+/m5IjpgePcZNCKY1yq7e4da8elXiQVcPL5J8Pb1zprNPsPjc9y21K/fPnuLf65HLPeCxhF22FY6q8iJM+77nHOQ8mXTuc0dqHPZgKZVDQX7HFKRlvoDheYFzdPTaubQgFxKSUMxQQNmySjROQasOG1+lfnfSOX5//XF73nxU4Y9vHqTOjz5/J41yzs1GwtlgPfpFLYcjskFMphawVlW59PevRo1rm8iqMj2p5HdQd9Cuxrq3dyEbcBwUehfm+YZ7wAs/YxPFGPXdS6ila9bxNRqUOtPbUwFNpEVX5lEgqVbAkQ7S+y8hpfH+bnE+02q1sS7TY3Mc+qtDSlvf15W51ft1qzWX361br163Wr1utZenrVuuDbLWWmeBF9PlwuKzGvmT2gdH3YHvOX9VFb/FGIvzcZhuyxhYkVKncgKys/E+4vpDCyH+EIfqrE42quvGM67v1YxHAArgHy/WfEZTctkvmhXfqolekOZfq4qGtt6FLlnxG0/LGmaJXA0Sm62c06SYXhN0Ub2Kvq32E3ALtyYop+3otJ5yJH3Pxcf71sPDd2eajvvBRHmIOyl0mNx4IZorM9RtBFHTxazcEJlpih5v5o/BC7GH2xH/jnmSO4m9oAQysHWGaXLUere6XhxPYZ2ogqb5Gbn4i/l940/FgbZnCjEHq8VxE4tx1lpAnA1Ywa9E9XwTsWlgn3Md3Rsw2svZk9ZYkfP+6Se82u0aUNTWzNjtHPBnCpUTriDvtgdsrZYAFFy0/FKKiKvAPiCGuYaQeRqWJF2s1x/bAg9P6V7RzP8I5QH8yEzd4H3tzPlrkX3rnPprTnIfM8ZvcmbADh3VCgOhHL2NX73MPq9/V17mxuX7nW1UzuXYTNz4R+f5vXtintmNJje3Wja3W4gf1+c/467zev0sn61gCVJTod97+FMx3F4Xe3u9G91v97red+KrrZzKRzCMNxPhxsBE/w2+/PAL0j4+NTPLk6dFRplJoFsJn+vol0dDIDQhKHs/Lgmfm0Yt5vMRvGEmHcftftCriLg==', 'base64'));"); // notifybar-desktop, refer to modules/notifybar-desktop.js - duk_peval_string_noresult(ctx, "addCompressedModule('notifybar-desktop', Buffer.from('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', 'base64'));"); + duk_peval_string_noresult(ctx, "addCompressedModule('notifybar-desktop', Buffer.from('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', 'base64'));"); // proxy-helper, refer to modules/proxy-helper.js duk_peval_string_noresult(ctx, "addCompressedModule('proxy-helper', Buffer.from('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', 'base64'));"); diff --git a/modules/notifybar-desktop.js b/modules/notifybar-desktop.js index 9ba5626..e06e0c5 100644 --- a/modules/notifybar-desktop.js +++ b/modules/notifybar-desktop.js @@ -124,31 +124,37 @@ function windows_notifybar_local(title) { 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); + + // If the bar is too far left, adjust to left most position + if (msg.lparam_raw.Deref(8, 4).toBuffer().readInt32LE() < this._options.window.left) { + msg.lparam_raw.Deref(8, 4).toBuffer().writeInt32LE(this._options.window.left); } - else - { - // Allow the move, but only on the X-axis - msg.lparam_raw.Deref(12, 4).toBuffer().writeInt32LE(this._options.window.y); + + // If the bar is too far right, adjust to right most position + if ((msg.lparam_raw.Deref(8, 4).toBuffer().readInt32LE() + this._options.window.width) >= this._options.window.right) { + msg.lparam_raw.Deref(8, 4).toBuffer().writeInt32LE(this._options.window.right - this._options.window.width); } + + // Lock the bar to the y 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); + + // If the bar is too far left, adjust to left most position + if (msg.lparam_raw.Deref(16, 4).toBuffer().readInt32LE() < this._options.window.left) { + msg.lparam_raw.Deref(16, 4).toBuffer().writeInt32LE(this._options.window.left); } - else - { - // Allow the move, but only on the X-axis - msg.lparam_raw.Deref(20, 4).toBuffer().writeInt32LE(this._options.window.y); + + // If the bar is too far right, adjust to right most position + if ((msg.lparam_raw.Deref(32, 4).toBuffer().readInt32LE() + this._options.window.width) >= this._options.window.right) { + msg.lparam_raw.Deref(32, 4).toBuffer().writeInt32LE(this._options.window.right - this._options.window.width); } + + // Lock the bar to the y axis + msg.lparam_raw.Deref(20, 4).toBuffer().writeInt32LE(this._options.window.y); + break; } } From 2a2386b78e4a6ea591d7b192957377d5f2e70d9f Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Fri, 9 Jul 2021 12:40:53 -0700 Subject: [PATCH 2/5] Fixed agent install dialog text. --- meshservice/MeshService.aps | Bin 56096 -> 38516 bytes meshservice/MeshService.rc | 14 +++++++------- microscript/ILibDuktape_Commit.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meshservice/MeshService.aps b/meshservice/MeshService.aps index d224cbc18151d5b650318120aa3acf48b142a3c4..33a660fb955e2010fb9a819e4c5aeab5aa1e45e7 100644 GIT binary patch delta 1088 zcmbVL-%C?*6hHS~9h#{tb?Qy#Pqc@~ElNd(cHQp0*SXF8FchmLY-mv?xl#&*f*yhp zx04hRQDo6WP_c;cCFrTAfuzgmMgM@xermnk&b^y>M{j-Md%ow#=bUrDpYOT%UUEO4 zu(LHxORTouxQYPw_M`5|#HcV58H>hzO^KoS*A9k7_o7&7hX{;86wbjgoQ4_@U?lBH zJXkDdSw+DY@7}1#)KV1_#<`_Ql7-6?Brh+Q6n9hNSvU{llqy3Q6U$;#81i6)15lJJ z;GtrZ6w~88)andGusS7Dl}PFm6Hct9I+?D+0My?J0}uiSl@p*Byp$TEQ-DFz`yoge zMHwLpV1fJ`P05H>DRz-(*ynRTrd;S2J;6Xw2=)g;L2)1mR*TgFyK$8%GnD|y4tppd z`j3cy*`bE4P>KaC&z1qM`6^fwpyJ~XmZyPkF(8FJf?HIPhoC~|l^xVZcFLk(jkQ1} z;Gn;X=hF~}7_j^0zM$;&sNpu)1IT#IOfBvls$uH@Z~DzlJwEkRF%5}%HY#$kz#uR2 zWo+h3N@nHf*r6S-xvKGot9{3|7n82L+2(${-P?mUX&;-%;VFsuz^l@+eBJvuVv%gl zb_~e1*^Y}vam)o+}}q{g#G^C!)r;X=f2K)w1;4y`?=lNyaW!ZtOi zBm^Wa^NVI~bG@P2ecoQ#KBxiKHAni@Lb^J?b$)uy?_Atp%KqZ;QO|{}OBLLL2AUmp zkE5_sUZ~E`7SSyjS*g!0AljedaJ)I!MA|yuk2f1=lEKDc^233;6O1~19Boo)8I9Wm z_}B=rw+TPL;u}Y4D%V@LplW_L)I#=@4Lg#&VV?TGwc$*XZ)6Ps*E`j$T-uol*EKj! tSxX{Lzwd~D%;}0c|NmcUl>qKIW7B5C0^MVC2F;S$kVoISGK*u9`7dF_G7A6z delta 9822 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 T{aT!TIW}$~d_$(R_UQiut0UYz diff --git a/meshservice/MeshService.rc b/meshservice/MeshService.rc index 7d15267..5c44024 100644 --- a/meshservice/MeshService.rc +++ b/meshservice/MeshService.rc @@ -100,7 +100,7 @@ END IDD_INSTALLDIALOG DIALOGEX 0, 100, 317, 148 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION -CAPTION "Mesh Agent v2" +CAPTION "MeshCentral Agent" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN PUSHBUTTON "Close",IDCANCEL,260,127,50,14 @@ -109,17 +109,17 @@ BEGIN PUSHBUTTON "Install / Update",IDC_INSTALLBUTTON,7,127,65,14 PUSHBUTTON "Uninstall",IDC_UNINSTALLBUTTON,75,127,65,14 ICON IDI_ICON1,IDC_STATIC,288,7,20,20 - LTEXT "Current Agent Status",IDC_AGENTSTATUS_TEXT,14,51,70,8 + LTEXT "Current Agent Status",IDC_AGENTSTATUS_TEXT,14,51,100,8 LTEXT "Unknown",IDC_STATUSTEXT,127,51,175,8,0,WS_EX_RIGHT - LTEXT "New Agent Version",IDC_AGENT_VERSION,14,63,62,8 + LTEXT "New Agent Version",IDC_AGENT_VERSION,14,63, 100,8 LTEXT "Unknown",IDC_VERSIONTEXT,127,63,175,8,0,WS_EX_RIGHT - LTEXT "New Mesh Identifier",IDC_MESH_IDENTIFIER,14,99,65,8 + LTEXT "New Group Id",IDC_MESH_IDENTIFIER,14,99, 100,8 LTEXT "Unknown",IDC_HASHTEXT,127,99,175,8,0,WS_EX_RIGHT - LTEXT "New Mesh Name",IDC_MESH_NAME,14,87,54,8 + LTEXT "New Group Name",IDC_MESH_NAME,14,87, 100,8 LTEXT "Unknown",IDC_POLICYTEXT,127,87,175,8,0,WS_EX_RIGHT - LTEXT "New Server Identifier",IDC_SERVER_IDENTIFIER,14,111,70,8 + LTEXT "New Server Identifier",IDC_SERVER_IDENTIFIER,14,111, 100,8 LTEXT "Unknown",IDC_SERVERID,127,111,175,8,0,WS_EX_RIGHT - LTEXT "New Server Location",IDC_SERVER_LOCATION,14,75,67,8 + LTEXT "New Server Location",IDC_SERVER_LOCATION,14,75, 100,8 LTEXT "Unknown",IDC_SERVERLOCATION,127,75,175,8,0,WS_EX_RIGHT PUSHBUTTON "Connect",IDC_CONNECTBUTTON,143,127,65,14 END diff --git a/microscript/ILibDuktape_Commit.h b/microscript/ILibDuktape_Commit.h index d223993..07ddc15 100644 --- a/microscript/ILibDuktape_Commit.h +++ b/microscript/ILibDuktape_Commit.h @@ -1,3 +1,3 @@ // This file is auto-generated, any edits may be overwritten -#define SOURCE_COMMIT_DATE "2021-Jul-6 14:07:36-0700" -#define SOURCE_COMMIT_HASH "1f5022ed166093f3781ce05814d4e1a5d6b3b625" +#define SOURCE_COMMIT_DATE "2021-Jul-9 12:34:15-0700" +#define SOURCE_COMMIT_HASH "b9ab7d3ca3f479c27ecceb6a6521a24a6dc6a5ad" From 51646002cd6d07c9d2ace22d3f526aeb33135734 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Fri, 9 Jul 2021 13:10:40 -0700 Subject: [PATCH 3/5] Fixed windows service install dialog box button placement. --- meshservice/ServiceMain.c | 19 +++++++++++++++++-- microscript/ILibDuktape_Commit.h | 4 ++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/meshservice/ServiceMain.c b/meshservice/ServiceMain.c index 8bee297..789c8aa 100644 --- a/meshservice/ServiceMain.c +++ b/meshservice/ServiceMain.c @@ -881,6 +881,8 @@ INT_PTR CALLBACK DialogHandler(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP { char *fileName = NULL, *meshname = NULL, *meshid = NULL, *serverid = NULL, *serverurl = NULL, *installFlags = NULL, *mshfile = NULL; char *displayName = NULL, *meshServiceName = NULL; + int hiddenButtons = 0; // Flags: 1 if "Connect" is hidden, 2 if "Uninstall" is hidden, 4 is "Install is hidden" + UNREFERENCED_PARAMETER(lParam); switch (message) { @@ -1084,17 +1086,20 @@ INT_PTR CALLBACK DialogHandler(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP if (meshid == NULL) { EnableWindow(GetDlgItem(hDlg, IDC_CONNECTBUTTON), FALSE); } if ((installFlagsInt & 3) == 1) { // Temporary Agent Only + hiddenButtons |= 6; // Both install and uninstall buttons are hidden ShowWindow(GetDlgItem(hDlg, IDC_INSTALLBUTTON), SW_HIDE); ShowWindow(GetDlgItem(hDlg, IDC_UNINSTALLBUTTON), SW_HIDE); GetWindowPlacement(GetDlgItem(hDlg, IDC_INSTALLBUTTON), &lpwndpl); SetWindowPlacement(GetDlgItem(hDlg, IDC_CONNECTBUTTON), &lpwndpl); } else if ((installFlagsInt & 3) == 2) { // Background Only + hiddenButtons |= 1; // Connect button is hidden hidden ShowWindow(GetDlgItem(hDlg, IDC_CONNECTBUTTON), SW_HIDE); } else if ((installFlagsInt & 3) == 3) { // Uninstall only GetWindowPlacement(GetDlgItem(hDlg, IDC_INSTALLBUTTON), &lpwndpl); SetWindowPlacement(GetDlgItem(hDlg, IDC_UNINSTALLBUTTON), &lpwndpl); + hiddenButtons |= 5; // Both install and connect buttons are hidden ShowWindow(GetDlgItem(hDlg, IDC_INSTALLBUTTON), SW_HIDE); ShowWindow(GetDlgItem(hDlg, IDC_CONNECTBUTTON), SW_HIDE); } @@ -1104,7 +1109,6 @@ INT_PTR CALLBACK DialogHandler(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP EnableWindow(GetDlgItem(hDlg, IDC_CONNECTBUTTON), FALSE); } - // Get the current service running state int r = GetServiceState(meshServiceName != NULL ? meshServiceName : serviceFile); SetWindowTextW(GetDlgItem(hDlg, IDC_INSTALLBUTTON), update_buttontext); @@ -1117,14 +1121,25 @@ INT_PTR CALLBACK DialogHandler(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP case 0: case 100: // Not installed SetWindowTextW(GetDlgItem(hDlg, IDC_STATUSTEXT), state_notinstalled); - ShowWindow(GetDlgItem(hDlg, IDC_UNINSTALLBUTTON), SW_HIDE); SetWindowTextW(GetDlgItem(hDlg, IDC_INSTALLBUTTON), install_buttontext); + hiddenButtons |= 2; // Uninstall buttons is hidden + ShowWindow(GetDlgItem(hDlg, IDC_UNINSTALLBUTTON), SW_HIDE); break; default: // Not running SetWindowTextW(GetDlgItem(hDlg, IDC_STATUSTEXT), state_notrunning); break; } + // Correct the placement of buttons, push them to the left side if some of them are hidden. + if (hiddenButtons == 2) { // Uninstall button is the only one hidden. Place connect button at uninstall position + WINDOWPLACEMENT lpwndpl; + GetWindowPlacement(GetDlgItem(hDlg, IDC_UNINSTALLBUTTON), &lpwndpl); + SetWindowPlacement(GetDlgItem(hDlg, IDC_CONNECTBUTTON), &lpwndpl); + } else if (hiddenButtons == 6) { // Only connect button is showing, place it in the install button location + WINDOWPLACEMENT lpwndpl; + GetWindowPlacement(GetDlgItem(hDlg, IDC_INSTALLBUTTON), &lpwndpl); + SetWindowPlacement(GetDlgItem(hDlg, IDC_CONNECTBUTTON), &lpwndpl); + } if (mshfile != NULL) { free(mshfile); } Duktape_SafeDestroyHeap(ctx); diff --git a/microscript/ILibDuktape_Commit.h b/microscript/ILibDuktape_Commit.h index 07ddc15..6de4fb5 100644 --- a/microscript/ILibDuktape_Commit.h +++ b/microscript/ILibDuktape_Commit.h @@ -1,3 +1,3 @@ // This file is auto-generated, any edits may be overwritten -#define SOURCE_COMMIT_DATE "2021-Jul-9 12:34:15-0700" -#define SOURCE_COMMIT_HASH "b9ab7d3ca3f479c27ecceb6a6521a24a6dc6a5ad" +#define SOURCE_COMMIT_DATE "2021-Jul-9 12:40:53-0700" +#define SOURCE_COMMIT_HASH "2a2386b78e4a6ea591d7b192957377d5f2e70d9f" From 5618516cb96f22a24ae06fc910a61cfeb2d9eaa9 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Sun, 11 Jul 2021 11:42:24 -0700 Subject: [PATCH 4/5] Fixed RCTPRCVDEBUG in ILibSCTP_AddPacketToHoldingQueue. --- microscript/ILibDuktape_Commit.h | 6 ++++-- microstack/ILibWebRTC.c | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/microscript/ILibDuktape_Commit.h b/microscript/ILibDuktape_Commit.h index 6de4fb5..bc19328 100644 --- a/microscript/ILibDuktape_Commit.h +++ b/microscript/ILibDuktape_Commit.h @@ -1,3 +1,5 @@ // This file is auto-generated, any edits may be overwritten -#define SOURCE_COMMIT_DATE "2021-Jul-9 12:40:53-0700" -#define SOURCE_COMMIT_HASH "2a2386b78e4a6ea591d7b192957377d5f2e70d9f" +#define SOURCE_COMMIT_DATE "2021-Jul-9 13:10:40-0700" +#define SOURCE_COMMIT_DATE "2021-Jul-9 13:10:40-0700" +#define SOURCE_COMMIT_HASH "51646002cd6d07c9d2ace22d3f526aeb33135734" +#define SOURCE_COMMIT_HASH "51646002cd6d07c9d2ace22d3f526aeb33135734" diff --git a/microstack/ILibWebRTC.c b/microstack/ILibWebRTC.c index 8a07f20..aa37fd6 100644 --- a/microstack/ILibWebRTC.c +++ b/microstack/ILibWebRTC.c @@ -4083,9 +4083,9 @@ void* ILibSCTP_AddPacketToHoldingQueue(struct ILibStun_dTlsSession* o, ILibSCTP_ { void* retVal = NULL; // Out of sequence packet, find a spot in the receive queue. - - RCTPRCVDEBUG(printf("STORING %u, size = %d\r\n", tsn, chunksize);) - if (ReceiveHoldBuffer_Used(o->receiveHoldBuffer) + payload->length > ILibSCTP_MaxReceiverCredits) { *sentsack = ILibSCTP_SackStatus_Skip; return(NULL); } + + RCTPRCVDEBUG(printf("STORING %u, size = %d\r\n", ntohl(payload->TSN), ntohs(payload->length));) + if (ReceiveHoldBuffer_Used(o->receiveHoldBuffer) + payload->length > ILibSCTP_MaxReceiverCredits) { *sentsack = ILibSCTP_SackStatus_Skip; return(NULL); } retVal = ILibLinkedList_SortedInsertEx(o->receiveHoldBuffer, &ILibSCTP_AddPacketToHoldingQueue_Comparer, &ILibSCTP_AddPacketToHoldingQueue_Chooser, payload, o->receiveHoldBuffer); From a678ff77f0426a20ad5f0b324b4b6c5889b4f502 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Sun, 11 Jul 2021 12:20:43 -0700 Subject: [PATCH 5/5] Fixed agent crash in WebRTC --- microscript/ILibDuktape_Commit.h | 6 ++---- microscript/ILibDuktape_HttpStream.c | 1 + microstack/ILibParsers.c | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/microscript/ILibDuktape_Commit.h b/microscript/ILibDuktape_Commit.h index bc19328..6d7f426 100644 --- a/microscript/ILibDuktape_Commit.h +++ b/microscript/ILibDuktape_Commit.h @@ -1,5 +1,3 @@ // This file is auto-generated, any edits may be overwritten -#define SOURCE_COMMIT_DATE "2021-Jul-9 13:10:40-0700" -#define SOURCE_COMMIT_DATE "2021-Jul-9 13:10:40-0700" -#define SOURCE_COMMIT_HASH "51646002cd6d07c9d2ace22d3f526aeb33135734" -#define SOURCE_COMMIT_HASH "51646002cd6d07c9d2ace22d3f526aeb33135734" +#define SOURCE_COMMIT_DATE "2021-Jul-11 11:42:24-0700" +#define SOURCE_COMMIT_HASH "5618516cb96f22a24ae06fc910a61cfeb2d9eaa9" diff --git a/microscript/ILibDuktape_HttpStream.c b/microscript/ILibDuktape_HttpStream.c index 240ce72..7fc94a6 100644 --- a/microscript/ILibDuktape_HttpStream.c +++ b/microscript/ILibDuktape_HttpStream.c @@ -3991,6 +3991,7 @@ ILibTransport_DoneState ILibDuktape_httpStream_webSocket_WriteWebSocketPacket(IL size_t compressedLen = 0; char *compressedBuffer = NULL; + if (!ILibMemory_CanaryOK(state)) { return(ILibTransport_DoneState_ERROR); } buffer = _buffer; bufferLen = _bufferLen; diff --git a/microstack/ILibParsers.c b/microstack/ILibParsers.c index a726c3e..335ec60 100644 --- a/microstack/ILibParsers.c +++ b/microstack/ILibParsers.c @@ -10925,6 +10925,7 @@ int ILibIsRunningOnChainThread(void* chain) { if (chain == NULL) { return(1); } struct ILibBaseChain* c = (struct ILibBaseChain*)chain; + #if defined(WIN32) return(c->ChainThreadID == 0 || c->ChainThreadID == GetCurrentThreadId()); #else