April 2023 - Wine-Commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Fix URI leak in NewURI on failure.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: 1544be253a3e5f9a67a371ab33dfacd7c1dec2a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/1544be253a3e5f9a67a371ab33dfac… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 25 20:29:25 2023 +0300 mshtml: Fix URI leak in NewURI on failure. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/nsio.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d60b2f0fa81..ca4542c6166 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3876,16 +3876,6 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC if(!strncmp(spec, "wine:", 5)) spec += 5; - if(aBaseURI) { - nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsWineURI, (void**)&base_wine_uri); - if(NS_SUCCEEDED(nsres)) { - if(!ensure_uri(base_wine_uri)) - return NS_ERROR_UNEXPECTED; - }else { - WARN("Could not get base nsWineURI: %08lx\n", nsres); - } - } - if(aOriginCharset && *aOriginCharset && _strnicmp(aOriginCharset, "utf", 3)) { BSTR charset; int len; @@ -3903,8 +3893,21 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC MultiByteToWideChar(cp, 0, spec, -1, new_spec, ARRAY_SIZE(new_spec)); + if(aBaseURI) { + nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsWineURI, (void**)&base_wine_uri); + if(NS_SUCCEEDED(nsres)) { + if(!ensure_uri(base_wine_uri)) { + nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface); + return NS_ERROR_UNEXPECTED; + } + }else { + WARN("Could not get base nsWineURI: %08lx\n", nsres); + } + } + if(base_wine_uri) { hres = combine_url(base_wine_uri->uri, new_spec, &urlmon_uri); + nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface); }else { hres = create_uri(new_spec, 0, &urlmon_uri); if(FAILED(hres)) @@ -3916,8 +3919,6 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC nsres = create_nsuri(urlmon_uri, &wine_uri); IUri_Release(urlmon_uri); - if(base_wine_uri) - nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface); if(NS_FAILED(nsres)) return nsres;

1 0

