December 2023 - Wine-commits

Zebediah Figura : wined3d: Introduce an API for creating an identity SRV on a texture.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 1698fd40cd3bb88874a9ad0d93fdaa6d3b2e3ca3 URL: https://gitlab.winehq.org/wine/wine/-/commit/1698fd40cd3bb88874a9ad0d93fdaa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 30 18:13:57 2022 -0600 wined3d: Introduce an API for creating an identity SRV on a texture. --- dlls/wined3d/texture.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 1 + dlls/wined3d/view.c | 27 ++++++++++++++++++++++----- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 3 +++ include/wine/wined3d.h | 4 ++++ 6 files changed, 73 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3dfecc949d1..09eea050d9c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1648,6 +1648,12 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) { bool in_cs_thread = GetCurrentThreadId() == texture->resource.device->cs->thread_id; + if (texture->identity_srv) + { + assert(!in_cs_thread); + wined3d_shader_resource_view_destroy(texture->identity_srv); + } + /* This is called from the CS thread to destroy temporary textures. */ if (!in_cs_thread) wined3d_mutex_lock(); @@ -4667,6 +4673,42 @@ void wined3d_texture_update_sub_resource(struct wined3d_texture *texture, unsign wined3d_texture_invalidate_location(texture, sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); } +struct wined3d_shader_resource_view * CDECL wined3d_texture_acquire_identity_srv(struct wined3d_texture *texture) +{ + struct wined3d_view_desc desc; + HRESULT hr; + + TRACE("texture %p.\n", texture); + + if (texture->identity_srv) + return texture->identity_srv; + + desc.format_id = texture->resource.format->id; + /* The texture owns a reference to the SRV, so we can't have the SRV hold + * a reference to the texture. + * At the same time, a view must be destroyed before its texture, and we + * need a bound SRV to keep the texture alive even if it doesn't have any + * other references. + * In order to achieve this we have the objects share reference counts. + * This means the view doesn't hold a reference to the resource, but any + * references to the view are forwarded to the resource instead. The view + * is destroyed manually when all references are released. */ + desc.flags = WINED3D_VIEW_FORWARD_REFERENCE; + desc.u.texture.level_idx = 0; + desc.u.texture.level_count = texture->level_count; + desc.u.texture.layer_idx = 0; + desc.u.texture.layer_count = texture->layer_count; + if (FAILED(hr = wined3d_shader_resource_view_create(&desc, &texture->resource, + NULL, &wined3d_null_parent_ops, &texture->identity_srv))) + { + ERR("Failed to create shader resource view, hr %#lx.\n", hr); + return NULL; + } + wined3d_shader_resource_view_decref(texture->identity_srv); + + return texture->identity_srv; +} + static void wined3d_texture_no3d_upload_data(struct wined3d_context *context, const struct wined3d_const_bo_address *src_bo_addr, const struct wined3d_format *src_format, const struct wined3d_box *src_box, unsigned int src_row_pitch, unsigned int src_slice_pitch, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 05a0ab36af8..e833bdc8d90 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4918,6 +4918,7 @@ const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, const str VIEW_FLAG_TO_STR(WINED3D_VIEW_TEXTURE_ARRAY); VIEW_FLAG_TO_STR(WINED3D_VIEW_READ_ONLY_DEPTH); VIEW_FLAG_TO_STR(WINED3D_VIEW_READ_ONLY_STENCIL); + VIEW_FLAG_TO_STR(WINED3D_VIEW_FORWARD_REFERENCE); #undef VIEW_FLAG_TO_STR if (flags) FIXME("Unrecognised view flag(s) %#x.\n", flags); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 76b6e66b82e..5174075cdd2 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -959,8 +959,12 @@ HRESULT CDECL wined3d_rendertarget_view_create_from_sub_resource(struct wined3d_ ULONG CDECL wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view) { - unsigned int refcount = InterlockedIncrement(&view->refcount); + unsigned int refcount; + + if (view->desc.flags & WINED3D_VIEW_FORWARD_REFERENCE) + return wined3d_resource_incref(view->resource); + refcount = InterlockedIncrement(&view->refcount); TRACE("%p increasing refcount to %u.\n", view, refcount); return refcount; @@ -971,10 +975,21 @@ void wined3d_shader_resource_view_cleanup(struct wined3d_shader_resource_view *v view->parent_ops->wined3d_object_destroyed(view->parent); } +void wined3d_shader_resource_view_destroy(struct wined3d_shader_resource_view *view) +{ + wined3d_mutex_lock(); + view->resource->device->adapter->adapter_ops->adapter_destroy_shader_resource_view(view); + wined3d_mutex_unlock(); +} + ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view) { - unsigned int refcount = InterlockedDecrement(&view->refcount); + unsigned int refcount; + + if (view->desc.flags & WINED3D_VIEW_FORWARD_REFERENCE) + return wined3d_resource_decref(view->resource); + refcount = InterlockedDecrement(&view->refcount); TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) @@ -986,9 +1001,7 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v * device, which the resource implicitly provides. * - We shouldn't free buffer resources until after we've removed the * view from its bo_user list. */ - wined3d_mutex_lock(); - resource->device->adapter->adapter_ops->adapter_destroy_shader_resource_view(view); - wined3d_mutex_unlock(); + wined3d_shader_resource_view_destroy(view); wined3d_resource_decref(resource); } @@ -1091,6 +1104,10 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ return E_INVALIDARG; view->desc = *desc; + /* If WINED3D_VIEW_FORWARD_REFERENCE, the view shouldn't take a reference + * to the resource. However, the reference to the view returned by this + * function should translate to a resource reference, so we increment the + * resource's reference count anyway. */ wined3d_resource_incref(view->resource = resource); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2eaf83160c1..72e0e3fd8fa 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -298,6 +298,7 @@ @ cdecl wined3d_swapchain_state_resize_target(ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr) +@ cdecl wined3d_texture_acquire_identity_srv(ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) @ cdecl wined3d_texture_create(ptr ptr long long long ptr ptr ptr ptr) @ cdecl wined3d_texture_decref(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index adbb755ec4c..cb1d5100d76 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3335,6 +3335,8 @@ struct wined3d_texture unsigned int row_pitch; unsigned int slice_pitch; + struct wined3d_shader_resource_view *identity_srv; + /* May only be accessed from the command stream worker thread. */ struct wined3d_texture_async { @@ -3935,6 +3937,7 @@ struct wined3d_shader_resource_view }; void wined3d_shader_resource_view_cleanup(struct wined3d_shader_resource_view *view); +void wined3d_shader_resource_view_destroy(struct wined3d_shader_resource_view *view); static inline struct wined3d_texture *wined3d_state_get_ffp_texture(const struct wined3d_state *state, unsigned int idx) { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c2f7950ad3f..d7a3dd1e0fe 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1583,6 +1583,9 @@ enum wined3d_memory_segment_group #define WINED3D_VIEW_TEXTURE_ARRAY 0x00000010 #define WINED3D_VIEW_READ_ONLY_DEPTH 0x00000020 #define WINED3D_VIEW_READ_ONLY_STENCIL 0x00000040 +/* The view shares a reference count with its resource. + * See wined3d_texture_acquire_identity_srv(). */ +#define WINED3D_VIEW_FORWARD_REFERENCE 0x00000080 #define WINED3D_MAX_VIEWPORTS 16 @@ -2866,6 +2869,7 @@ HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_s HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, const struct wined3d_swapchain_desc *desc, const struct wined3d_display_mode *mode); +struct wined3d_shader_resource_view * __cdecl wined3d_texture_acquire_identity_srv(struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region); HRESULT __cdecl wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc,

