November 2021 - Wine-Devel - list.winehq.org

[PATCH v2 3/5] mshtml: Don't release location when releasing the window.

by Gabriel Ivăncescu

We don't hold a refcount to the location, but only a weak ref (as tests show). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0b25e71..4e5b036 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -269,10 +269,8 @@ static void release_inner_window(HTMLInnerWindow *This) heap_free(This->global_props[i].name); heap_free(This->global_props); - if(This->location) { + if(This->location) This->location->window = NULL; - IHTMLLocation_Release(&This->location->IHTMLLocation_iface); - } if(This->image_factory) { This->image_factory->window = NULL; -- 2.31.1

Nov. 2, 2021

[PATCH v2 2/5] jscript: Implement Object.prototype.__proto__ property.

by Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 23 ++++++++++++- dlls/jscript/jscript.h | 2 ++ dlls/jscript/object.c | 28 ++++++++++++++++ dlls/mshtml/tests/documentmode.js | 55 +++++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 4c57a69..e64a520 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -461,7 +461,8 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) prop_iter = prototype_iter->props + prop_iter->u.ref; } while(prop_iter->type == PROP_PROTREF); - if(prop_iter->type == PROP_ACCESSOR) + if(prop_iter->type == PROP_ACCESSOR || + (prop_iter->type == PROP_BUILTIN && prop_iter->u.p->setter)) prop = prop_iter; } @@ -2654,6 +2655,26 @@ HRESULT jsdisp_define_data_property(jsdisp_t *obj, const WCHAR *name, unsigned f return jsdisp_define_property(obj, name, &prop_desc); } +HRESULT jsdisp_change_prototype(jsdisp_t *obj, jsdisp_t *proto) +{ + DWORD i; + + if(obj->prototype == proto) + return S_OK; + + if(obj->prototype) { + for(i = 0; i < obj->prop_cnt; i++) + if(obj->props[i].type == PROP_PROTREF) + obj->props[i].type = PROP_DELETED; + jsdisp_release(obj->prototype); + } + + obj->prototype = proto; + if(proto) + jsdisp_addref(proto); + return S_OK; +} + void jsdisp_freeze(jsdisp_t *obj, BOOL seal) { unsigned int i; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 90a5e15..69897cd 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -104,6 +104,7 @@ HRESULT get_dispatch_typeinfo(ITypeInfo**) DECLSPEC_HIDDEN; #define PROPF_VERSION_SHIFT 16 #define PROPF_HTML (SCRIPTLANGUAGEVERSION_HTML << PROPF_VERSION_SHIFT) #define PROPF_ES5 ((SCRIPTLANGUAGEVERSION_HTML|SCRIPTLANGUAGEVERSION_ES5) << PROPF_VERSION_SHIFT) +#define PROPF_ES6 ((SCRIPTLANGUAGEVERSION_HTML|SCRIPTLANGUAGEVERSION_ES6) << PROPF_VERSION_SHIFT) /* * This is our internal dispatch flag informing calee that it's called directly from interpreter. @@ -326,6 +327,7 @@ HRESULT jsdisp_define_property(jsdisp_t*,const WCHAR*,property_desc_t*) DECLSPEC HRESULT jsdisp_define_data_property(jsdisp_t*,const WCHAR*,unsigned,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_next_prop(jsdisp_t*,DISPID,enum jsdisp_enum_type,DISPID*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_prop_name(jsdisp_t*,DISPID,jsstr_t**); +HRESULT jsdisp_change_prototype(jsdisp_t*,jsdisp_t*) DECLSPEC_HIDDEN; void jsdisp_freeze(jsdisp_t*,BOOL) DECLSPEC_HIDDEN; BOOL jsdisp_is_frozen(jsdisp_t*,BOOL) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index fd5ab52..89684f5 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -216,6 +216,33 @@ static HRESULT Object_isPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla return S_OK; } +static HRESULT Object_get_proto_(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) +{ + TRACE("%p\n", jsthis); + + if(r) + *r = jsthis->prototype + ? jsval_obj(jsdisp_addref(jsthis->prototype)) + : jsval_null(); + return S_OK; +} + +static HRESULT Object_set_proto_(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) +{ + jsdisp_t *proto; + + TRACE("%p\n", jsthis); + + if(is_undefined(value) || is_null(value)) + proto = NULL; + else if(!is_object_instance(value) || !(proto = to_jsdisp(get_object(value)))) { + FIXME("not an object\n"); + return E_FAIL; + } + + return jsdisp_change_prototype(jsthis, proto); +} + static HRESULT Object_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { jsstr_t *ret; @@ -236,6 +263,7 @@ static void Object_destructor(jsdisp_t *dispex) } static const builtin_prop_t Object_props[] = { + {L"__proto__", NULL, PROPF_ES6, Object_get_proto_, Object_set_proto_}, {L"hasOwnProperty", Object_hasOwnProperty, PROPF_METHOD|1}, {L"isPrototypeOf", Object_isPrototypeOf, PROPF_METHOD|1}, {L"propertyIsEnumerable", Object_propertyIsEnumerable, PROPF_METHOD|1}, diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 3307f2c..02a5f5f 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1025,3 +1025,58 @@ sync_test("elem_attr", function() { r = elem.getAttribute("className"); ok(r === "cls3", "className attr = " + r); }); + +sync_test("__proto__", function() { + var v = document.documentMode; + var r, x = 42; + + if(v < 11) { + ok(x.__proto__ === undefined, "x.__proto__ = " + x.__proto__); + ok(!("__proto__" in Object), "Object.__proto__ = " + Object.__proto__); + return; + } + + ok(x.__proto__ === Number.prototype, "x.__proto__ = " + x.__proto__); + ok(Object.__proto__ === Function.prototype, "Object.__proto__ = " + Object.__proto__); + ok(Object.prototype.__proto__ === null, "Object.prototype.__proto__ = " + Object.prototype.__proto__); + ok(Object.prototype.hasOwnProperty("__proto__"), "__proto__ is not a property of Object.prototype"); + ok(!Object.prototype.hasOwnProperty.call(x, "__proto__"), "__proto__ is a property of x"); + + x.__proto__ = Object.prototype; + ok(x.__proto__ === Number.prototype, "x.__proto__ set to Object.prototype = " + x.__proto__); + ok(!Object.prototype.hasOwnProperty.call(x, "__proto__"), "__proto__ is a property of x after set to Object.prototype"); + x = {}; + x.__proto__ = null; + r = Object.getPrototypeOf(x); + ok(x.__proto__ === undefined, "x.__proto__ after set to null = " + x.__proto__); + ok(r === null, "getPrototypeOf(x) after set to null = " + r); + + function check(expect, msg) { + var r = Object.getPrototypeOf(x); + ok(x.__proto__ === expect, "x.__proto__ " + msg + " = " + x.__proto__); + ok(r === expect, "getPrototypeOf(x) " + msg + " = " + r); + ok(!Object.prototype.hasOwnProperty.call(x, "__proto__"), "__proto__ is a property of x " + msg); + } + + x = {}; + check(Object.prototype, "after x set to {}"); + x.__proto__ = Number.prototype; + check(Number.prototype, "after set to Number.prototype"); + x.__proto__ = Object.prototype; + check(Object.prototype, "after re-set to Object.prototype"); + + function ctor() { } + var obj = new ctor(); + x.__proto__ = obj; + check(obj, "after set to obj"); + x.__proto__ = ctor.prototype; + check(obj.__proto__, "after set to ctor.prototype"); + ok(obj.__proto__ === ctor.prototype, "obj.__proto__ !== ctor.prototype"); + + r = (delete x.__proto__); + todo_wine. + ok(r, "delete x.__proto__ returned " + r); + ok(Object.prototype.hasOwnProperty("__proto__"), "__proto__ is not a property of Object.prototype after delete"); + r = Object.getPrototypeOf(x); + ok(r === ctor.prototype, "x.__proto__ after delete = " + r); +}); -- 2.31.1

Nov. 2, 2021

[PATCH v2 1/5] jscript: Implement Object.prototype.isPrototypeOf method.

by Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/object.c | 20 ++++++++++++++++++-- dlls/jscript/tests/lang.js | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 169b47c..fd5ab52 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -196,8 +196,24 @@ static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, W static HRESULT Object_isPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + jsdisp_t *jsdisp; + BOOL ret = FALSE; + + if(!r) + return S_OK; + + if(argc && is_jsdisp(jsthis) && is_object_instance(argv[0]) && (jsdisp = to_jsdisp(get_object(argv[0])))) { + while(jsdisp->prototype) { + if(jsdisp->prototype == jsthis->u.jsdisp) { + ret = TRUE; + break; + } + jsdisp = jsdisp->prototype; + } + } + + *r = jsval_bool(ret); + return S_OK; } static HRESULT Object_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index ad1217d..63aa669 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1679,14 +1679,28 @@ tmp = new instanceOfTest(); ok((tmp instanceof instanceOfTest) === true, "tmp is not instance of instanceOfTest"); ok((tmp instanceof Object) === true, "tmp is not instance of Object"); ok((tmp instanceof String) === false, "tmp is instance of String"); +ok(instanceOfTest.isPrototypeOf(tmp) === false, "instanceOfTest is prototype of tmp"); +ok(instanceOfTest.prototype.isPrototypeOf(tmp) === true, "instanceOfTest.prototype is not prototype of tmp"); +ok(Object.prototype.isPrototypeOf(tmp) === true, "Object.prototype is not prototype of tmp"); instanceOfTest.prototype = new Object(); ok((tmp instanceof instanceOfTest) === false, "tmp is instance of instanceOfTest"); ok((tmp instanceof Object) === true, "tmp is not instance of Object"); +ok(instanceOfTest.prototype.isPrototypeOf(tmp) === false, "instanceOfTest.prototype is prototype of tmp"); ok((1 instanceof Object) === false, "1 is instance of Object"); ok((false instanceof Boolean) === false, "false is instance of Boolean"); ok(("" instanceof Object) === false, "'' is instance of Object"); +ok(Number.prototype.isPrototypeOf(1) === false, "Number.prototype is prototype of 1"); +ok(String.prototype.isPrototypeOf("") === false, "String.prototype is prototype of ''"); + +ok(tmp.isPrototypeOf(null) === false, "tmp is prototype of null"); +ok(tmp.isPrototypeOf(undefined) === false, "tmp is prototype of undefined"); +ok(Object.prototype.isPrototypeOf.call(tmp) === false, "tmp is prototype of no argument"); +ok(Object.prototype.isPrototypeOf.call(test, Object) === false, "test is prototype of Object"); +ok(Object.prototype.isPrototypeOf.call(testObj, Object) === false, "testObj is prototype of Object"); +ok(Object.prototype.isPrototypeOf(test) === false, "Object.prototype is prototype of test"); +ok(Object.prototype.isPrototypeOf(testObj) === false, "Object.prototype is prototype of testObj"); (function () { ok((arguments instanceof Object) === true, "argument is not instance of Object"); -- 2.31.1

Nov. 2, 2021

[PATCH] win32u: use 7-bit ascii for unhandled encodings

by Aurélien Inacio

Signed-off-by: Aurélien Inacio <aur36(a)mailo.com> --- dlls/win32u/opentype.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/opentype.c b/dlls/win32u/opentype.c index 10234c6d5aa..c206d6dae57 100644 --- a/dlls/win32u/opentype.c +++ b/dlls/win32u/opentype.c @@ -344,8 +344,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case TT_NAME_MAC_ENCODING_THAI: return 10021; default: - FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); - break; + WARN( "default ascii encoding used for encoding %d, platform %d\n", encoding, platform ); + return 20127; } break; case OPENTYPE_PLATFORM_WIN: @@ -366,8 +366,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case TT_NAME_WIN_ENCODING_JOHAB: return 1361; default: - FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); - break; + WARN( "default ascii encoding used for encoding %d, platform %d\n", encoding, platform ); + return 20127; } break; default: -- 2.30.2

