MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-11 05:43:33 +00:00
Code Issues Releases Wiki Activity

Fixed bug where Windows GetClipboard was getting wrong length when UTF8

Browse Source
This commit is contained in:
Bryan Roe
2020-01-31 09:52:10 -08:00
parent d690d24c89
commit cdb7f4cfc0
2 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

33
modules/clipboard.js
View File

@@ -342,6 +342,7 @@ function lin_copytext(txt)
function win_readtext() function win_readtext()
{ {
var h;
var ret = ''; var ret = '';
var GM = require('_GenericMarshal'); var GM = require('_GenericMarshal');
var user32 = GM.CreateNativeProxy('user32.dll'); var user32 = GM.CreateNativeProxy('user32.dll');
@@ -349,18 +350,33 @@ function win_readtext()
kernel32.CreateMethod('GlobalAlloc'); kernel32.CreateMethod('GlobalAlloc');
kernel32.CreateMethod('GlobalLock'); kernel32.CreateMethod('GlobalLock');
kernel32.CreateMethod('GlobalUnlock'); kernel32.CreateMethod('GlobalUnlock');
user32.CreateMethod('OpenClipboard');
user32.CreateMethod('CloseClipboard'); user32.CreateMethod('CloseClipboard');
user32.CreateMethod('IsClipboardFormatAvailable');
user32.CreateMethod('GetClipboardData'); user32.CreateMethod('GetClipboardData');
user32.CreateMethod('OpenClipboard');
user32.OpenClipboard(0); user32.OpenClipboard(0);
var h = user32.GetClipboardData(CF_UNICODETEXT);
if(h.Val!=0) if (user32.IsClipboardFormatAvailable(CF_UNICODETEXT).Val != 0)
{ {
var hbuffer = kernel32.GlobalLock(h); h = user32.GetClipboardData(CF_UNICODETEXT);
ret = hbuffer.Wide2UTF8; if (h.Val != 0)
kernel32.GlobalUnlock(h); {
var hbuffer = kernel32.GlobalLock(h);
hbuffer._size = -1;
ret = hbuffer.Wide2UTF8;
kernel32.GlobalUnlock(h);
}
} }
else
{
var p = new promise(function (res, rej) { this._res = res; this._rej = rej; });
p._rej('Unknown Clipboard Data');
return (p);
}
user32.CloseClipboard(); user32.CloseClipboard();
var p = new promise(function (res, rej) { this._res = res; this._rej = rej; }); var p = new promise(function (res, rej) { this._res = res; this._rej = rej; });
@@ -379,9 +395,10 @@ function win_copytext(txt)
kernel32.CreateMethod('GlobalAlloc'); kernel32.CreateMethod('GlobalAlloc');
kernel32.CreateMethod('GlobalLock'); kernel32.CreateMethod('GlobalLock');
kernel32.CreateMethod('GlobalUnlock'); kernel32.CreateMethod('GlobalUnlock');
user32.CreateMethod('OpenClipboard');
user32.CreateMethod('EmptyClipboard');
user32.CreateMethod('CloseClipboard'); user32.CreateMethod('CloseClipboard');
user32.CreateMethod('EmptyClipboard');
user32.CreateMethod('IsClipboardFormatAvailable');
user32.CreateMethod('OpenClipboard');
user32.CreateMethod('SetClipboardData'); user32.CreateMethod('SetClipboardData');
var mtxt = GM.CreateVariable(txt, { wide: true }); var mtxt = GM.CreateVariable(txt, { wide: true });