1 0

Zebediah Figura : d3d9: Use wined3d_texture_acquire_identity_srv().
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: ff30b54791bc61e32faf079ce3e3383decf8695f URL: https://gitlab.winehq.org/wine/wine/-/commit/ff30b54791bc61e32faf079ce3e338… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 30 17:57:23 2022 -0600 d3d9: Use wined3d_texture_acquire_identity_srv(). --- dlls/d3d9/d3d9_private.h | 1 - dlls/d3d9/texture.c | 46 ++-------------------------------------------- 2 files changed, 2 insertions(+), 45 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index fcd82d2e674..a5f059c5aef 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -222,7 +222,6 @@ struct d3d9_texture struct list rtv_list; DWORD usage; BOOL flags; - struct wined3d_shader_resource_view *wined3d_srv; D3DTEXTUREFILTERTYPE autogen_filter_type; }; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index a3a4dc41272..4de7d2eb99e 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -57,8 +57,6 @@ static ULONG d3d9_texture_decref(struct d3d9_texture *texture) struct d3d9_surface *surface; wined3d_mutex_lock(); - if (texture->wined3d_srv) - wined3d_shader_resource_view_decref(texture->wined3d_srv); LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) wined3d_rendertarget_view_decref(surface->wined3d_rtv); wined3d_texture_decref(d3d9_texture_get_draw_texture(texture)); @@ -92,56 +90,16 @@ static inline struct d3d9_texture *impl_from_IDirect3DVolumeTexture9(IDirect3DVo return CONTAINING_RECORD(iface, struct d3d9_texture, IDirect3DBaseTexture9_iface); } -static void STDMETHODCALLTYPE srv_wined3d_object_destroyed(void *parent) -{ - struct d3d9_texture *texture = parent; - - texture->wined3d_srv = NULL; -} - -static const struct wined3d_parent_ops d3d9_srv_wined3d_parent_ops = -{ - srv_wined3d_object_destroyed, -}; - -/* wined3d critical section must be taken by the caller. */ -static struct wined3d_shader_resource_view *d3d9_texture_acquire_shader_resource_view(struct d3d9_texture *texture) -{ - struct wined3d_sub_resource_desc sr_desc; - struct wined3d_view_desc desc; - HRESULT hr; - - if (texture->wined3d_srv) - return texture->wined3d_srv; - - wined3d_texture_get_sub_resource_desc(texture->wined3d_texture, 0, &sr_desc); - desc.format_id = sr_desc.format; - desc.flags = 0; - desc.u.texture.level_idx = 0; - desc.u.texture.level_count = wined3d_texture_get_level_count(texture->wined3d_texture); - desc.u.texture.layer_idx = 0; - desc.u.texture.layer_count = sr_desc.usage & WINED3DUSAGE_LEGACY_CUBEMAP ? 6 : 1; - if (FAILED(hr = wined3d_shader_resource_view_create(&desc, - wined3d_texture_get_resource(d3d9_texture_get_draw_texture(texture)), texture, - &d3d9_srv_wined3d_parent_ops, &texture->wined3d_srv))) - { - ERR("Failed to create shader resource view, hr %#lx.\n", hr); - return NULL; - } - - return texture->wined3d_srv; -} - /* wined3d critical section must be taken by the caller. */ void d3d9_texture_gen_auto_mipmap(struct d3d9_texture *texture) { if (!(texture->flags & D3D9_TEXTURE_MIPMAP_DIRTY)) return; - d3d9_texture_acquire_shader_resource_view(texture); if (texture->draw_texture) wined3d_device_update_texture(texture->parent_device->wined3d_device, texture->wined3d_texture, texture->draw_texture); - wined3d_device_context_generate_mipmaps(texture->parent_device->immediate_context, texture->wined3d_srv); + wined3d_device_context_generate_mipmaps(texture->parent_device->immediate_context, + wined3d_texture_acquire_identity_srv(d3d9_texture_get_draw_texture(texture))); texture->flags &= ~D3D9_TEXTURE_MIPMAP_DIRTY; }

