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

Re: [PATCH v2] msvcrt: Don't use GetDaylightFlag function in _ftime64.

by Zebediah Figura (she/her)

On 11/1/21 11:58, Piotr Caban wrote: > On 11/1/21 5:37 PM, Zebediah Figura wrote: >> On 11/1/21 9:07 AM, Piotr Caban wrote: >>> >>> The function is not available on current Windows releases. >>> >>> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51959 >>> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> >>> --- >>> dlls/msvcrt/time.c | 5 ++--- >>> 1 file changed, 2 insertions(+), 3 deletions(-) >>> >>> >> >> This was added in the first place to avoid the overhead of loading >> tzres.dll. Is that no longer a concern? >> > It's just copying body of GetDaylightFlag function to msvcrt. There's no > change regarding tzres.dll being loaded. > > If GetTimeZoneInformation performance is a concern we should probably > avoid calling it too often. Hrm, that's true. I distinctly remember 2efc73b96811 being an alternative to caching the time zone information (cf [1]), but on examination it was a no-op even then... [1] https://www.winehq.org/pipermail/wine-devel/2018-December/137085.html

Nov. 1, 2021

Re: [PATCH v2] msvcrt: Don't use GetDaylightFlag function in _ftime64.

by Piotr Caban

On 11/1/21 5:37 PM, Zebediah Figura wrote: > On 11/1/21 9:07 AM, Piotr Caban wrote: >> >> The function is not available on current Windows releases. >> >> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51959 >> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> >> --- >> dlls/msvcrt/time.c | 5 ++--- >> 1 file changed, 2 insertions(+), 3 deletions(-) >> >> > > This was added in the first place to avoid the overhead of loading > tzres.dll. Is that no longer a concern? > It's just copying body of GetDaylightFlag function to msvcrt. There's no change regarding tzres.dll being loaded. If GetTimeZoneInformation performance is a concern we should probably avoid calling it too often. Thanks, Piotr

Nov. 1, 2021

Re: [PATCH 6/7] mshtml: Implement inline attributes parsing for createElement.

by Gabriel Ivăncescu

On 01/11/2021 16:06, Jacek Caban wrote: > On 10/25/21 3:30 PM, Gabriel Ivăncescu wrote: >> This is implemented by creating a dummy HTML element and parsing the >> inline >> tag there, under a dummy tag name, so that it's filled with the parsed >> attributes. After that, its attributes are copied into a proper element >> with the proper tag name. >> >> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> >> --- >> dlls/mshtml/htmlelem.c | 154 +++++++++++++++++++++++++++++- >> dlls/mshtml/tests/documentmode.js | 69 +++++++++++++ >> 2 files changed, 222 insertions(+), 1 deletion(-) >> >> diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c >> index de69e2f..d5463f5 100644 >> --- a/dlls/mshtml/htmlelem.c >> +++ b/dlls/mshtml/htmlelem.c >> @@ -355,6 +355,154 @@ static inline HTMLElement >> *impl_from_IHTMLElement(IHTMLElement *iface) >> return CONTAINING_RECORD(iface, HTMLElement, IHTMLElement_iface); >> } >> +static HRESULT create_nselem_with_elem_attrs(HTMLDocumentNode *doc, >> const WCHAR *tag, nsIDOMElement *elem_with_attr, nsIDOMElement **ret) >> +{ >> + nsIDOMMozNamedAttrMap *attrs; >> + nsAString name_str, val_str; >> + nsresult nsres, nsres2; >> + nsIDOMElement *elem; >> + nsIDOMAttr *attr; >> + UINT32 i, length; >> + >> + nsAString_InitDepend(&name_str, tag); >> + nsres = nsIDOMHTMLDocument_CreateElement(doc->nsdoc, &name_str, >> &elem); >> + nsAString_Finish(&name_str); >> + if(NS_FAILED(nsres)) >> + return map_nsresult(nsres); >> + >> + nsres = nsIDOMElement_GetAttributes(elem_with_attr, &attrs); >> + if(NS_FAILED(nsres)) >> + goto fail; >> + >> + nsres = nsIDOMMozNamedAttrMap_GetLength(attrs, &length); >> + if(NS_FAILED(nsres)) { >> + nsIDOMMozNamedAttrMap_Release(attrs); >> + goto fail; >> + } >> + >> + nsAString_Init(&name_str, NULL); >> + nsAString_Init(&val_str, NULL); >> + for(i = 0; i < length; i++) { >> + nsres = nsIDOMMozNamedAttrMap_Item(attrs, i, &attr); >> + if(NS_FAILED(nsres)) >> + continue; >> + >> + nsres = nsIDOMAttr_GetNodeName(attr, &name_str); >> + nsres2 = nsIDOMAttr_GetNodeValue(attr, &val_str); >> + nsIDOMAttr_Release(attr); >> + if(NS_FAILED(nsres) || NS_FAILED(nsres2)) >> + continue; >> + >> + nsres = nsIDOMElement_SetAttribute(elem, &name_str, &val_str); >> + } >> + nsAString_Finish(&name_str); >> + nsAString_Finish(&val_str); >> + >> + nsIDOMMozNamedAttrMap_Release(attrs); >> + *ret = elem; >> + return S_OK; >> + >> +fail: >> + nsIDOMElement_Release(elem); >> + return E_FAIL; >> +} > > > Isn't Node.cloneNode what you need here? > Thanks for the suggestion, I wasn't aware it copied the attributes to a different element. > >> +static HRESULT create_nselem_parse(HTMLDocumentNode *doc, const WCHAR >> *tag, nsIDOMElement **ret) >> +{ >> + static const WCHAR prefix[15] = L"<BODY><DUMMYTAG"; >> + static const WCHAR suffix[] = L"/></BODY>"; > > > This whole function looks hacky. Why do you need extra <BODY> element? > Could we just parse the whole tag string? > Would it work properly with things like <html ...> or <body ...> elements? I have tests for them and I remember testing them precisely for this reason. I remember I tried it originally to parse the whole thing, but ended up with those corner cases not working. I'll look at it again and see if I messed something up, but I can't guarantee it will work. Thanks, Gabriel

