June 2022 - Wine-Devel - list.winehq.org

Re: [PATCH v2 0/11] MR193: wineandroid: PE conversion - approved
by Alexandre Julliard (＠julliard) June 7, 2022

June 7, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/193

1 0

[PATCH 0/1] MR202: server: Hold socket reference in sock_poll_event().
by Paul Gofman (＠gofman) June 7, 2022

June 7, 2022

The socket may get released if the sock_poll_event() is inspired by closing socket. Here is a WIP test (where I am trying to test unrelated things) which causes assert in wineserver on closing socket (when server is trying to use already freed socket): https://gist.github.com/gofman/cc78a07ed58f6d02ff863388d5992acb -- https://gitlab.winehq.org/wine/wine/-/merge_requests/202

2 1

[PATCH 1/8] mshtml: Expose IE10+ XMLHttpRequest props via private interface.
by Gabriel Ivăncescu June 7, 2022

June 7, 2022

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mshtml_private_iface.idl | 46 +++++ dlls/mshtml/tests/documentmode.js | 10 ++ dlls/mshtml/xmlhttprequest.c | 243 +++++++++++++++++++++++++++ 4 files changed, 300 insertions(+) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ca637e5..d8b4dde 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -282,6 +282,7 @@ typedef struct EventTarget EventTarget; XIID(IWineHTMLElementPrivate) \ XIID(IWineHTMLWindowPrivate) \ XIID(IWineHTMLWindowCompatPrivate) \ + XIID(IWineXMLHttpRequestPrivate) \ XIID(IWineMSHTMLConsole) typedef enum { diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index a273e33..972f9b3 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -139,4 +139,50 @@ interface IWineDOMTokenList : IDispatch HRESULT toString([retval, out] BSTR *String); } +const long DISPID_IWINEXMLHTTPREQUESTPRIVATE_OVERRIDEMIMETYPE = 5; +[ + odl, + oleautomation, + dual, + hidden, + uuid(08ef0edd-5fb8-4178-a2f0-9f686e00441c) +] +interface IWineXMLHttpRequestPrivate : IDispatch +{ + [propget, id(1)] + HRESULT response([retval, out] VARIANT *p); + [propput, id(2)] + HRESULT responseType([in] BSTR v); + [propget, id(2)] + HRESULT responseType([retval, out] BSTR *p); + [propget, id(3)] + HRESULT upload([retval, out] IDispatch **p); + [propput, id(4)] + HRESULT withCredentials([in] VARIANT_BOOL v); + [propget, id(4)] + HRESULT withCredentials([retval, out] VARIANT_BOOL *p); + [id(DISPID_IWINEXMLHTTPREQUESTPRIVATE_OVERRIDEMIMETYPE)] + HRESULT overrideMimeType([in] BSTR mimeType); + [propput, id(DISPID_EVPROP_ONERROR)] + HRESULT onerror([in] VARIANT v); + [propget, id(DISPID_EVPROP_ONERROR)] + HRESULT onerror([retval, out] VARIANT *p); + [propput, id(DISPID_EVPROP_ONABORT)] + HRESULT onabort([in] VARIANT v); + [propget, id(DISPID_EVPROP_ONABORT)] + HRESULT onabort([retval, out] VARIANT *p); + [propput, id(DISPID_EVPROP_PROGRESS)] + HRESULT onprogress([in] VARIANT v); + [propget, id(DISPID_EVPROP_PROGRESS)] + HRESULT onprogress([retval, out] VARIANT *p); + [propput, id(DISPID_EVPROP_LOADSTART)] + HRESULT onloadstart([in] VARIANT v); + [propget, id(DISPID_EVPROP_LOADSTART)] + HRESULT onloadstart([retval, out] VARIANT *p); + [propput, id(DISPID_EVPROP_LOADEND)] + HRESULT onloadend([in] VARIANT v); + [propget, id(DISPID_EVPROP_LOADEND)] + HRESULT onloadend([retval, out] VARIANT *p); +} + } /* library MSHTML_private */ diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 8503523..f2da811 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -397,8 +397,18 @@ sync_test("xhr_props", function() { test_exposed("addEventListener", v >= 9); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); + test_exposed("onabort", v >= 10); + test_exposed("onerror", v >= 10); + test_exposed("onloadend", v >= 10); + test_exposed("onloadstart", v >= 10); + test_exposed("onprogress", v >= 10); test_exposed("ontimeout", true); + test_exposed("overrideMimeType", v >= 11); + test_exposed("response", v >= 10); + test_exposed("responseType", v >= 10); test_exposed("timeout", true); + test_exposed("upload", v >= 10); + test_exposed("withCredentials", v >= 10); }); sync_test("stylesheet_props", function() { diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 966dc8d..12356f1 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -97,6 +97,7 @@ static HRESULT return_nscstr(nsresult nsres, nsACString *nscstr, BSTR *p) static const eventid_t events[] = { EVENTID_READYSTATECHANGE, EVENTID_LOAD, + EVENTID_ERROR, EVENTID_TIMEOUT, }; @@ -111,6 +112,7 @@ struct HTMLXMLHttpRequest { EventTarget event_target; IHTMLXMLHttpRequest IHTMLXMLHttpRequest_iface; IHTMLXMLHttpRequest2 IHTMLXMLHttpRequest2_iface; + IWineXMLHttpRequestPrivate IWineXMLHttpRequestPrivate_iface; IProvideClassInfo2 IProvideClassInfo2_iface; LONG ref; nsIXMLHttpRequest *nsxhr; @@ -240,6 +242,8 @@ static HRESULT WINAPI HTMLXMLHttpRequest_QueryInterface(IHTMLXMLHttpRequest *ifa *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)) { @@ -841,6 +845,238 @@ static const IHTMLXMLHttpRequest2Vtbl HTMLXMLHttpRequest2Vtbl = { HTMLXMLHttpRequest2_get_ontimeout }; +static inline HTMLXMLHttpRequest *impl_from_IWineXMLHttpRequestPrivate(IWineXMLHttpRequestPrivate *iface) +{ + return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, IWineXMLHttpRequestPrivate_iface); +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_QueryInterface(IWineXMLHttpRequestPrivate *iface, REFIID riid, void **ppv) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + return IHTMLXMLHttpRequest_QueryInterface(&This->IHTMLXMLHttpRequest_iface, riid, ppv); +} + +static ULONG WINAPI HTMLXMLHttpRequest_private_AddRef(IWineXMLHttpRequestPrivate *iface) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + return IHTMLXMLHttpRequest_AddRef(&This->IHTMLXMLHttpRequest_iface); +} + +static ULONG WINAPI HTMLXMLHttpRequest_private_Release(IWineXMLHttpRequestPrivate *iface) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + return IHTMLXMLHttpRequest_Release(&This->IHTMLXMLHttpRequest_iface); +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_GetTypeInfoCount(IWineXMLHttpRequestPrivate *iface, UINT *pctinfo) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + return IDispatchEx_GetTypeInfoCount(&This->event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_GetTypeInfo(IWineXMLHttpRequestPrivate *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + return IDispatchEx_GetTypeInfo(&This->event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_GetIDsOfNames(IWineXMLHttpRequestPrivate *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + return IDispatchEx_GetIDsOfNames(&This->event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_Invoke(IWineXMLHttpRequestPrivate *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + return IDispatchEx_Invoke(&This->event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_get_response(IWineXMLHttpRequestPrivate *iface, VARIANT *p) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + + FIXME("(%p)->(%p)\n", This, p); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_put_responseType(IWineXMLHttpRequestPrivate *iface, BSTR v) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_get_responseType(IWineXMLHttpRequestPrivate *iface, BSTR *p) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + + FIXME("(%p)->(%p)\n", This, p); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_get_upload(IWineXMLHttpRequestPrivate *iface, IDispatch **p) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + + FIXME("(%p)->(%p)\n", This, p); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_put_withCredentials(IWineXMLHttpRequestPrivate *iface, VARIANT_BOOL v) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + + FIXME("(%p)->(%x)\n", This, v); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_get_withCredentials(IWineXMLHttpRequestPrivate *iface, VARIANT_BOOL *p) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + + FIXME("(%p)->(%p)\n", This, p); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_overrideMimeType(IWineXMLHttpRequestPrivate *iface, BSTR mimeType) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + + FIXME("(%p)->(%s)\n", This, debugstr_w(mimeType)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_put_onerror(IWineXMLHttpRequestPrivate *iface, VARIANT v) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_event_handler(&This->event_target, EVENTID_ERROR, &v); +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_get_onerror(IWineXMLHttpRequestPrivate *iface, VARIANT *p) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + + TRACE("(%p)->(%p)\n", This, p); + + return get_event_handler(&This->event_target, EVENTID_ERROR, p); +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_put_onabort(IWineXMLHttpRequestPrivate *iface, VARIANT v) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_get_onabort(IWineXMLHttpRequestPrivate *iface, VARIANT *p) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + + FIXME("(%p)->(%p)\n", This, p); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_put_onprogress(IWineXMLHttpRequestPrivate *iface, VARIANT v) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_get_onprogress(IWineXMLHttpRequestPrivate *iface, VARIANT *p) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + + FIXME("(%p)->(%p)\n", This, p); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_put_onloadstart(IWineXMLHttpRequestPrivate *iface, VARIANT v) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_get_onloadstart(IWineXMLHttpRequestPrivate *iface, VARIANT *p) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + + FIXME("(%p)->(%p)\n", This, p); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_put_onloadend(IWineXMLHttpRequestPrivate *iface, VARIANT v) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest_private_get_onloadend(IWineXMLHttpRequestPrivate *iface, VARIANT *p) +{ + HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + + FIXME("(%p)->(%p)\n", This, p); + + return E_NOTIMPL; +} + +static const IWineXMLHttpRequestPrivateVtbl WineXMLHttpRequestPrivateVtbl = { + HTMLXMLHttpRequest_private_QueryInterface, + HTMLXMLHttpRequest_private_AddRef, + HTMLXMLHttpRequest_private_Release, + HTMLXMLHttpRequest_private_GetTypeInfoCount, + HTMLXMLHttpRequest_private_GetTypeInfo, + HTMLXMLHttpRequest_private_GetIDsOfNames, + HTMLXMLHttpRequest_private_Invoke, + HTMLXMLHttpRequest_private_get_response, + HTMLXMLHttpRequest_private_put_responseType, + HTMLXMLHttpRequest_private_get_responseType, + HTMLXMLHttpRequest_private_get_upload, + HTMLXMLHttpRequest_private_put_withCredentials, + HTMLXMLHttpRequest_private_get_withCredentials, + HTMLXMLHttpRequest_private_overrideMimeType, + HTMLXMLHttpRequest_private_put_onerror, + HTMLXMLHttpRequest_private_get_onerror, + HTMLXMLHttpRequest_private_put_onabort, + HTMLXMLHttpRequest_private_get_onabort, + HTMLXMLHttpRequest_private_put_onprogress, + HTMLXMLHttpRequest_private_get_onprogress, + HTMLXMLHttpRequest_private_put_onloadstart, + HTMLXMLHttpRequest_private_get_onloadstart, + HTMLXMLHttpRequest_private_put_onloadend, + HTMLXMLHttpRequest_private_get_onloadend +}; + static inline HTMLXMLHttpRequest *impl_from_IProvideClassInfo2(IProvideClassInfo2 *iface) { return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, IProvideClassInfo2_iface); @@ -987,9 +1223,15 @@ static void HTMLXMLHttpRequest_init_dispex_info(dispex_data_t *info, compat_mode {DISPID_IHTMLXMLHTTPREQUEST_OPEN, HTMLXMLHttpRequest_open_hook}, {DISPID_UNKNOWN} }; + static const dispex_hook_t private_ie10_hooks[] = { + {DISPID_IWINEXMLHTTPREQUESTPRIVATE_OVERRIDEMIMETYPE}, + {DISPID_UNKNOWN} + }; EventTarget_init_dispex_info(info, compat_mode); dispex_info_add_interface(info, IHTMLXMLHttpRequest_tid, compat_mode >= COMPAT_MODE_IE10 ? xhr_hooks : NULL); + if(compat_mode >= COMPAT_MODE_IE10) + dispex_info_add_interface(info, IWineXMLHttpRequestPrivate_tid, compat_mode == COMPAT_MODE_IE10 ? private_ie10_hooks : NULL); } static event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { @@ -1123,6 +1365,7 @@ static HRESULT WINAPI HTMLXMLHttpRequestFactory_create(IHTMLXMLHttpRequestFactor ret->IHTMLXMLHttpRequest_iface.lpVtbl = &HTMLXMLHttpRequestVtbl; ret->IHTMLXMLHttpRequest2_iface.lpVtbl = &HTMLXMLHttpRequest2Vtbl; + ret->IWineXMLHttpRequestPrivate_iface.lpVtbl = &WineXMLHttpRequestPrivateVtbl; ret->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; EventTarget_Init(&ret->event_target, (IUnknown*)&ret->IHTMLXMLHttpRequest_iface, &HTMLXMLHttpRequest_dispex, This->window->doc->document_mode); -- 2.34.1

3 23

[PATCH 0/3] MR199: jscript: Set and Map object fixes
by Jacek Caban (＠jacek) June 7, 2022

June 7, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/199

4 4

[PATCH 0/1] MR200: vbscript: Use return_bool in more places.
by Jacek Caban (＠jacek) June 7, 2022

June 7, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/200

2 1

[PATCH v2 1/2] jscript: Only remove one reference to each entry when clearing the Map or Set.
by Gabriel Ivăncescu June 7, 2022

June 7, 2022

Checking for list_empty doesn't stop until all entries have been removed, no matter their ref count. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Also fix it for Set... dlls/jscript/set.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index d1ea663..0ef014b 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -223,6 +223,7 @@ static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, j static HRESULT Map_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + struct jsval_map_entry *entry, *entry2; MapInstance *map; HRESULT hres; @@ -232,10 +233,8 @@ static HRESULT Map_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned TRACE("%p\n", map); - while(!list_empty(&map->entries)) { - struct jsval_map_entry *entry = LIST_ENTRY(list_head(&map->entries), struct jsval_map_entry, list_entry); + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &map->entries, struct jsval_map_entry, list_entry) delete_map_entry(map, entry); - } if(r) *r = jsval_undefined(); return S_OK; @@ -443,6 +442,7 @@ static HRESULT Set_add(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned ar static HRESULT Set_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + struct jsval_map_entry *entry, *entry2; MapInstance *set; HRESULT hres; @@ -452,10 +452,8 @@ static HRESULT Set_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned TRACE("%p\n", set); - while(!list_empty(&set->entries)) { - struct jsval_map_entry *entry = LIST_ENTRY(list_head(&set->entries), struct jsval_map_entry, list_entry); + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &set->entries, struct jsval_map_entry, list_entry) delete_map_entry(set, entry); - } if(r) *r = jsval_undefined(); return S_OK; -- 2.34.1

2 2

[tools 1/4] testbot/cgi: Don't pass the master columns to the details pages.
by Francois Gouget June 7, 2022

June 7, 2022

The details pages have no way to pass the master columns to the collection used to retrieve the Item to display: what they would need instead is a master object. So they don't even try to retrieve the master column values from the parameters (see *Param() in the FormPage and ItemPage classes). Fortunately so far there is no case where we need this functionality. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index e8156a1bf..7d42ba2c2 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -240,15 +240,6 @@ sub GetDetailsLink($$) if (!$Row->{DetailsLink}) { $Row->{DetailsLink} = "$Row->{DetailsPage}?Key=". uri_escape($Row->{Item}->GetKey()); - my ($MasterColNames, $MasterColValues) = $Row->{Item}->GetMasterCols(); - if (defined $MasterColNames) - { - foreach my $ColIndex (0..$#{$MasterColNames}) - { - $Row->{DetailsLink} .= "&". $MasterColNames->[$ColIndex] ."=". - uri_escape($MasterColValues->[$ColIndex]); - } - } } return $Row->{DetailsLink}; } @@ -680,17 +671,7 @@ sub OnAction($$) if ($self->{RW} and $Action eq $self->GetAddButtonLabel()) { - my $Target = $self->GetDetailsPage(); - my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); - if (defined($MasterColNames)) - { - foreach my $ColIndex (0..$#{$MasterColNames}) - { - $Target .= ($ColIndex == 0 ? "?" : "&") . $MasterColNames->[$ColIndex] . - "=" . uri_escape($MasterColValues->[$ColIndex]); - } - } - exit($self->{EnclosingPage}->Redirect($Target)); + exit($self->{EnclosingPage}->Redirect($self->GetDetailsPage())); } foreach my $Key (@{$self->{Collection}->GetKeys()}) -- 2.30.2

1 3

[tools] testbot/orm: Add support for multi-column Itemrefs.
by Francois Gouget June 7, 2022

June 7, 2022

Also document why they are not supported in filters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45023 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes issue 9 "No Itemref support for multiple key fields" except where filters are concerned. Most of the other 18 known issues still need fixing. --- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 6 ++- testbot/lib/ObjectModel/DBIBackEnd.pm | 7 +++- testbot/lib/ObjectModel/Item.pm | 41 ++++++++++++++----- 3 files changed, 40 insertions(+), 14 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm index 41d1e14aa..49bf85658 100644 --- a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -306,16 +306,18 @@ sub GenerateValueHTML($$$;$) } elsif ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) { - # Note: This only supports single-key Itemrefs + my $First = 1; foreach my $ValuePD (@{$Value->GetPropertyDescriptors()}) { if ($ValuePD->GetIsKey()) { + print "/" if (!$First); + $First = 0; my $PropertyName = $ValuePD->GetName(); GenerateValueHTML($Parent, $ValuePD, $Value->$PropertyName); - return; } } + return; } print defined $Value ? $Parent->escapeHTML($Value) : " "; } diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 62332c1f6..f4d16836b 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -222,7 +222,12 @@ sub ColNameToDb($) my $ColNames = $PropertyDescriptor->GetColNames(); if (@$ColNames != 1) { - die "cannot filter on Itemref with more than one column name: @$ColNames"; + # This would require building a more complex where clause, something like + # ((col1 = item1.val1 AND col2 = item1.val2...) OR + # (col1 = item2.val1 AND col2 = item2.val2...) OR ...) + # So it is not supported. Instead one should build the where clause by + # hand from the underlying columns. + die "cannot filter on the ". $PropertyDescriptor->GetName() ." Itemref because it has a multi-column key: @$ColNames"; } return $ColNames->[0]; } diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 39c80cc89..593b039ff 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -281,26 +281,45 @@ sub AUTOLOAD } elsif($PropertyDescriptor->GetClass() eq "Itemref") { - my $ColNames = $PropertyDescriptor->GetColNames(); - if (@{$ColNames} != 1) - { - die "Multiple key components not supported"; - } if (@_) { - $self->{Itemrefs}{$PropertyName} = shift; - if ($self->ValuesDiffer($self->{ColValues}{@{$ColNames}[0]}, - $self->{Itemrefs}{$PropertyName}->GetKey())) + my $Item = shift; + if (!$Item and !$self->{Itemrefs}{$PropertyName}) + { + # No change -> nothing to do + } + elsif (!$Item) + { + $self->{IsModified} = 1; + $self->{Itemrefs}{$PropertyName} = undef; + foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) + { + $self->{ColValues}{$ColName} = undef; + } + } + elsif (!$self->{Itemrefs}{$PropertyName} or + $self->{Itemrefs}{$PropertyName} ne $Item) { $self->{IsModified} = 1; - $self->{ColValues}{@{$ColNames}[0]} = $self->{Itemrefs}{$PropertyName}->GetKey(); + $self->{Itemrefs}{$PropertyName} = $Item; + # Note that the foreign key names ($RefColNames) typically don't + # match the Item's primary key column names. But their order and + # count must match the primary key values. + my $RefColNames = $PropertyDescriptor->GetColNames(); + my ($_ColNames, $ColValues) = $Item->GetMasterKey(); + foreach my $ColIndex (0..$#{$RefColNames}) + { + $self->{ColValues}{$RefColNames->[$ColIndex]} = $ColValues->[$ColIndex]; + } } } elsif (! defined($self->{Itemrefs}{$PropertyName})) { + my $ColNames = $PropertyDescriptor->GetColNames(); + my @KeyComponents = map { $self->{ColValues}{$_} || "" } @$ColNames; my $Collection = &{$PropertyDescriptor->GetCreator()}($self); - my $Item = $Collection->GetItem($self->{ColValues}{@{$ColNames}[0]}); - $self->{Itemrefs}{$PropertyName} = $Item; + my $Key = $Collection->CombineKey(@KeyComponents); + $self->{Itemrefs}{$PropertyName} = $Collection->GetItem($Key); } return $self->{Itemrefs}{$PropertyName}; } -- 2.30.2

1 0

[tools] testbot/web: Query the VMs table only once for the main page.
by Francois Gouget June 7, 2022

June 7, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/index.pl | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 21ee5fea4..1083d3b57 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -264,14 +264,15 @@ sub GenerateBody($) print "<div class='GeneralStatusItemText'><a href='#jobs'>Engine appears to be dead and is not processing jobs</a></div>"; } print "</div>\n"; - - my $OfflineVMs = CreateVMs(); - $OfflineVMs->FilterEnabledRole(); - $OfflineVMs->AddFilter("Status", ["offline"]); - my $MaintenanceVMs = CreateVMs(); - $MaintenanceVMs->FilterEnabledRole(); - $MaintenanceVMs->AddFilter("Status", ["maintenance"]); - if ($OfflineVMs->IsEmpty() and $MaintenanceVMs->IsEmpty()) + + my $VMs = CreateVMs(); + my ($OfflineVMs, $MaintenanceVMs); + foreach my $VM (@{$VMs->GetItems()}) + { + $OfflineVMs++ if ($VM->Status eq "offline"); + $MaintenanceVMs++ if ($VM->Status eq "maintenance"); + } + if (!$OfflineVMs and !$MaintenanceVMs) { print "<div class='GeneralStatusItem'>"; $self->OutputDot("green"); @@ -280,18 +281,18 @@ sub GenerateBody($) } else { - if (!$OfflineVMs->IsEmpty()) + if ($OfflineVMs) { print "<div class='GeneralStatusItem'>"; $self->OutputDot("red"); - print "<div class='GeneralStatusItemText'><a href='#vms'>One or more VMs are offline</a></div>"; + print "<div class='GeneralStatusItemText'><a href='#vms'>$OfflineVMs VMs are offline</a></div>"; print "</div>\n"; } - if (!$MaintenanceVMs->IsEmpty()) + if ($MaintenanceVMs) { print "<div class='GeneralStatusItem'>"; $self->OutputDot("red"); - print "<div class='GeneralStatusItemText'><a href='#vms'>One or more VMs are undergoing maintenance</a></div>"; + print "<div class='GeneralStatusItemText'><a href='#vms'>$MaintenanceVMs VMs are undergoing maintenance</a></div>"; print "</div>\n"; } } @@ -343,7 +344,7 @@ sub GenerateBody($) EOF print "<h2><a name='vms'></a>VMs</h2>\n"; - my $VMsCollectionBlock = new VMStatusBlock(CreateVMs(), $self); + my $VMsCollectionBlock = new VMStatusBlock($VMs, $self); $VMsCollectionBlock->SetReadWrite(0); $VMsCollectionBlock->GenerateList(); print "</div>\n"; -- 2.30.2

1 0

[PATCH 0/1] MR181: winebus: Optionally split joysticks with more than 6 axes.
by Timo Zuccarello (＠timozuccarello) June 7, 2022

June 7, 2022

Add registry option "Split Controllers" and optionally split joysticks with more than 6 axes to improve compatibility with applications that do not support more than 6 axes where on Windows a driver would be installed that splits the device. Signed-off-by: Timo Zuccarello <timo(a)zuccarello.eu> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/181

3 10