June 2023 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : jscript: Use jsstr_empty instead of allocating empty string.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: e748ead5cf41a72a92cab16a9b1deee2ca2e74c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/e748ead5cf41a72a92cab16a9b1dee… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 22 16:19:01 2023 +0300 jscript: Use jsstr_empty instead of allocating empty string. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/json.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index 7826000f87d..e07ad863348 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -396,13 +396,11 @@ static HRESULT JSON_parse(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned if(SUCCEEDED(hres)) { struct transform_json_object_ctx proc_ctx = { ctx, get_object(argv[1]), S_OK }; - if(!(str = jsstr_alloc(L""))) - hres = E_OUTOFMEMORY; - else { - ret = transform_json_object(&proc_ctx, root, str); - jsstr_release(str); - hres = proc_ctx.hres; - } + + str = jsstr_empty(); + ret = transform_json_object(&proc_ctx, root, str); + jsstr_release(str); + hres = proc_ctx.hres; } jsdisp_release(root); if(FAILED(hres))

1 0

Gabriel Ivăncescu : jscript: Implement `caller` for function instances and prototype.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 426f4bb3eadcf15378f7d4682a8ea904d5143408 URL: https://gitlab.winehq.org/wine/wine/-/commit/426f4bb3eadcf15378f7d4682a8ea9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 22 16:19:01 2023 +0300 jscript: Implement `caller` for function instances and prototype. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/function.c | 49 ++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 1 + dlls/mshtml/tests/documentmode.js | 21 +++++++++++++++++ dlls/mshtml/tests/es5.js | 12 ++++++++++ 4 files changed, 82 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 83dbfed6054..abd6638cab8 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -270,6 +270,26 @@ HRESULT Function_invoke(jsdisp_t *func_this, jsval_t vthis, WORD flags, unsigned return function->vtbl->call(function->dispex.ctx, function, vthis, flags, argc, argv, r); } +static HRESULT Function_get_caller(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) +{ + FunctionInstance *function = function_from_jsdisp(jsthis); + call_frame_t *frame; + + TRACE("%p\n", jsthis); + + for(frame = ctx->call_ctx; frame; frame = frame->prev_frame) { + if(frame->function_instance == &function->dispex) { + if(!frame->prev_frame || !frame->prev_frame->function_instance) + break; + *r = jsval_obj(jsdisp_addref(frame->prev_frame->function_instance)); + return S_OK; + } + } + + *r = jsval_null(); + return S_OK; +} + static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { TRACE("%p\n", jsthis); @@ -565,6 +585,7 @@ static const builtin_prop_t Function_props[] = { {L"arguments", NULL, 0, Function_get_arguments}, {L"bind", Function_bind, PROPF_METHOD|PROPF_ES5|1}, {L"call", Function_call, PROPF_METHOD|1}, + {L"caller", NULL, PROPF_HTML, Function_get_caller}, {L"length", NULL, 0, Function_get_length}, {L"toString", Function_toString, PROPF_METHOD} }; @@ -584,6 +605,7 @@ static const builtin_info_t Function_info = { static const builtin_prop_t FunctionInst_props[] = { {L"arguments", NULL, 0, Function_get_arguments}, + {L"caller", NULL, PROPF_HTML, Function_get_caller}, {L"length", NULL, 0, Function_get_length} }; @@ -769,6 +791,7 @@ static HRESULT InterpretedFunction_set_prototype(script_ctx_t *ctx, jsdisp_t *js static const builtin_prop_t InterpretedFunction_props[] = { {L"arguments", NULL, 0, Function_get_arguments}, + {L"caller", NULL, PROPF_HTML, Function_get_caller}, {L"length", NULL, 0, Function_get_length}, {L"prototype", NULL, 0, InterpretedFunction_get_prototype, InterpretedFunction_set_prototype} }; @@ -889,6 +912,30 @@ HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, function_cod return S_OK; } +static HRESULT BindFunction_get_caller(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) +{ + return JS_E_INVALID_ACTION; +} + +static const builtin_prop_t BindFunction_props[] = { + {L"arguments", NULL, 0, Function_get_arguments}, + {L"caller", NULL, 0, BindFunction_get_caller}, + {L"length", NULL, 0, Function_get_length} +}; + +static const builtin_info_t BindFunction_info = { + JSCLASS_FUNCTION, + Function_value, + ARRAY_SIZE(BindFunction_props), + BindFunction_props, + Function_destructor, + NULL, + NULL, + NULL, + NULL, + Function_gc_traverse +}; + static HRESULT BindFunction_call(script_ctx_t *ctx, FunctionInstance *func, jsval_t vthis, unsigned flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -975,7 +1022,7 @@ static HRESULT create_bind_function(script_ctx_t *ctx, FunctionInstance *target, BindFunction *function; HRESULT hres; - hres = create_function(ctx, NULL, &BindFunctionVtbl, FIELD_OFFSET(BindFunction, args[argc]), PROPF_METHOD, + hres = create_function(ctx, &BindFunction_info, &BindFunctionVtbl, FIELD_OFFSET(BindFunction, args[argc]), PROPF_METHOD, FALSE, NULL, (void**)&function); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 481e0612be5..a7a6f5a0ac2 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -286,6 +286,7 @@ ok(unescape(escape(tmp)) === tmp, "unescape(escape('" + tmp + "')) = " + unescap ok(Object.prototype.hasOwnProperty('toString'), "Object.prototype.hasOwnProperty('toString') is false"); ok(Object.prototype.hasOwnProperty('isPrototypeOf'), "Object.prototype.hasOwnProperty('isPrototypeOf') is false"); ok(Function.prototype.hasOwnProperty('call'), "Function.prototype.hasOwnProperty('call') is false"); +ok(!Function.prototype.hasOwnProperty('caller'), "Function.prototype.hasOwnProperty('caller') is true"); Object(); new Object(); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 9007d451bdb..dd67a117e64 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -840,6 +840,27 @@ sync_test("for..in", function() { ok(found === 1, "ondragstart enumerated " + found + " times in document after set to empty string"); }); +sync_test("function caller", function() { + ok(Function.prototype.hasOwnProperty("caller"), "caller not prop of Function.prototype"); + + function test_caller(expected_caller, stop) { + ok(test_caller.caller === expected_caller, "caller = " + test_caller.caller); + if(stop) return; + function nested() { + ok(nested.caller === test_caller, "nested caller = " + nested.caller); + test_caller(nested, true); + ok(test_caller.caller === expected_caller, "caller within nested = " + test_caller.caller); + } + nested(); + ok(test_caller.caller === expected_caller, "caller after nested = " + test_caller.caller); + } + ok(test_caller.hasOwnProperty("caller"), "caller not prop of test_caller"); + ok(test_caller.caller === null, "test_caller.caller = " + test_caller.caller); + + function f1() { test_caller(f1); } f1(); + function f2() { test_caller(f2); } f2(); +}); + sync_test("elem_by_id", function() { document.body.innerHTML = '<form id="testid" name="testname"></form>'; var v = document.documentMode, found, i; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 1ed3a64bcba..43723a68d00 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -18,6 +18,7 @@ var E_INVALIDARG = 0x80070057; var JS_E_PROP_DESC_MISMATCH = 0x800a01bd; +var JS_E_INVALID_ACTION = 0x800a01bd; var JS_E_NUMBER_EXPECTED = 0x800a1389; var JS_E_FUNCTION_EXPECTED = 0x800a138a; var JS_E_DATE_EXPECTED = 0x800a138e; @@ -525,11 +526,14 @@ sync_test("getOwnPropertyDescriptor", function() { (function() { test_own_data_prop_desc(arguments, "length", true, false, true); test_own_data_prop_desc(arguments, "callee", true, false, true); + ok(!("caller" in arguments), "caller in arguments"); })(); test_own_data_prop_desc(String, "prototype", false, false, false); test_own_data_prop_desc(function(){}, "prototype", true, false, false); + test_own_data_prop_desc(function(){}, "caller", false, false, false); test_own_data_prop_desc(Function, "prototype", false, false, false); + test_own_data_prop_desc(Function.prototype, "caller", false, false, false); test_own_data_prop_desc(String.prototype, "constructor", true, false, true); try { @@ -1136,6 +1140,14 @@ sync_test("bind", function() { r = f.call(o2); ok(r === 1, "r = " + r); + try { + f.caller; + ok(false, "expected exception getting f.caller"); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === JS_E_INVALID_ACTION, "f.caller threw " + n); + } + f = (function() { ok(this === o, "this != o"); ok(arguments.length === 1, "arguments.length = " + arguments.length);

1 0

Gabriel Ivăncescu : jscript: Throw error when accessing `arguments` prop of bind functions.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: a4c2f6ab72d233f103445f711808b29fa2cc8590 URL: https://gitlab.winehq.org/wine/wine/-/commit/a4c2f6ab72d233f103445f711808b2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 22 16:19:01 2023 +0300 jscript: Throw error when accessing `arguments` prop of bind functions. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/function.c | 7 ++++++- dlls/mshtml/tests/es5.js | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index abd6638cab8..c4ee495a428 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -912,13 +912,18 @@ HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, function_cod return S_OK; } +static HRESULT BindFunction_get_arguments(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) +{ + return JS_E_INVALID_ACTION; +} + static HRESULT BindFunction_get_caller(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { return JS_E_INVALID_ACTION; } static const builtin_prop_t BindFunction_props[] = { - {L"arguments", NULL, 0, Function_get_arguments}, + {L"arguments", NULL, 0, BindFunction_get_arguments}, {L"caller", NULL, 0, BindFunction_get_caller}, {L"length", NULL, 0, Function_get_length} }; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 43723a68d00..fb9b710c70c 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -532,8 +532,10 @@ sync_test("getOwnPropertyDescriptor", function() { test_own_data_prop_desc(String, "prototype", false, false, false); test_own_data_prop_desc(function(){}, "prototype", true, false, false); test_own_data_prop_desc(function(){}, "caller", false, false, false); + test_own_data_prop_desc(function(){}, "arguments", false, false, false); test_own_data_prop_desc(Function, "prototype", false, false, false); test_own_data_prop_desc(Function.prototype, "caller", false, false, false); + test_own_data_prop_desc(Function.prototype, "arguments", false, false, false); test_own_data_prop_desc(String.prototype, "constructor", true, false, true); try { @@ -1140,6 +1142,13 @@ sync_test("bind", function() { r = f.call(o2); ok(r === 1, "r = " + r); + try { + f.arguments; + ok(false, "expected exception getting f.arguments"); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === JS_E_INVALID_ACTION, "f.arguments threw " + n); + } try { f.caller; ok(false, "expected exception getting f.caller");

1 0

Gabriel Ivăncescu : jscript: Don't expose Function.prototype.arguments in non-html mode.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 898b705e834f445c497b66ef240f7af1a1e7907b URL: https://gitlab.winehq.org/wine/wine/-/commit/898b705e834f445c497b66ef240f7a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 22 16:19:01 2023 +0300 jscript: Don't expose Function.prototype.arguments in non-html mode. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/function.c | 2 +- dlls/jscript/tests/api.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index c4ee495a428..a0450c57fe4 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -582,7 +582,7 @@ static HRESULT Function_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op o static const builtin_prop_t Function_props[] = { {L"apply", Function_apply, PROPF_METHOD|2}, - {L"arguments", NULL, 0, Function_get_arguments}, + {L"arguments", NULL, PROPF_HTML, Function_get_arguments}, {L"bind", Function_bind, PROPF_METHOD|PROPF_ES5|1}, {L"call", Function_call, PROPF_METHOD|1}, {L"caller", NULL, PROPF_HTML, Function_get_caller}, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a7a6f5a0ac2..d632d889476 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -287,6 +287,7 @@ ok(Object.prototype.hasOwnProperty('toString'), "Object.prototype.hasOwnProperty ok(Object.prototype.hasOwnProperty('isPrototypeOf'), "Object.prototype.hasOwnProperty('isPrototypeOf') is false"); ok(Function.prototype.hasOwnProperty('call'), "Function.prototype.hasOwnProperty('call') is false"); ok(!Function.prototype.hasOwnProperty('caller'), "Function.prototype.hasOwnProperty('caller') is true"); +ok(!Function.prototype.hasOwnProperty('arguments'), "Function.prototype.hasOwnProperty('arguments') is true"); Object(); new Object();

1 0

Gabriel Ivăncescu : jscript: Store ref to scope directly instead of frame in arguments object.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 963be08bcc30c5a89f89ea78cc74c2f8407b5ee0 URL: https://gitlab.winehq.org/wine/wine/-/commit/963be08bcc30c5a89f89ea78cc74c2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 22 16:19:01 2023 +0300 jscript: Store ref to scope directly instead of frame in arguments object. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 2 +- dlls/jscript/function.c | 37 ++++++++++++++++++++++++------------- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d2b1089b8ac..379d209f0b0 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3116,7 +3116,7 @@ static void pop_call_frame(script_ctx_t *ctx) } if(frame->arguments_obj) - detach_arguments_object(frame->arguments_obj); + detach_arguments_object(frame); if(frame->scope) scope_release(frame->scope); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 917f67c17d8..68b60401063 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -310,4 +310,4 @@ HRESULT exec_source(script_ctx_t*,DWORD,bytecode_t*,function_code_t*,scope_chain HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT setup_arguments_object(script_ctx_t*,call_frame_t*) DECLSPEC_HIDDEN; -void detach_arguments_object(jsdisp_t*) DECLSPEC_HIDDEN; +void detach_arguments_object(call_frame_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index a0450c57fe4..4942c70e75e 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -66,7 +66,7 @@ typedef struct { typedef struct { jsdisp_t jsdisp; jsval_t *buf; - call_frame_t *frame; + scope_chain_t *scope; unsigned argc; } ArgumentsInstance; @@ -113,6 +113,9 @@ static void Arguments_destructor(jsdisp_t *jsdisp) free(arguments->buf); } + if(arguments->scope) + scope_release(arguments->scope); + free(arguments); } @@ -126,9 +129,9 @@ static jsval_t *get_argument_ref(ArgumentsInstance *arguments, unsigned idx) { if(arguments->buf) return arguments->buf + idx; - if(!arguments->frame->base_scope->detached_vars) - return arguments->jsdisp.ctx->stack + arguments->frame->arguments_off + idx; - return arguments->frame->base_scope->detached_vars->var + idx; + if(!arguments->scope->detached_vars) + return arguments->jsdisp.ctx->stack + arguments->scope->frame->arguments_off + idx; + return arguments->scope->detached_vars->var + idx; } static HRESULT Arguments_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) @@ -172,6 +175,12 @@ static HRESULT Arguments_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op } } + if(arguments->scope) { + hres = gc_process_linked_obj(gc_ctx, op, jsdisp, &arguments->scope->dispex, (void**)&arguments->scope); + if(FAILED(hres)) + return hres; + } + return S_OK; } @@ -203,7 +212,7 @@ HRESULT setup_arguments_object(script_ctx_t *ctx, call_frame_t *frame) } args->argc = frame->argc; - args->frame = frame; + args->scope = scope_addref(frame->base_scope); hres = jsdisp_define_data_property(&args->jsdisp, L"length", PROPF_WRITABLE | PROPF_CONFIGURABLE, jsval_number(args->argc)); @@ -221,23 +230,22 @@ HRESULT setup_arguments_object(script_ctx_t *ctx, call_frame_t *frame) return S_OK; } -void detach_arguments_object(jsdisp_t *args_disp) +void detach_arguments_object(call_frame_t *frame) { - ArgumentsInstance *arguments = arguments_from_jsdisp(args_disp); - call_frame_t *frame = arguments->frame; - const BOOL on_stack = frame->base_scope->frame == frame; - jsdisp_t *jsobj = as_jsdisp(frame->base_scope->obj); + ArgumentsInstance *arguments = arguments_from_jsdisp(frame->arguments_obj); + scope_chain_t *scope = arguments->scope; + const BOOL on_stack = scope->frame == frame; + jsdisp_t *jsobj = as_jsdisp(scope->obj); /* Reset arguments value to cut the reference cycle. Note that since all activation contexts have * their own arguments property, it's impossible to use prototype's one during name lookup */ jsdisp_propput_name(jsobj, L"arguments", jsval_undefined()); - arguments->frame = NULL; /* Don't bother coppying arguments if call frame holds the last reference. */ if(arguments->jsdisp.ref > 1) { arguments->buf = malloc(arguments->argc * sizeof(*arguments->buf)); if(arguments->buf) { - const jsval_t *args = on_stack ? arguments->jsdisp.ctx->stack + frame->arguments_off : frame->base_scope->detached_vars->var; + const jsval_t *args = on_stack ? arguments->jsdisp.ctx->stack + frame->arguments_off : scope->detached_vars->var; int i; for(i = 0; i < arguments->argc ; i++) { @@ -248,9 +256,12 @@ void detach_arguments_object(jsdisp_t *args_disp) ERR("out of memory\n"); arguments->argc = 0; } + + arguments->scope = NULL; + scope_release(scope); } - jsdisp_release(frame->arguments_obj); + jsdisp_release(&arguments->jsdisp); } HRESULT Function_invoke(jsdisp_t *func_this, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)

1 0

Gabriel Ivăncescu : jscript: Don't use detached arguments buffer in html mode.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 4a78b9914f7faf0030b7ee3e77c7fe71a4149ff5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a78b9914f7faf0030b7ee3e77c7fe… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 22 16:19:01 2023 +0300 jscript: Don't use detached arguments buffer in html mode. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/function.c | 2 +- dlls/mshtml/tests/documentmode.js | 50 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 4942c70e75e..68f841b38a1 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -242,7 +242,7 @@ void detach_arguments_object(call_frame_t *frame) jsdisp_propput_name(jsobj, L"arguments", jsval_undefined()); /* Don't bother coppying arguments if call frame holds the last reference. */ - if(arguments->jsdisp.ref > 1) { + if(arguments->jsdisp.ref > 1 && !arguments->jsdisp.ctx->html_mode) { arguments->buf = malloc(arguments->argc * sizeof(*arguments->buf)); if(arguments->buf) { const jsval_t *args = on_stack ? arguments->jsdisp.ctx->stack + frame->arguments_off : scope->detached_vars->var; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index dd67a117e64..3533d721960 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1228,6 +1228,56 @@ sync_test("delete_prop", function() { ok(!("globalprop4" in obj), "globalprop4 is still in obj"); }); +sync_test("detached arguments", function() { + var args, get_a, set_a, get_x, set_x; + + function test_args() { + ok(args[0] === 1, "args[0] = " + args[0]); + set_x(2); + ok(args[0] === 2, "args[0] = " + args[0]); + args[0] = 3; + ok(get_x() === 3, "get_x() = " + get_x()); + ok(args[0] === 3, "args[0] = " + args[0]); + } + + (function(x) { + args = arguments; + get_x = function() { return x; }; + set_x = function(v) { x = v; }; + + test_args(); + x = 1; + })(1); + test_args(); + + (function(a, a, b, c) { + get_a = function() { return a; } + set_a = function(v) { a = v; } + ok(get_a() === 2, "get_a() = " + get_a()); + ok(a === 2, "a = " + a); + ok(b === 3, "b = " + b); + ok(c === 4, "c = " + c); + a = 42; + ok(arguments[0] === 1, "arguments[0] = " + arguments[0]); + ok(arguments[1] === 42, "arguments[1] = " + arguments[1]); + ok(get_a() === 42, "get_a() after assign = " + get_a()); + args = arguments; + })(1, 2, 3, 4); + + ok(get_a() === 42, "get_a() after detach = " + get_a()); + set_a(100); + ok(get_a() === 100, "get_a() after set_a() = " + get_a()); + ok(args[0] === 1, "detached args[0] = " + args[0]); + ok(args[1] === 100, "detached args[1] = " + args[1]); + + (function(a, a) { + eval("var a = 7;"); + ok(a === 7, "function(a, a) a = " + a); + ok(arguments[0] === 5, "function(a, a) arguments[0] = " + arguments[0]); + ok(arguments[1] === 7, "function(a, a) arguments[1] = " + arguments[1]); + })(5, 6); +}); + var func_scope_val = 1; var func_scope_val2 = 2;

1 0

Gabriel Ivăncescu : jscript: Always create detached variable objects with no class.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 1f4cdeeeac2b6fd6421231c6c449e9d8a4712fc1 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f4cdeeeac2b6fd6421231c6c449e9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 22 16:19:01 2023 +0300 jscript: Always create detached variable objects with no class. As it is done in exec_source. This matters as we actually have a check in exprval_call that relies on this (because scope variable objects must never be exposed). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 379d209f0b0..1bf5bb77858 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -749,7 +749,7 @@ static HRESULT detach_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_ if (!scope->obj) { - if (FAILED(hres = create_object(ctx, NULL, &jsobj))) + if (FAILED(hres = create_dispex(ctx, NULL, NULL, &jsobj))) return hres; scope->obj = to_disp(jsobj); } @@ -1071,7 +1071,7 @@ static HRESULT scope_init_locals(script_ctx_t *ctx) } else if (!scope->obj) { - if (FAILED(hres = create_object(ctx, NULL, &jsobj))) + if (FAILED(hres = create_dispex(ctx, NULL, NULL, &jsobj))) return hres; scope->obj = to_disp(jsobj); }

1 0

Alistair Leslie-Hughes : wbemdisp: Support DISPATCH_PROPERTYGET in Object Invoke.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 0c5107afe25405162f9b5f27d3a5e95ee19ddfe3 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c5107afe25405162f9b5f27d3a5e9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 22 09:34:26 2023 +1000 wbemdisp: Support DISPATCH_PROPERTYGET in Object Invoke. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55053 --- dlls/wbemdisp/locator.c | 3 ++- dlls/wbemdisp/tests/wbemdisp.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 6880a503e1d..c3e0c86f4ae 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -1286,7 +1286,8 @@ static HRESULT WINAPI object_Invoke( if (!(name = get_member_name( object, member, &type ))) return DISP_E_MEMBERNOTFOUND; - if (flags == (DISPATCH_METHOD|DISPATCH_PROPERTYGET)) + if (flags == (DISPATCH_METHOD|DISPATCH_PROPERTYGET) || + flags == DISPATCH_PROPERTYGET) { memset( params, 0, sizeof(*params) ); return IWbemClassObject_Get( object->object, name, 0, result, NULL, NULL ); diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 187cb8d9e80..0144f91c493 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -223,6 +223,21 @@ static void test_ParseDisplayName(void) ok( V_VT( &res ) == VT_BSTR, "got %u\n", V_VT( &res ) ); ok( V_BSTR( &res ) != (BSTR)0xdeadbeef, "got %u\n", V_VT( &res ) ); VariantClear( &res ); + + V_VT( &res ) = VT_ERROR; + V_BSTR( &res ) = (BSTR)0xdeadbeef; + memset( &params, 0, sizeof(params) ); + hr = IDispatch_Invoke( dispatch, dispid, &IID_NULL, LOCALE_USER_DEFAULT, + DISPATCH_PROPERTYGET, + &params, &res, NULL, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( params.rgvarg == NULL, "got %p\n", params.rgvarg ); + ok( params.rgdispidNamedArgs == NULL, "got %p\n", params.rgdispidNamedArgs ); + ok( !params.cArgs, "got %u\n", params.cArgs ); + ok( !params.cNamedArgs, "got %u\n", params.cNamedArgs ); + ok( V_VT( &res ) == VT_BSTR, "got %u\n", V_VT( &res ) ); + ok( V_BSTR( &res ) != (BSTR)0xdeadbeef, "got %u\n", V_VT( &res ) ); + VariantClear( &res ); VariantClear( &var ); fetched = 0xdeadbeef;

1 0

David Kahurani : msi: Reject shorter/longer lines in MsiDatabaseImportA.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: e1ddc58a259d80f16bf1e62f23428775e1b070a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1ddc58a259d80f16bf1e62f234287… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Tue Jun 6 15:27:42 2023 +0300 msi: Reject shorter/longer lines in MsiDatabaseImportA. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54532 Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/msi/database.c | 21 ++++++++++++++++----- dlls/msi/tests/db.c | 18 ++++++++++++++++++ 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 20c74c4d742..2aaf495b728 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -377,7 +377,7 @@ done: return wdata; } -static void parse_line(WCHAR **line, WCHAR ***entries, DWORD *num_entries, DWORD *len) +static UINT parse_line(WCHAR **line, WCHAR ***entries, DWORD *num_entries, DWORD *len) { LPWSTR ptr = *line, save; DWORD i, count = 1, chars_left = *len; @@ -395,9 +395,16 @@ static void parse_line(WCHAR **line, WCHAR ***entries, DWORD *num_entries, DWORD chars_left--; } + /* + * make sure this line has the same number of entries as there are columns + * which are indicated by the first line. + */ + if (*num_entries && *num_entries != count) + return ERROR_FUNCTION_FAILED; + *entries = malloc(count * sizeof(WCHAR *)); if (!*entries) - return; + return ERROR_OUTOFMEMORY; /* store pointers into the data */ chars_left = *len; @@ -442,8 +449,10 @@ static void parse_line(WCHAR **line, WCHAR ***entries, DWORD *num_entries, DWORD /* move to the next line if there's more, else EOF */ *line = ptr; *len = chars_left; - if (num_entries) + if (!*num_entries) *num_entries = count; + + return ERROR_SUCCESS; } static WCHAR *build_createsql_prelude(const WCHAR *table) @@ -732,7 +741,7 @@ done: static UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) { UINT r; - DWORD len, i, num_labels, num_types, num_columns, num_records = 0; + DWORD len, i, num_labels = 0, num_types = 0, num_columns = 0, num_records = 0; WCHAR **columns, **types, **labels, *path, *ptr, *data, ***records = NULL, ***temp_records; TRACE("%p %s %s\n", db, debugstr_w(folder), debugstr_w(file) ); @@ -784,7 +793,9 @@ static UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) /* read in the table records */ while (len) { - parse_line( &ptr, &records[num_records], NULL, &len ); + r = parse_line( &ptr, &records[num_records], &num_columns, &len ); + if (r != ERROR_SUCCESS) + goto done; num_records++; temp_records = realloc(records, (num_records + 1) * sizeof(WCHAR **)); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 59dcf87a47c..29b8d45e25a 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -8584,6 +8584,12 @@ static void test_embedded_nulls(void) "s72\tL0\n" "Control\tDialog\n" "LicenseAgreementDlg\ttext\x11\x19text\0text"; + /* newlines have alternate representation in idt files */ + static const char control_table2[] = + "Dialog\tText\n" + "s72\tL0\n" + "Control\tDialog\n" + "LicenseAgreementDlg\ttext\x11\x19te\nxt\0text"; UINT r; DWORD sz; MSIHANDLE hdb, hrec; @@ -8610,6 +8616,18 @@ static void test_embedded_nulls(void) MsiCloseHandle( hrec ); MsiCloseHandle( hdb ); DeleteFileA( msifile ); + + r = MsiOpenDatabaseW( msifileW, MSIDBOPEN_CREATE, &hdb ); + ok( r == ERROR_SUCCESS, "failed to open database %u\n", r ); + + GetCurrentDirectoryA( MAX_PATH, CURR_DIR ); + write_file( "temp_file", control_table2, sizeof(control_table2) ); + r = MsiDatabaseImportA( hdb, CURR_DIR, "temp_file" ); + ok( r == ERROR_FUNCTION_FAILED, "failed to import table %u\n", r ); + DeleteFileA( "temp_file" ); + + MsiCloseHandle( hdb ); + DeleteFileA( msifile ); } static void test_select_column_names(void)

1 0

David Kahurani : msi: Convert newlines to alternate representation when exporting.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 60e4f8a261ae9044aafa9c4eec2a3f2aec6481b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/60e4f8a261ae9044aafa9c4eec2a3f… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Wed Jun 21 12:07:11 2023 +0300 msi: Convert newlines to alternate representation when exporting. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54532 Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/msi/database.c | 18 +++++++++++++++++- dlls/msi/tests/db.c | 12 ++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 2aaf495b728..a39321a18bb 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -892,7 +892,7 @@ end: static UINT export_field( HANDLE handle, MSIRECORD *row, UINT field ) { - char *buffer; + char *buffer, *ptr; BOOL ret; DWORD sz = 0x100; UINT r; @@ -928,6 +928,22 @@ static UINT export_field( HANDLE handle, MSIRECORD *row, UINT field ) return r; } + ptr = buffer; + while( *ptr ) + { + if (*ptr == '\r' && *( ptr + 1 ) == '\n') + { + *ptr++ = '\x11'; + *ptr++ = '\x19'; + continue; + } + + if (*ptr == '\n') + *ptr = '\x19'; + + ptr++; + } + ret = WriteFile( handle, buffer, sz, &sz, NULL ); free( buffer ); return ret ? ERROR_SUCCESS : ERROR_FUNCTION_FAILED; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 29b8d45e25a..22fe92688ad 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -8584,12 +8584,18 @@ static void test_embedded_nulls(void) "s72\tL0\n" "Control\tDialog\n" "LicenseAgreementDlg\ttext\x11\x19text\0text"; + static const char export_expected[] = + "Dialog\tText\r\n" + "s72\tL0\r\n" + "Control\tDialog\r\n" + "LicenseAgreementDlg\ttext\x11\x19text\x19text"; /* newlines have alternate representation in idt files */ static const char control_table2[] = "Dialog\tText\n" "s72\tL0\n" "Control\tDialog\n" "LicenseAgreementDlg\ttext\x11\x19te\nxt\0text"; + char data[1024]; UINT r; DWORD sz; MSIHANDLE hdb, hrec; @@ -8613,6 +8619,12 @@ static void test_embedded_nulls(void) ok( r == ERROR_SUCCESS, "failed to get string %u\n", r ); ok( !memcmp( "text\r\ntext\ntext", buffer, sizeof("text\r\ntext\ntext") - 1 ), "wrong buffer contents \"%s\"\n", buffer ); + r = MsiDatabaseExportA( hdb, "Control", CURR_DIR, "temp_file1"); + ok( r == ERROR_SUCCESS, "failed to export table %u\n", r ); + read_file_data( "temp_file1", data ); + ok( !memcmp( data, export_expected, sizeof(export_expected) - 1), "expected: \"%s\" got: \"%s\"\n", export_expected, data ); + DeleteFileA( "temp_file1" ); + MsiCloseHandle( hrec ); MsiCloseHandle( hdb ); DeleteFileA( msifile );

1 0