June 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Move NtCreateThreadEx() to the Unix library.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: 245efd04e1456a71a6962acbb8ebc279481e9ffa URL: https://source.winehq.org/git/wine.git/?a=commit;h=245efd04e1456a71a6962acb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 16:37:49 2020 +0200 ntdll: Move NtCreateThreadEx() to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 39 +++++-------------------- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/thread.c | 66 ++++++++++++++++++++++++++++-------------- dlls/ntdll/unix/unix_private.h | 4 --- dlls/ntdll/unixlib.h | 10 +++---- include/winternl.h | 1 + 7 files changed, 61 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=245efd04e1456a71a696…

1 0

Alexandre Julliard : ntdll: Use NtCreateThreadEx() for remote thread creation.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: 33c750f50ff8b6f1eae63140e8287c49a5130a60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33c750f50ff8b6f1eae63140… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 15:23:37 2020 +0200 ntdll: Use NtCreateThreadEx() for remote thread creation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 22 +++++++++++++++++----- dlls/ntdll/unix/thread.c | 8 ++++++-- include/wine/server_protocol.h | 5 +++-- include/winternl.h | 1 + server/protocol.def | 3 ++- server/trace.c | 6 +++--- 6 files changed, 32 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 4b38a73039..a7592f5e15 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -555,6 +555,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) break; case APC_CREATE_THREAD: { + PS_ATTRIBUTE_LIST attr = { sizeof(attr) }; CLIENT_ID id; HANDLE handle; SIZE_T reserve = call->create_thread.reserve; @@ -566,20 +567,31 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) if (reserve == call->create_thread.reserve && commit == call->create_thread.commit && (ULONG_PTR)func == call->create_thread.func && (ULONG_PTR)arg == call->create_thread.arg) { - result->create_thread.status = RtlCreateUserThread( NtCurrentProcess(), NULL, - call->create_thread.suspend, NULL, - reserve, commit, func, arg, &handle, &id ); + attr.Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; + attr.Attributes[0].Size = sizeof(id); + attr.Attributes[0].ValuePtr = &id; + result->create_thread.status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, + NtCurrentProcess(), func, arg, + call->create_thread.flags, 0, + commit, reserve, &attr ); result->create_thread.handle = wine_server_obj_handle( handle ); + result->create_thread.pid = HandleToULong(id.UniqueProcess); result->create_thread.tid = HandleToULong(id.UniqueThread); } else result->create_thread.status = STATUS_INVALID_PARAMETER; break; } case APC_BREAK_PROCESS: + { + HANDLE handle; + result->type = APC_BREAK_PROCESS; - result->break_process.status = RtlCreateUserThread( NtCurrentProcess(), NULL, FALSE, NULL, 0, 0, - DbgUiRemoteBreakin, NULL, NULL, NULL ); + result->break_process.status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, + NtCurrentProcess(), DbgUiRemoteBreakin, NULL, + 0, 0, 0, 0, NULL ); + if (!result->break_process.status) NtClose( handle ); break; + } default: server_protocol_error( "get_apc_request: bad type %d\n", call->type ); break; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 602e0930ab..ec8f1cf8c4 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -185,18 +185,22 @@ NTSTATUS CDECL create_thread( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU memset( &call, 0, sizeof(call) ); call.create_thread.type = APC_CREATE_THREAD; + call.create_thread.flags = flags; call.create_thread.func = wine_server_client_ptr( start ); call.create_thread.arg = wine_server_client_ptr( param ); call.create_thread.reserve = stack_reserve; call.create_thread.commit = stack_commit; - call.create_thread.suspend = flags & THREAD_CREATE_FLAGS_CREATE_SUSPENDED; status = server_queue_process_apc( process, &call, &result ); if (status != STATUS_SUCCESS) return status; if (result.create_thread.status == STATUS_SUCCESS) { - if (id) id->UniqueThread = ULongToHandle( result.create_thread.tid ); *handle = wine_server_ptr_handle( result.create_thread.handle ); + if (id) + { + id->UniqueProcess = ULongToHandle( result.create_thread.pid ); + id->UniqueThread = ULongToHandle( result.create_thread.tid ); + } } return result.create_thread.status; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 520251fd3d..4b40ba7772 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -557,7 +557,7 @@ typedef union struct { enum apc_type type; - int suspend; + unsigned int flags; client_ptr_t func; client_ptr_t arg; mem_size_t reserve; @@ -645,6 +645,7 @@ typedef union { enum apc_type type; unsigned int status; + process_id_t pid; thread_id_t tid; obj_handle_t handle; } create_thread; @@ -6683,7 +6684,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 607 +#define SERVER_PROTOCOL_VERSION 608 /* ### protocol_version end ### */ diff --git a/include/winternl.h b/include/winternl.h index 2342835911..ad64df9d2e 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2580,6 +2580,7 @@ NTSYSAPI NTSTATUS WINAPI NtCreateSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRI NTSYSAPI NTSTATUS WINAPI NtCreateSemaphore(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,LONG,LONG); NTSYSAPI NTSTATUS WINAPI NtCreateSymbolicLinkObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI NtCreateThread(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PCONTEXT,PINITIAL_TEB,BOOLEAN); +NTSYSAPI NTSTATUS WINAPI NtCreateThreadEx(HANDLE*,ACCESS_MASK,OBJECT_ATTRIBUTES*,HANDLE,PRTL_THREAD_START_ROUTINE,void*,ULONG,SIZE_T,SIZE_T,SIZE_T,PS_ATTRIBUTE_LIST*); NTSYSAPI NTSTATUS WINAPI NtCreateTimer(HANDLE*, ACCESS_MASK, const OBJECT_ATTRIBUTES*, TIMER_TYPE); NTSYSAPI NTSTATUS WINAPI NtCreateToken(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,TOKEN_TYPE,PLUID,PLARGE_INTEGER,PTOKEN_USER,PTOKEN_GROUPS,PTOKEN_PRIVILEGES,PTOKEN_OWNER,PTOKEN_PRIMARY_GROUP,PTOKEN_DEFAULT_DACL,PTOKEN_SOURCE); NTSYSAPI NTSTATUS WINAPI NtDelayExecution(BOOLEAN,const LARGE_INTEGER*); diff --git a/server/protocol.def b/server/protocol.def index 632c996dc0..95a3021ee8 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -573,7 +573,7 @@ typedef union struct { enum apc_type type; /* APC_CREATE_THREAD */ - int suspend; /* suspended thread? */ + unsigned int flags; /* creation flags */ client_ptr_t func; /* void (__stdcall *func)(void*); start function */ client_ptr_t arg; /* argument for start function */ mem_size_t reserve; /* reserve size for thread stack */ @@ -661,6 +661,7 @@ typedef union { enum apc_type type; /* APC_CREATE_THREAD */ unsigned int status; /* status returned by call */ + process_id_t pid; /* process id */ thread_id_t tid; /* thread id */ obj_handle_t handle; /* handle to new thread */ } create_thread; diff --git a/server/trace.c b/server/trace.c index 555e697657..83db655d3e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -221,7 +221,7 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) dump_uint64( ",arg=", &call->create_thread.arg ); dump_uint64( ",reserve=", &call->create_thread.reserve ); dump_uint64( ",commit=", &call->create_thread.commit ); - fprintf( stderr, ",suspend=%u", call->create_thread.suspend ); + fprintf( stderr, ",flags=%x", call->create_thread.flags ); break; case APC_BREAK_PROCESS: fprintf( stderr, "APC_BREAK_PROCESS" ); @@ -302,9 +302,9 @@ static void dump_apc_result( const char *prefix, const apc_result_t *result ) get_status_name( result->unmap_view.status ) ); break; case APC_CREATE_THREAD: - fprintf( stderr, "APC_CREATE_THREAD,status=%s,tid=%04x,handle=%04x", + fprintf( stderr, "APC_CREATE_THREAD,status=%s,pid=%04x,tid=%04x,handle=%04x", get_status_name( result->create_thread.status ), - result->create_thread.tid, result->create_thread.handle ); + result->create_thread.pid, result->create_thread.tid, result->create_thread.handle ); break; case APC_BREAK_PROCESS: fprintf( stderr, "APC_BREAK_PROCESS,status=%s", get_status_name( result->break_process.status ) );

1 0

Zebediah Figura : d3dcompiler: Remove a redundant check for writemasks on non-numeric types.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: 24a4f52bbf7ac482c0f9129c1afdeccc8d319702 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24a4f52bbf7ac482c0f9129c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 3 21:06:51 2020 -0500 d3dcompiler: Remove a redundant check for writemasks on non-numeric types. This can only happen if a swizzle is emitted on a non-numeric type, but this is checked when emitting swizzles. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 7093e9eb2c..767d2dee50 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1514,13 +1514,6 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign DWORD bitmask; enum hlsl_type_class type_class; - if (lhs->data_type->type > HLSL_CLASS_LAST_NUMERIC) - { - hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, - "writemask on a non scalar/vector/matrix type"); - d3dcompiler_free(assign); - return NULL; - } bitmask = writemask & ((1 << lhs->data_type->dimx) - 1); while (bitmask) {

1 0

Jacek Caban : mshtml/tests: Improve tests exception handling.
by Alexandre Julliard June 4, 2020

June 4, 2020

Module: wine Branch: master Commit: 78d6d41c4cb7be9a2f1f7e8c0fe5dac99e709f94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78d6d41c4cb7be9a2f1f7e8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 17:29:19 2020 +0200 mshtml/tests: Improve tests exception handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/winetest.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/winetest.js b/dlls/mshtml/tests/winetest.js index 7e8cbfc9b2..6d99adf12b 100644 --- a/dlls/mshtml/tests/winetest.js +++ b/dlls/mshtml/tests/winetest.js @@ -23,10 +23,11 @@ function guard(f) { }catch(e) { var msg = "Got exception "; if(e && typeof(e) == "object" && "message") - msg += e.msg; + msg += e.message; else msg += e; ok(false, msg); + if("tests" in window) next_test(); } }; }