Nov. 1, 2021

Re: [PATCH 2/7] jscript: Implement Object.prototype.isPrototypeOf method.

by Gabriel Ivăncescu

On 01/11/2021 15:46, Jacek Caban wrote: > On 10/25/21 3:30 PM, Gabriel Ivăncescu wrote: >> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> >> --- >> dlls/jscript/object.c | 13 +++++++++++-- >> dlls/jscript/tests/lang.js | 13 +++++++++++++ >> 2 files changed, 24 insertions(+), 2 deletions(-) >> >> diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c >> index 169b47c..8da0ff4 100644 >> --- a/dlls/jscript/object.c >> +++ b/dlls/jscript/object.c >> @@ -196,8 +196,17 @@ 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])))) >> + ret = (jsdisp->prototype == jsthis->u.jsdisp); > > > That's not what spec says we should do. > Oh yeah, oops, I see it's supposed to check the whole chain. > >> diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js >> index ad1217d..bcfe88b 100644 >> --- a/dlls/jscript/tests/lang.js >> +++ b/dlls/jscript/tests/lang.js >> @@ -1679,14 +1679,27 @@ 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(Object.prototype.isPrototypeOf.call(instanceOfTest, tmp) === >> false, "instanceOfTest is prototype of tmp"); >> +ok(Object.prototype.isPrototypeOf.call(instanceOfTest.prototype, tmp) >> === true, "instanceOfTest.prototype is not prototype of tmp"); > > > Why do you use call() instead of doing regular calls? > > Not a specific reason, I just use it in general to make sure it's the proper one called, so I end up copy pasting it.

Nov. 1, 2021

Re: [PATCH v2] msvcrt: Don't use GetDaylightFlag function in _ftime64.

by Zebediah Figura

On 11/1/21 9:07 AM, Piotr Caban wrote: > > The function is not available on current Windows releases. > > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51959 > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/msvcrt/time.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > This was added in the first place to avoid the overhead of loading tzres.dll. Is that no longer a concern?

Nov. 1, 2021

Re: [PATCH] configure.ac: allow expressing dwarf version in CFLAGS and CROSSCFLAGS

by Eric Pouech

