MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2026-02-08 04:33:23 +00:00
Code Issues Releases Wiki Activity

1. Added 'getUsername' for windows

Browse Source 
2. Added UTF8/Wide conversions for _GenericMarshal
3. Added UTF8 support for win-registry and process-manager
This commit is contained in:
Bryan Roe
2019-08-08 15:37:17 -07:00
parent 10332b3775
commit b34eee2dca
5 changed files with 76 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
microscript/ILibDuktape_GenericMarshal.c
View File

@@ -185,6 +185,22 @@ duk_ret_t ILibDuktape_GenericMarshal_Variable_Val_ASTRING(duk_context *ctx)
return 1;
}
duk_ret_t ILibDuktape_GenericMarshal_Variable_Val_UTFSTRING(duk_context *ctx)
{
void *ptr;
int size;
duk_push_this(ctx); // [var]
duk_get_prop_string(ctx, -1, "_ptr"); // [var][ptr]
ptr = duk_to_pointer(ctx, -1);
duk_get_prop_string(ctx, -2, "_size"); // [var][ptr][size]
size = duk_to_int(ctx, -1);
ILibDuktape_String_PushWideString(ctx, ptr, size == 0 ? -1 : size);
return 1;
}
duk_ret_t ILibDuktape_GenericMarshal_Variable_Val_GET(duk_context *ctx)
{
void *ptr;
@@ -414,6 +430,8 @@ void ILibDuktape_GenericMarshal_Variable_PUSH(duk_context *ctx, void *ptr, int s
ILibDuktape_CreateInstanceMethod(ctx, "Deref", ILibDuktape_GenericMarshal_Variable_Deref, DUK_VARARGS);
ILibDuktape_CreateEventWithGetter(ctx, "String", ILibDuktape_GenericMarshal_Variable_Val_STRING);
ILibDuktape_CreateEventWithGetter(ctx, "AnsiString", ILibDuktape_GenericMarshal_Variable_Val_ASTRING);
ILibDuktape_CreateEventWithGetter(ctx, "Wide2UTF8", ILibDuktape_GenericMarshal_Variable_Val_UTFSTRING);
ILibDuktape_CreateEventWithGetter(ctx, "HexString", ILibDuktape_GenericMarshal_Variable_Val_HSTRING);
ILibDuktape_CreateEventWithGetter(ctx, "HexString2", ILibDuktape_GenericMarshal_Variable_Val_HSTRING2);
@@ -448,7 +466,10 @@ duk_ret_t ILibDuktape_GenericMarshal_CreateVariable(duk_context *ctx)
#ifdef WIN32
wchar_t *wbuffer = (wchar_t*)ILibMemory_AllocateA(((int)strLen * 2) + 2);
size_t converted;
mbstowcs_s(&converted, wbuffer, (size_t)strLen+1, str, (size_t)strLen);
if (MultiByteToWideChar(CP_UTF8, 0, (LPCCH)str, size, wbuffer, strLen + 1) == 0)
{
return(ILibDuktape_Error(ctx, "UTF8 Conversion Error"));
}
str = (char*)wbuffer;
size = (int)ILibMemory_AllocateA_Size(str);
strLen = size - 1;

20
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long