August 2023 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Use designated initializers in node vtables.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: 965040f04b6816ce11d1d2d52f47d6cb4784a31e URL: https://gitlab.winehq.org/wine/wine/-/commit/965040f04b6816ce11d1d2d52f47d6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:26 2023 +0300 mshtml: Use designated initializers in node vtables. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 27 +++++---------- dlls/mshtml/htmlarea.c | 27 +++++---------- dlls/mshtml/htmlbody.c | 32 +++++++----------- dlls/mshtml/htmlcomment.c | 14 ++++---- dlls/mshtml/htmldoc.c | 57 +++++++++---------------------- dlls/mshtml/htmlelem.c | 14 ++++---- dlls/mshtml/htmlform.c | 30 +++++++---------- dlls/mshtml/htmlframe.c | 66 +++++++++++++++++------------------- dlls/mshtml/htmlgeneric.c | 14 ++++---- dlls/mshtml/htmlhead.c | 70 ++++++++++++++++----------------------- dlls/mshtml/htmlimg.c | 28 ++++++---------- dlls/mshtml/htmlinput.c | 76 +++++++++++++++++------------------------- dlls/mshtml/htmllink.c | 29 ++++++---------- dlls/mshtml/htmlnode.c | 9 +++-- dlls/mshtml/htmlobject.c | 45 +++++++++++-------------- dlls/mshtml/htmlscript.c | 29 ++++++---------- dlls/mshtml/htmlselect.c | 59 +++++++++++++-------------------- dlls/mshtml/htmlstyleelem.c | 27 +++++---------- dlls/mshtml/htmltable.c | 81 +++++++++++++++------------------------------ dlls/mshtml/htmltextarea.c | 31 +++++++---------- dlls/mshtml/htmltextnode.c | 9 +++-- dlls/mshtml/svg.c | 52 ++++++++++++++--------------- 22 files changed, 324 insertions(+), 502 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Rename dispex_query_interface to dispex_query_interface_no_cc.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: 07923da1cffcda76259f4384bde9a597c104a860 URL: https://gitlab.winehq.org/wine/wine/-/commit/07923da1cffcda76259f4384bde9a5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:26 2023 +0300 mshtml: Rename dispex_query_interface to dispex_query_interface_no_cc. The new dispex_query_interface will use the cycle collector later. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 4 ++-- dlls/mshtml/htmlattr.c | 2 +- dlls/mshtml/htmlelem.c | 10 +++++----- dlls/mshtml/htmlelemcol.c | 2 +- dlls/mshtml/htmlevent.c | 6 +++--- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmllocation.c | 2 +- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/htmlselect.c | 2 +- dlls/mshtml/htmlstorage.c | 2 +- dlls/mshtml/htmlstyle.c | 2 +- dlls/mshtml/htmlstylesheet.c | 8 ++++---- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/mutation.c | 4 ++-- dlls/mshtml/omnavigator.c | 24 ++++++++++++------------ dlls/mshtml/range.c | 4 ++-- dlls/mshtml/selection.c | 2 +- dlls/mshtml/xmlhttprequest.c | 2 +- 18 files changed, 41 insertions(+), 41 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Rename EventTarget_QI to EventTarget_QI_no_cc.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: d4770578c401051d3e9353b8fe48360daf3e23bb URL: https://gitlab.winehq.org/wine/wine/-/commit/d4770578c401051d3e9353b8fe4836… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:27 2023 +0300 mshtml: Rename EventTarget_QI to EventTarget_QI_no_cc. The new EventTarget_QI will use the cycle collector later. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/htmlwindow.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/xmlhttprequest.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index b54cd4a5cda..e224185a013 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -4478,7 +4478,7 @@ static HRESULT get_gecko_target(IEventTarget *target, nsIDOMEventTarget **ret) return S_OK; } -HRESULT EventTarget_QI(EventTarget *event_target, REFIID riid, void **ppv) +HRESULT EventTarget_QI_no_cc(EventTarget *event_target, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IEventTarget)) { if(use_event_quirks(event_target)) { diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index ea6498e6904..7a3b390100e 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1444,7 +1444,7 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDOMNode_iface; return S_OK; }else { - return EventTarget_QI(&This->event_target, riid, ppv); + return EventTarget_QI_no_cc(&This->event_target, riid, ppv); } IUnknown_AddRef((IUnknown*)*ppv); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 571b04d23c8..e6812d100af 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -214,7 +214,7 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii if(hres != S_FALSE) return hres; - return EventTarget_QI(&This->event_target, riid, ppv); + return EventTarget_QI_no_cc(&This->event_target, riid, ppv); } static ULONG WINAPI HTMLWindow2_AddRef(IHTMLWindow2 *iface) @@ -251,7 +251,7 @@ static HRESULT WINAPI outer_window_QueryInterface(IHTMLWindow2 *iface, REFIID ri if(hres != S_FALSE) return hres; - return EventTarget_QI(&This->base.inner_window->event_target, riid, ppv); + return EventTarget_QI_no_cc(&This->base.inner_window->event_target, riid, ppv); } static ULONG WINAPI outer_window_AddRef(IHTMLWindow2 *iface) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d4ae83a3e4e..96e0e9b7fa7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1221,7 +1221,7 @@ void HTMLDOMNode_Init(HTMLDocumentNode*,HTMLDOMNode*,nsIDOMNode*,dispex_static_d void HTMLElement_Init(HTMLElement*,HTMLDocumentNode*,nsIDOMElement*,dispex_static_data_t*); void EventTarget_Init(EventTarget*,IUnknown*,dispex_static_data_t*,compat_mode_t); -HRESULT EventTarget_QI(EventTarget*,REFIID,void**); +HRESULT EventTarget_QI_no_cc(EventTarget*,REFIID,void**); void EventTarget_init_dispex_info(dispex_data_t*,compat_mode_t); HRESULT HTMLDOMNode_QI(HTMLDOMNode*,REFIID,void**); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index c153d3cf827..33770faa1bf 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -526,7 +526,7 @@ static HRESULT WINAPI HTMLXMLHttpRequest_QueryInterface(IHTMLXMLHttpRequest *ifa }else if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) { *ppv = &This->IProvideClassInfo2_iface; }else { - return EventTarget_QI(&This->event_target, riid, ppv); + return EventTarget_QI_no_cc(&This->event_target, riid, ppv); } IUnknown_AddRef((IUnknown*)*ppv);

