- Wine-Commits - list.winehq.org

Rémi Bernon : rpcss: Use I_Rpc(Free|Allocate) in MIDL_user_(allocate|free).
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: f810a57590fa84f6684300516e1d160cb3109082 URL: https://gitlab.winehq.org/wine/wine/-/commit/f810a57590fa84f6684300516e1d16… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 18 18:37:44 2022 +0100 rpcss: Use I_Rpc(Free|Allocate) in MIDL_user_(allocate|free). In ept_map, rpcss uses TowerConstruct to allocate tower array elements. The array is later released by the generated stub code, and each element is ultimately freed using MIDL_user_free. TowerConstruct always allocate memory using I_RpcAllocate, we must use I_RpcFree to free it. --- programs/rpcss/irotp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/rpcss/irotp.c b/programs/rpcss/irotp.c index daf48daf0a7..357a7f84cd9 100644 --- a/programs/rpcss/irotp.c +++ b/programs/rpcss/irotp.c @@ -368,10 +368,10 @@ void __RPC_USER IrotContextHandle_rundown(IrotContextHandle ctxt_handle) void * __RPC_USER MIDL_user_allocate(SIZE_T size) { - return malloc(size); + return I_RpcAllocate(size); } void __RPC_USER MIDL_user_free(void * p) { - free(p); + I_RpcFree(p); }

1 0

Gabriel Ivăncescu : jscript: Throw proper error when calling Map constructor as method.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 84f7f601925f261d8bacf9d031c579ccd65fbff2 URL: https://gitlab.winehq.org/wine/wine/-/commit/84f7f601925f261d8bacf9d031c579… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 22 18:53:20 2022 +0200 jscript: Throw proper error when calling Map constructor as method. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/set.c | 3 +++ dlls/mshtml/tests/documentmode.js | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 4e2c1ffb33f..09f3746740c 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -417,6 +417,9 @@ static HRESULT Map_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns *r = jsval_obj(&map->dispex); return S_OK; + case DISPATCH_METHOD: + return throw_error(ctx, JS_E_WRONG_THIS, L"Map"); + default: FIXME("unimplemented flags %x\n", flags); return E_NOTIMPL; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index f968fae00df..c6a12203af6 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1301,6 +1301,13 @@ sync_test("set_obj", function() { sync_test("map_obj", function() { if(!("Map" in window)) return; + try { + var s = Map(); + ok(false, "expected exception calling constructor as method"); + }catch(e) { + ok(e.number === 0xa13fc - 0x80000000, "calling constructor as method threw " + e.number); + } + var s = new Map, r, i; ok(Object.getPrototypeOf(s) === Map.prototype, "unexpected Map prototype");

1 0

Gabriel Ivăncescu : jscript: Throw proper error when calling Set constructor as method.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 534b977c62c7deaa12fcfb99449f8f8ba5d9c6fc URL: https://gitlab.winehq.org/wine/wine/-/commit/534b977c62c7deaa12fcfb99449f8f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 22 18:53:20 2022 +0200 jscript: Throw proper error when calling Set constructor as method. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/set.c | 3 +++ dlls/mshtml/tests/documentmode.js | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 09f3746740c..535ecdc49a4 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -572,6 +572,9 @@ static HRESULT Set_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns *r = jsval_obj(&set->dispex); return S_OK; + case DISPATCH_METHOD: + return throw_error(ctx, JS_E_WRONG_THIS, L"Set"); + default: FIXME("unimplemented flags %x\n", flags); return E_NOTIMPL; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index c6a12203af6..3965c8ec41b 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1201,6 +1201,13 @@ sync_test("func_scope", function() { sync_test("set_obj", function() { if(!("Set" in window)) return; + try { + var s = Set(); + ok(false, "expected exception calling constructor as method"); + }catch(e) { + ok(e.number === 0xa13fc - 0x80000000, "calling constructor as method threw " + e.number); + } + var s = new Set, r; ok(Object.getPrototypeOf(s) === Set.prototype, "unexpected Set prototype");

