September 2023 - Wine-commits

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for inner windows.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 070b51d7b7684d66609e3f48789347352a1053f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/070b51d7b7684d66609e3f48789347… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 7 16:07:00 2023 +0300 mshtml: Use query_interface in the dispex vtbl for inner windows. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 122 ++++++++++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 59 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index de09a99000f..f12bae6c2b5 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -157,70 +157,64 @@ static inline HTMLOuterWindow *HTMLOuterWindow_from_IHTMLWindow2(IHTMLWindow2 *i 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)) { - *ppv = &This->IHTMLWindow2_iface; - }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { - *ppv = &This->IDispatchEx_iface; - }else if(IsEqualGUID(&IID_IHTMLFramesCollection2, riid)) { - *ppv = &This->IHTMLWindow2_iface; - }else if(IsEqualGUID(&IID_IHTMLWindow2, riid)) { - *ppv = &This->IHTMLWindow2_iface; - }else if(IsEqualGUID(&IID_IHTMLWindow3, riid)) { - *ppv = &This->IHTMLWindow3_iface; - }else if(IsEqualGUID(&IID_IHTMLWindow4, riid)) { - *ppv = &This->IHTMLWindow4_iface; - }else if(IsEqualGUID(&IID_IHTMLWindow5, riid)) { - *ppv = &This->IHTMLWindow5_iface; - }else if(IsEqualGUID(&IID_IHTMLWindow6, riid)) { - *ppv = &This->IHTMLWindow6_iface; - }else if(IsEqualGUID(&IID_IHTMLWindow7, riid)) { - *ppv = &This->IHTMLWindow7_iface; - }else if(IsEqualGUID(&IID_IHTMLPrivateWindow, riid)) { - *ppv = &This->IHTMLPrivateWindow_iface; - }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { - *ppv = &This->IServiceProvider_iface; - }else if(IsEqualGUID(&IID_ITravelLogClient, riid)) { - *ppv = &This->ITravelLogClient_iface; - }else if(IsEqualGUID(&IID_IObjectIdentity, riid)) { - *ppv = &This->IObjectIdentity_iface; - }else if(IsEqualGUID(&IID_IProvideClassInfo, riid)) { - *ppv = &This->IProvideMultipleClassInfo_iface; - }else if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) { - *ppv = &This->IProvideMultipleClassInfo_iface; - }else if(IsEqualGUID(&IID_IProvideMultipleClassInfo, riid)) { - *ppv = &This->IProvideMultipleClassInfo_iface; - }else if(IsEqualGUID(&IID_IWineHTMLWindowPrivate, riid)) { - *ppv = &This->IWineHTMLWindowPrivate_iface; - }else if(IsEqualGUID(&IID_IWineHTMLWindowCompatPrivate, riid)) { - *ppv = &This->IWineHTMLWindowCompatPrivate_iface; - }else if(IsEqualGUID(&IID_IMarshal, riid)) { - *ppv = NULL; - FIXME("(%p)->(IID_IMarshal %p)\n", This, ppv); - return E_NOINTERFACE; - }else { - return S_FALSE; +static void *base_query_interface(HTMLWindow *This, REFIID riid) +{ + if(IsEqualGUID(&IID_IUnknown, riid)) + return &This->IHTMLWindow2_iface; + if(IsEqualGUID(&IID_IDispatch, riid)) + return &This->IHTMLWindow2_iface; + if(IsEqualGUID(&IID_IDispatchEx, riid)) + return &This->IDispatchEx_iface; + if(IsEqualGUID(&IID_IHTMLFramesCollection2, riid)) + return &This->IHTMLWindow2_iface; + if(IsEqualGUID(&IID_IHTMLWindow2, riid)) + return &This->IHTMLWindow2_iface; + if(IsEqualGUID(&IID_IHTMLWindow3, riid)) + return &This->IHTMLWindow3_iface; + if(IsEqualGUID(&IID_IHTMLWindow4, riid)) + return &This->IHTMLWindow4_iface; + if(IsEqualGUID(&IID_IHTMLWindow5, riid)) + return &This->IHTMLWindow5_iface; + if(IsEqualGUID(&IID_IHTMLWindow6, riid)) + return &This->IHTMLWindow6_iface; + if(IsEqualGUID(&IID_IHTMLWindow7, riid)) + return &This->IHTMLWindow7_iface; + if(IsEqualGUID(&IID_IHTMLPrivateWindow, riid)) + return &This->IHTMLPrivateWindow_iface; + if(IsEqualGUID(&IID_IServiceProvider, riid)) + return &This->IServiceProvider_iface; + if(IsEqualGUID(&IID_ITravelLogClient, riid)) + return &This->ITravelLogClient_iface; + if(IsEqualGUID(&IID_IObjectIdentity, riid)) + return &This->IObjectIdentity_iface; + if(IsEqualGUID(&IID_IProvideClassInfo, riid)) + return &This->IProvideMultipleClassInfo_iface; + if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) + return &This->IProvideMultipleClassInfo_iface; + if(IsEqualGUID(&IID_IProvideMultipleClassInfo, riid)) + return &This->IProvideMultipleClassInfo_iface; + if(IsEqualGUID(&IID_IWineHTMLWindowPrivate, riid)) + return &This->IWineHTMLWindowPrivate_iface; + if(IsEqualGUID(&IID_IWineHTMLWindowCompatPrivate, riid)) + return &This->IWineHTMLWindowCompatPrivate_iface; + if(IsEqualGUID(&IID_IMarshal, riid)) { + FIXME("(%p)->(IID_IMarshal)\n", This); + return NULL; } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + return NULL; } 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); + if(dispex_query_interface(&This->event_target.dispex, riid, ppv)) + return *ppv ? S_OK : E_NOINTERFACE; - hres = base_query_interface(&This->base, riid, ppv); - if(hres != S_FALSE) - return hres; - - return EventTarget_QI(&This->event_target, riid, ppv); + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI HTMLWindow2_AddRef(IHTMLWindow2 *iface) @@ -246,13 +240,15 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) static HRESULT WINAPI outer_window_QueryInterface(IHTMLWindow2 *iface, REFIID riid, void **ppv) { HTMLOuterWindow *This = HTMLOuterWindow_from_IHTMLWindow2(iface); - HRESULT hres; + IUnknown *base_iface; 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; + if((base_iface = base_query_interface(&This->base, riid))) { + *ppv = base_iface; + IUnknown_AddRef(base_iface); + return S_OK; + } if(IsEqualGUID(&IID_nsXPCOMCycleCollectionParticipant, riid)) { *ppv = &outer_window_ccp; @@ -3928,6 +3924,13 @@ static inline HTMLInnerWindow *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLInnerWindow, event_target.dispex); } +static void *HTMLWindow_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLInnerWindow *This = impl_from_DispatchEx(dispex); + void *iface = base_query_interface(&This->base, riid); + return iface ? iface : EventTarget_query_interface(&This->event_target, riid); +} + static void HTMLWindow_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLInnerWindow *This = impl_from_DispatchEx(dispex); @@ -4294,6 +4297,7 @@ static IHTMLEventObj *HTMLWindow_set_current_event(DispatchEx *dispex, IHTMLEven static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { { + .query_interface = HTMLWindow_query_interface, .destructor = HTMLWindow_destructor, .traverse = HTMLWindow_traverse, .unlink = HTMLWindow_unlink,

1 0

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for XMLHttpRequest.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 6b9c21484570504583faa216e9c3ccba40d383fc URL: https://gitlab.winehq.org/wine/wine/-/commit/6b9c21484570504583faa216e9c3cc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 7 16:07:00 2023 +0300 mshtml: Use query_interface in the dispex vtbl for XMLHttpRequest. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 21 --------------------- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/xmlhttprequest.c | 45 +++++++++++++++++++++++--------------------- 3 files changed, 24 insertions(+), 43 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c64eded6a0a..f8a418a8027 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -4577,27 +4577,6 @@ void *EventTarget_query_interface(EventTarget *event_target, REFIID riid) return NULL; } -HRESULT EventTarget_QI(EventTarget *event_target, REFIID riid, void **ppv) -{ - if(IsEqualGUID(riid, &IID_IEventTarget)) { - if(use_event_quirks(event_target)) { - WARN("IEventTarget queried, but not supported by in document mode\n"); - *ppv = NULL; - return E_NOINTERFACE; - } - IEventTarget_AddRef(&event_target->IEventTarget_iface); - *ppv = &event_target->IEventTarget_iface; - return S_OK; - } - - if(dispex_query_interface(&event_target->dispex, riid, ppv)) - return *ppv ? S_OK : E_NOINTERFACE; - - WARN("(%p)->(%s %p)\n", event_target, debugstr_mshtml_guid(riid), ppv); - *ppv = NULL; - return E_NOINTERFACE; -} - void EventTarget_init_dispex_info(dispex_data_t *dispex_info, compat_mode_t compat_mode) { static const dispex_hook_t IEventTarget_hooks[] = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0e7ad70e9c2..3c5fc6de949 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1211,7 +1211,6 @@ void HTMLElement_Init(HTMLElement*,HTMLDocumentNode*,nsIDOMElement*,dispex_stati void EventTarget_Init(EventTarget*,IUnknown*,dispex_static_data_t*,compat_mode_t); void *EventTarget_query_interface(EventTarget*,REFIID); -HRESULT EventTarget_QI(EventTarget*,REFIID,void**); void EventTarget_init_dispex_info(dispex_data_t*,compat_mode_t); void *HTMLDOMNode_QI(HTMLDOMNode*,REFIID); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index c062b117c5d..832acc33aef 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -508,28 +508,12 @@ static HRESULT WINAPI HTMLXMLHttpRequest_QueryInterface(IHTMLXMLHttpRequest *ifa { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLXMLHttpRequest_iface; - }else if(IsEqualGUID(&IID_IDispatch, riid)) { - *ppv = &This->IHTMLXMLHttpRequest_iface; - }else if(IsEqualGUID(&IID_IHTMLXMLHttpRequest, riid)) { - *ppv = &This->IHTMLXMLHttpRequest_iface; - }else if(IsEqualGUID(&IID_IHTMLXMLHttpRequest2, riid)) { - *ppv = &This->IHTMLXMLHttpRequest2_iface; - }else if(IsEqualGUID(&IID_IWineXMLHttpRequestPrivate, riid)) { - *ppv = &This->IWineXMLHttpRequestPrivate_iface; - }else if(IsEqualGUID(&IID_IProvideClassInfo, riid)) { - *ppv = &This->IProvideClassInfo2_iface; - }else if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) { - *ppv = &This->IProvideClassInfo2_iface; - }else { - return EventTarget_QI(&This->event_target, riid, ppv); - } + if(dispex_query_interface(&This->event_target.dispex, riid, ppv)) + return *ppv ? S_OK : E_NOINTERFACE; - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI HTMLXMLHttpRequest_AddRef(IHTMLXMLHttpRequest *iface) @@ -1517,6 +1501,24 @@ static inline HTMLXMLHttpRequest *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, event_target.dispex); } +static void *HTMLXMLHttpRequest_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLXMLHttpRequest *This = impl_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLXMLHttpRequest, riid)) + return &This->IHTMLXMLHttpRequest_iface; + if(IsEqualGUID(&IID_IHTMLXMLHttpRequest2, riid)) + return &This->IHTMLXMLHttpRequest2_iface; + if(IsEqualGUID(&IID_IWineXMLHttpRequestPrivate, riid)) + return &This->IWineXMLHttpRequestPrivate_iface; + if(IsEqualGUID(&IID_IProvideClassInfo, riid)) + return &This->IProvideClassInfo2_iface; + if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) + return &This->IProvideClassInfo2_iface; + + return EventTarget_query_interface(&This->event_target, riid); +} + static void HTMLXMLHttpRequest_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLXMLHttpRequest *This = impl_from_DispatchEx(dispex); @@ -1606,6 +1608,7 @@ static void HTMLXMLHttpRequest_init_dispex_info(dispex_data_t *info, compat_mode static const event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { { + .query_interface = HTMLXMLHttpRequest_query_interface, .destructor = HTMLXMLHttpRequest_destructor, .traverse = HTMLXMLHttpRequest_traverse, .unlink = HTMLXMLHttpRequest_unlink,

1 0

Gabriel Ivăncescu : mshtml: Trace the object name in dispex methods.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 7c94e4243c6f138a48837f2c77b9456db1003489 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c94e4243c6f138a48837f2c77b945… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 7 16:07:00 2023 +0300 mshtml: Trace the object name in dispex methods. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index ec781351291..b2af8722b45 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1612,7 +1612,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti { DispatchEx *This = impl_from_IDispatchEx(iface); - TRACE("(%p)->(%p)\n", This, pctinfo); + TRACE("%s (%p)->(%p)\n", This->info->desc->name, This, pctinfo); *pctinfo = 1; return S_OK; @@ -1624,7 +1624,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, DispatchEx *This = impl_from_IDispatchEx(iface); HRESULT hres; - TRACE("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("%s (%p)->(%u %lu %p)\n", This->info->desc->name, This, iTInfo, lcid, ppTInfo); hres = get_typeinfo(This->info->desc->disp_tid, ppTInfo); if(FAILED(hres)) @@ -1641,8 +1641,8 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, DispatchEx *This = impl_from_IDispatchEx(iface); HRESULT hres = S_OK; - TRACE("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); + TRACE("%s (%p)->(%s %p %u %lu %p)\n", This->info->desc->name, This, debugstr_guid(riid), rgszNames, + cNames, lcid, rgDispId); /* Native ignores all cNames > 1, and doesn't even fill them */ if(cNames) @@ -1657,8 +1657,8 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, { DispatchEx *This = impl_from_IDispatchEx(iface); - TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + TRACE("%s (%p)->(%ld %s %ld %d %p %p %p %p)\n", This->info->desc->name, This, dispIdMember, + debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, NULL); @@ -1670,7 +1670,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW dynamic_prop_t *dprop; HRESULT hres; - TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(bstrName), grfdex, pid); + TRACE("%s (%p)->(%s %lx %p)\n", This->info->desc->name, This, debugstr_w(bstrName), grfdex, pid); if(grfdex & ~(fdexNameCaseSensitive|fdexNameCaseInsensitive|fdexNameEnsure|fdexNameImplicit|FDEX_VERSION_MASK)) FIXME("Unsupported grfdex %lx\n", grfdex); @@ -1696,7 +1696,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc DispatchEx *This = impl_from_IDispatchEx(iface); HRESULT hres; - TRACE("(%p)->(%lx %lx %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + TRACE("%s (%p)->(%lx %lx %x %p %p %p %p)\n", This->info->desc->name, This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); if(!ensure_real_info(This)) return E_OUTOFMEMORY; @@ -1782,7 +1782,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR nam DISPID id; HRESULT hres; - TRACE("(%p)->(%s %lx)\n", This, debugstr_w(name), grfdex); + TRACE("%s (%p)->(%s %lx)\n", This->info->desc->name, This, debugstr_w(name), grfdex); hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, name, grfdex & ~fdexNameEnsure, &id); if(FAILED(hres)) { @@ -1799,7 +1799,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID { DispatchEx *This = impl_from_IDispatchEx(iface); - TRACE("(%p)->(%lx)\n", This, id); + TRACE("%s (%p)->(%lx)\n", This->info->desc->name, This, id); if(is_custom_dispid(id) && This->info->desc->vtbl->delete) return This->info->desc->vtbl->delete(This, id); @@ -1828,7 +1828,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) { DispatchEx *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%lx %lx %p)\n", This, id, grfdexFetch, pgrfdex); + FIXME("%s (%p)->(%lx %lx %p)\n", This->info->desc->name, This, id, grfdexFetch, pgrfdex); return E_NOTIMPL; } @@ -1838,7 +1838,7 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS func_info_t *func; HRESULT hres; - TRACE("(%p)->(%lx %p)\n", This, id, pbstrName); + TRACE("%s (%p)->(%lx %p)\n", This->info->desc->name, This, id, pbstrName); if(!ensure_real_info(This)) return E_OUTOFMEMORY; @@ -1893,7 +1893,7 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, func_info_t *func; HRESULT hres; - TRACE("(%p)->(%lx %lx %p)\n", This, grfdex, id, pid); + TRACE("%s (%p)->(%lx %lx %p)\n", This->info->desc->name, This, grfdex, id, pid); if(!ensure_real_info(This)) return E_OUTOFMEMORY; @@ -1944,7 +1944,7 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk) { DispatchEx *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%p)\n", This, ppunk); + FIXME("%s (%p)->(%p)\n", This->info->desc->name, This, ppunk); return E_NOTIMPL; }

1 0

Hans Leidekker : wsdapi: Use CRT allocation functions.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 22c293bda65233aa56456eb7ec3bceb7853136d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/22c293bda65233aa56456eb7ec3bce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 5 10:37:04 2023 +0200 wsdapi: Use CRT allocation functions. --- dlls/wsdapi/address.c | 4 ++-- dlls/wsdapi/discovery.c | 19 +++++++++---------- dlls/wsdapi/memory.c | 4 ++-- dlls/wsdapi/msgparams.c | 4 ++-- dlls/wsdapi/network.c | 31 +++++++++++++++---------------- dlls/wsdapi/soap.c | 23 +++++++++++------------ 6 files changed, 41 insertions(+), 44 deletions(-)

1 0

Hans Leidekker : wsdapi: Call GetAdaptersAddresses() in a loop.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 986732a5bafa661ef8746a13b3ac84f7a2ddd000 URL: https://gitlab.winehq.org/wine/wine/-/commit/986732a5bafa661ef8746a13b3ac84… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 5 10:42:25 2023 +0200 wsdapi: Call GetAdaptersAddresses() in a loop. --- dlls/wsdapi/network.c | 89 ++++++++++++++++----------------------------------- 1 file changed, 27 insertions(+), 62 deletions(-) diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index a17aa8daa79..97573c57919 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -97,44 +97,37 @@ static DWORD WINAPI sending_thread(LPVOID lpParam) return 0; } +static IP_ADAPTER_ADDRESSES *get_adapters(ULONG family) +{ + ULONG err, size = 4096; + IP_ADAPTER_ADDRESSES *tmp, *ret; + + if (!(ret = malloc( size ))) return NULL; + err = GetAdaptersAddresses( family, 0, NULL, ret, &size ); + while (err == ERROR_BUFFER_OVERFLOW) + { + if (!(tmp = realloc( ret, size ))) break; + ret = tmp; + err = GetAdaptersAddresses( family, 0, NULL, ret, &size ); + } + if (err == ERROR_SUCCESS) return ret; + free( ret ); + return NULL; +} + static BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_delay, ULONG family) { - IP_ADAPTER_ADDRESSES *adapter_addresses = NULL, *adapter_addr; + IP_ADAPTER_ADDRESSES *adapter_addresses, *adapter_addr; static const struct in6_addr i_addr_zero; sending_thread_params *send_params; - ULONG bufferSize = 0; LPSOCKADDR sockaddr; - BOOL ret = FALSE; HANDLE thread_handle; const char ttl = 8; - ULONG retval; SOCKET s; - /* Get size of buffer for adapters */ - retval = GetAdaptersAddresses(family, 0, NULL, NULL, &bufferSize); - - if (retval != ERROR_BUFFER_OVERFLOW) - { - WARN("GetAdaptorsAddresses failed with error %08lx\n", retval); - goto cleanup; - } - - adapter_addresses = malloc(bufferSize); - - if (adapter_addresses == NULL) - { - WARN("Out of memory allocating space for adapter information\n"); - goto cleanup; - } - - /* Get list of adapters */ - retval = GetAdaptersAddresses(family, 0, NULL, adapter_addresses, &bufferSize); - - if (retval != ERROR_SUCCESS) - { - WARN("GetAdaptorsAddresses failed with error %08lx\n", retval); - goto cleanup; - } + adapter_addresses = get_adapters(family); + if (!adapter_addresses) + return FALSE; for (adapter_addr = adapter_addresses; adapter_addr != NULL; adapter_addr = adapter_addr->Next) { @@ -211,12 +204,8 @@ static BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_d CloseHandle(thread_handle); } - ret = TRUE; - -cleanup: free(adapter_addresses); - - return ret; + return TRUE; } BOOL send_udp_multicast(IWSDiscoveryPublisherImpl *impl, char *data, int length, int max_initial_delay) @@ -504,36 +493,12 @@ cleanup: static BOOL start_listening_on_all_addresses(IWSDiscoveryPublisherImpl *impl, ULONG family) { - IP_ADAPTER_ADDRESSES *adapter_addresses = NULL, *adapter_address; + IP_ADAPTER_ADDRESSES *adapter_addresses, *adapter_address; int valid_listeners = 0; - ULONG bufferSize = 0; - ULONG ret; - - ret = GetAdaptersAddresses(family, 0, NULL, NULL, &bufferSize); /* family should be AF_INET or AF_INET6 */ - if (ret != ERROR_BUFFER_OVERFLOW) - { - WARN("GetAdaptorsAddresses failed with error %08lx\n", ret); + adapter_addresses = get_adapters(family); /* family should be AF_INET or AF_INET6 */ + if (!adapter_addresses) return FALSE; - } - - /* Get size of buffer for adapters */ - adapter_addresses = malloc(bufferSize); - - if (adapter_addresses == NULL) - { - WARN("Out of memory allocating space for adapter information\n"); - return FALSE; - } - - /* Get list of adapters */ - ret = GetAdaptersAddresses(family, 0, NULL, adapter_addresses, &bufferSize); - - if (ret != ERROR_SUCCESS) - { - WARN("GetAdaptorsAddresses failed with error %08lx\n", ret); - goto cleanup; - } for (adapter_address = adapter_addresses; adapter_address != NULL; adapter_address = adapter_address->Next) { @@ -554,7 +519,7 @@ static BOOL start_listening_on_all_addresses(IWSDiscoveryPublisherImpl *impl, UL cleanup: free(adapter_addresses); - return (ret == ERROR_SUCCESS) && (valid_listeners > 0); + return valid_listeners > 0; } HRESULT send_udp_unicast(char *data, int length, IWSDUdpAddress *remote_addr, int max_initial_delay)

1 0

Hans Leidekker : wsdapi/tests: Use CRT allocation functions.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 1b83a376737bfc24b8eacdf1a6bc9f032655af51 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b83a376737bfc24b8eacdf1a6bc9f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 5 10:59:17 2023 +0200 wsdapi/tests: Use CRT allocation functions. --- dlls/wsdapi/tests/discovery.c | 73 +++++++++++++++++++++---------------------- dlls/wsdapi/tests/xml.c | 4 +-- 2 files changed, 38 insertions(+), 39 deletions(-)

1 0

Hans Leidekker : wsdapi/tests: Call GetAdaptersAddresses() in a loop.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 074069b8854214e19667e0a9875b638ac5a1084c URL: https://gitlab.winehq.org/wine/wine/-/commit/074069b8854214e19667e0a9875b63… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 5 11:09:25 2023 +0200 wsdapi/tests: Call GetAdaptersAddresses() in a loop. --- dlls/wsdapi/tests/discovery.c | 56 +++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index cbf30b0456e..065b190ec35 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -331,26 +331,34 @@ cleanup_addresses: freeaddrinfo(interfaceAddr); } +static IP_ADAPTER_ADDRESSES *get_adapters( ULONG family ) +{ + ULONG err, size = 4096; + IP_ADAPTER_ADDRESSES *tmp, *ret; + + if (!(ret = malloc( size ))) return NULL; + err = GetAdaptersAddresses( family, 0, NULL, ret, &size ); + while (err == ERROR_BUFFER_OVERFLOW) + { + if (!(tmp = realloc( ret, size ))) break; + ret = tmp; + err = GetAdaptersAddresses( family, 0, NULL, ret, &size ); + } + if (err == ERROR_SUCCESS) return ret; + free( ret ); + return NULL; +} + static BOOL start_listening_on_all_addresses(messageStorage *msgStorage, ULONG family) { - IP_ADAPTER_ADDRESSES *adapterAddresses = NULL, *adapterAddress; - ULONG bufferSize = 0; + IP_ADAPTER_ADDRESSES *adapterAddresses, *adapterAddress; LPSOCKADDR sockaddr; DWORD addressLength; char address[64]; BOOL ret = FALSE; - ULONG retVal; - - retVal = GetAdaptersAddresses(family, 0, NULL, NULL, &bufferSize); /* family should be AF_INET or AF_INET6 */ - if (retVal != ERROR_BUFFER_OVERFLOW) goto cleanup; - - /* Get size of buffer for adapters */ - adapterAddresses = malloc(bufferSize); - if (adapterAddresses == NULL) goto cleanup; - /* Get list of adapters */ - retVal = GetAdaptersAddresses(family, 0, NULL, adapterAddresses, &bufferSize); - if (retVal != ERROR_SUCCESS) goto cleanup; + adapterAddresses = get_adapters(family); /* family should be AF_INET or AF_INET6 */ + if (!adapterAddresses) return FALSE; for (adapterAddress = adapterAddresses; adapterAddress != NULL; adapterAddress = adapterAddress->Next) { @@ -378,14 +386,11 @@ cleanup: static BOOL send_udp_multicast_of_type(const char *data, int length, ULONG family) { - IP_ADAPTER_ADDRESSES *adapter_addresses = NULL, *adapter_addr; + IP_ADAPTER_ADDRESSES *adapter_addresses, *adapter_addr; static const struct in6_addr i_addr_zero; struct addrinfo *multi_address; - ULONG bufferSize = 0; LPSOCKADDR sockaddr; - BOOL ret = FALSE; const char ttl = 8; - ULONG retval; SOCKET s; /* Resolve the multicast address */ @@ -397,16 +402,8 @@ static BOOL send_udp_multicast_of_type(const char *data, int length, ULONG famil if (multi_address == NULL) return FALSE; - /* Get size of buffer for adapters */ - retval = GetAdaptersAddresses(family, 0, NULL, NULL, &bufferSize); - if (retval != ERROR_BUFFER_OVERFLOW) goto cleanup; - - adapter_addresses = malloc(bufferSize); - if (adapter_addresses == NULL) goto cleanup; - - /* Get list of adapters */ - retval = GetAdaptersAddresses(family, 0, NULL, adapter_addresses, &bufferSize); - if (retval != ERROR_SUCCESS) goto cleanup; + adapter_addresses = get_adapters(family); + if (!adapter_addresses) return FALSE; for (adapter_addr = adapter_addresses; adapter_addr != NULL; adapter_addr = adapter_addr->Next) { @@ -433,12 +430,9 @@ static BOOL send_udp_multicast_of_type(const char *data, int length, ULONG famil closesocket(s); } - ret = TRUE; - -cleanup: freeaddrinfo(multi_address); free(adapter_addresses); - return ret; + return TRUE; } typedef struct IWSDiscoveryPublisherNotifyImpl {

1 0

Dmitry Timoshkov : comctl32: Use iswalnum() to filter alpha numeric characters from unicode messages.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: a5563e259c11f23236c1b93d9ff0ecfa1aa4dba7 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5563e259c11f23236c1b93d9ff0ec… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 15 20:59:29 2023 +0300 comctl32: Use iswalnum() to filter alpha numeric characters from unicode messages. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/treeview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index c4e8d926941..c531ad75370 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4664,7 +4664,7 @@ static INT TREEVIEW_ProcessLetterKeys(TREEVIEW_INFO *infoPtr, WPARAM charCode, L if (!charCode || !keyData) return 0; /* only allow the valid WM_CHARs through */ - if (!isalnum(charCode) && + if (!iswalnum(charCode) && charCode != '.' && charCode != '`' && charCode != '!' && charCode != '@' && charCode != '#' && charCode != '$' && charCode != '%' && charCode != '^' && charCode != '&' &&

1 0

Yuxuan Shui : urlmon: Test http protocol through CreateBinding.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: ac58b5fefd5bb6e4affb9a1b914a9761aa1bbb3d URL: https://gitlab.winehq.org/wine/wine/-/commit/ac58b5fefd5bb6e4affb9a1b914a97… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Tue Sep 5 17:05:25 2023 +0100 urlmon: Test http protocol through CreateBinding. --- dlls/urlmon/tests/protocol.c | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 550f38659c6..e2db124f21e 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -34,6 +34,8 @@ static HRESULT (WINAPI *pCoInternetGetSession)(DWORD, IInternetSession **, DWORD static HRESULT (WINAPI *pReleaseBindInfo)(BINDINFO*); static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); +#define CHARS_IN_GUID 39 + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -143,6 +145,9 @@ static const WCHAR winehq_ipW[] = {'2','0','9','.','4','6','.','2','5','.','1',' static const WCHAR emptyW[] = {0}; static const WCHAR pjpegW[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; static const WCHAR gifW[] = {'i','m','a','g','e','/','g','i','f',0}; +static const WCHAR null_guid[] = {'{','0','0','0','0','0','0','0','0','-','0','0','0','0','-', + '0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0','0','}',0}; +static WCHAR protocol_clsid[CHARS_IN_GUID]; static HRESULT expect_hrResult; static LPCWSTR file_name, http_url, expect_wsz; @@ -359,7 +364,7 @@ static HRESULT WINAPI HttpNegotiate_GetRootSecurityId(IHttpNegotiate2 *iface, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { static const BYTE sec_id[] = {'h','t','t','p',':','t','e','s','t',1,0,0,0}; - + CHECK_EXPECT(GetRootSecurityId); ok(!dwReserved, "dwReserved=%Id, expected 0\n", dwReserved); @@ -822,8 +827,6 @@ static const char *status_names[] = static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ULONG ulStatusCode, LPCWSTR szStatusText) { - static const WCHAR null_guid[] = {'{','0','0','0','0','0','0','0','0','-','0','0','0','0','-', - '0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0','0','}',0}; static const WCHAR text_plain[] = {'t','e','x','t','/','p','l','a','i','n',0}; if (winetest_debug > 1) @@ -913,7 +916,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, case BINDSTATUS_PROTOCOLCLASSID: CHECK_EXPECT(ReportProgress_PROTOCOLCLASSID); ok(szStatusText != NULL, "szStatusText == NULL\n"); - ok(!lstrcmpW(szStatusText, null_guid), "unexpected classid %s\n", wine_dbgstr_w(szStatusText)); + ok(!lstrcmpW(szStatusText, protocol_clsid), "unexpected classid %s\n", wine_dbgstr_w(szStatusText)); break; case BINDSTATUS_COOKIE_SENT: CHECK_EXPECT2(ReportProgress_COOKIE_SENT); @@ -2710,6 +2713,7 @@ static IClassFactory mimefilter_cf = { &MimeFilterCFVtbl }; #define TEST_FROMCACHE 0x4000 #define TEST_DISABLEAUTOREDIRECT 0x8000 #define TEST_RESULTFROMLOCK 0x10000 +#define TEST_USEBINDING 0x20000 static void register_filter(BOOL do_register) { @@ -2770,6 +2774,7 @@ static void init_test(int prot, DWORD flags) file_with_hash = FALSE; security_problem = FALSE; reuse_protocol_thread = FALSE; + memcpy(protocol_clsid, null_guid, sizeof(null_guid)); bindinfo_options = 0; if(flags & TEST_DISABLEAUTOREDIRECT) @@ -3357,6 +3362,7 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym { IInternetProtocolInfo *protocol_info; IClassFactory *factory; + IInternetSession *session; IUnknown *unk; HRESULT hres; @@ -3383,8 +3389,13 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym if(FAILED(hres)) return; - hres = IClassFactory_CreateInstance(factory, NULL, &IID_IInternetProtocol, - (void**)&async_protocol); + if (flags & TEST_USEBINDING) { + hres = pCoInternetGetSession(0, &session, 0); + ok(hres == S_OK, "CoInternetGetSession failed: %08lx\n", hres); + hres = IInternetSession_CreateBinding(session, NULL, url, NULL, NULL, &async_protocol, 0); + } else + hres = IClassFactory_CreateInstance(factory, NULL, &IID_IInternetProtocol, + (void**)&async_protocol); ok(hres == S_OK, "Could not get IInternetProtocol: %08lx\n", hres); if(SUCCEEDED(hres)) { BYTE buf[3600]; @@ -3393,6 +3404,14 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym test_priority(async_protocol); + if (flags & TEST_USEBINDING) { + SET_EXPECT(QueryService_InternetProtocol); + SET_EXPECT(ReportProgress_PROTOCOLCLASSID); + StringFromGUID2(&CLSID_HttpProtocol, protocol_clsid, ARRAY_SIZE(protocol_clsid)); + if (flags & TEST_DISABLEAUTOREDIRECT) + SET_EXPECT(QueryService_IBindCallbackRedirect); + } + SET_EXPECT(ReportProgress_COOKIE_SENT); if(http_is_first) { SET_EXPECT(ReportProgress_FINDINGRESOURCE); @@ -3422,6 +3441,13 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym return; } + if (flags & TEST_USEBINDING) { + todo_wine CHECK_NOT_CALLED(QueryService_InternetProtocol); + todo_wine CHECK_NOT_CALLED(ReportProgress_PROTOCOLCLASSID); + if (flags & TEST_DISABLEAUTOREDIRECT) + CHECK_CALLED(QueryService_IBindCallbackRedirect); + } + if(!direct_read && !bind_from_cache) SET_EXPECT(ReportResult); @@ -3589,6 +3615,10 @@ static void test_http_protocol(void) bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; test_http_protocol_url(empty_url, HTTP_TEST, TEST_EMPTY, TYMED_NULL); + trace("Testing http protocol (redirected, binding)...\n"); + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; + test_http_protocol_url(redirect_url, HTTP_TEST, TEST_REDIRECT|TEST_USEBINDING, TYMED_NULL); + /* This is a bit ugly. We unconditionally disable this test on Wine. This won't work until we have * support for reading from cache via HTTP layer in wininet. Until then, Wine will fail badly, affecting * other, unrelated, tests. Working around it is not worth the trouble, we may simply make sure those

1 0

Yuxuan Shui : urlmon: Fix NULL dereference in BindProtocol_UnlockRequest.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 1e8393f976d11bf831fa35466f805b73b63a06c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e8393f976d11bf831fa35466f805b… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Tue Sep 5 17:29:50 2023 +0100 urlmon: Fix NULL dereference in BindProtocol_UnlockRequest. --- dlls/urlmon/bindprot.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index b09acdd5c3a..ec52ac5e999 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -815,7 +815,9 @@ static HRESULT WINAPI ProtocolHandler_UnlockRequest(IInternetProtocol *iface) TRACE("(%p)\n", This); - return IInternetProtocol_UnlockRequest(This->protocol); + if (This->protocol) + return IInternetProtocol_UnlockRequest(This->protocol); + return S_OK; } static const IInternetProtocolVtbl InternetProtocolHandlerVtbl = {

1 0