> > I think that this will not work for PDBs: when CROSSCFLAGS="-g > -gcodeview", we'd try to append "-gdwarf-2 -gstrict-dwarf". I thought you'd use CROSSDEBUG=pdb in that case :-( I'll resend an update A+

Nov. 1, 2021

Re: [PATCH] winebuild: Rename delay import libs .text$2 section to .data$2.

by Jacek Caban

On 10/22/21 9:22 PM, Alexandre Julliard wrote: > Rémi Bernon <rbernon(a)codeweavers.com> writes: > >> GNU dlltool outputs the DELAY_IMPORT_DESCRIPTOR of delay import libs in >> a .text$2 section, which is then merged into .text and changes its flags >> to add the DATA flag. >> >> This is incorrect and breaks some DRMs, which are then validating that >> .text sections doesn't have the IMAGE_SCN_CNT_INITIALIZED_DATA flag set. >> >> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> >> --- >> >> This is actually more some kind of RFC, as I'm not sure at all what this >> change really implies and why the descriptor has to be in .text in the >> first place. It seems like some GNU specific thing, as it seems from >> internet comments that MSVC places the descriptor in .data section? > Yes, it sounds like it should be fixed in binutils. Sadly the delay > import support in dlltool is not great, maybe we should try to find a > way to bypass it. Technically, all that dlltool does we could do ourselves in winebuild, so we could potentially generate delay importlibs ourselves. However, I think that the whole binutils' idea of delay importlibs is just a hack that we'd ideally not follow. The right solution, in my opinion, is having proper support for -delayload linker flag. lld-link already got it right and Wine can use it (so I'd expect that the problem doesn't exist in llvm-mingw or pure Clang Wine builds). It should be possible to implement that in LD as well. Jacek

Nov. 1, 2021

Re: [PATCH] configure.ac: allow expressing dwarf version in CFLAGS and CROSSCFLAGS

by Jacek Caban

Hi Eric, Sorry for the delay. On 10/4/21 6:37 PM, Eric Pouech wrote: > + ac_debug_format_seen= > if test -z "$CROSSDEBUG" > then > for ac_flag in $CROSSCFLAGS; do > case $ac_flag in > - -gdwarf*) CROSSDEBUG=dwarf ;; > + -gdwarf-*) ac_debug_format_seen=yes ;; > + -g) ac_debug_format_seen=${ac_debug_format_seen:-default} ;; > -gcodeview) CROSSDEBUG=pdb ;; > - -g) CROSSDEBUG=${CROSSDEBUG:-dwarf} ;; > esac > done > fi > case $CROSSDEBUG in > - *dwarf) WINE_TRY_CROSSCFLAGS([-gdwarf-2]) > - WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;; > + *dwarf) ac_debug_format_seen=default ;; > pdb) WINE_TRY_CROSSCFLAGS([-gcodeview]) ;; > esac > + if test "x$ac_debug_format_seen" = "xdefault" > + then > + WINE_TRY_CROSSCFLAGS([-gdwarf-2]) > + WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) > + fi I think that this will not work for PDBs: when CROSSCFLAGS="-g -gcodeview", we'd try to append "-gdwarf-2 -gstrict-dwarf". Thanks, Jacek

Nov. 1, 2021

Re: [v2 PATCH] d3d11: Correctly handle optional arguments in OMGetBlendState().

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=101116 Your paranoid android. === w10pro64 (32 bit report) === d3d10core: d3d10core.c:4768: Test failed: Got unexpected IAVertices count: 0. d3d10core.c:4769: Test failed: Got unexpected IAPrimitives count: 0. d3d10core.c:4770: Test failed: Got unexpected VSInvocations count: 0. d3d10core.c:4773: Test failed: Got unexpected CInvocations count: 0. d3d10core.c:4774: Test failed: Got unexpected CPrimitives count: 0. === w1064 (64 bit report) === d3d10core: d3d10core.c:4566: Test failed: Got unexpected refcount 1, expected >= 2. 1b6c:d3d10core: unhandled exception c0000005 at 00000000004153A5 === w1064v1809 (32 bit report) === d3d11: d3d11.c:5920: Test failed: Got unexpected IAVertices count: 0. d3d11.c:5921: Test failed: Got unexpected IAPrimitives count: 0. d3d11.c:5922: Test failed: Got unexpected VSInvocations count: 0. d3d11.c:5925: Test failed: Got unexpected CInvocations count: 0. d3d11.c:5926: Test failed: Got unexpected CPrimitives count: 0. === debiant2 (32 bit Hebrew:Israel report) === d3d11: d3d11.c:16652: Test failed: Got unexpected hr 0x8876086c. === debiant2 (32 bit Hindi:India report) === d3d11: d3d11.c:9770: Test failed: d3d11.c:15246: Test marked todo: Got hr 0 for WRITE. === debiant2 (32 bit Japanese:Japan report) === d3d10core: d3d10core.c:4774: Test failed: Got unexpected hr 0x1. === debiant2 (64 bit WoW report) === d3d11: d3d11: Timeout

Nov. 1, 2021