1 0

Zebediah Figura : wined3d: Set d3d 1-9 textures in the state as SRVs.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 5b60f4649b15efb9ef10b63da3ef2c42f8665078 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b60f4649b15efb9ef10b63da3ef2c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 14 17:44:02 2023 -0500 wined3d: Set d3d 1-9 textures in the state as SRVs. The idea is to reuse the existing code to handle SRVs, which simplifies the GL code and essentially allows the Vulkan code to work "for free" (which is to say, by writing this patch, rather than by adding support for flat textures to the Vulkan renderer.) This is a large patch; it consists the following parts: * Create identity SRVs for d3d 1-9 textures. Store those in state->shader_resource_view instead of in state->texture. * (Re)use wined3d_context_gl_bind_shader_resources() instead of state_sampler() to bind them. - Introduce code to that function to handle FFP textures. - Bind the sRGB texture if necessary in wined3d_shader_resource_view_gl_bind. * (Re)use context_gl_load_shader_resources() instead of context_preload_textures() to load them. - Introduce code to that function to handle FFP textures. - Load the sRGB texture if necessary. - Port the SRV/RTV feedback loop check from context_preload_textures(). * Invalidate STATE_GRAPHICS_SHADER_RESOURCE_BINDING in places that now need to account for texture binding being guarded by that state instead of STATE_SAMPLER. Transitioning the remaining users of STATE_SAMPLER to STATE_GRAPHICS_SHADER_RESOURCE_BINDING, and removing STATE_SAMPLER, is left for future patches. --- dlls/wined3d/arb_program_shader.c | 6 +-- dlls/wined3d/context.c | 71 ---------------------------- dlls/wined3d/context_gl.c | 85 ++++++++++++++++++++++++++++++++- dlls/wined3d/cs.c | 99 ++++++++++++++++++++++----------------- dlls/wined3d/device.c | 13 ----- dlls/wined3d/glsl_shader.c | 9 +--- dlls/wined3d/shader.c | 11 +++-- dlls/wined3d/state.c | 57 +--------------------- dlls/wined3d/stateblock.c | 37 +++++++-------- dlls/wined3d/texture.c | 8 +--- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 11 +++-- 12 files changed, 177 insertions(+), 232 deletions(-)

