wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Alexandre Julliard : ntdll: Implement RtlCreateUserThread() on top of NtCreateThreadEx().
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 39e7f25e0918d23e5b9ef5fc5049948b6f56525e URL: https://source.winehq.org/git/wine.git/?a=commit;h=39e7f25e0918d23e5b9ef5fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 15:09:27 2020 +0200 ntdll: Implement RtlCreateUserThread() on top of NtCreateThreadEx(). Based on a patch by Andrew Wesie. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 43 ++++++++++++++++++++++++++++++++----------- include/winternl.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 91a6a90d26..f2fa9a8b75 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -326,16 +326,33 @@ static void WINAPI call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void * * NtCreateThreadEx (NTDLL.@) */ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle_ptr, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, - HANDLE process, LPTHREAD_START_ROUTINE start, void *param, - ULONG flags, ULONG zero_bits, ULONG stack_commit, - ULONG stack_reserve, void *attribute_list ) + HANDLE process, PRTL_THREAD_START_ROUTINE start, void *param, + ULONG flags, SIZE_T zero_bits, SIZE_T stack_commit, + SIZE_T stack_reserve, PS_ATTRIBUTE_LIST *attr_list ) { - FIXME( "%p, %x, %p, %p, %p, %p, %x, %x, %x, %x, %p semi-stub!\n", handle_ptr, access, attr, - process, start, param, flags, zero_bits, stack_commit, stack_reserve, attribute_list ); + NTSTATUS status; + CLIENT_ID client_id; - return RtlCreateUserThread( process, NULL, flags & THREAD_CREATE_FLAGS_CREATE_SUSPENDED, - NULL, stack_reserve, stack_commit, (PRTL_THREAD_START_ROUTINE)start, - param, handle_ptr, NULL ); + if (!access) access = THREAD_ALL_ACCESS; + + status = unix_funcs->create_thread( handle_ptr, access, attr, process, + start, param, call_thread_entry_point, flags, + stack_commit, stack_reserve, &client_id ); + if (!status && attr_list) + { + SIZE_T i, count = (attr_list->TotalLength - sizeof(attr_list->TotalLength)) / sizeof(PS_ATTRIBUTE); + for (i = 0; i < count; i++) + { + if (attr_list->Attributes[i].Attribute == PS_ATTRIBUTE_CLIENT_ID) + { + SIZE_T size = min( attr_list->Attributes[i].Size, sizeof(client_id) ); + memcpy( attr_list->Attributes[i].ValuePtr, &client_id, size ); + if (attr_list->Attributes[i].ReturnLength) *attr_list->Attributes[i].ReturnLength = size; + } + else FIXME( "Unsupported attribute %08lx\n", attr_list->Attributes[i].Attribute ); + } + } + return status; } @@ -353,12 +370,16 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr, NTSTATUS status; CLIENT_ID client_id; OBJECT_ATTRIBUTES attr; + PS_ATTRIBUTE_LIST attr_list = { sizeof(attr_list) }; + + attr_list.Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; + attr_list.Attributes[0].Size = sizeof(client_id); + attr_list.Attributes[0].ValuePtr = &client_id; InitializeObjectAttributes( &attr, NULL, 0, NULL, descr ); - status = unix_funcs->create_thread( &handle, THREAD_ALL_ACCESS, &attr, process, - start, param, call_thread_entry_point, flags, - stack_commit, stack_reserve, &client_id ); + status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, &attr, process, start, param, + flags, 0, stack_commit, stack_reserve, &attr_list ); if (!status) { if (id) *id = client_id; diff --git a/include/winternl.h b/include/winternl.h index f362790dbc..2342835911 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2453,6 +2453,55 @@ typedef LONG (CALLBACK *PRTL_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); typedef void (CALLBACK *PTP_IO_CALLBACK)(PTP_CALLBACK_INSTANCE,void*,void*,IO_STATUS_BLOCK*,PTP_IO); +#define PS_ATTRIBUTE_THREAD 0x00010000 +#define PS_ATTRIBUTE_INPUT 0x00020000 +#define PS_ATTRIBUTE_UNKNOWN 0x00040000 + +typedef enum _PS_ATTRIBUTE_NUM +{ + PsAttributeParentProcess, + PsAttributeDebugPort, + PsAttributeToken, + PsAttributeClientId, + PsAttributeTebAddress, + PsAttributeImageName, + PsAttributeImageInfo, + PsAttributeMemoryReserve, + PsAttributePriorityClass, + PsAttributeErrorMode, + PsAttributeStdHandleInfo, + PsAttributeHandleList, + PsAttributeGroupAffinity, + PsAttributePreferredNode, + PsAttributeIdealProcessor, + PsAttributeUmsThread, + PsAttributeMitigationOptions, + PsAttributeProtectionLevel, + PsAttributeSecureProcess, + PsAttributeJobList, + PsAttributeMax +} PS_ATTRIBUTE_NUM; + +#define PS_ATTRIBUTE_CLIENT_ID (PsAttributeClientId | PS_ATTRIBUTE_THREAD) + +typedef struct _PS_ATTRIBUTE +{ + ULONG_PTR Attribute; + SIZE_T Size; + union + { + ULONG_PTR Value; + void *ValuePtr; + }; + SIZE_T *ReturnLength; +} PS_ATTRIBUTE; + +typedef struct _PS_ATTRIBUTE_LIST +{ + SIZE_T TotalLength; + PS_ATTRIBUTE Attributes[1]; +} PS_ATTRIBUTE_LIST, *PPS_ATTRIBUTE_LIST; + /*********************************************************************** * Function declarations */