1 0

Gabriel Ivăncescu : jscript: Pass a jsval as the 'this' to disp_call_value.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: da842966ff5ca76040dd647975fe270dfc2cf5b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/da842966ff5ca76040dd647975fe27… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 22 18:53:20 2022 +0200 jscript: Pass a jsval as the 'this' to disp_call_value. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 37 +++++++++++++++++++++---------------- dlls/jscript/dispex.c | 18 ++++++++++++++---- dlls/jscript/engine.c | 10 +++++----- dlls/jscript/function.c | 3 +-- dlls/jscript/jscript.h | 2 +- dlls/jscript/json.c | 2 +- dlls/jscript/set.c | 7 +++---- 7 files changed, 46 insertions(+), 33 deletions(-)

1 0

Gabriel Ivăncescu : jscript: Pass correct 'this' to callbacks called by builtins.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 8cb5d74125329a10d79da8ffa129e183c282a6ed URL: https://gitlab.winehq.org/wine/wine/-/commit/8cb5d74125329a10d79da8ffa129e1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 22 18:53:20 2022 +0200 jscript: Pass correct 'this' to callbacks called by builtins. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 43 ++++++--------------------------------- dlls/jscript/set.c | 7 +------ dlls/mshtml/tests/documentmode.js | 6 ++++-- dlls/mshtml/tests/es5.js | 10 +++++++++ 4 files changed, 21 insertions(+), 45 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 27d85fdb22b..341505a335c 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1048,14 +1048,8 @@ static HRESULT Array_every(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigne } callback = get_object(argv[0]); - if(argc > 1 && !is_undefined(argv[1])) { - if(!is_object_instance(argv[1])) { - FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); - hres = E_NOTIMPL; - goto done; - } + if(argc > 1) context_this = argv[1]; - } for(i = 0; i < length; i++) { hres = jsdisp_get_idx(jsthis, i, &value); @@ -1115,14 +1109,8 @@ static HRESULT Array_filter(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsign } callback = get_object(argv[0]); - if(argc > 1 && !is_undefined(argv[1])) { - if(!is_object_instance(argv[1])) { - FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); - hres = E_NOTIMPL; - goto done; - } + if(argc > 1) context_this = argv[1]; - } hres = create_array(ctx, 0, &arr); if(FAILED(hres)) @@ -1189,14 +1177,8 @@ static HRESULT Array_forEach(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsig } callback = get_object(argv[0]); - if(argc > 1 && !is_undefined(argv[1])) { - if(!is_object_instance(argv[1])) { - FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); - hres = E_NOTIMPL; - goto done; - } + if(argc > 1) context_this = argv[1]; - } for(i = 0; i < length; i++) { hres = jsdisp_get_idx(jsthis, i, &value); @@ -1367,15 +1349,8 @@ static HRESULT Array_map(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned } callback = get_object(argv[0]); - if(argc > 1) { - if(is_object_instance(argv[1])) { - context_this = argv[1]; - }else if(!is_undefined(argv[1])) { - FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); - hres = E_NOTIMPL; - goto done; - } - } + if(argc > 1) + context_this = argv[1]; hres = create_array(ctx, length, &array); if(FAILED(hres)) @@ -1505,14 +1480,8 @@ static HRESULT Array_some(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned } callback = get_object(argv[0]); - if(argc > 1 && !is_undefined(argv[1])) { - if(!is_object_instance(argv[1])) { - FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); - hres = E_NOTIMPL; - goto done; - } + if(argc > 1) context_this = argv[1]; - } for(i = 0; i < length; i++) { hres = jsdisp_get_idx(jsthis, i, &value); diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 889b744b385..4e2c1ffb33f 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -192,13 +192,8 @@ static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, j return E_FAIL; } - if(argc > 1 && !is_undefined(argv[1])) { - if(!is_object_instance(argv[1])) { - FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); - return E_NOTIMPL; - } + if(argc > 1) context_this = argv[1]; - } while(iter) { struct jsval_map_entry *entry = LIST_ENTRY(iter, struct jsval_map_entry, list_entry); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 157a7337c04..f968fae00df 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1293,7 +1293,8 @@ sync_test("set_obj", function() { r++; s.clear(); ok(s.size === 0, "size = " + s.size); - }); + ok(this.valueOf() === 42, "this.valueOf() = " + this.valueOf()); + }, 42); ok(r === 1, "r = " + r); }); @@ -1447,7 +1448,8 @@ sync_test("map_obj", function() { r++; s.clear(); ok(s.size === 0, "size = " + s.size); - }); + ok(this.valueOf() === 42, "this.valueOf() = " + this.valueOf()); + }, 42); ok(r === 1, "r = " + r); }); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index e22f610e197..93ede87eeb0 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -280,6 +280,8 @@ sync_test("filter", function() { test(["a","b"], function(v) { if(v === "b") delete arr[0]; return typeof v === "string"; }); test(["b"], function(v) { if(arr[arr.length - 1] !== "c") arr.push("c"); return typeof v === "string"; }); test([true,"b",42,Math,arr[9],"c"], function(v) { return v; }, Object); + + [0].filter(function() { ok(this.valueOf() === "wine", "this.valueOf() = " + this.valueOf()); return true; }, "wine"); }); sync_test("every & some", function() { @@ -314,6 +316,9 @@ sync_test("every & some", function() { test(false, false, function(v) { return v; }); arr.push(1); test(false, true, function(v) { return v; }); + + [0].every(function() { ok(this.valueOf() === 42, "this.valueOf() = " + this.valueOf()); return true; }, 42); + [0].some(function() { ok(this.valueOf() === 137, "this.valueOf() = " + this.valueOf()); return false; }, 137); }); sync_test("forEach", function() { @@ -347,6 +352,8 @@ sync_test("forEach", function() { ok(array === a, "array != a"); ok(this === o, "this != o"); }, o); + + a.forEach(function() { ok(this.valueOf() === "foobar", "this.valueOf() = " + this.valueOf()); }, "foobar"); }); sync_test("isArray", function() { @@ -412,6 +419,9 @@ sync_test("array_map", function() { [1,2].map(function() { ok(this === window, "this != window"); }, undefined); + [1,2].map(function() { + ok(this.valueOf() === 137, "this.valueOf() = " + this.valueOf()); + }, 137); }); sync_test("array_sort", function() {