Nov. 2, 2021

Re: [PATCH] gdi32: use 7-bit ascii for unhandled encodings

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=101178 Your paranoid android. === debiant2 (build log) === Task: Patch failed to apply === debiant2 (build log) === Task: Patch failed to apply

Nov. 2, 2021

[PATCH] gdi32: use 7-bit ascii for unhandled encodings

by Aurélien Inacio

Signed-off-by: Aurélien Inacio <aur36(a)mailo.com> --- dlls/gdi32/opentype.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/opentype.c b/dlls/gdi32/opentype.c index 10234c6d5aa..c206d6dae57 100644 --- a/dlls/gdi32/opentype.c +++ b/dlls/gdi32/opentype.c @@ -344,8 +344,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case TT_NAME_MAC_ENCODING_THAI: return 10021; default: - FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); - break; + WARN( "default ascii encoding used for encoding %d, platform %d\n", encoding, platform ); + return 20127; } break; case OPENTYPE_PLATFORM_WIN: @@ -366,8 +366,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case TT_NAME_WIN_ENCODING_JOHAB: return 1361; default: - FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); - break; + WARN( "default ascii encoding used for encoding %d, platform %d\n", encoding, platform ); + return 20127; } break; default: -- 2.30.2

Nov. 2, 2021

Re: Re: [PATCH] mshtml: Implement HTMLAnchorElement_get_pathname().

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=101177 Your paranoid android. === w8adm (32 bit report) === mshtml: events.c:1089: Test failed: unexpected call img_onerror events: Timeout === w10pro64_ja (64 bit report) === mshtml: htmldoc.c:2541: Test failed: unexpected call UpdateUI htmldoc.c:2853: Test failed: unexpected call Exec_UPDATECOMMANDS htmldoc.c:350: Test failed: expected Exec_SETTITLE htmldoc.c:2859: Test failed: unexpected call Exec_SETTITLE === w7u_adm (32 bit report) === mshtml: script.c:624: Test failed: L"/index.html?es5.js:date_now: unexpected Date.now() result 1635874086624 expected 1635874086687" === debiant2 (32 bit report) === mshtml: script.c:624: Test failed: L"/index.html?dom.js:anchor: Got exception " === debiant2 (32 bit Arabic:Morocco report) === mshtml: script.c:624: Test failed: L"/index.html?dom.js:anchor: Got exception " === debiant2 (32 bit German report) === mshtml: script.c:624: Test failed: L"/index.html?dom.js:anchor: Got exception " === debiant2 (32 bit French report) === mshtml: script.c:624: Test failed: L"/index.html?dom.js:anchor: Got exception " === debiant2 (32 bit Hebrew:Israel report) === mshtml: script.c:624: Test failed: L"/index.html?dom.js:anchor: Got exception " === debiant2 (32 bit Hindi:India report) === mshtml: script.c:624: Test failed: L"/index.html?dom.js:anchor: Got exception " === debiant2 (32 bit Japanese:Japan report) === mshtml: script.c:624: Test failed: L"/index.html?dom.js:anchor: Got exception " === debiant2 (32 bit Chinese:China report) === mshtml: script.c:624: Test failed: L"/index.html?dom.js:anchor: Got exception " === debiant2 (32 bit WoW report) === mshtml: script.c:624: Test failed: L"/index.html?dom.js:anchor: Got exception " === debiant2 (64 bit WoW report) === mshtml: script.c:624: Test failed: L"/index.html?dom.js:anchor: Got exception "