1 0

Alexandre Julliard : ntdll: Move the rest of the thread creation code to the Unix library.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: ca3ca7b046ae94a152b1367ca982774345887e55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca3ca7b046ae94a152b1367c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 14:09:19 2020 +0200 ntdll: Move the rest of the thread creation code to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 92 ++++++------------------------------------ dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/sync.c | 4 +- dlls/ntdll/unix/thread.c | 91 ++++++++++++++++++++++++++++++++++++----- dlls/ntdll/unix/unix_private.h | 11 +++-- dlls/ntdll/unixlib.h | 10 ++--- 7 files changed, 109 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca3ca7b046ae94a152b1…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: f4efea22337f1099097471b48c002f6ed5290f83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4efea22337f1099097471b4… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Jun 5 00:19:11 2020 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index c61d89b1d1..5d4a4eadeb 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-06-04 01:06+0300\n" +"PO-Revision-Date: 2020-06-05 00:17+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3632,10 +3632,8 @@ msgid "Subscript out of range" msgstr "Indeksas nepatenka į rėžius" #: jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "Pasibaigęs popierius; " +msgstr "Trūksta vietos dėkle" #: jscript.rc:32 msgid "Object required"

1 0

Jacek Caban : jscript: Add Array.prototype.reduce implementation.
by Alexandre Julliard 04 Jun '20

04 Jun '20

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 04 Jun '20

04 Jun '20

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 04 Jun '20

04 Jun '20

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

Jacek Caban : mshtml/tests: Improve tests exception handling.
by Alexandre Julliard 04 Jun '20

04 Jun '20

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 04 Jun '20