Gabriel Ivăncescu : mshtml: Fix nsChannel's load_info leak.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: fd2f3a035cd34706233712c1a2f360ab624d90ce URL: https://gitlab.winehq.org/wine/wine/-/commit/fd2f3a035cd34706233712c1a2f360… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 25 20:29:25 2023 +0300 mshtml: Fix nsChannel's load_info leak. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/nsio.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index efe1f0389f7..6bd9a408037 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2263,6 +2263,8 @@ static nsresult NSAPI nsChannel_traverse(void *ccp, void *p, nsCycleCollectionTr note_cc_edge(This->owner, "owner", cb); if(This->post_data_stream) note_cc_edge((nsISupports*)This->post_data_stream, "post_data_stream", cb); + if(This->load_info) + note_cc_edge(This->load_info, "load_info", cb); if(This->load_group) note_cc_edge((nsISupports*)This->load_group, "load_group", cb); if(This->notif_callback) @@ -2291,6 +2293,11 @@ static nsresult NSAPI nsChannel_unlink(void *p) This->post_data_stream = NULL; nsIInputStream_Release(post_data_stream); } + if(This->load_info) { + nsISupports *load_info = This->load_info; + This->load_info = NULL; + nsISupports_Release(load_info); + } if(This->load_group) { nsILoadGroup *load_group = This->load_group; This->load_group = NULL;

1 0

Gabriel Ivăncescu : mshtml: Support cycle collection for nsChannel.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: 668d8afd741b5827983569775abb56c0c914b5c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/668d8afd741b5827983569775abb56… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 25 20:29:25 2023 +0300 mshtml: Support cycle collection for nsChannel. This is traversed from the Gecko document, and should be part of the graph (it refers to gecko objects that participate in it, and which are part of a cycle). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/nsio.c | 125 ++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 101 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 948bfb1c02b..07a8a999ec3 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -37,7 +37,7 @@ typedef struct { nsIHttpChannelInternal nsIHttpChannelInternal_iface; nsICacheInfoChannel nsICacheInfoChannel_iface; - LONG ref; + nsCycleCollectingAutoRefCnt ccref; nsWineURI *uri; nsIInputStream *post_data_stream; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index ca4542c6166..efe1f0389f7 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -45,6 +45,7 @@ static const IID NS_IOSERVICE_CID = static const IID IID_nsWineURI = {0x5088272e, 0x900b, 0x11da, {0xc6,0x87, 0x00,0x0f,0xea,0x57,0xf2,0x1a}}; +static ExternalCycleCollectionParticipant nschannel_ccp; static nsIIOService *nsio = NULL; static const char *request_method_strings[] = {"GET", "PUT", "POST"}; @@ -540,6 +541,14 @@ static nsresult NSAPI nsChannel_QueryInterface(nsIHttpChannel *iface, nsIIDRef r }else if(IsEqualGUID(&IID_nsICacheInfoChannel, riid)) { TRACE("(%p)->(IID_nsICacheInfoChannel %p)\n", This, result); *result = is_http_channel(This) ? &This->nsICacheInfoChannel_iface : NULL; + }else if(IsEqualGUID(&IID_nsXPCOMCycleCollectionParticipant, riid)) { + TRACE("(%p)->(IID_nsXPCOMCycleCollectionParticipant %p)\n", This, result); + *result = &nschannel_ccp; + return S_OK; + }else if(IsEqualGUID(&IID_nsCycleCollectionISupports, riid)) { + TRACE("(%p)->(IID_nsCycleCollectionISupports %p)\n", This, result); + *result = &This->nsIHttpChannel_iface; + return S_OK; }else { TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), result); *result = NULL; @@ -556,7 +565,7 @@ static nsresult NSAPI nsChannel_QueryInterface(nsIHttpChannel *iface, nsIIDRef r static nsrefcnt NSAPI nsChannel_AddRef(nsIHttpChannel *iface) { nsChannel *This = impl_from_nsIHttpChannel(iface); - nsrefcnt ref = InterlockedIncrement(&This->ref); + nsrefcnt ref = ccref_incr(&This->ccref, (nsISupports*)&This->nsIHttpChannel_iface); TRACE("(%p) ref=%ld\n", This, ref); @@ -566,30 +575,9 @@ static nsrefcnt NSAPI nsChannel_AddRef(nsIHttpChannel *iface) static nsrefcnt NSAPI nsChannel_Release(nsIHttpChannel *iface) { nsChannel *This = impl_from_nsIHttpChannel(iface); - LONG ref = InterlockedDecrement(&This->ref); + nsrefcnt ref = ccref_decr(&This->ccref, (nsISupports*)&This->nsIHttpChannel_iface, &nschannel_ccp); - if(!ref) { - nsIFileURL_Release(&This->uri->nsIFileURL_iface); - if(This->owner) - nsISupports_Release(This->owner); - if(This->post_data_stream) - nsIInputStream_Release(This->post_data_stream); - if(This->load_group) - nsILoadGroup_Release(This->load_group); - if(This->notif_callback) - nsIInterfaceRequestor_Release(This->notif_callback); - if(This->original_uri) - nsIURI_Release(This->original_uri); - if(This->referrer) - nsIURI_Release(This->referrer); - - free_http_headers(&This->response_headers); - free_http_headers(&This->request_headers); - - free(This->content_type); - free(This->charset); - free(This); - } + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -2263,6 +2251,86 @@ static const nsICacheInfoChannelVtbl nsCacheInfoChannelVtbl = { nsCacheInfoChannel_SetAllowStaleCacheContent }; +static nsresult NSAPI nsChannel_traverse(void *ccp, void *p, nsCycleCollectionTraversalCallback *cb) +{ + nsChannel *This = impl_from_nsIHttpChannel(p); + + TRACE("%p\n", This); + + describe_cc_node(&This->ccref, "nsChannel", cb); + + if(This->owner) + note_cc_edge(This->owner, "owner", cb); + if(This->post_data_stream) + note_cc_edge((nsISupports*)This->post_data_stream, "post_data_stream", cb); + if(This->load_group) + note_cc_edge((nsISupports*)This->load_group, "load_group", cb); + if(This->notif_callback) + note_cc_edge((nsISupports*)This->notif_callback, "notif_callback", cb); + if(This->original_uri) + note_cc_edge((nsISupports*)This->original_uri, "original_uri", cb); + if(This->referrer) + note_cc_edge((nsISupports*)This->referrer, "referrer", cb); + + return NS_OK; +} + +static nsresult NSAPI nsChannel_unlink(void *p) +{ + nsChannel *This = impl_from_nsIHttpChannel(p); + + TRACE("%p\n", This); + + if(This->owner) { + nsISupports *owner = This->owner; + This->owner = NULL; + nsISupports_Release(owner); + } + if(This->post_data_stream) { + nsIInputStream *post_data_stream = This->post_data_stream; + This->post_data_stream = NULL; + nsIInputStream_Release(post_data_stream); + } + if(This->load_group) { + nsILoadGroup *load_group = This->load_group; + This->load_group = NULL; + nsILoadGroup_Release(load_group); + } + if(This->notif_callback) { + nsIInterfaceRequestor *notif_callback = This->notif_callback; + This->notif_callback = NULL; + nsIInterfaceRequestor_Release(notif_callback); + } + if(This->original_uri) { + nsIURI *original_uri = This->original_uri; + This->original_uri = NULL; + nsIURI_Release(original_uri); + } + if(This->referrer) { + nsIURI *referrer = This->referrer; + This->referrer = NULL; + nsIURI_Release(referrer); + } + + return NS_OK; +} + +static void NSAPI nsChannel_delete_cycle_collectable(void *p) +{ + nsChannel *This = impl_from_nsIHttpChannel(p); + nsChannel_unlink(p); + + TRACE("(%p)\n", This); + + nsIFileURL_Release(&This->uri->nsIFileURL_iface); + free_http_headers(&This->response_headers); + free_http_headers(&This->request_headers); + + free(This->content_type); + free(This->charset); + free(This); +} + static void invalidate_uri(nsWineURI *This) { if(This->uri) { @@ -3517,10 +3585,10 @@ static nsresult create_nschannel(nsWineURI *uri, nsChannel **ret) channel->nsIUploadChannel_iface.lpVtbl = &nsUploadChannelVtbl; channel->nsIHttpChannelInternal_iface.lpVtbl = &nsHttpChannelInternalVtbl; channel->nsICacheInfoChannel_iface.lpVtbl = &nsCacheInfoChannelVtbl; - channel->ref = 1; channel->request_method = METHOD_GET; list_init(&channel->response_headers); list_init(&channel->request_headers); + ccref_init(&channel->ccref, 1); nsIFileURL_AddRef(&uri->nsIFileURL_iface); channel->uri = uri; @@ -3990,6 +4058,11 @@ static nsIIOServiceHook nsIOServiceHook = { &nsIOServiceHookVtbl }; void init_nsio(nsIComponentManager *component_manager) { + static const CCObjCallback nschannel_ccp_callback = { + nsChannel_traverse, + nsChannel_unlink, + nsChannel_delete_cycle_collectable + }; nsIFactory *old_factory = NULL; nsresult nsres; @@ -4009,6 +4082,8 @@ void init_nsio(nsIComponentManager *component_manager) nsres = nsIIOService_SetHook(nsio, &nsIOServiceHook); assert(nsres == NS_OK); + + ccp_init(&nschannel_ccp, &nschannel_ccp_callback); } void release_nsio(void)

1 0

Gabriel Ivăncescu : mshtml: Store minimum compat mode required for events in the ctor table.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: 917ec2db6658b87abb7bbdb257e72ee0e82dc7d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/917ec2db6658b87abb7bbdb257e72e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 25 20:29:25 2023 +0300 mshtml: Store minimum compat mode required for events in the ctor table. Since such event types don't exist as separate event types in older modes, this prevents confusing leaks without bloating the constructors with more boilerplate. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index dd0bfe8db02..ccea4e16567 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -3122,9 +3122,6 @@ static DOMEvent *progress_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_ { DOMProgressEvent *progress_event; - if(compat_mode < COMPAT_MODE_IE10) - return event_ctor(sizeof(DOMEvent), &DOMEvent_dispex, NULL, NULL, nsevent, event_id, compat_mode); - if(!(progress_event = event_ctor(sizeof(DOMProgressEvent), &DOMProgressEvent_dispex, DOMProgressEvent_query_interface, DOMProgressEvent_destroy, nsevent, event_id, compat_mode))) return NULL; @@ -3154,6 +3151,7 @@ static DOMEvent *storage_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t static const struct { REFIID iid; DOMEvent *(*ctor)(void *iface, nsIDOMEvent *nsevent, eventid_t, compat_mode_t); + compat_mode_t min_compat_mode; } event_types_ctor_table[] = { [EVENT_TYPE_EVENT] = { NULL, generic_event_ctor }, [EVENT_TYPE_UIEVENT] = { &IID_nsIDOMUIEvent, ui_event_ctor }, @@ -3164,7 +3162,7 @@ static const struct { [EVENT_TYPE_DRAG] = { NULL, generic_event_ctor }, [EVENT_TYPE_PAGETRANSITION] = { NULL, page_transition_event_ctor }, [EVENT_TYPE_CUSTOM] = { &IID_nsIDOMCustomEvent, custom_event_ctor }, - [EVENT_TYPE_PROGRESS] = { &IID_nsIDOMProgressEvent, progress_event_ctor }, + [EVENT_TYPE_PROGRESS] = { &IID_nsIDOMProgressEvent, progress_event_ctor, COMPAT_MODE_IE10 }, [EVENT_TYPE_MESSAGE] = { NULL, message_event_ctor }, [EVENT_TYPE_STORAGE] = { NULL, storage_event_ctor }, }; @@ -3175,6 +3173,9 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, ev void *iface = NULL; DOMEvent *event; + if(compat_mode < event_types_ctor_table[event_type].min_compat_mode) + event_type = EVENT_TYPE_EVENT; + if(event_types_ctor_table[event_type].iid) nsIDOMEvent_QueryInterface(nsevent, event_types_ctor_table[event_type].iid, &iface);

1 0

Gabriel Ivăncescu : mshtml: Fix nsIFile dir leak in init_xpcom.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: a10acc0ac398d5614ff731756c963c1416ed3255 URL: https://gitlab.winehq.org/wine/wine/-/commit/a10acc0ac398d5614ff731756c963c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 25 20:29:25 2023 +0300 mshtml: Fix nsIFile dir leak in init_xpcom. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/nsembed.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 16659055295..9952a553afd 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -561,6 +561,7 @@ static BOOL init_xpcom(const PRUnichar *gre_path) } nsres = NS_InitXPCOM2(&pServMgr, gre_dir, (nsIDirectoryServiceProvider*)&nsDirectoryServiceProvider2); + nsIFile_Release(gre_dir); if(NS_FAILED(nsres)) { ERR("NS_InitXPCOM2 failed: %08lx\n", nsres); FreeLibrary(xul_handle);

1 0

Gabriel Ivăncescu : mshtml: Fix factory leak in init_nsio.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: eba8c8d66e25e232953050e395ec1b71079bf9d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/eba8c8d66e25e232953050e395ec1b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 25 20:29:25 2023 +0300 mshtml: Fix factory leak in init_nsio. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d29bb43544e..d60b2f0fa81 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -4000,9 +4000,9 @@ void init_nsio(nsIComponentManager *component_manager) } nsres = nsIFactory_CreateInstance(old_factory, NULL, &IID_nsIIOService, (void**)&nsio); + nsIFactory_Release(old_factory); if(NS_FAILED(nsres)) { ERR("Couldn not create nsIOService instance %08lx\n", nsres); - nsIFactory_Release(old_factory); return; }

1 0

Gabriel Ivăncescu : mshtml: Do not release the principal returned by GetPrincipal.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: a80a3be462f31546190085fd1ddd065ad8b30077 URL: https://gitlab.winehq.org/wine/wine/-/commit/a80a3be462f31546190085fd1ddd06… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 25 20:29:25 2023 +0300 mshtml: Do not release the principal returned by GetPrincipal. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 3e315bc7211..16659055295 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -2440,6 +2440,7 @@ nsIXMLHttpRequest *create_nsxhr(nsIDOMWindow *nswindow) nsres = nsIGlobalObject_QueryInterface(nsglo, &IID_nsIScriptObjectPrincipal, (void**)&sop); assert(nsres == NS_OK); + /* The returned principal is *not* AddRef'd */ nspri = nsIScriptObjectPrincipal_GetPrincipal(sop); nsIScriptObjectPrincipal_Release(sop); @@ -2451,7 +2452,6 @@ nsIXMLHttpRequest *create_nsxhr(nsIDOMWindow *nswindow) if(NS_FAILED(nsres)) nsIXMLHttpRequest_Release(nsxhr); } - nsISupports_Release(nspri); nsIGlobalObject_Release(nsglo); if(NS_FAILED(nsres)) { ERR("nsIXMLHttpRequest_Init failed: %08lx\n", nsres);

1 0

Stefan Dösinger : d3d8/test: Accept AMD GPU sysmem sample failure in test_mipmap_upload.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: 60adbec765c9007f5a0e43f10e50108f2c6da350 URL: https://gitlab.winehq.org/wine/wine/-/commit/60adbec765c9007f5a0e43f10e5010… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 24 16:49:14 2023 +0300 d3d8/test: Accept AMD GPU sysmem sample failure in test_mipmap_upload. --- dlls/d3d8/tests/visual.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 75afff65a9c..264a4230a75 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -248,10 +248,12 @@ static void check_rect(struct surface_readback *rb, RECT r, const char *message) } } -#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b, false) -#define check_rt_color_todo(a, b) check_rt_color_(__LINE__, a, b, true) -#define check_rt_color_todo_if(a, b, c) check_rt_color_(__LINE__, a, b, c) -static void check_rt_color_(unsigned int line, IDirect3DSurface8 *rt, D3DCOLOR expected_color, bool todo) +#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b, false, 0, false) +#define check_rt_color_broken(a, b, c, d) check_rt_color_(__LINE__, a, b, false, c, d) +#define check_rt_color_todo(a, b) check_rt_color_(__LINE__, a, b, true, 0, false) +#define check_rt_color_todo_if(a, b, c) check_rt_color_(__LINE__, a, b, c, 0, false) +static void check_rt_color_(unsigned int line, IDirect3DSurface8 *rt, D3DCOLOR expected_color, bool todo, + D3DCOLOR broken_color, bool is_broken) { unsigned int color = 0xdeadbeef; struct surface_readback rb; @@ -276,7 +278,8 @@ static void check_rt_color_(unsigned int line, IDirect3DSurface8 *rt, D3DCOLOR e } release_surface_readback(&rb); todo_wine_if (todo) - ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); + ok_(__FILE__, line)(color == expected_color || broken(is_broken && color == broken_color), + "Got unexpected color 0x%08x.\n", color); } static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND focus_window, BOOL windowed) @@ -12189,7 +12192,8 @@ static void test_mipmap_upload(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); draw_textured_quad(&context, texture); - check_rt_color(context.backbuffer, 0x00111111 * (j + 1)); + /* AMD Windows drivers don't sample from sysmem textures. */ + check_rt_color_broken(context.backbuffer, 0x00111111 * (j + 1), 0x00000000, pools[i] == D3DPOOL_SYSTEMMEM); winetest_pop_context(); }

1 0

Stefan Dösinger : d3d8/tests: Radeon GPUs don't draw from sysmem textures.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: e39c497559df18c31a422e37b4e6c76949bd3ce1 URL: https://gitlab.winehq.org/wine/wine/-/commit/e39c497559df18c31a422e37b4e6c7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 7 12:43:50 2022 +0300 d3d8/tests: Radeon GPUs don't draw from sysmem textures. --- dlls/d3d8/tests/visual.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 5c2b71fc8c5..75afff65a9c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5828,7 +5828,9 @@ static void add_dirty_rect_test(void) ok(hr == S_OK, "Failed to set texture, hr %#lx.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + /* Radeon GPUs read zero from sysmem textures. */ + ok(color_match(color, 0x000000ff, 1) || broken(color_match(color, 0x00000000, 1)), + "Got unexpected color 0x%08x.\n", color); /* Blitting to the sysmem texture adds a dirty rect. */ fill_surface(surface_src_red, 0x00000000, D3DLOCK_NO_DIRTY_UPDATE);

1 0

Stefan Dösinger : d3d9/tests: Accept AMD GPU sysmem sample failure in test_mipmap_upload.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: 830906f3dcc7acfa8892af9b8c97955f06a31df4 URL: https://gitlab.winehq.org/wine/wine/-/commit/830906f3dcc7acfa8892af9b8c9795… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 24 16:41:39 2023 +0300 d3d9/tests: Accept AMD GPU sysmem sample failure in test_mipmap_upload. --- dlls/d3d9/tests/visual.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f82bb1e921c..23e22c2340f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -285,15 +285,18 @@ static D3DCOLOR check_expected_rt_color(unsigned int line, IDirect3DSurface9 *rt return color; } -#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b, false) -#define check_rt_color_todo(a, b) check_rt_color_(__LINE__, a, b, true) -#define check_rt_color_todo_if(a, b, c) check_rt_color_(__LINE__, a, b, c) -static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color, bool todo) +#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b, false, 0, false) +#define check_rt_color_broken(a, b, c, d) check_rt_color_(__LINE__, a, b, false, c, d) +#define check_rt_color_todo(a, b) check_rt_color_(__LINE__, a, b, true, 0, false) +#define check_rt_color_todo_if(a, b, c) check_rt_color_(__LINE__, a, b, c, 0, false) +static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color, bool todo, + D3DCOLOR broken_color, bool is_broken) { unsigned int color = check_expected_rt_color(line, rt, expected_color); todo_wine_if (todo) - ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); + ok_(__FILE__, line)(color == expected_color || broken(is_broken && color == broken_color), + "Got unexpected color 0x%08x.\n", color); } static IDirect3DDevice9 *create_device(IDirect3D9 *d3d, HWND device_window, HWND focus_window, BOOL windowed) @@ -28012,7 +28015,8 @@ static void test_mipmap_upload(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); draw_textured_quad(&context, texture); - check_rt_color(context.backbuffer, 0x00111111 * (j + 1)); + /* AMD Windows drivers don't sample from sysmem textures. */ + check_rt_color_broken(context.backbuffer, 0x00111111 * (j + 1), 0x00000000, pools[i] == D3DPOOL_SYSTEMMEM); winetest_pop_context(); }

1 0