1 0

Gabriel Ivăncescu : jscript: Initialize source and lastIndex for RegExp.prototype.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 3805eef49a323e5022329822cfd87dd32e7ce7fe URL: https://gitlab.winehq.org/wine/wine/-/commit/3805eef49a323e5022329822cfd87d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 22 18:53:20 2022 +0200 jscript: Initialize source and lastIndex for RegExp.prototype. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jsregexp.c | 14 ++++++++------ dlls/jscript/tests/api.js | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index fa4759b972d..1cbc828ce09 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -585,7 +585,7 @@ static const builtin_info_t RegExpInst_info = { NULL }; -static HRESULT alloc_regexp(script_ctx_t *ctx, jsdisp_t *object_prototype, RegExpInstance **ret) +static HRESULT alloc_regexp(script_ctx_t *ctx, jsstr_t *str, jsdisp_t *object_prototype, RegExpInstance **ret) { RegExpInstance *regexp; HRESULT hres; @@ -604,6 +604,9 @@ static HRESULT alloc_regexp(script_ctx_t *ctx, jsdisp_t *object_prototype, RegEx return hres; } + regexp->str = jsstr_addref(str); + regexp->last_index_val = jsval_number(0); + *ret = regexp; return S_OK; } @@ -620,13 +623,10 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r TRACE("%s %lx\n", debugstr_wn(str, jsstr_length(src)), flags); - hres = alloc_regexp(ctx, NULL, &regexp); + hres = alloc_regexp(ctx, src, NULL, &regexp); if(FAILED(hres)) return hres; - regexp->str = jsstr_addref(src); - regexp->last_index_val = jsval_number(0); - regexp->jsregexp = regexp_new(ctx, &ctx->tmp_heap, str, jsstr_length(regexp->str), flags, FALSE); if(!regexp->jsregexp) { WARN("regexp_new failed\n"); @@ -959,10 +959,12 @@ static const builtin_info_t RegExpConstr_info = { HRESULT create_regexp_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp_t **ret) { + jsstr_t *str = jsstr_empty(); RegExpInstance *regexp; HRESULT hres; - hres = alloc_regexp(ctx, object_prototype, &regexp); + hres = alloc_regexp(ctx, str, object_prototype, &regexp); + jsstr_release(str); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c33791f1fb1..a3b2bbcbba5 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -335,6 +335,8 @@ ok(obj.hasOwnProperty('source'), "obj.hasOwnProperty('source') is false"); ok(!RegExp.hasOwnProperty('exec'), "RegExp.hasOwnProperty('exec') is true"); ok(!RegExp.hasOwnProperty('source'), "RegExp.hasOwnProperty('source') is true"); ok(RegExp.prototype.hasOwnProperty('source'), "RegExp.prototype.hasOwnProperty('source') is false"); +ok(RegExp.prototype.source === "", "RegExp.prototype.source = " + RegExp.prototype.source); +ok(RegExp.prototype.lastIndex === 0, "RegExp.prototype.lastIndex = " + RegExp.prototype.lastIndex); String(); new String();