04 Jun '20

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: Don't realloc interpreter stack.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 2c21d0344cae7ee0c3205393b518a75ab882d535 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c21d0344cae7ee0c3205393… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 17:28:56 2020 +0200 jscript: Don't realloc interpreter stack. We share the stack for all calls in script instance, so it no loner makes sense. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 27 ++++++++++----------------- dlls/jscript/jscript.h | 1 - 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c39c59e3ab..548bc2560c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -62,25 +62,12 @@ typedef struct { } u; } exprval_t; +static const size_t stack_size = 0x4000; + static HRESULT stack_push(script_ctx_t *ctx, jsval_t v) { - if(!ctx->stack_size) { - ctx->stack = heap_alloc(16*sizeof(*ctx->stack)); - if(!ctx->stack) - return E_OUTOFMEMORY; - ctx->stack_size = 16; - }else if(ctx->stack_size == ctx->stack_top) { - jsval_t *new_stack; - - new_stack = heap_realloc(ctx->stack, ctx->stack_size*2*sizeof(*new_stack)); - if(!new_stack) { - jsval_release(v); - return E_OUTOFMEMORY; - } - - ctx->stack = new_stack; - ctx->stack_size *= 2; - } + if(ctx->stack_top == stack_size) + return E_OUTOFMEMORY; ctx->stack[ctx->stack_top++] = v; return S_OK; @@ -3006,6 +2993,12 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi unsigned i; HRESULT hres; + if(!ctx->stack) { + ctx->stack = heap_alloc(stack_size * sizeof(*ctx->stack)); + if(!ctx->stack) + return E_OUTOFMEMORY; + } + if(bytecode->named_item) { if(!bytecode->named_item->script_obj) { hres = create_named_item_script_obj(ctx, bytecode->named_item); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 40b9f794ae..2a2250d3e9 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -425,7 +425,6 @@ struct _script_ctx_t { heap_pool_t tmp_heap; jsval_t *stack; - unsigned stack_size; unsigned stack_top; jsval_t acc;

1 0

Jacek Caban : jscript: Inline add_eval implementation.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 0841b60b8d7464724eb52d0fab8e2c0321a2489c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0841b60b8d7464724eb52d0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 17:28:03 2020 +0200 jscript: Inline add_eval implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 27f03084fa..c39c59e3ab 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1734,21 +1734,27 @@ static HRESULT interp_in(script_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.6.1 */ -static HRESULT add_eval(script_ctx_t *ctx, jsval_t lval, jsval_t rval, jsval_t *ret) +static HRESULT interp_add(script_ctx_t *ctx) { - jsval_t r, l; + jsval_t l, r, lval, rval, ret; HRESULT hres; + rval = stack_pop(ctx); + lval = stack_pop(ctx); + + TRACE("%s + %s\n", debugstr_jsval(lval), debugstr_jsval(rval)); + hres = to_primitive(ctx, lval, &l, NO_HINT); + if(SUCCEEDED(hres)) { + hres = to_primitive(ctx, rval, &r, NO_HINT); + if(FAILED(hres)) + jsval_release(l); + } + jsval_release(lval); + jsval_release(rval); if(FAILED(hres)) return hres; - hres = to_primitive(ctx, rval, &r, NO_HINT); - if(FAILED(hres)) { - jsval_release(l); - return hres; - } - if(is_string(l) || is_string(r)) { jsstr_t *lstr, *rstr = NULL; @@ -1761,7 +1767,7 @@ static HRESULT add_eval(script_ctx_t *ctx, jsval_t lval, jsval_t rval, jsval_t * ret_str = jsstr_concat(lstr, rstr); if(ret_str) - *ret = jsval_string(ret_str); + ret = jsval_string(ret_str); else hres = E_OUTOFMEMORY; } @@ -1776,29 +1782,12 @@ static HRESULT add_eval(script_ctx_t *ctx, jsval_t lval, jsval_t rval, jsval_t * if(SUCCEEDED(hres)) { hres = to_number(ctx, r, &nr); if(SUCCEEDED(hres)) - *ret = jsval_number(nl+nr); + ret = jsval_number(nl+nr); } } jsval_release(r); jsval_release(l); - return hres; -} - -/* ECMA-262 3rd Edition 11.6.1 */ -static HRESULT interp_add(script_ctx_t *ctx) -{ - jsval_t l, r, ret; - HRESULT hres; - - r = stack_pop(ctx); - l = stack_pop(ctx); - - TRACE("%s + %s\n", debugstr_jsval(l), debugstr_jsval(r)); - - hres = add_eval(ctx, l, r, &ret); - jsval_release(l); - jsval_release(r); if(FAILED(hres)) return hres;

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2020