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

[PATCH 2/2] win32u: Use a real family name as otmpFamilyName for substituted face.

by Akihiro Sagawa

GetTextFace remains to return the original face name, e.g. MS Shell Dlg. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 2 +- dlls/win32u/font.c | 26 +++++++++++++------------- dlls/win32u/ntgdi_private.h | 1 + 3 files changed, 15 insertions(+), 14 deletions(-)

Nov. 4, 2021

[PATCH 1/2] gdi32/tests: Test substituted face family name.

by Akihiro Sagawa

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)

Nov. 4, 2021

[PATCH v3 3/3] mshtml: Populate the element props properly.

by Gabriel Ivăncescu

For IE modes 8 and above, IHTMLElement::setAttribute uses the underlying nsIDOMElement::SetAttribute, which does nothing since we're already enumerating the ns attributes, and we're supposed to create the DISPIDs for them. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 5 ++++- dlls/mshtml/tests/documentmode.js | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 503a287..6624264 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6480,7 +6480,10 @@ static HRESULT HTMLElement_populate_props(DispatchEx *dispex) } else V_BSTR(&value) = NULL; - IHTMLElement_setAttribute(&This->IHTMLElement_iface, name, value, 0); + hres = IDispatchEx_GetDispID(&dispex->IDispatchEx_iface, name, fdexNameEnsure | fdexNameCaseInsensitive, &id); + if(SUCCEEDED(hres)) + set_elem_attr_value_by_dispid(This, id, &value); + SysFreeString(name); VariantClear(&value); } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 69f4796..d7c1350 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -518,9 +518,7 @@ sync_test("createElement_inline_attr", function() { for(var i = 0; i < tags.length; i++) { e = document.createElement("<" + tags[i] + " test='a\"' abcd=\""b"\">"); ok(e.tagName === tags[i].toUpperCase(), "<" + tags[i] + " test=\"a\" abcd=\"b\">.tagName returned " + e.tagName); - todo_wine_if(v == 8). ok(e.test === "a\"", "<" + tags[i] + " test='a\"' abcd=\""b"\">.test returned " + e.test); - todo_wine_if(v == 8). ok(e.abcd === "\"b\"", "<" + tags[i] + " test='a\"' abcd=\""b"\">.abcd returned " + e.abcd); } }else { -- 2.31.1

Nov. 4, 2021

[PATCH v3 2/3] mshtml: Implement inline attributes parsing for createElement.

by Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 98 ++++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 63 ++++++++++++++++++++ 2 files changed, 160 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index de69e2f..503a287 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -355,6 +355,98 @@ static inline HTMLElement *impl_from_IHTMLElement(IHTMLElement *iface) return CONTAINING_RECORD(iface, HTMLElement, IHTMLElement_iface); } +static HRESULT create_nselem_parse(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMElement **ret) +{ + WCHAR *p = wcschr(tag + 1, '>'); + nsIDOMHTMLCollection *nscol; + UINT32 i, name_len, length; + nsIDOMHTMLElement *nshtml; + HRESULT hres = E_FAIL; + nsresult nsres; + nsAString str; + + if(!p || p[1] || wcschr(tag + 1, '<')) + return E_FAIL; + if(!doc->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + /* Ignore the > or /> end token */ + length = p - tag - (p[-1] == '/'); + + /* Get the tag name using HTML whitespace rules */ + name_len = length - 1; + for(i = 1; i < length; i++) { + if((tag[i] >= 0x09 && tag[i] <= 0x0d) || tag[i] == ' ') { + name_len = i - 1; + break; + } + } + if(!name_len) + return E_FAIL; + + /* Create a temporary html element and parse it there */ + nsAString_InitDepend(&str, L"HTML"); + nsres = nsIDOMHTMLDocument_CreateElement(doc->nsdoc, &str, (nsIDOMElement**)&nshtml); + nsAString_Finish(&str); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + + if(name_len == 4 && !wcsnicmp(tag + 1, L"HTML", 4)) { + FIXME("Returning <html> element with no attributes\n"); + *ret = (nsIDOMElement*)nshtml; + return S_OK; + } + + nsAString_InitDepend(&str, tag); + nsres = nsIDOMHTMLElement_SetInnerHTML(nshtml, &str); + nsAString_Finish(&str); + if(NS_FAILED(nsres)) { + hres = map_nsresult(nsres); + goto fail; + } + + /* Get the element and remove it from the temporary */ + if(!(p = heap_alloc((name_len + 1) * sizeof(WCHAR)))) + hres = E_OUTOFMEMORY; + else { + memcpy(p, tag + 1, name_len * sizeof(WCHAR)); + p[name_len] = '\0'; + nsAString_InitDepend(&str, p); + nsres = nsIDOMHTMLElement_GetElementsByTagName(nshtml, &str, &nscol); + nsAString_Finish(&str); + heap_free(p); + if(NS_FAILED(nsres)) + goto fail; + + length = 0; + nsres = nsIDOMHTMLCollection_GetLength(nscol, &length); + if(NS_SUCCEEDED(nsres) && length == 1) { + nsIDOMNode *nsnode, *nsparent, *tmp; + + nsIDOMHTMLCollection_Item(nscol, 0, &nsnode); + nsres = nsIDOMNode_GetParentNode(nsnode, &nsparent); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDOMNode_RemoveChild(nsparent, nsnode, &tmp); + nsIDOMNode_Release(nsparent); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDOMNode_QueryInterface(tmp, &IID_nsIDOMElement, (void**)ret); + nsIDOMNode_Release(tmp); + if(NS_SUCCEEDED(nsres)) + hres = S_OK; + } + } + nsIDOMNode_Release(nsnode); + } + nsIDOMHTMLCollection_Release(nscol); + } + +fail: + nsIDOMHTMLElement_Release(nshtml); + return hres; +} + HRESULT create_nselem(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMElement **ret) { nsAString tag_str; @@ -385,7 +477,11 @@ HRESULT create_element(HTMLDocumentNode *doc, const WCHAR *tag, HTMLElement **re if(!doc->nsdoc) doc = doc->node.doc; - hres = create_nselem(doc, tag, &nselem); + /* IE8 and below allow creating elements with attributes, such as <div class="a"> */ + if(tag[0] == '<' && dispex_compat_mode(&doc->node.event_target.dispex) <= COMPAT_MODE_IE8) + hres = create_nselem_parse(doc, tag, &nselem); + else + hres = create_nselem(doc, tag, &nselem); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 02a5f5f..69f4796 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -488,6 +488,69 @@ sync_test("style_props", function() { } }); +sync_test("createElement_inline_attr", function() { + var v = document.documentMode, e, s; + + if(v < 9) { + s = document.createElement("<div>").tagName; + ok(s === "DIV", "<div>.tagName returned " + s); + s = document.createElement("<div >").tagName; + ok(s === "DIV", "<div >.tagName returned " + s); + s = document.createElement("<div/>").tagName; + ok(s === "DIV", "<div/>.tagName returned " + s); + e = 0; + try { + document.createElement("<div"); + }catch(ex) { + e = ex.number; + } + ok(e === 0x4005 - 0x80000000, "<div e = " + e); + e = 0; + try { + document.createElement("<div test=1"); + }catch(ex) { + e = ex.number; + } + ok(e === 0x4005 - 0x80000000, "<div test=1 e = " + e); + + var tags = [ "div", "head", "body", "title" ]; + + for(var i = 0; i < tags.length; i++) { + e = document.createElement("<" + tags[i] + " test='a\"' abcd=\""b"\">"); + ok(e.tagName === tags[i].toUpperCase(), "<" + tags[i] + " test=\"a\" abcd=\"b\">.tagName returned " + e.tagName); + todo_wine_if(v == 8). + ok(e.test === "a\"", "<" + tags[i] + " test='a\"' abcd=\""b"\">.test returned " + e.test); + todo_wine_if(v == 8). + ok(e.abcd === "\"b\"", "<" + tags[i] + " test='a\"' abcd=\""b"\">.abcd returned " + e.abcd); + } + }else { + s = ""; + e = 0; + try { + document.createElement("<div>"); + }catch(ex) { + s = ex.toString(); + e = ex.number; + } + todo_wine. + ok(e === undefined, "<div> e = " + e); + todo_wine. + ok(s === "InvalidCharacterError", "<div> s = " + s); + s = ""; + e = 0; + try { + document.createElement("<div test=\"a\">"); + }catch(ex) { + s = ex.toString(); + e = ex.number; + } + todo_wine. + ok(e === undefined, "<div test=\"a\"> e = " + e); + todo_wine. + ok(s === "InvalidCharacterError", "<div test=\"a\"> s = " + s); + } +}); + sync_test("JS objs", function() { var g = window; -- 2.31.1

Nov. 4, 2021

[PATCH v3 1/3] mshtml: Hold a ref to the location on the window side.

by Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 5 ++--- dlls/mshtml/tests/dom.c | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0b25e71..635b046 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -68,9 +68,7 @@ static inline BOOL is_outer_window(HTMLWindow *window) static HRESULT get_location(HTMLInnerWindow *This, HTMLLocation **ret) { - if(This->location) { - IHTMLLocation_AddRef(&This->location->IHTMLLocation_iface); - }else { + if(!This->location) { HRESULT hres; hres = HTMLLocation_Create(This, &This->location); @@ -78,6 +76,7 @@ static HRESULT get_location(HTMLInnerWindow *This, HTMLLocation **ret) return hres; } + IHTMLLocation_AddRef(&This->location->IHTMLLocation_iface); *ret = This->location; return S_OK; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 03f5c04..ea5b210 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6015,7 +6015,6 @@ static void test_location(IHTMLDocument2 *doc) IHTMLLocation *location, *location2; IHTMLWindow2 *window; BSTR str; - ULONG ref; HRESULT hres; hres = IHTMLDocument2_get_location(doc, &location); @@ -6051,8 +6050,7 @@ static void test_location(IHTMLDocument2 *doc) ok(!lstrcmpW(str, L"about:blank"), "unexpected href %s\n", wine_dbgstr_w(str)); SysFreeString(str); - ref = IHTMLLocation_Release(location); - ok(!ref, "location should be destroyed here\n"); + IHTMLLocation_Release(location); } static void test_plugins_col(IHTMLDocument2 *doc) -- 2.31.1

Nov. 4, 2021

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

by Gabriel Ivăncescu

On 03/11/2021 21:42, Jacek Caban wrote: > On 11/2/21 7:07 PM, Gabriel Ivăncescu wrote: >> We don't hold a refcount to the location, but only a weak ref (as >> tests show). > > > To be honest, the test is not really interesting and I think that it > would be better to hold the reference instead. What we observe in tests > may be explained by some uninteresting internal details (like maybe the > returned interface is just some sort of a wrapper), but current > behaviour is broken for scripts. As an example like: > > location.prop = "test"; > > var v = location.prop; > > location may be released between those sentences, causing "prop" to be > lost. > > > I think that we can just remove the reference count test if it causes > problems. > > > Thanks, > > Jacek > Sure, I actually considered that, but didn't know whether the test was important or not. I'll re-send it that way.

Nov. 4, 2021

Re: [PATCH v4 1/3] uiautomationcore: Implement UiaGetReservedNotSupportedValue.

by Connor McAdams

On Tue, Nov 02, 2021 at 02:40:03AM +0300, Nikolay Sivov wrote: > > > On 10/29/21 4:43 PM, Connor McAdams wrote: > > +struct uia_rsrv_obj_marshal_wrapper > > +{ > > + IUnknown IUnknown_iface; > > + LONG refcount; > > + > > + IUnknown *marshaler; > > + IUnknown *marshal_object; > > +}; > > + > > +static struct uia_rsrv_obj_marshal_wrapper *impl_uia_rsrv_obj_marshal_wrapper_from_IUnknown(IUnknown *iface) > > +{ > > + return CONTAINING_RECORD(iface, struct uia_rsrv_obj_marshal_wrapper, IUnknown_iface); > > +} > > +static HRESULT uia_rsrv_obj_create_marshal_wrapper(IUnknown *reserved, void **ppv) > > +{ > > Other than naming, I think this looks good now. I'm not sure if this is > waiting for someone to sign off. > Yeah, I think it needs a sign-off from somebody other than myself. If you'd be willing to, that'd probably help. If you'd like me to change the naming to get your sign-off, just let me know what to rename and I'll send in a new series. :) Thanks.

Nov. 4, 2021

Re: [PATCH 1/8] wined3d: Pass a wined3d_device_vk to wined3d_context_vk_create_bo().

by Henri Verbeet

On Wed, 3 Nov 2021 at 21:47, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > On 11/3/21 12:10 PM, Henri Verbeet wrote: > > On Wed, 3 Nov 2021 at 00:20, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > >> With the goal of making the context_vk parameter optional, so that we can > >> allocate new BOs from the client thread. > >> > > This would mainly be for the wined3d_buffer_vk_create_buffer_object() > > call in patch 8/8, but in the Vulkan backend, we can always get the > > context through "device_vk->context_vk", provided we're inside an > > init_3d()/uninit_3d() pair. I.e., the Vulkan backend can make Vulkan > > calls from applications threads, it just needs synchronisation. I.e., > > I don't think the Vulkan backend needs this. > > It's true that this patch series is modeled more like the GL backend > than it needs to be in general. > Which, to be clear, is largely fine with me, as long as the justification is something along the lines of "consistency with the GL backend", instead of "required to do maps with a NULL context". > I had gotten the impression that we didn't want to touch > wined3d_context_vk outside of the CS thread, even though it is thread > safe. If that's not the case, all the better, although I'm still more > than a little confused about the seemingly arbitrary division between > device and context in the Vulkan adapter. > It's true that it's largely arbitrary; for the purposes of the Vulkan backend, the device and the context could/should be considered to be the same object. (And perhaps significantly, within the Vulkan backend you can get a wined3d_device_vk from a wined3d_context using CONTAINING_RECORD.) If you feel strongly about this being confusing, I'd certainly be fine with just getting rid of wined3d_context_vk, and moving everything to wined3d_device_vk. That said, there are broadly two considerations for things ending up in one or the other structure: - Things that have direct equivalents in the OpenGL backend generally are in the corresponding structure. E.g., "null_resources_vk" and "null_views_vk" in wined3d_device_vk are equivalents of "dummy_textures" in wined3d_device_gl; "free_*_query_pools" in wined3d_context_vk are equivalents of "free_*_queries" in wined3d_context_gl. - Things that mostly get accessed from context functions are in wined3d_context_vk. E.g., "vk_framebuffer" is in that category. That is itself somewhat influenced by equivalency to things in the GL backend; wined3d_context_vk_apply_draw_state() is an equivalent of context_(gl_)apply_draw_state(). The basic idea was that it would make it easier to find things for people already familiar with the GL backend; it does mean some things are somewhat arbitrary when considering the Vulkan backend on its own.

Nov. 4, 2021

Re: [PATCH 8/8] wined3d: Try to allocate new Vulkan BOs from the client thread for DISCARD maps.

by Henri Verbeet

On Wed, 3 Nov 2021 at 21:47, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > On 11/3/21 12:11 PM, Henri Verbeet wrote: > > On Wed, 3 Nov 2021 at 00:37, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > >> +static bool adapter_vk_alloc_bo(struct wined3d_device *device, struct wined3d_resource *resource, > >> + unsigned int sub_resource_idx, struct wined3d_bo_address *addr) > >> +{ > >> + wined3d_not_from_cs(device->cs); > >> + > >> + if (resource->type == WINED3D_RTYPE_BUFFER) > >> + { > >> + struct wined3d_buffer_vk *buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource)); > >> + struct wined3d_client_bo_vk *client_bo; > >> + > >> + if (!(client_bo = heap_alloc(sizeof(*client_bo)))) > >> + return false; > >> + > >> + if (!wined3d_buffer_vk_create_buffer_object(buffer_vk, NULL, &client_bo->bo)) > >> + { > >> + heap_free(client_bo); > >> + return false; > >> + } > >> + > >> + if (!client_bo->bo.b.map_ptr) > >> + { > >> + struct wined3d_client_bo_vk_map_ctx ctx = {.device = device, .client_bo = client_bo}; > >> + > >> + WARN_(d3d_perf)("BO %p (chunk %p, slab %p) is not persistently mapped.\n", &client_bo->bo, > >> + client_bo->bo.memory ? client_bo->bo.memory->chunk : NULL, client_bo->bo.slab); > >> + > >> + wined3d_cs_map_object(device->cs, wined3d_client_bo_vk_map_cs, &ctx); > >> + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_MAP); > >> + } > > wined3d_cs_map_object() almost sounds like it would emit a > > WINED3D_CS_OP_MAP, somewhat like wined3d_device_context_map() back > > when that was still called wined3d_cs_map()... > > Indeed, except that WINED3D_CS_OP_MAP takes the resource. I don't think > we want to change that, either, although we could create a new CS op > instead of using WINED3D_CS_OP_CALLBACK. > Yeah, I'm not suggesting we change WINED3D_CS_OP_MAP. It's somewhat moot for the Vulkan backend now, but I would argue that if we would have to go through the CS to map the bo anyway, we might as well either give up and just map the resource through the CS, or allocate the staging memory on the CPU. > (Now that I think about it, *is* there any sort of a rule as to what > deserves WINED3D_CS_OP_CALLBACK and what doesn't? I know that currently > it's just a matter of init and destroy, but it seeems a bit arbitrary on > reflection.) > For the most part, it's things that I don't think should have their own wined3d_cs_op. WINED3D_CS_OP_CALLBACK is a little ugly, but it works well enough for the moment. I suppose we could do something along the lines of the following: struct wined3d_cs_resource_ops { void (*cs_resource_init)(struct wined3d_cs_resource *resource); void (*cs_resource_cleanup)(struct wined3d_cs_resource *resource); }; struct wined3d_cs_resource { struct wined3d_cs_resource_ops *ops; }; and then struct wined3d_cs_init_resource { enum wined3d_cs_op opcode; struct wined3d_cs_resource *resource; }; static void wined3d_cs_exec_init_resource(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_init_resource *op = data; op->resource->ops->cs_resource_init(op->resource); } and equivalent cleanup variants. Something like wined3d_sampler_vk would then include a wined3d_cs_resource structure, and call "wined3d_cs_init_object(device->cs, &sampler_vk->cs_resource);". That ends up being largely equivalent to the current scheme, although perhaps a little more structured.

Nov. 4, 2021

Re: [PATCH v2] 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=101291 Your paranoid android. === w10pro64 (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

Nov. 4, 2021