Nov. 2, 2021

Re: [PATCH] mshtml: Implement HTMLAnchorElement_get_pathname().

by Jacek Caban

Hi Hans, On 11/2/21 3:27 PM, Hans Leidekker wrote: > + if(path[0] == '/') { > + BSTR str = SysAllocString(path + 1); > + SysFreeString(path); > + if (!str) > + return E_OUTOFMEMORY; > + *p = str; > + } We had problems with this in the past already, see e33ce7c5385 for example. Spec says that we should include leading slash in the result. IE does that in some cases, but doesn't in other cases. It's not clear to me what exactly triggers broken behaviour, but your tests happen to fall into this. I attached tests that check for proper results. I'd rather start with implement proper behaviour (which is more likely to be expected by scripts) and try to implement 'broken' behaviour only if we have a strong reason. Also, if possible, using Gecko's GetPathname would be preferable (unless it doesn't do what we need for some reason). Thanks, Jacek

Nov. 2, 2021

Re: [PATCH v5 6/7] gdi32: allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC.

by Jacek Caban

On 11/2/21 1:58 AM, Jin-oh Kang wrote: > On Tue, Nov 2, 2021 at 6:34 AM Jacek Caban <jacek(a)codeweavers.com> wrote: >> On 11/1/21 6:31 AM, Jinoh Kang wrote: >>> + UINT elm_size = coloruse == DIB_PAL_COLORS ? sizeof(WORD) : sizeof(DWORD); >>> + UINT colours = dst->biClrUsed; >>> + >>> + if (colours > UINT_MAX / elm_size) >>> + return FALSE; >> >> Should we use at most 1 << bpp entries here? > Windows is happy with whatever size is requested for the palette, even > if it's > (1<<bpp). In fact, setting a large colour table size results > in OOM. To replicate this behavior, I set the limit to the maximum > possible with the current implementation. Okay, that part seems good then. Thanks, Jacek

Nov. 2, 2021

Re: [PATCH v5 3/7] win32u: fix return value of StretchDIBits for EMF DC.

by Jacek Caban

On 11/2/21 4:46 AM, Jin-oh Kang wrote: > On Tue, Nov 2, 2021 at 6:21 AM Jacek Caban <jacek(a)codeweavers.com> wrote: >> Hi Jinoh, >> >> On 11/1/21 6:30 AM, Jinoh Kang wrote: >>> Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> >>> --- >>> dlls/win32u/emfdrv.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/dlls/win32u/emfdrv.c b/dlls/win32u/emfdrv.c >>> index e05f11d7b9a..395d51048d8 100644 >>> --- a/dlls/win32u/emfdrv.c >>> +++ b/dlls/win32u/emfdrv.c >>> @@ -408,7 +408,7 @@ static INT CDECL EMFDRV_StretchDIBits( PHYSDEV dev, INT x_dst, INT y_dst, INT wi >>> UINT wUsage, DWORD dwRop ) >>> { >>> /* FIXME: Update bound rect */ >>> - return height_src; >>> + return abs( info->bmiHeader.biHeight ); >>> } >>> >>> static INT CDECL EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, >> >> For this and the next patch, you could simply remove >> EMFDRV_StretchDIBits and EMFDRV_SetDIBitsToDevice and let the null >> driver take care of it. > The nulldrv code is still broken w.r.t. BI_RLE[48] case, so I guess > that side needs fixing? If it's broken then ideally yes, but not necessarily in this series. A quick testing with tests from your patches works fine. >> I originally left it because of bound rect >> update (that's supposed to happen in win32u instead of of gdi32), but >> that doesn't seem worth keeping it now. > I suppose the most ideal way to deal with it is to do normalization > early (in either gdi32 or NtGdi* functions) so that the calculation > code doesn't have to be duplicated between emfdc.c, EMFDRV and > nulldrv. Currently the args are passed as-is to both EMFDC and NtGdi*, > and the normalization work is done *twice*. NtGdi* functions generally need to validate input. They are syscalls which generally can't trust callers much and we mostly follow what Windows does here. It's possible that gdi32.dll should be more involved, but we will still need some duplication. EMFDRV is a different story. Most of those functions should probably just be removed. They are there because we should move bounding rect calculation for EMFs to win32u. However, I later found that there is an undocumented generic way to request that for any DC. It's currently not implemented, but ideally we'd use that. Once implemented, it should live in common DC code, so most of EMFDRV entries will probably not be needed. Thanks, Jacek

Nov. 2, 2021