1 0

Jacek Caban : jscript: Throw proper stack overflow exception.
by Alexandre Julliard June 4, 2020

June 4, 2020

Module: wine Branch: master Commit: 3e9d32ca43b71be2a8e64984b81742316d21527b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e9d32ca43b71be2a8e64984… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 17:29:11 2020 +0200 jscript: Throw proper stack overflow exception. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 2 +- dlls/jscript/jscript.h | 1 + dlls/jscript/jscript.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 10 ++++- po/ar.po | 100 ++++++++++++++++++++++++---------------------- po/ast.po | 98 +++++++++++++++++++++++---------------------- po/bg.po | 100 ++++++++++++++++++++++++---------------------- po/ca.po | 100 ++++++++++++++++++++++++---------------------- po/cs.po | 100 ++++++++++++++++++++++++---------------------- po/da.po | 100 ++++++++++++++++++++++++---------------------- po/de.po | 100 ++++++++++++++++++++++++---------------------- po/el.po | 100 ++++++++++++++++++++++++---------------------- po/en.po | 98 +++++++++++++++++++++++---------------------- po/en_US.po | 98 +++++++++++++++++++++++---------------------- po/eo.po | 100 ++++++++++++++++++++++++---------------------- po/es.po | 100 ++++++++++++++++++++++++---------------------- po/fa.po | 98 +++++++++++++++++++++++---------------------- po/fi.po | 100 ++++++++++++++++++++++++---------------------- po/fr.po | 100 ++++++++++++++++++++++++---------------------- po/he.po | 100 ++++++++++++++++++++++++---------------------- po/hi.po | 98 +++++++++++++++++++++++---------------------- po/hr.po | 100 ++++++++++++++++++++++++---------------------- po/hu.po | 100 ++++++++++++++++++++++++---------------------- po/it.po | 100 ++++++++++++++++++++++++---------------------- po/ja.po | 100 ++++++++++++++++++++++++---------------------- po/ko.po | 100 ++++++++++++++++++++++++---------------------- po/lt.po | 100 ++++++++++++++++++++++++---------------------- po/ml.po | 98 +++++++++++++++++++++++---------------------- po/nb_NO.po | 100 ++++++++++++++++++++++++---------------------- po/nl.po | 100 ++++++++++++++++++++++++---------------------- po/or.po | 98 +++++++++++++++++++++++---------------------- po/pa.po | 98 +++++++++++++++++++++++---------------------- po/pl.po | 100 ++++++++++++++++++++++++---------------------- po/pt_BR.po | 100 ++++++++++++++++++++++++---------------------- po/pt_PT.po | 100 ++++++++++++++++++++++++---------------------- po/rm.po | 98 +++++++++++++++++++++++---------------------- po/ro.po | 100 ++++++++++++++++++++++++---------------------- po/ru.po | 100 ++++++++++++++++++++++++---------------------- po/si.po | 100 ++++++++++++++++++++++++---------------------- po/sk.po | 100 ++++++++++++++++++++++++---------------------- po/sl.po | 100 ++++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 100 ++++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 100 ++++++++++++++++++++++++---------------------- po/sv.po | 100 ++++++++++++++++++++++++---------------------- po/ta.po | 98 +++++++++++++++++++++++---------------------- po/te.po | 98 +++++++++++++++++++++++---------------------- po/th.po | 100 ++++++++++++++++++++++++---------------------- po/tr.po | 100 ++++++++++++++++++++++++---------------------- po/uk.po | 100 ++++++++++++++++++++++++---------------------- po/wa.po | 98 +++++++++++++++++++++++---------------------- po/wine.pot | 98 +++++++++++++++++++++++---------------------- po/zh_CN.po | 100 ++++++++++++++++++++++++---------------------- po/zh_TW.po | 100 ++++++++++++++++++++++++---------------------- 54 files changed, 2583 insertions(+), 2306 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e9d32ca43b71be2a8e6…