1 0

Gabriel Ivăncescu : mshtml/tests: Improve the iframe navigation test.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 1593f2f508e5179061c4bb634c817cea79ff2302 URL: https://gitlab.winehq.org/wine/wine/-/commit/1593f2f508e5179061c4bb634c817c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 30 17:51:54 2023 +0200 mshtml/tests: Improve the iframe navigation test. It was confusing before since it made it seem like it might use the outer window, while in fact the document is unchanged on native. Now the "new" doc is used for navigating, since it's already checked to be the same as the iframes_doc (but that test fails in wine and is todo_wine). --- dlls/mshtml/tests/events.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index b76e7982638..0f0246bfe5c 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -173,16 +173,16 @@ static const char iframe_doc_str[] = static void navigate(IHTMLDocument2*,const WCHAR*); -static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) +static BOOL iface_cmp(void *iface1, void *iface2) { IUnknown *unk1, *unk2; if(iface1 == iface2) return TRUE; - IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk1); + IUnknown_QueryInterface((IUnknown *)iface1, &IID_IUnknown, (void**)&unk1); IUnknown_Release(unk1); - IUnknown_QueryInterface(iface2, &IID_IUnknown, (void**)&unk2); + IUnknown_QueryInterface((IUnknown *)iface2, &IID_IUnknown, (void**)&unk2); IUnknown_Release(unk2); return unk1 == unk2; @@ -3170,8 +3170,8 @@ static IHTMLDocument2 *get_iframe_doc(IHTMLIFrameElement *iframe) static void test_iframe_connections(IHTMLDocument2 *doc) { + IHTMLDocument2 *iframes_doc, *new_doc; IHTMLIFrameElement *iframe; - IHTMLDocument2 *iframes_doc; DWORD cookie; IConnectionPoint *cp; IHTMLElement *element; @@ -3185,7 +3185,6 @@ static void test_iframe_connections(IHTMLDocument2 *doc) IHTMLElement_Release(element); iframes_doc = get_iframe_doc(iframe); - IHTMLIFrameElement_Release(iframe); cookie = register_cp((IUnknown*)iframes_doc, &IID_IDispatch, (IUnknown*)&div_onclick_disp); @@ -3215,23 +3214,38 @@ static void test_iframe_connections(IHTMLDocument2 *doc) ok(hres == S_OK, "put_URL failed: %08lx\n", hres); SysFreeString(str); + new_doc = get_iframe_doc(iframe); + ok(iface_cmp(new_doc, iframes_doc), "new_doc != iframes_doc\n"); + IHTMLDocument2_Release(new_doc); + SET_EXPECT(iframe_onload); pump_msgs(&called_iframe_onload); CHECK_CALLED(iframe_onload); + new_doc = get_iframe_doc(iframe); + todo_wine + ok(iface_cmp(new_doc, iframes_doc), "new_doc != iframes_doc\n"); + str = SysAllocString(L"about:test"); - hres = IHTMLDocument2_put_URL(iframes_doc, str); + hres = IHTMLDocument2_put_URL(new_doc, str); ok(hres == S_OK, "put_URL failed: %08lx\n", hres); + IHTMLDocument2_Release(new_doc); SysFreeString(str); SET_EXPECT(iframe_onload); pump_msgs(&called_iframe_onload); CHECK_CALLED(iframe_onload); + + new_doc = get_iframe_doc(iframe); + todo_wine + ok(iface_cmp(new_doc, iframes_doc), "new_doc != iframes_doc\n"); + IHTMLDocument2_Release(new_doc); }else { win_skip("Skipping iframe onload tests on IE older than 9.\n"); } IHTMLDocument2_Release(iframes_doc); + IHTMLIFrameElement_Release(iframe); } static void test_window_refs(IHTMLDocument2 *doc)

