wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Jacek Caban : mshtml: Initialize HTMLLocation object with compat mode.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: d1c51350f0dbf664defe4ebb4e1b0b5d44abb586 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1c51350f0dbf664defe4ebb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 11 20:40:41 2021 +0100 mshtml: Initialize HTMLLocation object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmllocation.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 4e15fb45242..9355acd2622 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -649,7 +649,8 @@ HRESULT HTMLLocation_Create(HTMLInnerWindow *window, HTMLLocation **ret) location->ref = 1; location->window = window; - init_dispex(&location->dispex, (IUnknown*)&location->IHTMLLocation_iface, &HTMLLocation_dispex); + init_dispex_with_compat_mode(&location->dispex, (IUnknown*)&location->IHTMLLocation_iface, &HTMLLocation_dispex, + dispex_compat_mode(&window->event_target.dispex)); *ret = location; return S_OK;

1 0

Jacek Caban : mshtml: Initialize DOMEventObj object with compat mode.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: e61e1968437e82fa19f821c2f6ca4b7e86d1b305 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e61e1968437e82fa19f821c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 11 20:40:35 2021 +0100 mshtml: Initialize DOMEventObj object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlevent.c | 12 ++++++------ dlls/mshtml/htmlevent.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 344079ba36e..4e56d548f47 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2681,7 +2681,7 @@ static HRESULT WINAPI HTMLDocument4_createEventObject(IHTMLDocument4 *iface, return E_NOTIMPL; } - return create_event_obj(ppEventObj); + return create_event_obj(dispex_compat_mode(&This->doc_node->node.event_target.dispex), ppEventObj); } static HRESULT WINAPI HTMLDocument4_fireEvent(IHTMLDocument4 *iface, BSTR bstrEventName, diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9995f40a571..17584669c3b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -756,7 +756,7 @@ static dispex_static_data_t HTMLEventObj_dispex = { HTMLEventObj_iface_tids }; -static HTMLEventObj *alloc_event_obj(DOMEvent *event) +static HTMLEventObj *alloc_event_obj(DOMEvent *event, compat_mode_t compat_mode) { HTMLEventObj *event_obj; @@ -770,15 +770,15 @@ static HTMLEventObj *alloc_event_obj(DOMEvent *event) if(event) IDOMEvent_AddRef(&event->IDOMEvent_iface); - init_dispex(&event_obj->dispex, (IUnknown*)&event_obj->IHTMLEventObj_iface, &HTMLEventObj_dispex); + init_dispex_with_compat_mode(&event_obj->dispex, (IUnknown*)&event_obj->IHTMLEventObj_iface, &HTMLEventObj_dispex, compat_mode); return event_obj; } -HRESULT create_event_obj(IHTMLEventObj **ret) +HRESULT create_event_obj(compat_mode_t compat_mode, IHTMLEventObj **ret) { HTMLEventObj *event_obj; - event_obj = alloc_event_obj(NULL); + event_obj = alloc_event_obj(NULL, compat_mode); if(!event_obj) return E_OUTOFMEMORY; @@ -2682,7 +2682,7 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, } while(iter); if(!event->event_obj && !event->no_event_obj) { - event_obj_ref = alloc_event_obj(event); + event_obj_ref = alloc_event_obj(event, dispex_compat_mode(&event->dispex)); if(event_obj_ref) event->event_obj = &event_obj_ref->IHTMLEventObj_iface; } @@ -2800,7 +2800,7 @@ HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_va } if(!event_obj) { - event_obj = alloc_event_obj(NULL); + event_obj = alloc_event_obj(NULL, dispex_compat_mode(&node->event_target.dispex)); if(!event_obj) return E_OUTOFMEMORY; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index fc581ee5398..617b15b6c49 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -102,7 +102,7 @@ HRESULT fire_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HI void update_doc_cp_events(HTMLDocumentNode*,cp_static_data_t*) DECLSPEC_HIDDEN; HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; -HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; +HRESULT create_event_obj(compat_mode_t,IHTMLEventObj**) DECLSPEC_HIDDEN; void bind_target_event(HTMLDocumentNode*,EventTarget*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,nsIDOMNode*,eventid_t) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Initialize HTMLImageElementFactory object with compat mode.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: f4ad57d4319e45c7305847cf5dce2f336ee58e2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4ad57d4319e45c7305847cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 11 20:40:30 2021 +0100 mshtml: Initialize HTMLImageElementFactory object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlimg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index aa4129e760e..65fa9bbebcc 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -992,8 +992,8 @@ HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow *window, HTMLImageElement ret->ref = 1; ret->window = window; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLImageElementFactory_iface, - &HTMLImageElementFactory_dispex); + init_dispex_with_compat_mode(&ret->dispex, (IUnknown*)&ret->IHTMLImageElementFactory_iface, + &HTMLImageElementFactory_dispex, dispex_compat_mode(&window->event_target.dispex)); *ret_val = ret; return S_OK;

