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

Jacek Caban : wineandroid: Use libc for memory allocation.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: wine Branch: master Commit: 08fff518c687b46e0bff926e055925dcd70b4094 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08fff518c687b46e0bff926e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 4 15:32:21 2022 +0200 wineandroid: Use libc for memory allocation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/device.c | 16 +++++++-------- dlls/wineandroid.drv/init.c | 4 ++-- dlls/wineandroid.drv/opengl.c | 17 ++++++++-------- dlls/wineandroid.drv/window.c | 45 +++++++++++++++++++++---------------------- 4 files changed, 41 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08fff518c687b46e0bff…

1 0

Jacek Caban : wineandroid: Directly use ntdll instead of kernel32.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: wine Branch: master Commit: 196b4e5916dfeb44e289114580543baf64a6a5c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=196b4e5916dfeb44e2891145… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 4 16:07:18 2022 +0200 wineandroid: Directly use ntdll instead of kernel32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/device.c | 60 +++++++++++++++++++++++++++++-------------- dlls/wineandroid.drv/window.c | 12 ++++----- 2 files changed, 47 insertions(+), 25 deletions(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index b54eabbcc75..b4f332d2cef 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -331,8 +331,8 @@ static int duplicate_fd( HANDLE client, int fd ) HANDLE handle, ret = 0; if (!wine_server_fd_to_handle( dup(fd), GENERIC_READ | SYNCHRONIZE, 0, &handle )) - DuplicateHandle( GetCurrentProcess(), handle, client, &ret, - 0, FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE ); + NtDuplicateObject( GetCurrentProcess(), handle, client, &ret, + 0, 0, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE ); if (!ret) return -1; return HandleToLong( ret ); @@ -347,8 +347,8 @@ static int map_native_handle( union native_handle_buffer *dest, const native_han if (mapping) /* only duplicate the mapping handle */ { HANDLE ret = 0; - if (!DuplicateHandle( GetCurrentProcess(), mapping, client, &ret, - 0, FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE )) + if (!NtDuplicateObject( GetCurrentProcess(), mapping, client, &ret, + 0, 0, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE )) return -ENOSPC; dest->handle.numFds = 0; dest->handle.numInts = 1; @@ -434,7 +434,7 @@ static int register_buffer( struct native_win_data *win, struct ANativeWindowBuf TRACE( "%p %p evicting buffer %p id %d from cache\n", win->hwnd, win->parent, win->buffers[i], i ); win->buffers[i]->common.decRef( &win->buffers[i]->common ); - if (win->mappings[i]) UnmapViewOfFile( win->mappings[i] ); + if (win->mappings[i]) NtUnmapViewOfSection( GetCurrentProcess(), win->mappings[i] ); } win->buffers[i] = buffer; @@ -442,9 +442,16 @@ static int register_buffer( struct native_win_data *win, struct ANativeWindowBuf if (mapping) { - *mapping = CreateFileMappingW( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, - buffer->stride * buffer->height * 4, NULL ); - win->mappings[i] = MapViewOfFile( *mapping, FILE_MAP_READ, 0, 0, 0 ); + OBJECT_ATTRIBUTES attr; + LARGE_INTEGER size; + SIZE_T count = 0; + size.QuadPart = buffer->stride * buffer->height * 4; + InitializeObjectAttributes( &attr, NULL, OBJ_OPENIF, NULL, NULL ); + NtCreateSection( mapping, + STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE, + &attr, &size, PAGE_READWRITE, 0, INVALID_HANDLE_VALUE ); + NtMapViewOfSection( *mapping, GetCurrentProcess(), &win->mappings[i], 0, 0, + NULL, &count, ViewShare, 0, PAGE_READONLY ); } buffer->common.incRef( &buffer->common ); *is_new = 1; @@ -473,7 +480,7 @@ static void release_native_window( struct native_win_data *data ) for (i = 0; i < NB_CACHED_BUFFERS; i++) { if (data->buffers[i]) data->buffers[i]->common.decRef( &data->buffers[i]->common ); - if (data->mappings[i]) UnmapViewOfFile( data->mappings[i] ); + if (data->mappings[i]) NtUnmapViewOfSection( GetCurrentProcess(), data->mappings[i] ); data->buffer_lru[i] = -1; } memset( data->buffers, 0, sizeof(data->buffers) ); @@ -823,9 +830,12 @@ static NTSTATUS dequeueBuffer_ioctl( void *data, DWORD in_size, DWORD out_size, res->generation = win_data->generation; if (is_new) { - HANDLE process = OpenProcess( PROCESS_DUP_HANDLE, FALSE, current_client_id() ); + OBJECT_ATTRIBUTES attr = { .Length = sizeof(attr) }; + CLIENT_ID cid = { .UniqueProcess = UlongToHandle( current_client_id() ) }; + HANDLE process; + NtOpenProcess( &process, PROCESS_DUP_HANDLE, &attr, &cid ); map_native_handle( &res->native_handle, buffer->handle, mapping, process ); - CloseHandle( process ); + NtClose( process ); *ret_size = sizeof( *res ); } wait_fence_and_close( fence ); @@ -1212,10 +1222,19 @@ static int android_ioctl( enum android_ioctl code, void *in, DWORD in_size, void if (!device) { - HANDLE file = CreateFileW( deviceW, GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); - if (file == INVALID_HANDLE_VALUE) return -ENOENT; - if (InterlockedCompareExchangePointer( &device, file, NULL )) CloseHandle( file ); + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE file; + + RtlInitUnicodeString( &name, deviceW ); + InitializeObjectAttributes( &attr, &name, OBJ_CASE_INSENSITIVE, NULL, NULL ); + status = NtCreateFile( &file, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN, + FILE_NON_DIRECTORY_FILE, NULL, 0 ); + if (status) return -ENOENT; + if (InterlockedCompareExchangePointer( &device, file, NULL )) NtClose( file ); } status = NtDeviceIoControlFile( device, NULL, NULL, NULL, &iosb, ANDROID_IOCTL(code), @@ -1223,7 +1242,7 @@ static int android_ioctl( enum android_ioctl code, void *in, DWORD in_size, void if (status == STATUS_FILE_DELETED) { WARN( "parent process is gone\n" ); - ExitProcess( 1 ); + NtTerminateProcess( 0, 1 ); } if (out_size) *out_size = iosb.Information; return status_to_android_error( status ); @@ -1254,7 +1273,7 @@ static void buffer_decRef( struct android_native_base_t *base ) if (!InterlockedDecrement( &buffer->ref )) { if (!is_in_desktop_process()) gralloc_release_buffer( &buffer->buffer ); - if (buffer->bits) UnmapViewOfFile( buffer->bits ); + if (buffer->bits) NtUnmapViewOfSection( GetCurrentProcess(), buffer->bits ); free( buffer ); } } @@ -1299,9 +1318,12 @@ static int dequeueBuffer( struct ANativeWindow *window, struct ANativeWindowBuff if (use_win32) { + LARGE_INTEGER zero = { .QuadPart = 0 }; + SIZE_T count = 0; HANDLE mapping = LongToHandle( res.native_handle.handle.data[0] ); - buf->bits = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 ); - CloseHandle( mapping ); + NtMapViewOfSection( mapping, GetCurrentProcess(), &buf->bits, 0, 0, &zero, &count, + ViewShare, 0, PAGE_READWRITE ); + NtClose( mapping ); } else if (!is_in_desktop_process()) { diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index a5d6a98cd3f..3860e0a2772 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -367,12 +367,12 @@ static void init_event_queue(void) if (pipe2( event_pipe, O_CLOEXEC | O_NONBLOCK ) == -1) { ERR( "could not create data\n" ); - ExitProcess(1); + NtTerminateProcess( 0, 1 ); } if (wine_server_fd_to_handle( event_pipe[0], GENERIC_READ | SYNCHRONIZE, 0, &handle )) { ERR( "Can't allocate handle for event fd\n" ); - ExitProcess(1); + NtTerminateProcess( 0, 1 ); } SERVER_START_REQ( set_queue_fd ) { @@ -383,9 +383,9 @@ static void init_event_queue(void) if (ret) { ERR( "Can't store handle for event fd %x\n", ret ); - ExitProcess(1); + NtTerminateProcess( 0, 1 ); } - CloseHandle( handle ); + NtClose( handle ); desktop_tid = GetCurrentThreadId(); } @@ -1450,9 +1450,9 @@ void ANDROID_SetCursor( HCURSOR handle ) static DWORD last_cursor_change; if (InterlockedExchangePointer( (void **)&last_cursor, handle ) != handle || - GetTickCount() - last_cursor_change > 100) + NtGetTickCount() - last_cursor_change > 100) { - last_cursor_change = GetTickCount(); + last_cursor_change = NtGetTickCount(); if (handle) {

1 0

Jeremy White : Avoid extra quoting if the current note is quoted.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: tools Branch: master Commit: 1b867cb3e46155e7d85c7c629980093c1d768b22 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1b867cb3e46155e7d85c7c6… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Jun 6 16:04:51 2022 -0500 Avoid extra quoting if the current note is quoted. If you look at: https://www.winehq.org/pipermail/wine-devel/2022-May/217121.html and compare with the merge request itself, you can see that the combined quotes create a deceptive looking trail on the mailing list. This is event 1549 on the winehq gitlab. --- gitlab/gitlab-to-mail/gitlabtomail.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index d426cc9..e113eaa 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -339,8 +339,11 @@ def process_commented_on(event): # If we are part of a thread, naively quote the last comment # this seems slightly improve reported context. + # Unless the commentor has already injected some quoting, in which + # case let's trust them to get it right. + quoting = len(event['note']['body']) > 0 and event['note']['body'][0] == '>' original = find_original_comment(event['note']['noteable_iid'], event['note']['id']) - if original: + if original and not quoting: body += quote_original_comment(original) body += event['note']['body']

1 0

Francois Gouget : testbot/orm: Add support for multi-column Itemrefs.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: tools Branch: master Commit: 763995636b6b2fb1e703fbb405b651d057a22ed0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=763995636b6b2fb1e703fbb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 7 18:49:35 2022 +0200 testbot/orm: Add support for multi-column Itemrefs. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 41d1e14..49bf856 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 62332c1..f4d1683 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 39c80cc..593b039 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}; }

1 0

Francois Gouget : testbot/web: Query the VMs table only once for the main page.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: tools Branch: master Commit: d18131423558cadca25db714adc95cc6559bbb4d URL: https://source.winehq.org/git/tools.git/?a=commit;h=d18131423558cadca25db71… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 7 18:49:28 2022 +0200 testbot/web: Query the VMs table only once for the main page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 21ee5fe..1083d3b 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";

1 0

Francois Gouget : testbot/cgi: Don't pass the master columns to the details pages.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: tools Branch: master Commit: 5156da1e4b7bc8fa34f85784ddf7084b28f6284b URL: https://source.winehq.org/git/tools.git/?a=commit;h=5156da1e4b7bc8fa34f8578… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 7 18:49:39 2022 +0200 testbot/cgi: Don't pass the master columns to the details pages. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/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 e8156a1..7d42ba2 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()})

1 0

Francois Gouget : testbot/cgi: Pass the full key to the details page.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: tools Branch: master Commit: c18c125f01e39bc6ba82dd36b118adbbf88cc5da URL: https://source.winehq.org/git/tools.git/?a=commit;h=c18c125f01e39bc6ba82dd3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 7 18:49:43 2022 +0200 testbot/cgi: Pass the full key to the details page. The details page's collection does not have master columns and thus it needs the full key to load the Item. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 7d42ba2..0f0a3bd 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -239,7 +239,7 @@ sub GetDetailsLink($$) if (!$Row->{DetailsLink}) { - $Row->{DetailsLink} = "$Row->{DetailsPage}?Key=". uri_escape($Row->{Item}->GetKey()); + $Row->{DetailsLink} = "$Row->{DetailsPage}?Key=". uri_escape($Row->{Item}->GetFullKey()); } return $Row->{DetailsLink}; }

1 0

Francois Gouget : testbot/cgi: ItemPage does not retrieve the master columns so simplify GenerateFormStart().
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: tools Branch: master Commit: 284612cab919e96658bd78129982d6e3af04b706 URL: https://source.winehq.org/git/tools.git/?a=commit;h=284612cab919e96658bd781… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 7 18:49:46 2022 +0200 testbot/cgi: ItemPage does not retrieve the master columns so simplify GenerateFormStart(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 8bea816..b4d79e7 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -106,16 +106,6 @@ sub GenerateFormStart($) $self->SUPER::GenerateFormStart(); - my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); - if (defined($MasterColNames)) - { - foreach my $ColIndex (0..$#{$MasterColNames}) - { - print "<div><input type='hidden' name='", $MasterColNames->[$ColIndex], - "' value='", $self->escapeHTML($MasterColValues->[$ColIndex]), - "' /></div>\n"; - } - } if (! $self->{Item}->GetIsNew()) { print "<div><input type='hidden' name='Key' value='",

1 0

Francois Gouget : testbot/cgi: Don't pass the master columns to the list page.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: tools Branch: master Commit: 352c2c7ba2830aafef52ec6cdfd7a0e87a25bed7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=352c2c7ba2830aafef52ec6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 7 18:49:49 2022 +0200 testbot/cgi: Don't pass the master columns to the list page. ItemPage ignores any master column parameter that it might receive so RedirectToList() has nothing to pass on. CollectionPage would ignore the master column parameters anyway. Fortunately this functionality is not used and not needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index b4d79e7..690458e 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -129,17 +129,7 @@ sub RedirectToList($) { my ($self) = @_; - my $Target = $self->{Collection}->GetCollectionName() . "List.pl"; - my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); - if (defined($MasterColNames)) - { - foreach my $ColIndex (0..$#{$MasterColNames}) - { - $Target .= ($ColIndex == 0 ? "?" : "&") . $MasterColNames->[$ColIndex] . - "=" . url_escape($MasterColValues->[$ColIndex]); - } - } - return $self->Redirect($Target); + return $self->Redirect($self->{Collection}->GetCollectionName() . "List.pl"); } sub OnAction($$)

1 0

Zebediah Figura : vkd3d-shader: Allow writing log output via a custom callback.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: vkd3d Branch: master Commit: 174172887b2b8c5a1a0e2d94c4c596511664ac61 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=174172887b2b8c5a1a0e2d9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 1 19:01:00 2022 -0500 vkd3d-shader: Allow writing log output via a custom callback. 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> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 8ab653ae..579c33d3 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 05d235f9..1e5a332e 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 7014f4c2..4a7aca23 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 4868f3fb..0b9e765a 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 2e49fe24..cac96972 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 6fd32435..7d0157fc 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); +}

1 0