December 2023 - Wine-Commits

Fabian Maurer : coml2: Move ReadClassStg from ole32.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

Module: wine Branch: master Commit: fae825276a446f72e1d6793df0227076bb87aa92 URL: https://gitlab.winehq.org/wine/wine/-/commit/fae825276a446f72e1d6793df02270… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Nov 16 05:04:10 2023 +0100 coml2: Move ReadClassStg from ole32. --- dlls/coml2/coml2.spec | 2 +- dlls/coml2/storage32.c | 24 ++++++++++++++++++++++++ dlls/ole32/storage32.c | 35 ----------------------------------- 3 files changed, 25 insertions(+), 36 deletions(-) diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec index 9cac5f9d01f..a41482bc46e 100644 --- a/dlls/coml2/coml2.spec +++ b/dlls/coml2/coml2.spec @@ -15,7 +15,7 @@ @ stdcall GetConvertStg(ptr) @ stdcall GetHGlobalFromILockBytes(ptr ptr) @ stub PropStgNameToFmtId -@ stub ReadClassStg +@ stdcall ReadClassStg(ptr ptr) @ stdcall ReadClassStm(ptr ptr) @ stub StgCreateDocfile @ stub StgCreateDocfileOnILockBytes diff --git a/dlls/coml2/storage32.c b/dlls/coml2/storage32.c index 051555566ef..06a58749c5d 100644 --- a/dlls/coml2/storage32.c +++ b/dlls/coml2/storage32.c @@ -50,6 +50,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); +/*********************************************************************** + * ReadClassStg (coml2.@) + */ +HRESULT WINAPI ReadClassStg(IStorage *pstg, CLSID *pclsid) +{ + STATSTG pstatstg; + HRESULT hRes; + + TRACE("(%p, %p)\n", pstg, pclsid); + + if (!pstg || !pclsid) + return E_INVALIDARG; + + /* + * read a STATSTG structure (contains the clsid) from the storage + */ + hRes = IStorage_Stat(pstg, &pstatstg, STATFLAG_NONAME); + + if (SUCCEEDED(hRes)) + *pclsid = pstatstg.clsid; + + return hRes; +} + /*********************************************************************** * ReadClassStm (coml2.@) */ diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index e463400d2bb..33586de5e68 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9042,41 +9042,6 @@ HRESULT WINAPI WriteClassStg(IStorage* pStg, REFCLSID rclsid) return IStorage_SetClass(pStg, rclsid); } -/*********************************************************************** - * ReadClassStg (OLE32.@) - * - * This method reads the CLSID previously written to a storage object with - * the WriteClassStg. - * - * PARAMS - * pstg [I] IStorage pointer - * pclsid [O] Pointer to where the CLSID is written - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - */ -HRESULT WINAPI ReadClassStg(IStorage *pstg,CLSID *pclsid){ - - STATSTG pstatstg; - HRESULT hRes; - - TRACE("(%p, %p)\n", pstg, pclsid); - - if(!pstg || !pclsid) - return E_INVALIDARG; - - /* - * read a STATSTG structure (contains the clsid) from the storage - */ - hRes=IStorage_Stat(pstg,&pstatstg,STATFLAG_NONAME); - - if(SUCCEEDED(hRes)) - *pclsid=pstatstg.clsid; - - return hRes; -} - /*********************************************************************** * OleLoadFromStream (OLE32.@) *

1 0

Fabian Maurer : coml2: Add dll and move code from ole32/memlockbytes.c.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

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

Jacek Caban : mshtml: Return failure in IHTMLDocument2::put_URL for detached documents.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

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 Dec. 1, 2023

Dec. 1, 2023

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

Jacek Caban : mshtml: Return failure in IHTMLDocument2::get_URL for detached documents.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

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

Gabriel Ivăncescu : mshtml/tests: Improve the iframe navigation test.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

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 Dec. 1, 2023

Dec. 1, 2023

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 Dec. 1, 2023

Dec. 1, 2023

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

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

Dec. 1, 2023

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

Zebediah Figura : d3d9: Use wined3d_texture_acquire_identity_srv().
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

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