1 0

Gabriel Ivăncescu : mshtml: Remove the inner window ref from the doc only when it is actually unlinked.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 068f24406366d61eebcf48480d0d59f65c7f4b65 URL: https://gitlab.winehq.org/wine/wine/-/commit/068f24406366d61eebcf48480d0d59… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 30 17:51:54 2023 +0200 mshtml: Remove the inner window ref from the doc only when it is actually unlinked. --- dlls/mshtml/htmldoc.c | 14 +++++++------- dlls/mshtml/tests/events.c | 7 +++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 540bbbd1626..9f9791c3b1e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5707,12 +5707,6 @@ void detach_document_node(HTMLDocumentNode *doc) { unsigned i; - if(doc->window) { - HTMLInnerWindow *window = doc->window; - doc->window = NULL; - IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); - } - while(!list_empty(&doc->plugin_hosts)) detach_plugin_host(LIST_ENTRY(list_head(&doc->plugin_hosts), PluginHost, entry)); @@ -5884,14 +5878,20 @@ static void HTMLDocumentNode_traverse(DispatchEx *dispex, nsCycleCollectionTrave static void HTMLDocumentNode_unlink(DispatchEx *dispex) { HTMLDocumentNode *This = impl_from_DispatchEx(dispex); + HTMLInnerWindow *window = This->window; HTMLDOMNode_unlink(dispex); + if(window) { + This->window = NULL; + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + } + if(This->dom_document) { release_document_mutation(This); detach_document_node(This); This->dom_document = NULL; This->html_document = NULL; - }else if(This->window) { + }else if(window) { detach_document_node(This); } } diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 0f0246bfe5c..4b775ceb8b8 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -3589,7 +3589,14 @@ static void test_doc_obj(IHTMLDocument2 *doc) ok(hres == S_OK, "get_document failed: %08lx\n", hres); ok(doc_node != doc_node2, "doc_node == doc_node2\n"); IHTMLDocument2_Release(doc_node2); + + hres = IHTMLDocument2_get_parentWindow(doc_node, &window2); + todo_wine + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); + todo_wine + ok(window == window2, "window != window2\n"); IHTMLDocument2_Release(doc_node); + if(hres == S_OK) IHTMLWindow2_Release(window2); hres = IHTMLWindow2_get_location(window, &location2); ok(hres == S_OK, "get_location failed: %08lx\n", hres);