[v2 PATCH] d3d11: Correctly handle optional arguments in OMGetBlendState().

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 14 ++++++++++++ dlls/d3d11/device.c | 37 ++++++++++++++++++++++---------- dlls/d3d11/tests/d3d11.c | 14 ++++++++++++ 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 6ec398269fa..b8338152bb7 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -5533,6 +5533,20 @@ float4 main(float4 color : COLOR) : SV_TARGET blend_factor[2] = 0.3f; blend_factor[3] = 0.4f; ID3D10Device_OMSetBlendState(device, blend_state, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + /* OMGetBlendState() arguments are optional */ + ID3D10Device_OMGetBlendState(device, NULL, NULL, NULL); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, NULL, NULL); + ID3D10BlendState_Release(tmp_blend_state); + sample_mask = 0; + ID3D10Device_OMGetBlendState(device, NULL, NULL, &sample_mask); + ok(sample_mask == D3D10_DEFAULT_SAMPLE_MASK, "Unexpected sample mask %#x.\n", sample_mask); + memset(tmp_blend_factor, 0, sizeof(tmp_blend_factor)); + ID3D10Device_OMGetBlendState(device, NULL, tmp_blend_factor, NULL); + ok(tmp_blend_factor[0] == 0.1f && tmp_blend_factor[1] == 0.2f + && tmp_blend_factor[2] == 0.3f && tmp_blend_factor[3] == 0.4f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + tmp_blend_factor[0], tmp_blend_factor[1], tmp_blend_factor[2], tmp_blend_factor[3]); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, tmp_blend_factor, &sample_mask); ok(tmp_blend_factor[0] == 0.1f && tmp_blend_factor[1] == 0.2f && tmp_blend_factor[2] == 0.3f && tmp_blend_factor[3] == 0.4f, diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8d88ee26222..417638bf314 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2190,20 +2190,26 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMGetBlendState(ID3D11DeviceC struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_blend_state *wined3d_state; struct d3d_blend_state *blend_state_impl; + unsigned int tmp_sample_mask; + float tmp_blend_factor[4]; TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", iface, blend_state, blend_factor, sample_mask); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_context_get_blend_state(context->wined3d_context, - (struct wined3d_color *)blend_factor, sample_mask))) + if (!blend_factor) blend_factor = tmp_blend_factor; + if (!sample_mask) sample_mask = &tmp_sample_mask; + wined3d_state = wined3d_device_context_get_blend_state(context->wined3d_context, + (struct wined3d_color *)blend_factor, sample_mask); + if (blend_state) { - blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); - ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState_iface); - } - else - { - *blend_state = NULL; + if (wined3d_state) + { + blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); + ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState_iface); + } + else + *blend_state = NULL; } wined3d_mutex_unlock(); } @@ -5541,10 +5547,19 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device1 *iface, d3d11_device_context_OMGetBlendState(&device->immediate_context.ID3D11DeviceContext1_iface, &d3d11_blend_state, blend_factor, sample_mask); + if (blend_state) + { + if (d3d11_blend_state) + { + *blend_state = (ID3D10BlendState *)&impl_from_ID3D11BlendState(d3d11_blend_state)->ID3D10BlendState1_iface; + ID3D10BlendState_AddRef(*blend_state); + } + else + *blend_state = NULL; + } + if (d3d11_blend_state) - *blend_state = (ID3D10BlendState *)&impl_from_ID3D11BlendState(d3d11_blend_state)->ID3D10BlendState1_iface; - else - *blend_state = NULL; + ID3D11BlendState_Release(d3d11_blend_state); } static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 553caa10e46..2ed9aed490e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12608,6 +12608,20 @@ static void test_clear_state(void) ID3D11DeviceContext_OMGetDepthStencilState(context, &tmp_ds_state, NULL); ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); ID3D11DepthStencilState_Release(tmp_ds_state); + /* OMGetBlendState() arguments are optional */ + ID3D11DeviceContext_OMGetBlendState(context, NULL, NULL, NULL); + ID3D11DeviceContext_OMGetBlendState(context, &tmp_blend_state, NULL, NULL); + ok(tmp_blend_state == blend_state, "Got unexpected blend state %p, expected %p.\n", tmp_blend_state, blend_state); + ID3D11BlendState_Release(tmp_blend_state); + sample_mask = 0; + ID3D11DeviceContext_OMGetBlendState(context, NULL, NULL, &sample_mask); + ok(sample_mask == 0xff00ff00, "Got unexpected sample mask %#x.\n", sample_mask); + memset(blend_factor, 0, sizeof(blend_factor)); + ID3D11DeviceContext_OMGetBlendState(context, NULL, blend_factor, NULL); + ok(blend_factor[0] == 0.1f && blend_factor[1] == 0.2f + && blend_factor[2] == 0.3f && blend_factor[3] == 0.4f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3]); ID3D11DeviceContext_OMGetRenderTargets(context, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT, tmp_rtv, &tmp_dsv); for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT - 1; ++i) -- 2.33.0

Nov. 1, 2021