1 0

Gabriel Ivăncescu : jscript: Pass a jsval as the 'this' to jsdisp_call_value.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 9d4e93cfde176e679a467a9332725b1861687a05 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d4e93cfde176e679a467a9332725b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 22 18:53:20 2022 +0200 jscript: Pass a jsval as the 'this' to jsdisp_call_value. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 2 +- dlls/jscript/dispex.c | 18 ++++++++++-------- dlls/jscript/function.c | 9 ++------- dlls/jscript/jscript.h | 4 ++-- dlls/jscript/json.c | 2 +- dlls/jscript/string.c | 2 +- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index db92a6fe109..80ccfcacb73 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -631,7 +631,7 @@ static HRESULT sort_cmp(script_ctx_t *ctx, jsdisp_t *cmp_func, jsval_t v1, jsval jsval_t res; double n; - hres = jsdisp_call_value(cmp_func, NULL, DISPATCH_METHOD, 2, args, &res); + hres = jsdisp_call_value(cmp_func, jsval_undefined(), DISPATCH_METHOD, 2, args, &res); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 699e4c87b52..87b1d245aa7 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -462,7 +462,7 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) break; case PROP_ACCESSOR: if(prop->u.accessor.getter) { - hres = jsdisp_call_value(prop->u.accessor.getter, to_disp(This), + hres = jsdisp_call_value(prop->u.accessor.getter, jsval_obj(This), DISPATCH_METHOD, 0, NULL, r); }else { *r = jsval_undefined(); @@ -529,7 +529,7 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) TRACE("no setter\n"); return S_OK; } - return jsdisp_call_value(prop->u.accessor.setter, to_disp(This), DISPATCH_METHOD, 1, &val, NULL); + return jsdisp_call_value(prop->u.accessor.setter, jsval_obj(This), DISPATCH_METHOD, 1, &val, NULL); case PROP_IDX: if(!This->builtin_info->idx_put) { TRACE("no put_idx\n"); @@ -1602,16 +1602,18 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc case DISPATCH_METHOD: case DISPATCH_CONSTRUCT: { jsval_t *argv, buf[6], r; + IDispatch *passed_this; unsigned argc; hres = convert_params(This->ctx, pdp, buf, &argc, &argv); if(FAILED(hres)) break; + passed_this = get_this(pdp); if(prop) - hres = invoke_prop_func(This, get_this(pdp), prop, wFlags, argc, argv, pvarRes ? &r : NULL, pspCaller); + hres = invoke_prop_func(This, passed_this, prop, wFlags, argc, argv, pvarRes ? &r : NULL, pspCaller); else - hres = jsdisp_call_value(This, get_this(pdp), wFlags, argc, argv, pvarRes ? &r : NULL); + hres = jsdisp_call_value(This, passed_this ? jsval_disp(passed_this) : jsval_undefined(), wFlags, argc, argv, pvarRes ? &r : NULL); if(argv != buf) free(argv); @@ -1991,14 +1993,14 @@ HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID * return DISP_E_UNKNOWNNAME; } -HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +HRESULT jsdisp_call_value(jsdisp_t *jsfunc, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { HRESULT hres; assert(!(flags & ~(DISPATCH_METHOD|DISPATCH_CONSTRUCT|DISPATCH_JSCRIPT_INTERNAL_MASK))); if(is_class(jsfunc, JSCLASS_FUNCTION)) { - hres = Function_invoke(jsfunc, jsthis, flags, argc, argv, r); + hres = Function_invoke(jsfunc, vthis, flags, argc, argv, r); }else { if(!jsfunc->builtin_info->call) { WARN("Not a function\n"); @@ -2009,7 +2011,7 @@ HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsig return E_UNEXPECTED; flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; - hres = jsfunc->builtin_info->call(jsfunc->ctx, jsthis ? jsval_disp(jsthis) : jsval_null(), flags, argc, argv, r); + hres = jsfunc->builtin_info->call(jsfunc->ctx, vthis, flags, argc, argv, r); } return hres; } @@ -2202,7 +2204,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W jsdisp = iface_to_jsdisp(disp); if(jsdisp && jsdisp->ctx == ctx) { - hres = jsdisp_call_value(jsdisp, jsthis, flags, argc, argv, r); + hres = jsdisp_call_value(jsdisp, jsthis ? jsval_disp(jsthis) : jsval_undefined(), flags, argc, argv, r); jsdisp_release(jsdisp); return hres; } diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index ef76766df7d..2a03fdd07ae 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -247,12 +247,11 @@ void detach_arguments_object(jsdisp_t *args_disp) jsdisp_release(frame->arguments_obj); } -HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +HRESULT Function_invoke(jsdisp_t *func_this, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FunctionInstance *function; - jsval_t vthis; - TRACE("func %p this %p\n", func_this, jsthis); + TRACE("func %p this %s\n", func_this, debugstr_jsval(vthis)); assert(is_class(func_this, JSCLASS_FUNCTION)); function = function_from_jsdisp(func_this); @@ -262,10 +261,6 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi return E_UNEXPECTED; } - if(jsthis) - vthis = jsval_disp(jsthis); - else - vthis = function->dispex.ctx->version < SCRIPTLANGUAGEVERSION_ES5 ? jsval_null() : jsval_undefined(); return function->vtbl->call(function->dispex.ctx, function, vthis, flags, argc, argv, r); } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index c46dd6ed682..48d7542e3cc 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -226,7 +226,7 @@ HRESULT init_dispex_from_constr(jsdisp_t*,script_ctx_t*,const builtin_info_t*,js HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT disp_call_name(script_ctx_t*,IDispatch*,const WCHAR*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT disp_call_value(script_ctx_t*,IDispatch*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_call_value(jsdisp_t*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT jsdisp_call_value(jsdisp_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_call(jsdisp_t*,DISPID,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_call_name(jsdisp_t*,const WCHAR*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT disp_propget(script_ctx_t*,IDispatch*,DISPID,jsval_t*) DECLSPEC_HIDDEN; @@ -255,7 +255,7 @@ HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,cons jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_builtin_constructor(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT Function_invoke(jsdisp_t*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT Function_invoke(jsdisp_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT Function_value(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT Function_get_value(script_ctx_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index 005422be426..a595a778324 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -775,7 +775,7 @@ static HRESULT stringify(stringify_ctx_t *ctx, jsdisp_t *object, const WCHAR *na } args[0] = jsval_string(name_str); args[1] = value; - hres = jsdisp_call_value(ctx->replacer, to_disp(object), DISPATCH_METHOD, ARRAY_SIZE(args), args, &v); + hres = jsdisp_call_value(ctx->replacer, jsval_obj(object), DISPATCH_METHOD, ARRAY_SIZE(args), args, &v); jsstr_release(name_str); jsval_release(value); if(FAILED(hres)) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 254ead61eef..14bcfbdaaf3 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -702,7 +702,7 @@ static HRESULT rep_call(script_ctx_t *ctx, jsdisp_t *func, } if(SUCCEEDED(hres)) - hres = jsdisp_call_value(func, NULL, DISPATCH_METHOD, argc, argv, &val); + hres = jsdisp_call_value(func, jsval_undefined(), DISPATCH_METHOD, argc, argv, &val); for(i=0; i <= match->paren_count; i++) jsstr_release(get_string(argv[i]));

1 0

Piotr Caban : winspool: Correctly free data allocated with GdiConvertToDevmodeW.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: f8a0d965675f91c1f447fd901fc1235d1729d990 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8a0d965675f91c1f447fd901fc123… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 22 15:11:21 2022 +0100 winspool: Correctly free data allocated with GdiConvertToDevmodeW. --- dlls/winspool.drv/info.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 6286dc36f3e..1434a5c1e2b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1748,7 +1748,7 @@ static void free_printer_info( void *data, DWORD level ) free( piW->pDriverName ); free( piW->pComment ); free( piW->pLocation ); - free( piW->pDevMode ); + heap_free( piW->pDevMode ); free( piW->pSepFile ); free( piW->pPrintProcessor ); free( piW->pDatatype ); @@ -1761,7 +1761,7 @@ static void free_printer_info( void *data, DWORD level ) { PRINTER_INFO_9W *piW = (PRINTER_INFO_9W *)data; - free( piW->pDevMode ); + heap_free( piW->pDevMode ); break; } @@ -1827,7 +1827,7 @@ INT WINAPI DeviceCapabilitiesA(const char *device, const char *portA, WORD cap, } cleanup: free(device_name); - free(devmode); + heap_free(devmode); free(port); return ret; } @@ -1893,7 +1893,7 @@ LONG WINAPI DocumentPropertiesA(HWND hwnd, HANDLE printer, char *device_name, DE DEVMODEWtoA( outputW, output ); free(device); - free(inputW); + heap_free(inputW); free(outputW); if (!mode && ret > 0) ret -= CCHDEVICENAME + CCHFORMNAME; @@ -2113,7 +2113,7 @@ BOOL WINAPI OpenPrinter2A(LPSTR name, HANDLE *printer, if (p_defaultsW) { RtlFreeUnicodeString(&datatypeU); - free(defaultsW.pDevMode); + heap_free(defaultsW.pDevMode); } RtlFreeUnicodeString(&nameU); @@ -3197,7 +3197,7 @@ BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, free(info2W->pDatatype); free(info2W->pPrintProcessor); free(info2W->pParameters); - free(info2W->pDevMode); + heap_free(info2W->pDevMode); free(info2W->pStatus); break; } @@ -3677,7 +3677,7 @@ static BOOL WINSPOOL_GetDevModeFromReg(HKEY hkey, LPCWSTR ValueName, if (ptr && (buflen >= sz)) { DEVMODEW *dmW = GdiConvertToDevmodeW((DEVMODEA*)ptr); memcpy(ptr, dmW, sz); - free(dmW); + heap_free(dmW); } *needed = sz; return TRUE;

1 0

Alexandre Julliard : makedep: Unify the search for static and import libs.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 51087b9b650952b0f62880826792db1a3d2e5dba URL: https://gitlab.winehq.org/wine/wine/-/commit/51087b9b650952b0f62880826792db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 17:47:39 2022 +0100 makedep: Unify the search for static and import libs. --- tools/makedep.c | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 484d2902817..a3a665cc84a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2065,16 +2065,23 @@ static struct strarray get_local_dependencies( const struct makefile *make, cons /******************************************************************* * get_static_lib * - * Check if makefile builds the named static library and return the full lib path. + * Find the makefile that builds the named static library (which may be an import lib). */ -static const char *get_static_lib( const struct makefile *make, const char *name, unsigned int arch ) +static struct makefile *get_static_lib( const char *name, unsigned int arch ) { - if (!make->staticlib) return NULL; - if (make->disabled[arch]) return NULL; - if (strncmp( make->staticlib, "lib", 3 )) return NULL; - if (strncmp( make->staticlib + 3, name, strlen(name) )) return NULL; - if (strcmp( make->staticlib + 3 + strlen(name), ".a" )) return NULL; - return obj_dir_path( make, strmake( "%s%s", arch_dirs[arch], make->staticlib )); + unsigned int i; + + for (i = 0; i < subdirs.count; i++) + { + if (submakes[i]->importlib && !strcmp( submakes[i]->importlib, name )) return submakes[i]; + if (!submakes[i]->staticlib) continue; + if (submakes[i]->disabled[arch]) continue; + if (strncmp( submakes[i]->staticlib, "lib", 3 )) continue; + if (strncmp( submakes[i]->staticlib + 3, name, strlen(name) )) continue; + if (strcmp( submakes[i]->staticlib + 3 + strlen(name), ".a" )) continue; + return submakes[i]; + } + return NULL; } @@ -2240,12 +2247,12 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra struct strarray imports, enum import_type type, unsigned int arch ) { struct strarray ret = empty_strarray; - unsigned int i, j; + unsigned int i; for (i = 0; i < imports.count; i++) { const char *name = imports.str[i]; - const char *lib = NULL; + struct makefile *submake; /* add crt import lib only when adding the default imports libs */ if (is_crt_module( imports.str[i] ) && type != IMPORT_TYPE_DEFAULT) continue; @@ -2261,21 +2268,10 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra } else name = get_base_name( name ); - for (j = 0; j < subdirs.count; j++) + if ((submake = get_static_lib( name, arch ))) { - if (submakes[j]->importlib && !strcmp( submakes[j]->importlib, name )) - lib = obj_dir_path( submakes[j], strmake( "%slib%s.a", arch_dirs[arch], name )); - else - lib = get_static_lib( submakes[j], name, arch ); - if (lib) break; - } - - if (lib) - { - const char *ext = NULL; - - if (type == IMPORT_TYPE_DELAYED && !delay_load_flags[arch]) ext = ".delay.a"; - if (ext) lib = replace_extension( lib, ".a", ext ); + const char *ext = (type == IMPORT_TYPE_DELAYED && !delay_load_flags[arch]) ? ".delay.a" : ".a"; + const char *lib = obj_dir_path( submake, strmake( "%slib%s%s", arch_dirs[arch], name, ext )); strarray_add_uniq( deps, lib ); strarray_add( &ret, lib ); }

1 0

Alexandre Julliard : win32u: Use int instead of long types in a few places.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 670033b2cb04eab8575bab070356b1d51a95fe18 URL: https://gitlab.winehq.org/wine/wine/-/commit/670033b2cb04eab8575bab070356b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 16:02:56 2022 +0100 win32u: Use int instead of long types in a few places. To avoid typecasts in debug traces. --- dlls/win32u/clipboard.c | 4 ++-- dlls/win32u/dc.c | 2 +- dlls/win32u/dce.c | 2 +- dlls/win32u/defwnd.c | 8 ++++---- dlls/win32u/dibdrv/dibdrv.h | 2 +- dlls/win32u/font.c | 14 +++++++------- dlls/win32u/input.c | 17 +++++++++-------- dlls/win32u/menu.c | 6 ++++-- dlls/win32u/message.c | 4 ++-- dlls/win32u/ntgdi_private.h | 4 ++-- dlls/win32u/ntuser_private.h | 10 +++++----- dlls/win32u/rawinput.c | 2 +- dlls/win32u/sysparams.c | 6 +++--- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 10 +++++----- dlls/win32u/winstation.c | 2 +- 16 files changed, 49 insertions(+), 46 deletions(-)

1 0