1 0

Jacek Caban : mshtml: Initialize DOMEvent object with compat mode.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: c833238a21c384372e17e6dc413962e52cf0e8d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c833238a21c384372e17e6dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 11 20:40:19 2021 +0100 mshtml: Initialize DOMEvent object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 12 ++++++------ dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 4 ++-- dlls/mshtml/xmlhttprequest.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index da2d59bc894..9995f40a571 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2201,7 +2201,7 @@ static BOOL check_event_iface(nsIDOMEvent *event, REFIID riid) return TRUE; } -static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) +static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, eventid_t event_id) { dispex_static_data_t *dispex_data = &DOMEvent_dispex; DOMEvent *event = NULL; @@ -2266,11 +2266,11 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) else event->keyboard_event = NULL; - init_dispex(&event->dispex, (IUnknown*)&event->IDOMEvent_iface, dispex_data); + init_dispex_with_compat_mode(&event->dispex, (IUnknown*)&event->IDOMEvent_iface, dispex_data, compat_mode); return event; } -HRESULT create_event_from_nsevent(nsIDOMEvent *nsevent, DOMEvent **ret_event) +HRESULT create_event_from_nsevent(nsIDOMEvent *nsevent, compat_mode_t compat_mode, DOMEvent **ret_event) { eventid_t event_id = EVENTID_LAST; DOMEvent *event; @@ -2290,7 +2290,7 @@ HRESULT create_event_from_nsevent(nsIDOMEvent *nsevent, DOMEvent **ret_event) } nsAString_Finish(&nsstr); - event = alloc_event(nsevent, event_id); + event = alloc_event(nsevent, compat_mode, event_id); if(!event) return E_OUTOFMEMORY; @@ -2313,7 +2313,7 @@ HRESULT create_document_event_str(HTMLDocumentNode *doc, const WCHAR *type, IDOM return E_FAIL; } - event = alloc_event(nsevent, EVENTID_LAST); + event = alloc_event(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), EVENTID_LAST); nsIDOMEvent_Release(nsevent); if(!event) return E_OUTOFMEMORY; @@ -2337,7 +2337,7 @@ HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEven return E_FAIL; } - event = alloc_event(nsevent, event_id); + event = alloc_event(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), event_id); if(!event) return E_OUTOFMEMORY; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 69655d2a4ee..fc581ee5398 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -110,7 +110,7 @@ void dispatch_event(EventTarget*,DOMEvent*) DECLSPEC_HIDDEN; HRESULT create_document_event(HTMLDocumentNode*,eventid_t,DOMEvent**) DECLSPEC_HIDDEN; HRESULT create_document_event_str(HTMLDocumentNode*,const WCHAR*,IDOMEvent**) DECLSPEC_HIDDEN; -HRESULT create_event_from_nsevent(nsIDOMEvent*,DOMEvent**) DECLSPEC_HIDDEN; +HRESULT create_event_from_nsevent(nsIDOMEvent*,compat_mode_t,DOMEvent**) DECLSPEC_HIDDEN; void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 750f5cfd5e0..700eee4d779 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1659,7 +1659,7 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList if(FAILED(hres)) return NS_ERROR_FAILURE; - hres = create_event_from_nsevent(aEvent, &event); + hres = create_event_from_nsevent(aEvent, dispex_compat_mode(&node->event_target.dispex), &event); if(SUCCEEDED(hres)) { dispatch_event(&node->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 21b59cf6e1d..b060ae521c5 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -270,7 +270,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event } if(doc->window) { - hres = create_event_from_nsevent(event, &load_event); + hres = create_event_from_nsevent(event, dispex_compat_mode(&doc->node.event_target.dispex), &load_event); if(SUCCEEDED(hres)) { dispatch_event(&doc->window->event_target, load_event); IDOMEvent_Release(&load_event->IDOMEvent_iface); @@ -319,7 +319,7 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * if(FAILED(hres)) return NS_OK; - hres = create_event_from_nsevent(nsevent, &event); + hres = create_event_from_nsevent(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), &event); if(FAILED(hres)) { node_release(node); return NS_OK; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 8790807ce77..0ee05f04e40 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -205,7 +205,7 @@ static nsresult NSAPI XMLHttpReqEventListener_HandleEvent(nsIDOMEventListener *i if(!This->xhr) return NS_OK; - hres = create_event_from_nsevent(nsevent, &event); + hres = create_event_from_nsevent(nsevent, dispex_compat_mode(&This->xhr->event_target.dispex), &event); if(SUCCEEDED(hres) ){ dispatch_event(&This->xhr->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface);

1 0

Jacek Caban : mshtml: Initialize HTMLAttributeCollection object with compat mode.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 78be56291a566eaef9b5ad444d1638af29cca3bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=78be56291a566eaef9b5ad44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 11 20:40:12 2021 +0100 mshtml: Initialize HTMLAttributeCollection object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 1a5ac7f5717..04e59eafdae 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7196,8 +7196,8 @@ HRESULT HTMLElement_get_attr_col(HTMLDOMNode *iface, HTMLAttributeCollection **a This->attrs->elem = This; list_init(&This->attrs->attrs); - init_dispex(&This->attrs->dispex, (IUnknown*)&This->attrs->IHTMLAttributeCollection_iface, - &HTMLAttributeCollection_dispex); + init_dispex_with_compat_mode(&This->attrs->dispex, (IUnknown*)&This->attrs->IHTMLAttributeCollection_iface, + &HTMLAttributeCollection_dispex, dispex_compat_mode(&iface->event_target.dispex)); *ac = This->attrs; return S_OK;

1 0

Jacek Caban : mshtml: Initialize HTMLRectCollection object with compat mode.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 872ff6502d62ce9ee1b8f0d4c08a02215b0b024d URL: https://source.winehq.org/git/wine.git/?a=commit;h=872ff6502d62ce9ee1b8f0d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 11 20:40:06 2021 +0100 mshtml: Initialize HTMLRectCollection object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 514212217e1..1a5ac7f5717 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2670,7 +2670,8 @@ static HRESULT WINAPI HTMLElement2_getClientRects(IHTMLElement2 *iface, IHTMLRec rects->IHTMLRectCollection_iface.lpVtbl = &HTMLRectCollectionVtbl; rects->ref = 1; rects->rect_list = rect_list; - init_dispex(&rects->dispex, (IUnknown*)&rects->IHTMLRectCollection_iface, &HTMLRectCollection_dispex); + init_dispex_with_compat_mode(&rects->dispex, (IUnknown*)&rects->IHTMLRectCollection_iface, + &HTMLRectCollection_dispex, dispex_compat_mode(&This->node.event_target.dispex)); *pRectCol = &rects->IHTMLRectCollection_iface; return S_OK;

1 0

Jacek Caban : mshtml: Initialize HTMLRect object with compat mode.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: d6fcfe241c43ac19504b667dd565445d82997966 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6fcfe241c43ac19504b667d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 11 20:40:01 2021 +0100 mshtml: Initialize HTMLRect object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index f93e015f559..514212217e1 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -501,7 +501,7 @@ static dispex_static_data_t HTMLRect_dispex = { HTMLRect_iface_tids }; -static HRESULT create_html_rect(nsIDOMClientRect *nsrect, IHTMLRect **ret) +static HRESULT create_html_rect(nsIDOMClientRect *nsrect, compat_mode_t compat_mode, IHTMLRect **ret) { HTMLRect *rect; @@ -512,7 +512,7 @@ static HRESULT create_html_rect(nsIDOMClientRect *nsrect, IHTMLRect **ret) rect->IHTMLRect_iface.lpVtbl = &HTMLRectVtbl; rect->ref = 1; - init_dispex(&rect->dispex, (IUnknown*)&rect->IHTMLRect_iface, &HTMLRect_dispex); + init_dispex_with_compat_mode(&rect->dispex, (IUnknown*)&rect->IHTMLRect_iface, &HTMLRect_dispex, compat_mode); nsIDOMClientRect_AddRef(nsrect); rect->nsrect = nsrect; @@ -659,7 +659,7 @@ static HRESULT WINAPI HTMLRectCollection_item(IHTMLRectCollection *iface, VARIAN return S_OK; } - hres = create_html_rect(nsrect, &rect); + hres = create_html_rect(nsrect, dispex_compat_mode(&This->dispex), &rect); nsIDOMClientRect_Release(nsrect); if(FAILED(hres)) return hres; @@ -728,7 +728,7 @@ static HRESULT HTMLRectCollection_invoke(DispatchEx *dispex, DISPID id, LCID lci return DISP_E_UNKNOWNNAME; } - hres = create_html_rect(rect, &html_rect); + hres = create_html_rect(rect, dispex_compat_mode(&This->dispex), &html_rect); nsIDOMClientRect_Release(rect); if(FAILED(hres)) return hres; @@ -2696,7 +2696,7 @@ static HRESULT WINAPI HTMLElement2_getBoundingClientRect(IHTMLElement2 *iface, I return E_FAIL; } - hres = create_html_rect(nsrect, pRect); + hres = create_html_rect(nsrect, dispex_compat_mode(&This->node.event_target.dispex), pRect); nsIDOMClientRect_Release(nsrect); return hres;

1 0

Jacek Caban : mshtml: Initialize attribute object with compatibility mode.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 5a813f6f6e15bb00dcb64dde7907b08098d52d60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a813f6f6e15bb00dcb64dde… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 11 20:39:54 2021 +0100 mshtml: Initialize attribute object with compatibility mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 61c6455027a..8e72c9a8045 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -497,6 +497,7 @@ HTMLDOMAttribute *unsafe_impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute *iface) HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dispid, HTMLDOMAttribute **attr) { + compat_mode_t compat_mode = elem ? dispex_compat_mode(&elem->node.event_target.dispex) : COMPAT_MODE_QUIRKS; HTMLAttributeCollection *col; HTMLDOMAttribute *ret; HRESULT hres; @@ -511,8 +512,8 @@ HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dis ret->dispid = dispid; ret->elem = elem; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMAttribute_iface, - &HTMLDOMAttribute_dispex); + init_dispex_with_compat_mode(&ret->dispex, (IUnknown*)&ret->IHTMLDOMAttribute_iface, + &HTMLDOMAttribute_dispex, compat_mode); /* For attributes attached to an element, (elem,dispid) pair should be valid used for its operation. */ if(elem) {

1 0

Zebediah Figura : configure: Use -Winit-self if possible.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 131d2d2ef3ab180eeb9d6c7e7b9c8bd8697b62d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=131d2d2ef3ab180eeb9d6c7e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 11 10:08:06 2021 -0600 configure: Use -Winit-self if possible. This protects against variable initialization like "int x = x". gcc apparently treats this as an intentional way to suppress uninitialized or unused variable warnings, but in my case it has caused at least one confusing bug. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 ++ 2 files changed, 58 insertions(+) diff --git a/configure b/configure index 475fcfdf749..9026b1f53ad 100755 --- a/configure +++ b/configure @@ -9981,6 +9981,37 @@ fi $as_echo "$ac_cv_crosscflags__Wignored_qualifiers" >&6; } if test "x$ac_cv_crosscflags__Wignored_qualifiers" = xyes; then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wignored-qualifiers" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Winit-self" >&5 +$as_echo_n "checking whether the cross-compiler supports -Winit-self... " >&6; } +if ${ac_cv_crosscflags__Winit_self+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_cc=$CC +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -Winit-self" +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_crosscflags__Winit_self=yes +else + ac_cv_crosscflags__Winit_self=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +CC=$ac_wine_try_cflags_saved_cc +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__Winit_self" >&5 +$as_echo "$ac_cv_crosscflags__Winit_self" >&6; } +if test "x$ac_cv_crosscflags__Winit_self" = xyes; then : + EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Winit-self" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Wpacked-not-aligned" >&5 $as_echo_n "checking whether the cross-compiler supports -Wpacked-not-aligned... " >&6; } @@ -17193,6 +17224,31 @@ fi $as_echo "$ac_cv_cflags__Wignored_qualifiers" >&6; } if test "x$ac_cv_cflags__Wignored_qualifiers" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wignored-qualifiers" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Winit-self" >&5 +$as_echo_n "checking whether the compiler supports -Winit-self... " >&6; } +if ${ac_cv_cflags__Winit_self+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Winit-self" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Winit_self=yes +else + ac_cv_cflags__Winit_self=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Winit_self" >&5 +$as_echo "$ac_cv_cflags__Winit_self" >&6; } +if test "x$ac_cv_cflags__Winit_self" = xyes; then : + EXTRACFLAGS="$EXTRACFLAGS -Winit-self" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wpacked-not-aligned" >&5 $as_echo_n "checking whether the compiler supports -Wpacked-not-aligned... " >&6; } diff --git a/configure.ac b/configure.ac index 5b7f09de924..1ca832102d8 100644 --- a/configure.ac +++ b/configure.ac @@ -1044,6 +1044,7 @@ then WINE_TRY_CROSSCFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CROSSCFLAGS([-Wempty-body]) WINE_TRY_CROSSCFLAGS([-Wignored-qualifiers]) + WINE_TRY_CROSSCFLAGS([-Winit-self]) WINE_TRY_CROSSCFLAGS([-Wpacked-not-aligned],[EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wno-packed-not-aligned"]) WINE_TRY_CROSSCFLAGS([-Wpragma-pack],[EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wno-pragma-pack"]) WINE_TRY_CROSSCFLAGS([-Wshift-overflow=2]) @@ -2024,6 +2025,7 @@ then WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) + WINE_TRY_CFLAGS([-Winit-self]) WINE_TRY_CFLAGS([-Wpacked-not-aligned],[EXTRACFLAGS="$EXTRACFLAGS -Wno-packed-not-aligned"]) WINE_TRY_CFLAGS([-Wpragma-pack],[EXTRACFLAGS="$EXTRACFLAGS -Wno-pragma-pack"]) WINE_TRY_CFLAGS([-Wshift-overflow=2])

1 0

Georg Lehmann : winevulkan: Fix 64bit enums on old gcc versions.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 5a3b5c96894dd34f26cfda6d64d3e333b3c8efa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a3b5c96894dd34f26cfda6d… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Mar 11 15:05:22 2021 +0100 winevulkan: Fix 64bit enums on old gcc versions. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 12 ++- include/wine/vulkan.h | 179 +++++++++++++++++++++----------------------- 2 files changed, 96 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5a3b5c96894dd34f26cf…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021