- Wine-Commits - list.winehq.org

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

Aug. 16, 2023

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: Use designated initializers in node vtables.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

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 EventTarget_QI to EventTarget_QI_no_cc.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

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 Aug. 16, 2023

Aug. 16, 2023

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: Split IUnknown methods for outer windows into separate vtable.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: 4e08d7e200779f81666e5afe2066343106de0444 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e08d7e200779f81666e5afe206634… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:26 2023 +0300 mshtml: Split IUnknown methods for outer windows into separate vtable. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 174 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 150 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 26964b3216f..ef71246d723 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -62,11 +62,6 @@ HTMLOuterWindow *mozwindow_to_window(const mozIDOMWindowProxy *mozwindow) return entry ? WINE_RB_ENTRY_VALUE(entry, HTMLOuterWindow, entry) : NULL; } -static inline BOOL is_outer_window(HTMLWindow *window) -{ - return &window->outer_window->base == window; -} - static void get_location(HTMLOuterWindow *This, HTMLLocation **ret) { if(!This->location.dispex.outer) @@ -146,12 +141,18 @@ static inline HTMLWindow *impl_from_IHTMLWindow2(IHTMLWindow2 *iface) return CONTAINING_RECORD(iface, HTMLWindow, IHTMLWindow2_iface); } -static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID riid, void **ppv) +static inline HTMLInnerWindow *HTMLInnerWindow_from_IHTMLWindow2(IHTMLWindow2 *iface) { - HTMLWindow *This = impl_from_IHTMLWindow2(iface); + return CONTAINING_RECORD(iface, HTMLInnerWindow, base.IHTMLWindow2_iface); +} - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); +static inline HTMLOuterWindow *HTMLOuterWindow_from_IHTMLWindow2(IHTMLWindow2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLOuterWindow, base.IHTMLWindow2_iface); +} +static HRESULT base_query_interface(HTMLWindow *This, REFIID riid, void **ppv) +{ if(IsEqualGUID(&IID_IUnknown, riid)) { *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { @@ -194,21 +195,69 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii *ppv = NULL; FIXME("(%p)->(IID_IMarshal %p)\n", This, ppv); return E_NOINTERFACE; - }else if(dispex_query_interface(&This->inner_window->event_target.dispex, riid, ppv)) { - assert(!*ppv); - return E_NOINTERFACE; }else { - return EventTarget_QI(&This->inner_window->event_target, riid, ppv); + return S_FALSE; } IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } +static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID riid, void **ppv) +{ + HTMLInnerWindow *This = HTMLInnerWindow_from_IHTMLWindow2(iface); + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + hres = base_query_interface(&This->base, riid, ppv); + if(hres != S_FALSE) + return hres; + + return EventTarget_QI(&This->event_target, riid, ppv); +} + static ULONG WINAPI HTMLWindow2_AddRef(IHTMLWindow2 *iface) { - HTMLWindow *This = impl_from_IHTMLWindow2(iface); - LONG ref = InterlockedIncrement(&This->ref); + HTMLInnerWindow *This = HTMLInnerWindow_from_IHTMLWindow2(iface); + LONG ref = InterlockedIncrement(&This->base.ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) +{ + HTMLInnerWindow *This = HTMLInnerWindow_from_IHTMLWindow2(iface); + LONG ref = InterlockedDecrement(&This->base.ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + if(!ref) + release_dispex(&This->event_target.dispex); + + return ref; +} + +static HRESULT WINAPI outer_window_QueryInterface(IHTMLWindow2 *iface, REFIID riid, void **ppv) +{ + HTMLOuterWindow *This = HTMLOuterWindow_from_IHTMLWindow2(iface); + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + hres = base_query_interface(&This->base, riid, ppv); + if(hres != S_FALSE) + return hres; + + return EventTarget_QI(&This->base.inner_window->event_target, riid, ppv); +} + +static ULONG WINAPI outer_window_AddRef(IHTMLWindow2 *iface) +{ + HTMLOuterWindow *This = HTMLOuterWindow_from_IHTMLWindow2(iface); + LONG ref = InterlockedIncrement(&This->base.ref); TRACE("(%p) ref=%ld\n", This, ref); @@ -249,19 +298,15 @@ static void release_outer_window(HTMLOuterWindow *This) free(This); } -static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) +static ULONG WINAPI outer_window_Release(IHTMLWindow2 *iface) { - HTMLWindow *This = impl_from_IHTMLWindow2(iface); - LONG ref = InterlockedDecrement(&This->ref); + HTMLOuterWindow *This = HTMLOuterWindow_from_IHTMLWindow2(iface); + LONG ref = InterlockedDecrement(&This->base.ref); TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - if(is_outer_window(This)) - release_outer_window(This->outer_window); - else - release_dispex(&This->inner_window->event_target.dispex); - } + if(!ref) + release_outer_window(This); return ref; } @@ -1548,6 +1593,86 @@ static const IHTMLWindow2Vtbl HTMLWindow2Vtbl = { HTMLWindow2_get_external }; +static const IHTMLWindow2Vtbl outer_window_HTMLWindow2Vtbl = { + outer_window_QueryInterface, + outer_window_AddRef, + outer_window_Release, + HTMLWindow2_GetTypeInfoCount, + HTMLWindow2_GetTypeInfo, + HTMLWindow2_GetIDsOfNames, + HTMLWindow2_Invoke, + HTMLWindow2_item, + HTMLWindow2_get_length, + HTMLWindow2_get_frames, + HTMLWindow2_put_defaultStatus, + HTMLWindow2_get_defaultStatus, + HTMLWindow2_put_status, + HTMLWindow2_get_status, + HTMLWindow2_setTimeout, + HTMLWindow2_clearTimeout, + HTMLWindow2_alert, + HTMLWindow2_confirm, + HTMLWindow2_prompt, + HTMLWindow2_get_Image, + HTMLWindow2_get_location, + HTMLWindow2_get_history, + HTMLWindow2_close, + HTMLWindow2_put_opener, + HTMLWindow2_get_opener, + HTMLWindow2_get_navigator, + HTMLWindow2_put_name, + HTMLWindow2_get_name, + HTMLWindow2_get_parent, + HTMLWindow2_open, + HTMLWindow2_get_self, + HTMLWindow2_get_top, + HTMLWindow2_get_window, + HTMLWindow2_navigate, + HTMLWindow2_put_onfocus, + HTMLWindow2_get_onfocus, + HTMLWindow2_put_onblur, + HTMLWindow2_get_onblur, + HTMLWindow2_put_onload, + HTMLWindow2_get_onload, + HTMLWindow2_put_onbeforeunload, + HTMLWindow2_get_onbeforeunload, + HTMLWindow2_put_onunload, + HTMLWindow2_get_onunload, + HTMLWindow2_put_onhelp, + HTMLWindow2_get_onhelp, + HTMLWindow2_put_onerror, + HTMLWindow2_get_onerror, + HTMLWindow2_put_onresize, + HTMLWindow2_get_onresize, + HTMLWindow2_put_onscroll, + HTMLWindow2_get_onscroll, + HTMLWindow2_get_document, + HTMLWindow2_get_event, + HTMLWindow2_get__newEnum, + HTMLWindow2_showModalDialog, + HTMLWindow2_showHelp, + HTMLWindow2_get_screen, + HTMLWindow2_get_Option, + HTMLWindow2_focus, + HTMLWindow2_get_closed, + HTMLWindow2_blur, + HTMLWindow2_scroll, + HTMLWindow2_get_clientInformation, + HTMLWindow2_setInterval, + HTMLWindow2_clearInterval, + HTMLWindow2_put_offscreenBuffering, + HTMLWindow2_get_offscreenBuffering, + HTMLWindow2_execScript, + HTMLWindow2_toString, + HTMLWindow2_scrollBy, + HTMLWindow2_scrollTo, + HTMLWindow2_moveTo, + HTMLWindow2_moveBy, + HTMLWindow2_resizeTo, + HTMLWindow2_resizeBy, + HTMLWindow2_get_external +}; + static inline HTMLWindow *impl_from_IHTMLWindow3(IHTMLWindow3 *iface) { return CONTAINING_RECORD(iface, HTMLWindow, IHTMLWindow3_iface); @@ -4078,7 +4203,6 @@ static void *alloc_window(size_t size) if(!window) return NULL; - window->IHTMLWindow2_iface.lpVtbl = &HTMLWindow2Vtbl; window->IHTMLWindow3_iface.lpVtbl = &HTMLWindow3Vtbl; window->IHTMLWindow4_iface.lpVtbl = &HTMLWindow4Vtbl; window->IHTMLWindow5_iface.lpVtbl = &HTMLWindow5Vtbl; @@ -4105,6 +4229,7 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, window = alloc_window(sizeof(HTMLInnerWindow)); if(!window) return E_OUTOFMEMORY; + window->base.IHTMLWindow2_iface.lpVtbl = &HTMLWindow2Vtbl; hres = create_performance_timing(&window->performance_timing); if(FAILED(hres)) { @@ -4144,6 +4269,7 @@ HRESULT create_outer_window(GeckoBrowser *browser, mozIDOMWindowProxy *mozwindow window = alloc_window(sizeof(HTMLOuterWindow)); if(!window) return E_OUTOFMEMORY; + window->base.IHTMLWindow2_iface.lpVtbl = &outer_window_HTMLWindow2Vtbl; window->base.outer_window = window; window->base.inner_window = NULL;

1 0

Gabriel Ivăncescu : mshtml: Use designated initializers in dispex and event target vtables.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: b4f9aee68c1c51cec7eba5094297f225e0ee77b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b4f9aee68c1c51cec7eba5094297f2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:26 2023 +0300 mshtml: Use designated initializers in dispex and event target vtables. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 8 ++--- dlls/mshtml/htmlattr.c | 4 +-- dlls/mshtml/htmldoc.c | 34 +++++++------------ dlls/mshtml/htmlelem.c | 77 ++++++++++++++++++-------------------------- dlls/mshtml/htmlelemcol.c | 12 +++---- dlls/mshtml/htmlevent.c | 36 ++++++++++----------- dlls/mshtml/htmlimg.c | 8 ++--- dlls/mshtml/htmlnode.c | 12 +++---- dlls/mshtml/htmlselect.c | 8 ++--- dlls/mshtml/htmlstorage.c | 15 ++++----- dlls/mshtml/htmlstyle.c | 9 ++---- dlls/mshtml/htmlstylesheet.c | 30 ++++++++--------- dlls/mshtml/htmlwindow.c | 25 ++++++-------- dlls/mshtml/mutation.c | 9 +++--- dlls/mshtml/omnavigator.c | 36 ++++++++++----------- dlls/mshtml/range.c | 8 ++--- dlls/mshtml/selection.c | 4 +-- dlls/mshtml/xmlhttprequest.c | 13 ++++---- 18 files changed, 146 insertions(+), 202 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Move console to the inner window.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: 5e8210bb94f31bab5b329dd9133561d2c04f65aa URL: https://gitlab.winehq.org/wine/wine/-/commit/5e8210bb94f31bab5b329dd9133561… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:26 2023 +0300 mshtml: Move console to the inner window. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 16 +++++++--------- dlls/mshtml/mshtml_private.h | 3 +-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e668f8a5d2b..26964b3216f 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -257,9 +257,6 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { - if (This->console) - IWineMSHTMLConsole_Release(This->console); - if(is_outer_window(This)) release_outer_window(This->outer_window); else @@ -3255,15 +3252,16 @@ static HRESULT WINAPI window_private_postMessage(IWineHTMLWindowPrivate *iface, static HRESULT WINAPI window_private_get_console(IWineHTMLWindowPrivate *iface, IDispatch **console) { HTMLWindow *This = impl_from_IWineHTMLWindowPrivateVtbl(iface); + HTMLInnerWindow *window = This->inner_window; TRACE("iface %p, console %p.\n", iface, console); - if (!This->console) - create_console(dispex_compat_mode(&This->inner_window->event_target.dispex), &This->console); + if (!window->console) + create_console(dispex_compat_mode(&window->event_target.dispex), &window->console); - *console = (IDispatch *)This->console; - if (This->console) - IWineMSHTMLConsole_AddRef(This->console); + *console = (IDispatch *)window->console; + if (window->console) + IWineMSHTMLConsole_AddRef(window->console); return S_OK; } @@ -3725,7 +3723,7 @@ static void HTMLWindow_unlink(DispatchEx *dispex) TRACE("%p\n", This); - unlink_ref(&This->base.console); + unlink_ref(&This->console); detach_inner_window(This); if(This->doc) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 32ea4c9c9ea..2a608efcfc6 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -569,8 +569,6 @@ struct HTMLWindow { IWineHTMLWindowPrivate IWineHTMLWindowPrivate_iface; IWineHTMLWindowCompatPrivate IWineHTMLWindowCompatPrivate_iface; - IWineMSHTMLConsole *console; - LONG ref; HTMLInnerWindow *inner_window; @@ -625,6 +623,7 @@ struct HTMLInnerWindow { IOmNavigator *navigator; IHTMLStorage *session_storage; IHTMLStorage *local_storage; + IWineMSHTMLConsole *console; BOOL performance_initialized; VARIANT performance;

1 0

Gabriel Ivăncescu : mshtml: Make all event target vtbls const.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: dfd32a332a2689664fc37c482127ff8b3c2035db URL: https://gitlab.winehq.org/wine/wine/-/commit/dfd32a332a2689664fc37c482127ff… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:26 2023 +0300 mshtml: Make all event target vtbls const. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/xmlhttprequest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index d4761db77aa..77916ca1a0f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -365,7 +365,7 @@ static IHTMLEventObj *DocumentType_set_current_event(DispatchEx *dispex, IHTMLEv return default_set_current_event(This->node.doc->window, event); } -static event_target_vtbl_t DocumentType_event_target_vtbl = { +static const event_target_vtbl_t DocumentType_event_target_vtbl = { { NULL, }, diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 417923cf444..9bfaefcd892 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -1592,7 +1592,7 @@ static void HTMLXMLHttpRequest_init_dispex_info(dispex_data_t *info, compat_mode compat_mode < COMPAT_MODE_IE11 ? private_ie10_hooks : NULL); } -static event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { +static const event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { { HTMLXMLHttpRequest_destructor, HTMLXMLHttpRequest_unlink

1 0

Gabriel Ivăncescu : mshtml: Use ASCII strings for dispex object names.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: c81c0aa7a35d4fbd770b845207240d6055b77f24 URL: https://gitlab.winehq.org/wine/wine/-/commit/c81c0aa7a35d4fbd770b845207240d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 15 19:46:26 2023 +0300 mshtml: Use ASCII strings for dispex object names. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 12 +++++------- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmlarea.c | 2 +- dlls/mshtml/htmlattr.c | 2 +- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmlcomment.c | 2 +- dlls/mshtml/htmlcurstyle.c | 2 +- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/htmlelem.c | 14 +++++++------- dlls/mshtml/htmlelemcol.c | 2 +- dlls/mshtml/htmlevent.c | 20 ++++++++++---------- dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmlframe.c | 4 ++-- dlls/mshtml/htmlgeneric.c | 2 +- dlls/mshtml/htmlhead.c | 8 ++++---- dlls/mshtml/htmlimg.c | 4 ++-- dlls/mshtml/htmlinput.c | 6 +++--- dlls/mshtml/htmllink.c | 2 +- dlls/mshtml/htmllocation.c | 2 +- dlls/mshtml/htmlnode.c | 4 ++-- dlls/mshtml/htmlobject.c | 4 ++-- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlselect.c | 6 +++--- dlls/mshtml/htmlstorage.c | 2 +- dlls/mshtml/htmlstyle.c | 4 ++-- dlls/mshtml/htmlstyleelem.c | 2 +- dlls/mshtml/htmlstylesheet.c | 8 ++++---- dlls/mshtml/htmltable.c | 6 +++--- dlls/mshtml/htmltextarea.c | 2 +- dlls/mshtml/htmltextnode.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- 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 | 4 ++-- 37 files changed, 88 insertions(+), 90 deletions(-)

1 0

Alexandre Julliard : include: Get rid of the NONAMELESS access macros in tests.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: 1f9c6e83bd1c89cd3ca8691df9b0f08f141e2429 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f9c6e83bd1c89cd3ca8691df9b0f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:47:51 2023 +0200 include: Get rid of the NONAMELESS access macros in tests. --- include/wine/test.h | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index c28128d9f0c..73d6d164c46 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -135,44 +135,6 @@ extern void winetest_pop_context(void); # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #endif -#ifdef NONAMELESSUNION -# define U(x) (x).u -# define U1(x) (x).u1 -# define U2(x) (x).u2 -# define U3(x) (x).u3 -# define U4(x) (x).u4 -# define U5(x) (x).u5 -# define U6(x) (x).u6 -# define U7(x) (x).u7 -# define U8(x) (x).u8 -#else -# define U(x) (x) -# define U1(x) (x) -# define U2(x) (x) -# define U3(x) (x) -# define U4(x) (x) -# define U5(x) (x) -# define U6(x) (x) -# define U7(x) (x) -# define U8(x) (x) -#endif - -#ifdef NONAMELESSSTRUCT -# define S(x) (x).s -# define S1(x) (x).s1 -# define S2(x) (x).s2 -# define S3(x) (x).s3 -# define S4(x) (x).s4 -# define S5(x) (x).s5 -#else -# define S(x) (x) -# define S1(x) (x) -# define S2(x) (x) -# define S3(x) (x) -# define S4(x) (x) -# define S5(x) (x) -#endif - /************************************************************************/ /* Below is the implementation of the various functions, to be included

1 0