- Wine-Devel - list.winehq.org

[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

[PATCH vkd3d] vkd3d-shader/spirv: Do not print a warning for VKD3D_SHADER_COMPILE_OPTION_API_VERSION.
by Zebediah Figura June 7, 2022

June 7, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7190a9dcb..bce3521ba 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2397,6 +2397,8 @@ static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_ve default: WARN("Ignoring unrecognised option %#x with value %#x.\n", option->name, option->value); + + case VKD3D_SHADER_COMPILE_OPTION_API_VERSION: break; } } -- 2.36.1

2 1

[PATCH vkd3d 1/3] vkd3d-shader: Allow writing log output via a custom callback.
by Zebediah Figura June 7, 2022

June 7, 2022

When using PE vkd3d through Wine, debug output may be swallowed by writing to Win32 stderr. Avoid this by providing a way to hook up vkd3d log output to Wine output. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/private/vkd3d_debug.h | 1 + include/vkd3d_shader.h | 15 ++++++++++++++ include/vkd3d_types.h | 4 ++++ libs/vkd3d-common/debug.c | 28 +++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 5 +++++ 6 files changed, 52 insertions(+), 2 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 8ab653aef..579c33d36 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -47,6 +47,7 @@ enum vkd3d_dbg_level enum vkd3d_dbg_level vkd3d_dbg_get_level(void); void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4); +void vkd3d_dbg_set_log_callback(PFN_vkd3d_log callback); const char *vkd3d_dbg_sprintf(const char *fmt, ...) VKD3D_PRINTF_FUNC(1, 2); const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args); diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 05d235f9d..1e5a332ef 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1806,6 +1806,18 @@ VKD3D_SHADER_API void vkd3d_shader_free_shader_signature(struct vkd3d_shader_sig VKD3D_SHADER_API int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); +/** + * Set a callback to be called when vkd3d-shader outputs debug logging. + * + * If NULL, or if this function has not been called, libvkd3d-shader will print + * all enabled log output to stderr. + * + * \param callback Callback function to set. + * + * \since 1.4 + */ +VKD3D_SHADER_API void vkd3d_shader_set_log_callback(PFN_vkd3d_log callback); + #endif /* VKD3D_SHADER_NO_PROTOTYPES */ /** Type of vkd3d_shader_get_version(). */ @@ -1859,6 +1871,9 @@ typedef void (*PFN_vkd3d_shader_free_shader_signature)(struct vkd3d_shader_signa typedef void (*PFN_vkd3d_shader_preprocess)(struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); +/** Type of vkd3d_shader_set_log_callback(). \since 1.4 */ +typedef void (*PFN_vkd3d_shader_set_log_callback)(PFN_vkd3d_log callback); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/include/vkd3d_types.h b/include/vkd3d_types.h index 7014f4c25..4a7aca236 100644 --- a/include/vkd3d_types.h +++ b/include/vkd3d_types.h @@ -19,6 +19,8 @@ #ifndef __VKD3D_TYPES_H #define __VKD3D_TYPES_H +#include <stdarg.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -53,6 +55,8 @@ enum vkd3d_result VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), }; +typedef void (*PFN_vkd3d_log)(const char *format, va_list args); + #ifdef _WIN32 # define VKD3D_IMPORT __declspec(dllimport) # define VKD3D_EXPORT __declspec(dllexport) diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 4868f3fba..0b9e765ac 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -68,6 +68,25 @@ enum vkd3d_dbg_level vkd3d_dbg_get_level(void) return level; } +static PFN_vkd3d_log log_callback; + +static void vkd3d_dbg_voutput(const char *fmt, va_list args) +{ + if (log_callback) + log_callback(fmt, args); + else + vfprintf(stderr, fmt, args); +} + +static void vkd3d_dbg_output(const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + vkd3d_dbg_voutput(fmt, args); + va_end(args); +} + void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) { va_list args; @@ -77,12 +96,17 @@ void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const ch assert(level < ARRAY_SIZE(debug_level_names)); - fprintf(stderr, "%s:%s: ", debug_level_names[level], function); + vkd3d_dbg_output("%s:%s ", debug_level_names[level], function); va_start(args, fmt); - vfprintf(stderr, fmt, args); + vkd3d_dbg_voutput(fmt, args); va_end(args); } +void vkd3d_dbg_set_log_callback(PFN_vkd3d_log callback) +{ + log_callback = callback; +} + static char *get_buffer(void) { static char buffers[VKD3D_DEBUG_BUFFER_COUNT][VKD3D_DEBUG_BUFFER_SIZE]; diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 2e49fe248..cac96972a 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -17,6 +17,7 @@ global: vkd3d_shader_preprocess; vkd3d_shader_scan; vkd3d_shader_serialize_root_signature; + vkd3d_shader_set_log_callback; local: *; }; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6fd32435a..7d0157fca 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1550,3 +1550,8 @@ int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info vkd3d_shader_message_context_cleanup(&message_context); return ret; } + +void vkd3d_shader_set_log_callback(PFN_vkd3d_log callback) +{ + vkd3d_dbg_set_log_callback(callback); +} -- 2.36.1

3 10

[PATCH vkd3d] include: Add ID3D12Debug interface declarations in vkd3d_d3d12sdklayers.idl.
by Biswapriyo Nath June 7, 2022

June 7, 2022

2 1

[PATCH 0/7] MR195: winhttp: Abort web socket receive operations when the socket handle is closed
by Paul Gofman (＠gofman) June 7, 2022

June 7, 2022

I think somewhat similar should happen with normal winhttp requests (I was doing some brief tests around that back then) and that should hopefully be easy to add incrementally after this patchset. Then, sends for websockets should most likely also be cancelled the same way although that is a bit harder to test as most of the time sends are processed right away before returing from WinHttpWebSocketSend (although should be possible as out of tree test which might be flaky). The patches here address cancelling web socket receive operation (including receiving web socket close status). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/195

6 12

[PATCH 0/6] MR178: ntdll: Preparation for RtlSetUserValueHeap use in kernelbase.
by Rémi Bernon June 7, 2022

June 7, 2022

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

2 9