1 0

Jacek Caban : jscript: Add Array.prototype.reduce implementation.
by Alexandre Julliard June 4, 2020

June 4, 2020

Module: wine Branch: master Commit: 3c72034b72014a087eae8d181252c67cb0782e28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c72034b72014a087eae8d18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 17:30:22 2020 +0200 jscript: Add Array.prototype.reduce implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/es5.js | 47 ++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 5d50b9249e..7941031e49 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1048,7 +1048,7 @@ static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned return hres; } - /* Fixme check IsCallable */ + /* FIXME: check IsCallable */ if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); return E_INVALIDARG; @@ -1094,6 +1094,74 @@ static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned return hres; } +static HRESULT Array_reduce(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +{ + IDispatch *context_this = NULL, *callback; + jsval_t callback_args[4], acc, new_acc; + BOOL have_value = FALSE; + jsdisp_t *jsthis; + DWORD length, k; + HRESULT hres; + + TRACE("\n"); + + hres = get_length(ctx, vthis, &jsthis, &length); + if(FAILED(hres)) { + FIXME("Could not get length\n"); + return hres; + } + + /* Fixme check IsCallable */ + if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); + return E_INVALIDARG; + } + callback = get_object(argv[0]); + + if(argc > 1) { + have_value = TRUE; + hres = jsval_copy(argv[1], &acc); + if(FAILED(hres)) + return hres; + } + + for(k = 0; k < length; k++) { + hres = jsdisp_get_idx(jsthis, k, &callback_args[1]); + if(hres == DISP_E_UNKNOWNNAME) + continue; + if(FAILED(hres)) + break; + + if(!have_value) { + have_value = TRUE; + acc = callback_args[1]; + continue; + } + + callback_args[0] = acc; + callback_args[2] = jsval_number(k); + callback_args[3] = jsval_obj(jsthis); + hres = disp_call_value(ctx, callback, context_this, DISPATCH_METHOD, ARRAY_SIZE(callback_args), callback_args, &new_acc); + jsval_release(callback_args[1]); + if(FAILED(hres)) + break; + + jsval_release(acc); + acc = new_acc; + } + + if(SUCCEEDED(hres) && !have_value) { + WARN("No array element\n"); + hres = JS_E_INVALID_ACTION; + } + + if(SUCCEEDED(hres) && r) + *r = acc; + else if(have_value) + jsval_release(acc); + return hres; +} + /* ECMA-262 3rd Edition 15.4.4.13 */ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) @@ -1198,6 +1266,7 @@ static const builtin_prop_t Array_props[] = { {L"map", Array_map, PROPF_METHOD|PROPF_ES5|1}, {L"pop", Array_pop, PROPF_METHOD}, {L"push", Array_push, PROPF_METHOD|1}, + {L"reduce", Array_reduce, PROPF_METHOD|PROPF_ES5|1}, {L"reverse", Array_reverse, PROPF_METHOD}, {L"shift", Array_shift, PROPF_METHOD}, {L"slice", Array_slice, PROPF_METHOD|2}, diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index c179ca143f..f268eba24c 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -881,3 +881,50 @@ sync_test("keys", function() { ok(Object.keys.length === 1, "Object.keys.length = " + Object.keys.length); }); + +sync_test("reduce", function() { + var r, array; + + r = [1,2,3].reduce(function(a, value) { return a + value + 10; }); + ok(r === 26, "reduce() returned " + r); + + r = [1,2,3].reduce(function(a, value) { return a + value + 10; }, 1); + ok(r === 37, "reduce() returned " + r); + + r = [1,2,3].reduce(function(a, value) { return a + value; }, "str"); + ok(r === "str123", "reduce() returned " + r); + + array = [1,2,3]; + r = array.reduce(function(a, value, index, src) { + ok(src === array, "src != array"); + return a + "(" + index + "," + value + ")"; + }, "str"); + ok(r === "str(0,1)(1,2)(2,3)", "reduce() returned " + r); + + r = [1,2,3].reduce(function(a, value, index, src) { + src[0] = false; + delete src[1]; + src[2] = "test"; + return a + value; + }, ""); + ok(r === "1test", "reduce() returned " + r); + + r = [1].reduce(function(a) { return 0; }); + ok(r === 1, "[1].reduce() returned " + r); + + r = [1].reduce(function(a) { return 0; }, 2); + ok(r === 0, "[1].reduce(2) returned " + r); + + r = [].reduce(function(a) { return 0; }, 2); + ok(r === 2, "[].reduce(2) returned " + r); + + r = [].reduce(function(a) { return 0; }, undefined); + ok(r === undefined, "[].reduce(undefined) returned " + r); + + try { + [].reduce(function(a) { return 0; }); + ok(false, "expected exception"); + }catch(e) {trace(e.message);} + + ok(Array.prototype.reduce.length === 1, "Array.prototype.reduce.length = " + Array.prototype.reduce.length); +});

1 0

Jacek Caban : jscript: Use wide string literals in array.c.
by Alexandre Julliard June 4, 2020

June 4, 2020

Module: wine Branch: master Commit: 7bb9e5a13bfccd23d52b8658255fb6a7e4542e33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bb9e5a13bfccd23d52b8658… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 17:30:06 2020 +0200 jscript: Use wide string literals in array.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 77 ++++++++++++++++++---------------------------------- 1 file changed, 26 insertions(+), 51 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index f8ae12a7d8..5d50b9249e 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -32,25 +32,6 @@ typedef struct { DWORD length; } ArrayInstance; -static const WCHAR lengthW[] = {'l','e','n','g','t','h',0}; -static const WCHAR concatW[] = {'c','o','n','c','a','t',0}; -static const WCHAR forEachW[] = {'f','o','r','E','a','c','h',0}; -static const WCHAR joinW[] = {'j','o','i','n',0}; -static const WCHAR popW[] = {'p','o','p',0}; -static const WCHAR pushW[] = {'p','u','s','h',0}; -static const WCHAR reverseW[] = {'r','e','v','e','r','s','e',0}; -static const WCHAR shiftW[] = {'s','h','i','f','t',0}; -static const WCHAR sliceW[] = {'s','l','i','c','e',0}; -static const WCHAR sortW[] = {'s','o','r','t',0}; -static const WCHAR spliceW[] = {'s','p','l','i','c','e',0}; -static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; -static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; -static const WCHAR unshiftW[] = {'u','n','s','h','i','f','t',0}; -static const WCHAR indexOfW[] = {'i','n','d','e','x','O','f',0}; -static const WCHAR mapW[] = {'m','a','p',0}; - -static const WCHAR default_separatorW[] = {',',0}; - static inline ArrayInstance *array_from_jsdisp(jsdisp_t *jsdisp) { return CONTAINING_RECORD(jsdisp, ArrayInstance, dispex); @@ -88,7 +69,7 @@ static HRESULT get_length(script_ctx_t *ctx, vdisp_t *vdisp, jsdisp_t **jsthis, if(!is_jsdisp(vdisp)) return JS_E_JSCRIPT_EXPECTED; - hres = jsdisp_propget_name(vdisp->u.jsdisp, lengthW, &val); + hres = jsdisp_propget_name(vdisp->u.jsdisp, L"length", &val); if(FAILED(hres)) return hres; @@ -108,7 +89,7 @@ static HRESULT set_length(jsdisp_t *obj, DWORD length) return S_OK; } - return jsdisp_propput_name(obj, lengthW, jsval_number(length)); + return jsdisp_propput_name(obj, L"length", jsval_number(length)); } static WCHAR *idx_to_str(DWORD idx, WCHAR *ptr) @@ -354,7 +335,7 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne jsstr_release(sep_str); }else { - hres = array_join(ctx, jsthis, length, default_separatorW, lstrlenW(default_separatorW), r); + hres = array_join(ctx, jsthis, length, L",", 1, r); } return hres; @@ -878,7 +859,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig } if(SUCCEEDED(hres)) - hres = jsdisp_propput_name(ret_array, lengthW, jsval_number(delete_cnt)); + hres = jsdisp_propput_name(ret_array, L"length", jsval_number(delete_cnt)); } if(add_args < delete_cnt) { @@ -910,7 +891,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig hres = jsdisp_propput_idx(jsthis, start+i, argv[i+2]); if(SUCCEEDED(hres)) - hres = jsdisp_propput_name(jsthis, lengthW, jsval_number(length-delete_cnt+add_args)); + hres = jsdisp_propput_name(jsthis, L"length", jsval_number(length-delete_cnt+add_args)); if(FAILED(hres)) { if(ret_array) @@ -935,8 +916,7 @@ static HRESULT Array_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un if(!array) return JS_E_ARRAY_EXPECTED; - return array_join(ctx, &array->dispex, array->length, default_separatorW, - lstrlenW(default_separatorW), r); + return array_join(ctx, &array->dispex, array->length, L",", 1, r); } static HRESULT Array_toLocaleString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, @@ -1180,8 +1160,7 @@ static HRESULT Array_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) TRACE("\n"); - return array_join(ctx, &array->dispex, array->length, default_separatorW, - lstrlenW(default_separatorW), r); + return array_join(ctx, &array->dispex, array->length, L",", 1, r); } static void Array_destructor(jsdisp_t *dispex) @@ -1211,22 +1190,22 @@ static void Array_on_put(jsdisp_t *dispex, const WCHAR *name) } static const builtin_prop_t Array_props[] = { - {concatW, Array_concat, PROPF_METHOD|1}, - {forEachW, Array_forEach, PROPF_METHOD|PROPF_ES5|1}, - {indexOfW, Array_indexOf, PROPF_METHOD|PROPF_ES5|1}, - {joinW, Array_join, PROPF_METHOD|1}, - {lengthW, NULL,0, Array_get_length, Array_set_length}, - {mapW, Array_map, PROPF_METHOD|PROPF_ES5|1}, - {popW, Array_pop, PROPF_METHOD}, - {pushW, Array_push, PROPF_METHOD|1}, - {reverseW, Array_reverse, PROPF_METHOD}, - {shiftW, Array_shift, PROPF_METHOD}, - {sliceW, Array_slice, PROPF_METHOD|2}, - {sortW, Array_sort, PROPF_METHOD|1}, - {spliceW, Array_splice, PROPF_METHOD|2}, - {toLocaleStringW, Array_toLocaleString, PROPF_METHOD}, - {toStringW, Array_toString, PROPF_METHOD}, - {unshiftW, Array_unshift, PROPF_METHOD|1}, + {L"concat", Array_concat, PROPF_METHOD|1}, + {L"forEach", Array_forEach, PROPF_METHOD|PROPF_ES5|1}, + {L"indexOf", Array_indexOf, PROPF_METHOD|PROPF_ES5|1}, + {L"join", Array_join, PROPF_METHOD|1}, + {L"length", NULL,0, Array_get_length, Array_set_length}, + {L"map", Array_map, PROPF_METHOD|PROPF_ES5|1}, + {L"pop", Array_pop, PROPF_METHOD}, + {L"push", Array_push, PROPF_METHOD|1}, + {L"reverse", Array_reverse, PROPF_METHOD}, + {L"shift", Array_shift, PROPF_METHOD}, + {L"slice", Array_slice, PROPF_METHOD|2}, + {L"sort", Array_sort, PROPF_METHOD|1}, + {L"splice", Array_splice, PROPF_METHOD|2}, + {L"toLocaleString", Array_toLocaleString, PROPF_METHOD}, + {L"toString", Array_toString, PROPF_METHOD}, + {L"unshift", Array_unshift, PROPF_METHOD|1}, }; static const builtin_info_t Array_info = { @@ -1239,7 +1218,7 @@ static const builtin_info_t Array_info = { }; static const builtin_prop_t ArrayInst_props[] = { - {lengthW, NULL,0, Array_get_length, Array_set_length} + {L"length", NULL,0, Array_get_length, Array_set_length} }; static const builtin_info_t ArrayInst_info = { @@ -1343,10 +1322,8 @@ static HRESULT alloc_array(script_ctx_t *ctx, jsdisp_t *object_prototype, ArrayI return S_OK; } -static const WCHAR isArrayW[] = {'i','s','A','r','r','a','y',0}; - static const builtin_prop_t ArrayConstr_props[] = { - {isArrayW, ArrayConstr_isArray, PROPF_ES5|PROPF_METHOD|1} + {L"isArray", ArrayConstr_isArray, PROPF_ES5|PROPF_METHOD|1} }; static const builtin_info_t ArrayConstr_info = { @@ -1363,13 +1340,11 @@ HRESULT create_array_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdis ArrayInstance *array; HRESULT hres; - static const WCHAR ArrayW[] = {'A','r','r','a','y',0}; - hres = alloc_array(ctx, object_prototype, &array); if(FAILED(hres)) return hres; - hres = create_builtin_constructor(ctx, ArrayConstr_value, ArrayW, &ArrayConstr_info, PROPF_CONSTR|1, &array->dispex, ret); + hres = create_builtin_constructor(ctx, ArrayConstr_value, L"Array", &ArrayConstr_info, PROPF_CONSTR|1, &array->dispex, ret); jsdisp_release(&array->dispex); return hres;

1 0

Jacek Caban : jscript: Add Object.keys implementation.
by Alexandre Julliard June 4, 2020

June 4, 2020

Module: wine Branch: master Commit: 102fe73e66859127794cca9bd884a71a78175220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=102fe73e66859127794cca9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 17:29:51 2020 +0200 jscript: Add Object.keys implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 11 +++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/es5.js | 16 +++++++++++++++ 4 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e986de6ef2..d9097c47dd 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2572,3 +2572,14 @@ HRESULT jsdisp_define_data_property(jsdisp_t *obj, const WCHAR *name, unsigned f prop_desc.value = value; return jsdisp_define_property(obj, name, &prop_desc); } + +HRESULT jsdisp_get_prop_name(jsdisp_t *obj, DISPID id, jsstr_t **r) +{ + dispex_prop_t *prop = get_prop(obj, id); + + if(!prop || !prop->name || prop->type == PROP_DELETED) + return DISP_E_MEMBERNOTFOUND; + + *r = jsstr_alloc(prop->name); + return *r ? S_OK : E_OUTOFMEMORY; +} diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index b84f62ff33..e1ab5e5824 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -314,6 +314,7 @@ HRESULT jsdisp_get_own_property(jsdisp_t*,const WCHAR*,BOOL,property_desc_t*) DE HRESULT jsdisp_define_property(jsdisp_t*,const WCHAR*,property_desc_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_define_data_property(jsdisp_t*,const WCHAR*,unsigned,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_next_prop(jsdisp_t*,DISPID,BOOL,DISPID*) DECLSPEC_HIDDEN; +HRESULT jsdisp_get_prop_name(jsdisp_t*,DISPID,jsstr_t**); HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index ef249e91a9..bac79ebde2 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -610,7 +610,7 @@ static HRESULT Object_getPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return E_NOTIMPL; } - TRACE("(%s)\n", debugstr_jsval(argv[1])); + TRACE("(%s)\n", debugstr_jsval(argv[0])); obj = to_jsdisp(get_object(argv[0])); if(!obj) { @@ -625,12 +625,59 @@ static HRESULT Object_getPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return S_OK; } +static HRESULT Object_keys(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + DISPID id = DISPID_STARTENUM; + jsdisp_t *obj, *array; + unsigned i = 0; + jsstr_t *key; + HRESULT hres; + + if(!argc || !is_object_instance(argv[0])) { + FIXME("invalid arguments %s\n", debugstr_jsval(argv[0])); + return E_NOTIMPL; + } + + TRACE("(%s)\n", debugstr_jsval(argv[0])); + + obj = to_jsdisp(get_object(argv[0])); + if(!obj) { + FIXME("Non-JS object\n"); + return E_NOTIMPL; + } + + hres = create_array(ctx, 0, &array); + if(FAILED(hres)) + return hres; + + do { + hres = jsdisp_next_prop(obj, id, TRUE, &id); + if(hres != S_OK) + break; + + hres = jsdisp_get_prop_name(obj, id, &key); + if(FAILED(hres)) + break; + + hres = jsdisp_propput_idx(array, i++, jsval_string(key)); + jsstr_release(key); + } while(hres == S_OK); + + if(SUCCEEDED(hres) && r) + *r = jsval_obj(array); + else + jsdisp_release(array); + return hres; +} + static const builtin_prop_t ObjectConstr_props[] = { {L"create", Object_create, PROPF_ES5|PROPF_METHOD|2}, {L"defineProperties", Object_defineProperties, PROPF_ES5|PROPF_METHOD|2}, {L"defineProperty", Object_defineProperty, PROPF_ES5|PROPF_METHOD|2}, {L"getOwnPropertyDescriptor", Object_getOwnPropertyDescriptor, PROPF_ES5|PROPF_METHOD|2}, - {L"getPrototypeOf", Object_getPrototypeOf, PROPF_ES5|PROPF_METHOD|1} + {L"getPrototypeOf", Object_getPrototypeOf, PROPF_ES5|PROPF_METHOD|1}, + {L"keys", Object_keys, PROPF_ES5|PROPF_METHOD|1} }; static const builtin_info_t ObjectConstr_info = { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index dca5821c0c..c179ca143f 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -865,3 +865,19 @@ sync_test("bind", function() { ok(Function.prototype.bind.length === 1, "Function.prototype.bind.length = " + Function.prototype.bind.length); }); + +sync_test("keys", function() { + var o = { a: 1, b: 2, c: 3 }; + var keys = Object.keys(o).sort().join(); + ok(keys === "a,b,c", "keys = " + keys); + + o = Object.create(o); + keys = Object.keys(o).sort().join(); + ok(keys === "", "keys = " + keys); + + o.test = 1; + keys = Object.keys(o).sort().join(); + ok(keys === "test", "keys = " + keys); + + ok(Object.keys.length === 1, "Object.keys.length = " + Object.keys.length); +});

1 0

Alex Henrie : quartz/tests: Fix overflow in 32-bit time calculation.
by Alexandre Julliard June 4, 2020

June 4, 2020

Module: wine Branch: master Commit: 56e72e071dfa0fd9954f765fabf8e2a9ccb01af1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56e72e071dfa0fd9954f765f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 3 22:38:39 2020 -0600 quartz/tests: Fix overflow in 32-bit time calculation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/systemclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index 71a7ac26d8..f13e89abed 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -183,7 +183,7 @@ static void test_get_time(void) if (pGetTickCount64) time2 = pGetTickCount64() * 10000; else - time2 = GetTickCount() * 10000; + time2 = (REFERENCE_TIME)GetTickCount() * 10000; ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time1 % 10000 == 0, "Expected no less than 1ms coarseness, but got time %s.\n", wine_dbgstr_longlong(time1));

1 0

Louis Lenders : api-ms-win-core-memory-l1-1-4: Add new dll.
by Alexandre Julliard June 4, 2020

June 4, 2020

Module: wine Branch: master Commit: a20a02ca914d5817195c87a18470a24b9ea6841b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a20a02ca914d5817195c87a1… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jun 4 09:43:01 2020 +0200 api-ms-win-core-memory-l1-1-4: Add new dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49283 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-memory-l1-1-4/Makefile.in | 1 + .../api-ms-win-core-memory-l1-1-4.spec | 31 ++++++++++++++++++++++ 4 files changed, 35 insertions(+) diff --git a/configure b/configure index bd5d1166ee..5ad79eaf27 100755 --- a/configure +++ b/configure @@ -984,6 +984,7 @@ enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_memory_l1_1_0 enable_api_ms_win_core_memory_l1_1_1 enable_api_ms_win_core_memory_l1_1_2 +enable_api_ms_win_core_memory_l1_1_4 enable_api_ms_win_core_misc_l1_1_0 enable_api_ms_win_core_namedpipe_l1_1_0 enable_api_ms_win_core_namedpipe_l1_2_0 @@ -20310,6 +20311,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-localregistry-l1-1-0 enable_api_ms_ wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-0 enable_api_ms_win_core_memory_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-1 enable_api_ms_win_core_memory_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-2 enable_api_ms_win_core_memory_l1_1_2 +wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-4 enable_api_ms_win_core_memory_l1_1_4 wine_fn_config_makefile dlls/api-ms-win-core-misc-l1-1-0 enable_api_ms_win_core_misc_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-namedpipe-l1-1-0 enable_api_ms_win_core_namedpipe_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_namedpipe_l1_2_0 diff --git a/configure.ac b/configure.ac index 22369882ce..87ba3bb780 100644 --- a/configure.ac +++ b/configure.ac @@ -2900,6 +2900,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-2) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-4) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-misc-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-l1-2-0) diff --git a/dlls/api-ms-win-core-memory-l1-1-4/Makefile.in b/dlls/api-ms-win-core-memory-l1-1-4/Makefile.in new file mode 100644 index 0000000000..1a45e5581b --- /dev/null +++ b/dlls/api-ms-win-core-memory-l1-1-4/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-memory-l1-1-4.dll diff --git a/dlls/api-ms-win-core-memory-l1-1-4/api-ms-win-core-memory-l1-1-4.spec b/dlls/api-ms-win-core-memory-l1-1-4/api-ms-win-core-memory-l1-1-4.spec new file mode 100644 index 0000000000..b0d402b24c --- /dev/null +++ b/dlls/api-ms-win-core-memory-l1-1-4/api-ms-win-core-memory-l1-1-4.spec @@ -0,0 +1,31 @@ +@ stub CreateFileMappingFromApp +@ stdcall CreateFileMappingW(long ptr long long long wstr) kernel32.CreateFileMappingW +@ stub DiscardVirtualMemory +@ stdcall FlushViewOfFile(ptr long) kernel32.FlushViewOfFile +@ stdcall GetLargePageMinimum() kernel32.GetLargePageMinimum +@ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr) kernel32.GetProcessWorkingSetSizeEx +@ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch +@ stdcall MapViewOfFile(long long long long long) kernel32.MapViewOfFile +@ stdcall MapViewOfFileEx(long long long long long ptr) kernel32.MapViewOfFileEx +@ stub MapViewOfFileFromApp +@ stub OfferVirtualMemory +@ stub OpenFileMappingFromApp +@ stdcall OpenFileMappingW(long long wstr) kernel32.OpenFileMappingW +@ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory +@ stub ReclaimVirtualMemory +@ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch +@ stub SetProcessValidCallTargets +@ stdcall SetProcessWorkingSetSizeEx(long long long long) kernel32.SetProcessWorkingSetSizeEx +@ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile +@ stub UnmapViewOfFileEx +@ stdcall VirtualAlloc(ptr long long long) kernel32.VirtualAlloc +@ stub VirtualAllocFromApp +@ stdcall VirtualFree(ptr long long) kernel32.VirtualFree +@ stdcall VirtualFreeEx(long ptr long long) kernel32.VirtualFreeEx +@ stdcall VirtualLock(ptr long) kernel32.VirtualLock +@ stdcall VirtualProtect(ptr long long ptr) kernel32.VirtualProtect +@ stub VirtualProtectFromApp +@ stdcall VirtualQuery(ptr ptr long) kernel32.VirtualQuery +@ stdcall VirtualQueryEx(long ptr ptr long) kernel32.VirtualQueryEx +@ stdcall VirtualUnlock(ptr long) kernel32.VirtualUnlock +@ stdcall WriteProcessMemory(long ptr ptr long ptr) kernel32.WriteProcessMemory

1 0