1 0

Gabriel Ivăncescu : mshtml: Move ccref from the node to the dispex.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: ac572bc4ae31552074e82c3e8606d240fc6ed8c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac572bc4ae31552074e82c3e8606d2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:27 2023 +0300 mshtml: Move ccref from the node to the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 1 + dlls/mshtml/htmlnode.c | 7 +++---- dlls/mshtml/mshtml_private.h | 14 ++++++-------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index aa1708beb39..0ff22dd5a77 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -2094,6 +2094,7 @@ void init_dispatch(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *da dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; dispex->outer = outer; dispex->dynamic_data = NULL; + ccref_init(&dispex->ccref, 1); if(data->vtbl && data->vtbl->get_compat_mode) { /* delayed init */ diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 7a3b390100e..0546ded5f4a 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -501,7 +501,7 @@ static ULONG WINAPI HTMLDOMNode_AddRef(IHTMLDOMNode *iface) HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); LONG ref; - ref = ccref_incr(&This->ccref, (nsISupports*)&This->IHTMLDOMNode_iface); + ref = ccref_incr(&This->event_target.dispex.ccref, (nsISupports*)&This->IHTMLDOMNode_iface); TRACE("(%p) ref=%ld\n", This, ref); @@ -511,7 +511,7 @@ static ULONG WINAPI HTMLDOMNode_AddRef(IHTMLDOMNode *iface) static ULONG WINAPI HTMLDOMNode_Release(IHTMLDOMNode *iface) { HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); - LONG ref = ccref_decr(&This->ccref, (nsISupports*)&This->IHTMLDOMNode_iface, &node_ccp); + LONG ref = ccref_decr(&This->event_target.dispex.ccref, (nsISupports*)&This->IHTMLDOMNode_iface, &node_ccp); TRACE("(%p) ref=%ld\n", This, ref); @@ -1490,7 +1490,6 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno node->IHTMLDOMNode2_iface.lpVtbl = &HTMLDOMNode2Vtbl; node->IHTMLDOMNode3_iface.lpVtbl = &HTMLDOMNode3Vtbl; - ccref_init(&node->ccref, 1); EventTarget_Init(&node->event_target, (IUnknown*)&node->IHTMLDOMNode_iface, dispex_data, doc->document_mode); if(&doc->node != node) @@ -1582,7 +1581,7 @@ static nsresult NSAPI HTMLDOMNode_traverse(void *ccp, void *p, nsCycleCollection TRACE("%p\n", This); - describe_cc_node(&This->ccref, "HTMLDOMNode", cb); + describe_cc_node(&This->event_target.dispex.ccref, "HTMLDOMNode", cb); if(This->nsnode) note_cc_edge((nsISupports*)This->nsnode, "This->nsnode", cb); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 96e0e9b7fa7..82f673e8486 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -337,6 +337,11 @@ typedef struct dispex_dynamic_data_t dispex_dynamic_data_t; #define MSHTML_CUSTOM_DISPID_CNT (MSHTML_DISPID_CUSTOM_MAX-MSHTML_DISPID_CUSTOM_MIN) typedef struct DispatchEx DispatchEx; +typedef struct nsCycleCollectionTraversalCallback nsCycleCollectionTraversalCallback; + +typedef struct { + UINT_PTR x; +} nsCycleCollectingAutoRefCnt; /* dispex is our base IDispatchEx implementation for all mshtml objects, and the vtbl allows @@ -393,23 +398,18 @@ struct DispatchEx { IDispatchEx IDispatchEx_iface; IUnknown *outer; + nsCycleCollectingAutoRefCnt ccref; dispex_data_t *info; dispex_dynamic_data_t *dynamic_data; }; -typedef struct { - UINT_PTR x; -} nsCycleCollectingAutoRefCnt; - typedef struct { void *vtbl; int ref_flags; void *callbacks; } ExternalCycleCollectionParticipant; -typedef struct nsCycleCollectionTraversalCallback nsCycleCollectionTraversalCallback; - typedef struct { nsresult (NSAPI *traverse)(void*,void*,nsCycleCollectionTraversalCallback*); nsresult (NSAPI *unlink)(void*); @@ -851,8 +851,6 @@ struct HTMLDOMNode { IHTMLDOMNode3 IHTMLDOMNode3_iface; const NodeImplVtbl *vtbl; - nsCycleCollectingAutoRefCnt ccref; - nsIDOMNode *nsnode; HTMLDocumentNode *doc; };

1 0

Gabriel Ivăncescu : mshtml: Implement node cycle collection using the dispex.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: a54b322f6b557d6c2ee950abc27752d2bf462482 URL: https://gitlab.winehq.org/wine/wine/-/commit/a54b322f6b557d6c2ee950abc27752… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:27 2023 +0300 mshtml: Implement node cycle collection using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 70 +++++++++++++++++++-- dlls/mshtml/htmldoc.c | 15 ++--- dlls/mshtml/htmlelem.c | 5 +- dlls/mshtml/htmlevent.c | 21 +++++++ dlls/mshtml/htmlnode.c | 144 ++++++++++++++++--------------------------- dlls/mshtml/htmltextnode.c | 9 ++- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 27 ++++++-- dlls/mshtml/nsembed.c | 2 +- 9 files changed, 180 insertions(+), 115 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Release the event target during node unlink.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: 76f622a663bfb6e1cd46baaf25d4c55b7a236198 URL: https://gitlab.winehq.org/wine/wine/-/commit/76f622a663bfb6e1cd46baaf25d4c5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:27 2023 +0300 mshtml: Release the event target during node unlink. The event target can participate in a cycle. Also since release_event_target can now potentially be called multiple times, we have to NULL the rb tree to make it re-entrant safe. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 3 ++- dlls/mshtml/htmlnode.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 3b012980960..9f3dbae81d7 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -4552,11 +4552,12 @@ void release_event_target(EventTarget *event_target) WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR(iter, iter2, &event_target->handler_map, listener_container_t, entry) { while(!list_empty(&iter->listeners)) { event_listener_t *listener = LIST_ENTRY(list_head(&iter->listeners), event_listener_t, entry); + list_remove(&listener->entry); if(listener->function) IDispatch_Release(listener->function); - list_remove(&listener->entry); free(listener); } free(iter); } + rb_destroy(&event_target->handler_map, NULL, NULL); } diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 192e9c5b685..893a1a738f7 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1443,6 +1443,7 @@ void HTMLDOMNode_unlink(DispatchEx *dispex) if(This->vtbl->unlink) This->vtbl->unlink(This); + release_event_target(&This->event_target); unlink_ref(&This->nsnode); if(This->doc) { @@ -1456,7 +1457,6 @@ void HTMLDOMNode_unlink(DispatchEx *dispex) void HTMLDOMNode_destructor(DispatchEx *dispex) { HTMLDOMNode *This = HTMLDOMNode_from_DispatchEx(dispex); - release_event_target(&This->event_target); if(This->vtbl->destructor) This->vtbl->destructor(This); free(This);

1 0

Alexandre Julliard : d3d11/tests: Use nameless unions/structs.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: wine Branch: master Commit: e293a6c669bc5a85f0db9c2310f402fa67d0a9e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/e293a6c669bc5a85f0db9c2310f402… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:44:26 2023 +0200 d3d11/tests: Use nameless unions/structs. --- dlls/d3d11/tests/d3d11.c | 578 +++++++++++++++++++++++------------------------ 1 file changed, 289 insertions(+), 289 deletions(-)

1 0

Alexandre Julliard : d3d8/tests: Use nameless unions/structs.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: wine Branch: master Commit: 8d86c6d9d9f4d159e6592158c1f615f09d78e1e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d86c6d9d9f4d159e6592158c1f615… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:44:55 2023 +0200 d3d8/tests: Use nameless unions/structs. --- dlls/d3d8/tests/stateblock.c | 16 ++++++++-------- dlls/d3d8/tests/visual.c | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index 4a27738d5d4..d9a610d5438 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -957,14 +957,14 @@ static void compare_matrix(const char *name, unsigned int chain_stage, "\t\t%.8e, %.8e, %.8e, %.8e,\n" "\t} received\n", chain_stage, name, - U(*expected).m[0][0], U(*expected).m[1][0], U(*expected).m[2][0], U(*expected).m[3][0], - U(*expected).m[0][1], U(*expected).m[1][1], U(*expected).m[2][1], U(*expected).m[3][1], - U(*expected).m[0][2], U(*expected).m[1][2], U(*expected).m[2][2], U(*expected).m[3][2], - U(*expected).m[0][3], U(*expected).m[1][3], U(*expected).m[2][3], U(*expected).m[3][3], - U(*received).m[0][0], U(*received).m[1][0], U(*received).m[2][0], U(*received).m[3][0], - U(*received).m[0][1], U(*received).m[1][1], U(*received).m[2][1], U(*received).m[3][1], - U(*received).m[0][2], U(*received).m[1][2], U(*received).m[2][2], U(*received).m[3][2], - U(*received).m[0][3], U(*received).m[1][3], U(*received).m[2][3], U(*received).m[3][3]); + expected->m[0][0], expected->m[1][0], expected->m[2][0], expected->m[3][0], + expected->m[0][1], expected->m[1][1], expected->m[2][1], expected->m[3][1], + expected->m[0][2], expected->m[1][2], expected->m[2][2], expected->m[3][2], + expected->m[0][3], expected->m[1][3], expected->m[2][3], expected->m[3][3], + received->m[0][0], received->m[1][0], received->m[2][0], received->m[3][0], + received->m[0][1], received->m[1][1], received->m[2][1], received->m[3][1], + received->m[0][2], received->m[1][2], received->m[2][2], received->m[3][2], + received->m[0][3], received->m[1][3], received->m[2][3], received->m[3][3]); } static void transform_check_data(IDirect3DDevice8 *device, const struct state_test *test, diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index f80ff86010e..b7688e9251a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -7736,8 +7736,8 @@ static void test_pointsize(void) ok(color == 0x00ffff00, "pSprite: Pixel (64 + 4),(64 - 4) has color 0x%08x, expected 0x00ffff00\n", color); IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - U(matrix).m[0][0] = 1.0f / 64.0f; - U(matrix).m[1][1] = -1.0f / 64.0f; + matrix.m[0][0] = 1.0f / 64.0f; + matrix.m[1][1] = -1.0f / 64.0f; hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &matrix); ok(SUCCEEDED(hr), "Failed to set projection matrix, hr %#lx.\n", hr); @@ -7756,7 +7756,7 @@ static void test_pointsize(void) ok(SUCCEEDED(hr), "Failed setting point scale attenuation coefficient, hr %#lx.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_POINTSCALE_C, *(DWORD *)&c); ok(SUCCEEDED(hr), "Failed setting point scale attenuation coefficient, hr %#lx.\n", hr); - hr = IDirect3DDevice8_SetVertexShaderConstant(device, 0, &S(U(matrix))._11, 4); + hr = IDirect3DDevice8_SetVertexShaderConstant(device, 0, &matrix._11, 4); ok(SUCCEEDED(hr), "Failed to set vertex shader constants, hr %#lx.\n", hr); if (caps.MaxPointSize < 63.0f) @@ -12222,8 +12222,8 @@ START_TEST(visual) /* Only Windows XP's default VGA driver should have an empty description */ ok(identifier.Description[0] || broken(!strcmp(identifier.Driver, "vga.dll")), "Empty driver description.\n"); trace("Driver version %d.%d.%d.%d\n", - HIWORD(U(identifier.DriverVersion).HighPart), LOWORD(U(identifier.DriverVersion).HighPart), - HIWORD(U(identifier.DriverVersion).LowPart), LOWORD(U(identifier.DriverVersion).LowPart)); + HIWORD(identifier.DriverVersion.HighPart), LOWORD(identifier.DriverVersion.HighPart), + HIWORD(identifier.DriverVersion.LowPart), LOWORD(identifier.DriverVersion.LowPart)); IDirect3D8_Release(d3d);

1 0

Alexandre Julliard : d3d9/tests: Use nameless unions/structs.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: wine Branch: master Commit: 43d4956c27a0546f014dfd7c907a39006dc52bfa URL: https://gitlab.winehq.org/wine/wine/-/commit/43d4956c27a0546f014dfd7c907a39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:45:17 2023 +0200 d3d9/tests: Use nameless unions/structs. --- dlls/d3d9/tests/d3d9ex.c | 8 ++++---- dlls/d3d9/tests/stateblock.c | 16 ++++++++-------- dlls/d3d9/tests/visual.c | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 2056117f4d7..bde3dc62ef6 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -562,7 +562,7 @@ static void test_get_adapter_displaymode_ex(void) devmode = startmode; devmode.dmFields = DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT; - S2(U1(devmode)).dmDisplayOrientation = DMDO_180; + devmode.dmDisplayOrientation = DMDO_180; retval = ChangeDisplaySettingsExW(NULL, &devmode, NULL, 0, NULL); if (retval == DISP_CHANGE_BADMODE) { @@ -573,7 +573,7 @@ static void test_get_adapter_displaymode_ex(void) ok(retval == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsEx failed with %ld.\n", retval); /* try retrieve orientation info with EnumDisplaySettingsEx*/ devmode.dmFields = 0; - S2(U1(devmode)).dmDisplayOrientation = 0; + devmode.dmDisplayOrientation = 0; ok(EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &devmode, EDS_ROTATEDMODE), "EnumDisplaySettingsEx failed.\n"); @@ -605,8 +605,8 @@ static void test_get_adapter_displaymode_ex(void) ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0\n"); /* Check that orientation is returned correctly by GetAdapterDisplayModeEx * and EnumDisplaySettingsEx(). */ - ok(S2(U1(devmode)).dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, - "rotation is %d instead of %ld\n", rotation, S2(U1(devmode)).dmDisplayOrientation); + ok(devmode.dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, + "rotation is %d instead of %ld\n", rotation, devmode.dmDisplayOrientation); trace("GetAdapterDisplayModeEx returned Width = %d, Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d\n", mode_ex.Width, mode_ex.Height, mode_ex.RefreshRate, mode_ex.Format, mode_ex.ScanLineOrdering, rotation); diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index f42c880c372..def69105f14 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -1017,14 +1017,14 @@ static void compare_matrix(const char *name, unsigned int chain_stage, "\t\t%.8e, %.8e, %.8e, %.8e,\n" "\t} received\n", chain_stage, name, - U(*expected).m[0][0], U(*expected).m[1][0], U(*expected).m[2][0], U(*expected).m[3][0], - U(*expected).m[0][1], U(*expected).m[1][1], U(*expected).m[2][1], U(*expected).m[3][1], - U(*expected).m[0][2], U(*expected).m[1][2], U(*expected).m[2][2], U(*expected).m[3][2], - U(*expected).m[0][3], U(*expected).m[1][3], U(*expected).m[2][3], U(*expected).m[3][3], - U(*received).m[0][0], U(*received).m[1][0], U(*received).m[2][0], U(*received).m[3][0], - U(*received).m[0][1], U(*received).m[1][1], U(*received).m[2][1], U(*received).m[3][1], - U(*received).m[0][2], U(*received).m[1][2], U(*received).m[2][2], U(*received).m[3][2], - U(*received).m[0][3], U(*received).m[1][3], U(*received).m[2][3], U(*received).m[3][3]); + expected->m[0][0], expected->m[1][0], expected->m[2][0], expected->m[3][0], + expected->m[0][1], expected->m[1][1], expected->m[2][1], expected->m[3][1], + expected->m[0][2], expected->m[1][2], expected->m[2][2], expected->m[3][2], + expected->m[0][3], expected->m[1][3], expected->m[2][3], expected->m[3][3], + received->m[0][0], received->m[1][0], received->m[2][0], received->m[3][0], + received->m[0][1], received->m[1][1], received->m[2][1], received->m[3][1], + received->m[0][2], received->m[1][2], received->m[2][2], received->m[3][2], + received->m[0][3], received->m[1][3], received->m[2][3], received->m[3][3]); } static void transform_check_data(IDirect3DDevice9 *device, const struct state_test *test, diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 29b95419bed..a7d88adbc00 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5560,8 +5560,8 @@ static void texture_transform_flags_test(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); /* What happens if 4 coords are used, but only 2 given ?*/ - U(mat).m[2][0] = 1.0f; - U(mat).m[3][1] = 1.0f; + mat.m[2][0] = 1.0f; + mat.m[3][1] = 1.0f; hr = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE0, &mat); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT4); @@ -12122,8 +12122,8 @@ static void test_pointsize(void) ok(color == 0x00ffff00, "pSprite: Pixel (64+4),(64-4) has color 0x%08x, expected 0x00ffff00\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - U(matrix).m[0][0] = 1.0f / 64.0f; - U(matrix).m[1][1] = -1.0f / 64.0f; + matrix.m[0][0] = 1.0f / 64.0f; + matrix.m[1][1] = -1.0f / 64.0f; hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &matrix); ok(SUCCEEDED(hr), "SetTransform failed, hr %#lx.\n", hr); @@ -12142,7 +12142,7 @@ static void test_pointsize(void) ok(SUCCEEDED(hr), "Failed setting point scale attenuation coefficient, hr %#lx.\n", hr); if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) { - hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, &S(U(matrix))._11, 4); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, &matrix._11, 4); ok(SUCCEEDED(hr), "Failed to set vertex shader constants, hr %#lx.\n", hr); } @@ -28062,8 +28062,8 @@ START_TEST(visual) trace("Device name string: \"%s\"\n", identifier.DeviceName); ok(identifier.DeviceName[0], "Empty device name.\n"); trace("Driver version %d.%d.%d.%d\n", - HIWORD(U(identifier.DriverVersion).HighPart), LOWORD(U(identifier.DriverVersion).HighPart), - HIWORD(U(identifier.DriverVersion).LowPart), LOWORD(U(identifier.DriverVersion).LowPart)); + HIWORD(identifier.DriverVersion.HighPart), LOWORD(identifier.DriverVersion.HighPart), + HIWORD(identifier.DriverVersion.LowPart), LOWORD(identifier.DriverVersion.LowPart)); IDirect3D9_Release(d3d);

1 0

Alexandre Julliard : d3drm/tests: Use nameless unions/structs.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: wine Branch: master Commit: 43add3496349e8d355bb03518eb2545c2af031d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/43add3496349e8d355bb03518eb254… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:45:34 2023 +0200 d3drm/tests: Use nameless unions/structs. --- dlls/d3drm/tests/d3drm.c | 42 +++++++++++----------- dlls/d3drm/tests/vector.c | 88 +++++++++++++++++++++++------------------------ 2 files changed, 65 insertions(+), 65 deletions(-)

1 0