1 0

Jacek Caban : mshtml/tests: Add detached documents handling tests.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 58d4f541c05144b32ce7034c5f46ebb3c8fd8b21 URL: https://gitlab.winehq.org/wine/wine/-/commit/58d4f541c05144b32ce7034c5f46eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 16:17:33 2023 +0100 mshtml/tests: Add detached documents handling tests. --- dlls/mshtml/tests/navigation.js | 48 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/navigation.js b/dlls/mshtml/tests/navigation.js index ea91a56f1b0..668ee78245b 100644 --- a/dlls/mshtml/tests/navigation.js +++ b/dlls/mshtml/tests/navigation.js @@ -85,6 +85,51 @@ function detached_src_test() { ok(onload_called === false, "called onload too early?"); } +function detached_iframe_doc() { + document.body.innerHTML = ""; + + var iframe = document.createElement("iframe"); + var origDoc; + + function expect_exception(f, is_todo) { + try { + f(); + todo_wine_if(is_todo).ok(false, "expected exception"); + } catch(e) {} + } + + iframe.onload = guard(function() { + origDoc = iframe.contentWindow.document; + iframe.onload = guard(function () { + var doc = iframe.contentWindow.document; + + ok(/.*blank2.html/.test(doc.URL), "Unexpected iframe doc URL " + doc.URL); + + if (doc.documentMode >= 9) { + try { + origDoc != null; // it's not allowed to even compare detached document + todo_wine. + ok(false, "expected exception"); + } catch(e) {} + } else { + todo_wine. + ok(doc === origDoc, "doc != origDoc"); + } + + expect_exception(function() { origDoc.onclick; }, true); + expect_exception(function() { origDoc.toString; }, true); + expect_exception(function() { origDoc.toString(); }, true); + expect_exception(function() { origDoc.URL; }, true); + + next_test(); + }); + iframe.src = "blank2.html"; + }); + + iframe.src = "blank.html"; + document.body.appendChild(iframe); +} + function init_test_iframe() { var iframe = document.createElement("iframe"); @@ -99,5 +144,6 @@ var tests = [ nav_parent_test, window_navigate_test, window_open_self_test, - detached_src_test + detached_src_test, + detached_iframe_doc ];

1 0

Jacek Caban : mshtml: Return failure in IHTMLDocument2::get_URL for detached documents.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 4aad315a3f122cd26d2092cf163dc2c4f8953a9d URL: https://gitlab.winehq.org/wine/wine/-/commit/4aad315a3f122cd26d2092cf163dc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 15:44:34 2023 +0100 mshtml: Return failure in IHTMLDocument2::get_URL for detached documents. --- dlls/mshtml/htmldoc.c | 10 +++++++++- dlls/mshtml/tests/navigation.js | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9f9791c3b1e..504e0b9fc10 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1108,7 +1108,15 @@ static HRESULT WINAPI HTMLDocument_get_URL(IHTMLDocument2 *iface, BSTR *p) TRACE("(%p)->(%p)\n", iface, p); - *p = SysAllocString(This->outer_window && This->outer_window->url ? This->outer_window->url : L"about:blank"); + if(This->window && !This->window->base.outer_window) { + WARN("detached document\n"); + return E_FAIL; + } + + if(This->window && This->window->base.outer_window->url) + *p = SysAllocString(This->window->base.outer_window->url); + else + *p = SysAllocString(L"about:blank"); return *p ? S_OK : E_OUTOFMEMORY; } diff --git a/dlls/mshtml/tests/navigation.js b/dlls/mshtml/tests/navigation.js index 668ee78245b..71bda9ea2a5 100644 --- a/dlls/mshtml/tests/navigation.js +++ b/dlls/mshtml/tests/navigation.js @@ -119,7 +119,7 @@ function detached_iframe_doc() { expect_exception(function() { origDoc.onclick; }, true); expect_exception(function() { origDoc.toString; }, true); expect_exception(function() { origDoc.toString(); }, true); - expect_exception(function() { origDoc.URL; }, true); + expect_exception(function() { origDoc.URL; }); next_test(); });

