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

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

by Henri Verbeet

> +static void wined3d_buffer_vk_set_bo(struct wined3d_buffer *buffer, > + struct wined3d_context *context, struct wined3d_bo *bo) > +{ > + struct wined3d_bo_vk *prev_bo = (struct wined3d_bo_vk *)buffer->buffer_object; > + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); > + struct wined3d_buffer_vk *buffer_vk = wined3d_buffer_vk(buffer); > + struct wined3d_bo_vk *bo_vk = wined3d_bo_vk(bo); > + > + /* We can't just copy the contents of bo_vk into buffer_vk->bo, because the > + * new BO might still be in use by the client thread. We could allow both to > + * be valid, although knowing when to destroy a BO then becomes tricky, and > + * ensuring it's not mapped more than once also becomes tricky. */ > + Would it make sense then to either make "buffer_vk->bo" a pointer, or get rid of it entirely? Right now, we're handling the initial bo different from subsequent ones, and I'm not sure there's a good reason to justify that. Incidentally, now that we have an actual wined3d_bo structure, it would probably make sense to change the type of "buffer_object" in e.g. struct wined3d_buffer, struct wined3d_bo_address, etc. from uintptr_t (and variants) to a wined3d_bo pointer. That's not a prerequisite for this series, but would probably be a nice cleanup. > @@ -3121,12 +3124,20 @@ static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, str > { > /* Limit NOOVERWRITE maps to buffers for now; there are too many ways that > * a texture can be invalidated to even count. */ > - if (wined3d_map_persistent() && resource->type == WINED3D_RTYPE_BUFFER && (flags & WINED3D_MAP_NOOVERWRITE)) > + if (wined3d_map_persistent() && resource->type == WINED3D_RTYPE_BUFFER > + && (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE))) > { > struct wined3d_client_resource *client = &resource->client; > + struct wined3d_device *device = context->device; > const struct wined3d_bo *bo; > uint8_t *map_ptr; > > + if (flags & WINED3D_MAP_DISCARD) > + { > + if (!device->adapter->adapter_ops->adapter_alloc_bo(device, resource, sub_resource_idx, &client->addr)) > + return NULL; > + } > + Returning NULL here works, but "false" would be more appropriate.

Nov. 4, 2021

[PATCH v2] mshtml: Implement HTMLAnchorElement_get_pathname().

by Hans Leidekker

v2: Keep leading slash and use GetPathname(). I added some more tests which show that for some protocols IE will prepend a slash if it's not there in the URL. I left those as todo. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlanchor.c | 11 +++++++++-- dlls/mshtml/tests/dom.js | 37 ++++++++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a3608abbeb1..b11d39ae07f 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -476,8 +476,15 @@ static HRESULT WINAPI HTMLAnchorElement_put_pathname(IHTMLAnchorElement *iface, static HRESULT WINAPI HTMLAnchorElement_get_pathname(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString pathname_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + /* FIXME: IE prepends a slash for some protocols */ + nsAString_Init(&pathname_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetPathname(This->nsanchor, &pathname_str); + return return_nsstr(nsres, &pathname_str, p); } static HRESULT WINAPI HTMLAnchorElement_put_port(IHTMLAnchorElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 3a2b96a7958..e2be69782fc 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -137,24 +137,39 @@ async_test("iframe_location", function() { }); sync_test("anchor", function() { - var iframe = document.body.firstChild; - var anchor = document.createElement("a"); - var anchor_tests = [ - { href: "http://www.winehq.org:123/about", protocol: "http:", host: "www.winehq.org:123" }, - { href: "https://www.winehq.org:123/about", protocol: "https:", host: "www.winehq.org:123" }, - { href: "about:blank", protocol: "about:", host: "" }, - { href: "file:///c:/dir/file.html", protocol: "file:", host: "" }, - { href: "http://www.winehq.org/about", protocol: "http:", host: "www.winehq.org:80", todo_host: true }, - { href: "https://www.winehq.org/about", protocol: "https:", host: "www.winehq.org:443", todo_host: true }, + { href: "http://www.winehq.org:123/about", + protocol: "http:", host: "www.winehq.org:123", path: "/about" }, + { href: "https://www.winehq.org:123/about", + protocol: "https:", host: "www.winehq.org:123", path: "/about" }, + { href: "about:blank", + protocol: "about:", host: "", path: "/blank", todo_pathname: 1 }, + { href: "unknown:path", + protocol: "unknown:", host: "", path: "path" }, + { href: "ftp:path", + protocol: "ftp:", host: "", path: "path" }, + { href: "mailto:path", + protocol: "mailto:", host: "", path: "path" }, + { href: "ws:path", + protocol: "ws:", host: "", path: "path" }, + { href: "file:path", + protocol: "file:", host: "", path: "/path", todo_pathname: 1 }, + { href: "file:///c:/dir/file.html", + protocol: "file:", host: "", path: "/c:/dir/file.html" }, + { href: "http://www.winehq.org/about", + protocol: "http:", host: "www.winehq.org", path: "/about" }, + { href: "https://www.winehq.org/about", + protocol: "https:", host: "www.winehq.org", path: "/about" }, ]; for(var i in anchor_tests) { var t = anchor_tests[i]; - anchor.href = t.href; + document.body.innerHTML = '<a href="' + t.href + '">'; + var anchor = document.body.firstChild; ok(anchor.protocol === t.protocol, "anchor(" + t.href + ").protocol = " + anchor.protocol); - todo_wine_if("todo_host" in t). ok(anchor.host === t.host, "anchor(" + t.href + ").host = " + anchor.host); + todo_wine_if("todo_pathname" in t). + ok(anchor.pathname === t.path, "anchor(" + t.href + ").pathname = " + anchor.pathname); } }); -- 2.30.2

Nov. 4, 2021

Re: [PATCH v2 5/7] wined3d: Protect wined3d_chunk_vk map fields with a mutex.

by Henri Verbeet

On Thu, 4 Nov 2021 at 06:04, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > void *wined3d_allocator_chunk_vk_map(struct wined3d_allocator_chunk_vk *chunk_vk, > struct wined3d_context_vk *context_vk) > { > struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); > const struct wined3d_vk_info *vk_info = context_vk->vk_info; > + void *map_ptr; > VkResult vr; > > TRACE("chunk %p, memory 0x%s, map_ptr %p.\n", chunk_vk, > wine_dbgstr_longlong(chunk_vk->vk_memory), chunk_vk->c.map_ptr); > > + wined3d_allocator_chunk_vk_lock(chunk_vk); > + > if (!chunk_vk->c.map_ptr && (vr = VK_CALL(vkMapMemory(device_vk->vk_device, > - chunk_vk->vk_memory, 0, VK_WHOLE_SIZE, 0, &chunk_vk->c.map_ptr))) < 0) > + chunk_vk->vk_memory, 0, VK_WHOLE_SIZE, 0, &map_ptr))) < 0) > { > ERR("Failed to map chunk memory, vr %s.\n", wined3d_debug_vkresult(vr)); > return NULL; > } > + chunk_vk->c.map_ptr = map_ptr; > That doesn't work. If the chunk was already mapped (i.e., "chunk_vk->c.map_ptr" isn't NULL), this will overwrite "chunk_vk->c.map_ptr" with the uninitialised "map_ptr".

Nov. 4, 2021