1 0

Jacek Caban : mshtml: Return failure in IHTMLDocument2::put_URL for detached documents.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: a3f4878f529b6a7288bc5caa7203e380dcd830d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3f4878f529b6a7288bc5caa7203e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 15:54:16 2023 +0100 mshtml: Return failure in IHTMLDocument2::put_URL for detached documents. --- dlls/mshtml/htmldoc.c | 5 +++-- dlls/mshtml/tests/navigation.js | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 504e0b9fc10..002d2553e4f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1094,12 +1094,13 @@ static HRESULT WINAPI HTMLDocument_put_URL(IHTMLDocument2 *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - if(!This->outer_window) { + if(!This->window || !This->window->base.outer_window) { FIXME("No window available\n"); return E_FAIL; } - return navigate_url(This->outer_window, v, This->outer_window->uri, BINDING_NAVIGATED); + return navigate_url(This->window->base.outer_window, v, + This->window->base.outer_window->uri, BINDING_NAVIGATED); } static HRESULT WINAPI HTMLDocument_get_URL(IHTMLDocument2 *iface, BSTR *p) diff --git a/dlls/mshtml/tests/navigation.js b/dlls/mshtml/tests/navigation.js index 71bda9ea2a5..402d933a54a 100644 --- a/dlls/mshtml/tests/navigation.js +++ b/dlls/mshtml/tests/navigation.js @@ -120,6 +120,7 @@ function detached_iframe_doc() { expect_exception(function() { origDoc.toString; }, true); expect_exception(function() { origDoc.toString(); }, true); expect_exception(function() { origDoc.URL; }); + expect_exception(function() { origDoc.URL = "blank.html"; }); next_test(); });

1 0

Alex Henrie : gdiplus: Use CRT allocation functions.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 69d815407d99667e2565e268629d909fe50b2b30 URL: https://gitlab.winehq.org/wine/wine/-/commit/69d815407d99667e2565e268629d90… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 29 09:18:48 2023 -0700 gdiplus: Use CRT allocation functions. --- dlls/gdiplus/brush.c | 162 ++++++++++++++++++------------------ dlls/gdiplus/customlinecap.c | 38 ++++----- dlls/gdiplus/font.c | 40 ++++----- dlls/gdiplus/gdiplus.c | 24 +++--- dlls/gdiplus/gdiplus_private.h | 1 - dlls/gdiplus/graphics.c | 184 ++++++++++++++++++++--------------------- dlls/gdiplus/graphicspath.c | 152 +++++++++++++++++----------------- dlls/gdiplus/image.c | 184 ++++++++++++++++++++--------------------- dlls/gdiplus/imageattributes.c | 18 ++-- dlls/gdiplus/matrix.c | 22 ++--- dlls/gdiplus/metafile.c | 84 +++++++++---------- dlls/gdiplus/pathiterator.c | 14 ++-- dlls/gdiplus/pen.c | 30 +++---- dlls/gdiplus/region.c | 68 +++++++-------- dlls/gdiplus/stringformat.c | 47 +++++------ 15 files changed, 530 insertions(+), 538 deletions(-)

1 0

Fabian Maurer : coml2: Add dll and move code from ole32/memlockbytes.c.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 53c0a31b28a5a12d5091ebfc6bd3e3b9b649a16b URL: https://gitlab.winehq.org/wine/wine/-/commit/53c0a31b28a5a12d5091ebfc6bd3e3… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Nov 4 16:42:22 2023 +0100 coml2: Add dll and move code from ole32/memlockbytes.c. --- configure | 2 ++ configure.ac | 1 + dlls/coml2/Makefile.in | 7 +++++++ dlls/coml2/coml2.spec | 33 +++++++++++++++++++++++++++++++++ dlls/{ole32 => coml2}/memlockbytes.c | 0 dlls/ole32/Makefile.in | 3 +-- 6 files changed, 44 insertions(+), 2 deletions(-) diff --git a/configure b/configure index a6f056e839f..718b0dd777c 100755 --- a/configure +++ b/configure @@ -1016,6 +1016,7 @@ enable_combase enable_comcat enable_comctl32 enable_comdlg32 +enable_coml2 enable_compstui enable_comsvcs enable_concrt140 @@ -21509,6 +21510,7 @@ wine_fn_config_makefile dlls/comctl32 enable_comctl32 wine_fn_config_makefile dlls/comctl32/tests enable_tests wine_fn_config_makefile dlls/comdlg32 enable_comdlg32 wine_fn_config_makefile dlls/comdlg32/tests enable_tests +wine_fn_config_makefile dlls/coml2 enable_coml2 wine_fn_config_makefile dlls/comm.drv16 enable_win16 wine_fn_config_makefile dlls/commdlg.dll16 enable_win16 wine_fn_config_makefile dlls/compobj.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 6454b1c50a0..47918e4bd18 100644 --- a/configure.ac +++ b/configure.ac @@ -2433,6 +2433,7 @@ WINE_CONFIG_MAKEFILE(dlls/comctl32) WINE_CONFIG_MAKEFILE(dlls/comctl32/tests) WINE_CONFIG_MAKEFILE(dlls/comdlg32) WINE_CONFIG_MAKEFILE(dlls/comdlg32/tests) +WINE_CONFIG_MAKEFILE(dlls/coml2) WINE_CONFIG_MAKEFILE(dlls/comm.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/commdlg.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/compobj.dll16,enable_win16) diff --git a/dlls/coml2/Makefile.in b/dlls/coml2/Makefile.in new file mode 100644 index 00000000000..9887ccff873 --- /dev/null +++ b/dlls/coml2/Makefile.in @@ -0,0 +1,7 @@ +EXTRADEFS = -DWINOLE32API= +MODULE = coml2.dll +IMPORTLIB = coml2 +IMPORTS = uuid + +SOURCES = \ + memlockbytes.c diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec new file mode 100644 index 00000000000..ea8eb7b5d9f --- /dev/null +++ b/dlls/coml2/coml2.spec @@ -0,0 +1,33 @@ +1 stub @ +2 stub @ +3 stub @ +4 stub @ +5 stub @ +6 stub @ +7 stub @ +8 stub @ +11 stub @ +12 stub @ +@ stub Coml2DllGetClassObject +@ stdcall CreateILockBytesOnHGlobal(ptr long ptr) +@ stub DllGetClassObject +@ stub FmtIdToPropStgName +@ stub GetConvertStg +@ stdcall GetHGlobalFromILockBytes(ptr ptr) +@ stub PropStgNameToFmtId +@ stub ReadClassStg +@ stub ReadClassStm +@ stub StgCreateDocfile +@ stub StgCreateDocfileOnILockBytes +@ stub StgCreatePropSetStg +@ stub StgCreatePropStg +@ stub StgCreateStorageEx +@ stub StgIsStorageFile +@ stub StgIsStorageILockBytes +@ stub StgOpenPropStg +@ stub StgOpenStorage +@ stub StgOpenStorageEx +@ stub StgOpenStorageOnILockBytes +@ stub StgSetTimes +@ stub WriteClassStg +@ stub WriteClassStm diff --git a/dlls/ole32/memlockbytes.c b/dlls/coml2/memlockbytes.c similarity index 100% rename from dlls/ole32/memlockbytes.c rename to dlls/coml2/memlockbytes.c diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index b65de3bd68a..ee0fcc41f7d 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_OLE32_ MODULE = ole32.dll IMPORTLIB = ole32 -IMPORTS = uuid advapi32 user32 gdi32 combase rpcrt4 kernelbase +IMPORTS = uuid advapi32 user32 gdi32 combase rpcrt4 kernelbase coml2 DELAYIMPORTS = oleaut32 SOURCES = \ @@ -26,7 +26,6 @@ SOURCES = \ irot.idl \ itemmoniker.c \ marshal.c \ - memlockbytes.c \ moniker.c \ nodrop.svg \ ole2.c \

1 0