- wine-devel - winehq.org

[PATCH v2 0/1] MR215: winevulkan: Update to VK spec version 1.3.217.
by Georg Lehmann (＠DadSchoorse) 09 Jun '22

09 Jun '22

-- v2: winevulkan: Update to VK spec version 1.3.217. https://gitlab.winehq.org/wine/wine/-/merge_requests/215

3 2

Re: [PATCH v3 0/3] MR208: dinput/tests: Cleanup old tests and merge more dinput8 / dinput tests together. - approved
by Alexandre Julliard (＠julliard) 09 Jun '22

09 Jun '22

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

1 0

Re: [PATCH v3 0/2] MR210: winhttp: Use completion port for overlapped send. - approved
by Alexandre Julliard (＠julliard) 09 Jun '22

09 Jun '22

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

1 0

Re: [PATCH v2 0/7] MR211: win32u: user32 conversion - approved
by Alexandre Julliard (＠julliard) 09 Jun '22

09 Jun '22

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

1 0

Re: [PATCH v6 0/2] MR135: Cancel asyncs queued by thread when the thread is terminated - approved
by Alexandre Julliard (＠julliard) 09 Jun '22

09 Jun '22

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

1 0

Re: [PATCH v3 0/1] MR203: ws2_32: Check for valid socket in WSAGetOverlappedResult(). - approved
by Alexandre Julliard (＠julliard) 09 Jun '22

09 Jun '22

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

1 0

[PATCH v2 0/2] MR214: ntdll: tests: Test returning an exception handler on arm/arm64
by Martin Storsjö (＠mstorsjo) 09 Jun '22

09 Jun '22

Also fix up the error message printed for the handler data. -- v2: ntdll/tests: Test returning an exception handler on arm/arm64. ntdll/tests: Fix printing of incorrect exception handler data. https://gitlab.winehq.org/wine/wine/-/merge_requests/214

3 3

Re: [PATCH v2 0/2] MR209: mfreadwrite: Base MF_SOURCE_READER_ANY_STREAM behavior off timestamps - approved
by Alexandre Julliard (＠julliard) 09 Jun '22

09 Jun '22

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

1 0

[PATCH v2 0/7] MR205: Add support for HRESULT and ID3DX10ThreadPump parameters in D3DX10GetImageInfo functions
by Piotr Caban (＠piotr) 09 Jun '22

09 Jun '22

-- v2: d3dx10/tests: Add D3DX10GetImageInfoFromMemory thread pump tests. d3dx10: Support ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromMemory. d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromResourceW. d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromResourceA. d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromFileW. d3dx10/tests: Add D3DX10GetImageInfoFromMemory HRESULT argument tests. d3dx10: Don't ignore HRESULT parameter in D3DX10GetImageInfoFrom* functions. https://gitlab.winehq.org/wine/wine/-/merge_requests/205

3 9

[PATCH 1/2] user32/tests: Test intra-thread SendMessage and ReplyMessage behavior.
by Gabriel Ivăncescu 09 Jun '22

09 Jun '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/tests/msg.c | 90 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2705914..fab3221 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -18521,6 +18521,12 @@ static void test_SendMessage_other_thread(int thread_n) CloseHandle(wnd_event.stop_event); } +static void CALLBACK msg_callback_nested( HWND hwnd, UINT msg, ULONG_PTR arg, LRESULT result ) +{ + ok( msg == WM_USER + 10, "wrong msg %x\n", msg ); + ok( result == 0, "wrong result %Ix\n", result ); +} + static LRESULT CALLBACK insendmessage_wnd_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { DWORD flags = InSendMessageEx( NULL ); @@ -18561,6 +18567,80 @@ static LRESULT CALLBACK insendmessage_wnd_proc( HWND hwnd, UINT msg, WPARAM wp, ret = ReplyMessage( msg ); ok( !ret, "ReplyMessage succeeded\n" ); break; + case WM_USER + 4: + ok( flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + SendMessageCallbackA( hwnd, WM_USER + 10, 0, 0, msg_callback_nested, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_SEND | ISMEX_REPLIED), "wrong flags %lx\n", flags ); + ret = ReplyMessage( msg ); + todo_wine + ok( !ret, "ReplyMessage returned %u\n", ret ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_SEND | ISMEX_REPLIED), "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 5: + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + SendMessageA( hwnd, WM_USER + 11, 0, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + flags = InSendMessageEx( NULL ); + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 6: + ok( flags == ISMEX_CALLBACK, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + SendMessageW( hwnd, WM_USER + 12, 0, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_CALLBACK | ISMEX_REPLIED) || flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + todo_wine + ok( !ret, "ReplyMessage returned %u\n", ret ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_CALLBACK | ISMEX_REPLIED) || flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 7: + ok( flags == ISMEX_NOSEND, "wrong flags %lx\n", flags ); + ok( !InSendMessage(), "InSendMessage returned true\n" ); + SendNotifyMessageW( hwnd, WM_USER + 13, 0, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == ISMEX_NOSEND, "wrong flags %lx\n", flags ); + ok( !InSendMessage(), "InSendMessage returned true\n" ); + ret = ReplyMessage( msg ); + ok( !ret, "ReplyMessage succeeded\n" ); + break; + + case WM_USER + 10: + ok( flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + break; + case WM_USER + 11: + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + break; + case WM_USER + 12: + ok( flags == ISMEX_CALLBACK, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + break; + case WM_USER + 13: + ok( flags == ISMEX_NOSEND, "wrong flags %lx\n", flags ); + ok( !InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( !ret, "ReplyMessage returned %u\n", ret ); + break; } return DefWindowProcA( hwnd, msg, wp, lp ); @@ -18572,6 +18652,12 @@ static void CALLBACK msg_callback( HWND hwnd, UINT msg, ULONG_PTR arg, LRESULT r ok( result == WM_USER + 2, "wrong result %Ix\n", result ); } +static void CALLBACK msg_callback2( HWND hwnd, UINT msg, ULONG_PTR arg, LRESULT result ) +{ + ok( msg == WM_USER + 6, "wrong msg %x\n", msg ); + ok( result == WM_USER + 6, "wrong result %Ix\n", result ); +} + static DWORD WINAPI send_message_thread( void *arg ) { HWND win = arg; @@ -18580,6 +18666,10 @@ static DWORD WINAPI send_message_thread( void *arg ) SendNotifyMessageA( win, WM_USER + 1, 0, 0 ); SendMessageCallbackA( win, WM_USER + 2, 0, 0, msg_callback, 0 ); PostMessageA( win, WM_USER + 3, 0, 0 ); + SendMessageA( win, WM_USER + 4, 0, 0 ); + SendNotifyMessageA( win, WM_USER + 5, 0, 0 ); + SendMessageCallbackA( win, WM_USER + 6, 0, 0, msg_callback2, 0 ); + PostMessageA( win, WM_USER + 7, 0, 0 ); PostMessageA( win, WM_QUIT, 0, 0 ); return 0; } -- 2.34.1

2 3

[PATCH v3 1/4] hidclass.sys: Expose an ioctl to retrieve the raw input handle.
by Rémi Bernon 09 Jun '22

09 Jun '22

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 12 ++++++++++++ include/wine/hid.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 9d917bbc674..7c0dbdcbc10 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -655,6 +655,18 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_SET_OUTPUT_REPORT: status = hid_device_xfer_report( ext, code, irp ); break; + + case IOCTL_HID_GET_WINE_RAWINPUT_HANDLE: + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + status = STATUS_BUFFER_OVERFLOW; + else + { + *(ULONG *)irp->AssociatedIrp.SystemBuffer = ext->u.pdo.rawinput_handle; + irp->IoStatus.Information = sizeof(ULONG); + status = STATUS_SUCCESS; + } + break; + default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; diff --git a/include/wine/hid.h b/include/wine/hid.h index 236888cbdc7..6a92317551f 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -227,4 +227,6 @@ struct hid_preparsed_data #define PID_USAGE_CREATE_NEW_EFFECT_REPORT ((USAGE) 0xab) #define PID_USAGE_RAM_POOL_AVAILABLE ((USAGE) 0xac) +#define IOCTL_HID_GET_WINE_RAWINPUT_HANDLE HID_BUFFER_CTL_CODE(300) + #endif /* __WINE_PARSE_H */ -- 2.36.1

2 4

[PATCH resend 1/2] comctl32: Set the selection if it's currently invalid in HandleTimer.
by Gabriel Ivăncescu 09 Jun '22

09 Jun '22

This can happen in a combo box if the dropdown is shown by a mouse click + release followed by the mouse being moved into the dropped listbox (when the listbox has nothing selected). In this case, the first item (with the index zero) would not be selected the first time the mouse moves over it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This can be easily tested with winecfg. Launch winecfg, go to `Libraries` tab, click on the combobox arrow dropdown for `New override for library` to open the listbox, then hover the mouse over the first entry (acledit). Notice that it does not get highlighted, which is the issue. If you move the mouse to the second entry (aclui) and then back to (acledit), it works. dlls/comctl32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 6724dee..2942952 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2339,7 +2339,7 @@ static LRESULT LISTBOX_HandleTimer( LB_DESCR *descr, INT index, TIMER_DIRECTION case LB_TIMER_NONE: break; } - if (index == descr->focus_item) return FALSE; + if (index == descr->focus_item && descr->selected_item != -1) return FALSE; LISTBOX_MoveCaret( descr, index, FALSE ); return TRUE; } -- 2.34.1

1 1

[PATCH] advapi32: Fix spec for LookupPrivilegeDisplayName{A,W}
by Louis Lenders 09 Jun '22

09 Jun '22

1 0

[PATCH v2 1/4] hidclass.sys: Expose an ioctl to retrieve the raw input handle.
by Rémi Bernon 09 Jun '22

09 Jun '22

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix some style nitpicks, move the ioctl to wine/hid.h and name it with a wine prefix, similarly to IOCTL_HID_GET_MS_GENRE_DESCRIPTOR. dlls/hidclass.sys/device.c | 12 ++++++++++++ include/wine/hid.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 9d917bbc674..7c0dbdcbc10 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -655,6 +655,18 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_SET_OUTPUT_REPORT: status = hid_device_xfer_report( ext, code, irp ); break; + + case IOCTL_HID_GET_WINE_RAWINPUT_HANDLE: + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + status = STATUS_BUFFER_OVERFLOW; + else + { + *(ULONG *)irp->AssociatedIrp.SystemBuffer = ext->u.pdo.rawinput_handle; + irp->IoStatus.Information = sizeof(ULONG); + status = STATUS_SUCCESS; + } + break; + default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; diff --git a/include/wine/hid.h b/include/wine/hid.h index 236888cbdc7..6a92317551f 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -227,4 +227,6 @@ struct hid_preparsed_data #define PID_USAGE_CREATE_NEW_EFFECT_REPORT ((USAGE) 0xab) #define PID_USAGE_RAM_POOL_AVAILABLE ((USAGE) 0xac) +#define IOCTL_HID_GET_WINE_RAWINPUT_HANDLE HID_BUFFER_CTL_CODE(300) + #endif /* __WINE_PARSE_H */ -- 2.36.1

2 5

[PATCH v3 0/2] MR192: ws2_32: Allow getsockname after AcceptEx
by DavidCurtiss (＠DavidCurtiss) 09 Jun '22

09 Jun '22

.NET 6's HTTP/Socket code queries this. Winsock allows getsockname on the AcceptEx AcceptSocket, but only if SO_UPDATE_ACCEPT_CONTEXT is set. Signed-off-by: David Curtiss <david.curtiss(a)ni.com> -- v3: Set bound in accept_into_socket instead of changing getsockname ws2_32: Allow getsockname after AcceptEx https://gitlab.winehq.org/wine/wine/-/merge_requests/192

3 3

[tools] testbot/orm: Prepare and validate the filters before use.
by Francois Gouget 09 Jun '22

09 Jun '22

This adds documentation to the filter methods. The preparation step replaces the Itemref properties with filters on the underlying database columns so that DBIBackend only has to deal with 'real' table columns. This also adds better support for multi-column Itemref properties. The validation is performed when building the filter. This means errors are reported close to when the invalid instructions were provided rather than when the database complains about a non-sensical WHERE clause. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45023 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes the remainder of issue 9 "No Itemref support for multiple key fields". --- testbot/lib/ObjectModel/Collection.pm | 154 +++++++++++++++++++++++++- testbot/lib/ObjectModel/DBIBackEnd.pm | 34 +----- 2 files changed, 153 insertions(+), 35 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 1a48eec35..9dcaf33d4 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -1,6 +1,6 @@ # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # Copyright 2009 Ge van Geldorp -# Copyright 2012-2014, 2021 Francois Gouget +# Copyright 2012-2014, 2021-2022 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -700,11 +700,31 @@ my %ValueComparators = ( 'NOT LIKE' => 1, ); +=pod +=over 12 + +=item C<FilterValue()> + +Compares the specified property to a set of values, joining the results with +an OR operator. + +If the property is an Itemref, the only allowed comparators are '=' and '<>', +and they apply to the underlying columns. +The inequality and like comparators are not allowed on boolean properties. + +Finally note that applying comparators like ">=" to multiple values is just an +inefficient way of requiring the property to be greater than or equal to the +minimum / maximum value. + +=back +=cut + sub FilterValue($$$) { my ($PropertyName, $Comparator, $Values) = @_; - die "unknown '$Comparator' comparator" if (!$ValueComparators{$Comparator}); + die "unknown $Comparator comparator" if (!$ValueComparators{$Comparator}); + die "invalid set of values" if (ref($Values) ne 'ARRAY' or @$Values == 0); return { Type => 'value', Property => $PropertyName, Comparator => $Comparator, @@ -719,6 +739,17 @@ sub FilterNull($) return { Type => 'null', Property => $PropertyName }; } +=pod +=over 12 + +=item C<FilterNotNull()> + +Requires that the specified property not be NULL. +This type of check is not allowed on required properties. + +=back +=cut + sub FilterNotNull($) { my ($PropertyName) = @_; @@ -744,10 +775,127 @@ sub FilterNot($) return { Type => 'not', Term => $Term }; } +=pod +=over 12 + +=item C<PrepareFilter()> + +Validates the filter and performs some preprocessing to remove references to +Itemrefs. + +=back +=cut + +sub PrepareFilter($$) +{ + my ($self, $Filter) = @_; + + die "undefined filter" if (!defined $Filter); + if ($Filter->{Terms}) + { + foreach my $Term (@{$Filter->{Terms}}) + { + $self->PrepareFilter($Term); + } + return; + } + if ($Filter->{Term}) + { + $self->PrepareFilter($Filter->{Term}); + return; + } + + my $PropertyName = $Filter->{Property}; + my $PropertyDescriptor = $self->GetPropertyDescriptorByName($PropertyName); + die "unknown $PropertyName property" if (!$PropertyDescriptor); + if ($PropertyDescriptor->GetClass() eq "Detailref") + { + die "$PropertyName: cannot filter on Detailref properties"; + } + + if ($Filter->{Type} eq "value") + { + if ($PropertyDescriptor->GetClass() eq "Itemref") + { + if ($Filter->{Comparator} ne "=" and $Filter->{Comparator} ne "<>") + { + die "$PropertyName: cannot perform $Filter->{Comparator} comparisons on Itemrefs"; + } + + my $RefColNames = $PropertyDescriptor->GetRefColNames(); + if (@$RefColNames == 1) + { + $Filter->{Property} = $RefColNames->[0]; + # @$RefColNames == 1 => $Value->GetKey() == column value + $Filter->{Values} = [ map { $_->GetKey() } @{$Filter->{Values}} ]; + $self->PrepareFilter($Filter); + } + elsif (@{$Filter->{Values}} == 1) + { + delete $Filter->{Property}; + delete $Filter->{Values}; + $Filter->{Type} = $Filter->{Comparator} eq "=" ? 'and' : 'or'; + + # The target table column names are unknown and thus cannot be accessed + # directly. But their values correspond to the target's key components. + my ($_ColNames, $ColValues) = $Filter->{Values}->[0]->GetMasterKey(); + foreach my $ColIndex (0..$#{$RefColNames}) + { + my $Term = FilterValue($RefColNames->[$ColIndex], $ColValues->[$ColIndex], $Filter->{Comparator}); + $self->PrepareFilter($Term); + push @{$Filter->{Terms}}, $Term; + } + } + else + { + my @Terms; + foreach my $Item (@{$Filter->{Values}}) + { + my $Term = FilterValue($PropertyName, [$Item], $Filter->{Comparator}); + $self->PrepareFilter($Term); + push @Terms, $Term; + } + delete $Filter->{Property}; + delete $Filter->{Values}; + $Filter->{Type} = 'or'; + $Filter->{Terms} = \@Terms; + } + } + elsif ($Filter->{Comparator} ne "=" and $Filter->{Comparator} ne "<>" and + $PropertyDescriptor->GetClass() eq "Basic" and + $PropertyDescriptor->GetType() eq "B") + { + die "$PropertyName: cannot perform $Filter->{Comparator} comparisons on booleans"; + } + } + elsif ($Filter->{Type} =~ /null/) + { + if ($PropertyDescriptor->GetIsRequired()) + { + die "$PropertyName cannot be NULL (pointless filter)"; + } + elsif ($PropertyDescriptor->GetClass() eq "Itemref") + { + my $RefColNames = $PropertyDescriptor->GetRefColNames(); + if (@$RefColNames > 1) + { + delete $Filter->{Property}; + $Filter->{Terms} = [ map { { Type => $Filter->{Type}, Property => $_ } } @$RefColNames ]; + $Filter->{Type} = $Filter->{Type} eq 'null' ? 'and' : 'or'; + } + else + { + $Filter->{Property} = $RefColNames->[0]; + } + } + } +} + sub AddFilter($$;$$) { my $self = shift; - my $Filter = @_ == 1 ? $_[0] : FilterValue($_[0], $_[2] || "=", $_[1]); + my $Filter =@_ == 1 ? $_[0] : FilterValue($_[0], $_[2] || "=", $_[1]); + $self->PrepareFilter($Filter); if (!$self->{Filter}) { diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index e837d47f5..d21b3f03f 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -215,31 +215,6 @@ sub BuildFieldList($$) return $Fields; } -sub ColNameToDb($) -{ - my ($PropertyDescriptor) = @_; - - my $ColNames; - if ($PropertyDescriptor->GetClass() eq "Itemref") - { - $ColNames = $PropertyDescriptor->GetRefColNames(); - if (@$ColNames != 1) - { - # 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"; - } - } - else - { - $ColNames = $PropertyDescriptor->GetColNames(); - } - return $ColNames->[0]; -} - =pod =over 12 @@ -273,13 +248,8 @@ sub GetFilterWhere($$$) my (@Wheres, @Data); foreach my $ColValue (@$Values) { - my $ColName = ColNameToDb($PropertyDescriptor); + my $ColName = $PropertyDescriptor->GetColNames()->[0]; push @Wheres, "$ColName $Filter->{Comparator} ?"; - - if ($PropertyDescriptor->GetClass() eq "Itemref") - { - $ColValue = $ColValue->GetKey(); - } push @Data, $self->ToDb($ColValue, $PropertyDescriptor); } return (@$Values > 1, join(" OR ", @Wheres), \@Data); @@ -312,7 +282,7 @@ sub GetFilterWhere($$$) if ($Filter->{Type} eq 'null' or $Filter->{Type} eq 'not null') { my $PropertyDescriptor = $Collection->GetPropertyDescriptorByName($Filter->{Property}); - my $ColName = ColNameToDb($PropertyDescriptor); + my $ColName = $PropertyDescriptor->GetColNames()->[0]; my $Operator = ($Filter->{Type} eq 'null' ? "IS NULL" : "IS NOT NULL"); return (0, "$ColName $Operator", []); } -- 2.30.2

1 0

[PATCH vkd3d v6 1/9] tests/shader_runner: Allow creating UAV resources.
by Zebediah Figura 09 Jun '22

09 Jun '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v6: avoid magic numbers... tests/shader_runner.c | 38 +++++++++++++++++++--------- tests/shader_runner.h | 2 ++ tests/shader_runner_d3d11.c | 31 ++++++++++++++++++----- tests/shader_runner_d3d12.c | 37 +++++++++++++++++++++------ tests/shader_runner_d3d9.c | 12 ++++++--- tests/shader_runner_vulkan.c | 48 ++++++++++++++++++++++++++++-------- 6 files changed, 130 insertions(+), 38 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 05e2a8a41..83f804ad3 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -78,14 +78,13 @@ enum parse_state STATE_PREPROC, STATE_PREPROC_INVALID, STATE_REQUIRE, + STATE_RESOURCE, STATE_SAMPLER, STATE_SHADER_INVALID_PIXEL, STATE_SHADER_INVALID_PIXEL_TODO, STATE_SHADER_PIXEL, STATE_SHADER_VERTEX, - STATE_TEXTURE, STATE_TEST, - STATE_VERTEX_BUFFER, }; static bool match_string(const char *line, const char *token, const char **const rest) @@ -314,6 +313,13 @@ static void parse_input_layout_directive(struct shader_runner *runner, const cha element->index = 0; } +void init_resource(struct resource *resource, const struct resource_params *params) +{ + resource->type = params->type; + resource->slot = params->slot; + resource->size = params->data_size; +} + static void set_resource(struct shader_runner *runner, struct resource *resource) { size_t i; @@ -617,8 +623,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const goto out; break; - case STATE_TEXTURE: - case STATE_VERTEX_BUFFER: + case STATE_RESOURCE: set_resource(runner, runner->ops->create_resource(runner, &current_resource)); free(current_resource.data); break; @@ -766,7 +771,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const } else if (sscanf(line, "[texture %u]\n", &index)) { - state = STATE_TEXTURE; + state = STATE_RESOURCE; memset(&current_resource, 0, sizeof(current_resource)); @@ -776,9 +781,21 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const current_resource.data_type = TEXTURE_DATA_FLOAT; current_resource.texel_size = 16; } + else if (sscanf(line, "[uav %u]\n", &index)) + { + state = STATE_RESOURCE; + + memset(&current_resource, 0, sizeof(current_resource)); + + current_resource.slot = index; + current_resource.type = RESOURCE_TYPE_UAV; + current_resource.format = DXGI_FORMAT_R32G32B32A32_FLOAT; + current_resource.data_type = TEXTURE_DATA_FLOAT; + current_resource.texel_size = 16; + } else if (sscanf(line, "[vertex buffer %u]\n", &index)) { - state = STATE_VERTEX_BUFFER; + state = STATE_RESOURCE; memset(&current_resource, 0, sizeof(current_resource)); @@ -844,13 +861,12 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const parse_require_directive(runner, line); break; - case STATE_SAMPLER: - parse_sampler_directive(current_sampler, line); + case STATE_RESOURCE: + parse_resource_directive(&current_resource, line); break; - case STATE_TEXTURE: - case STATE_VERTEX_BUFFER: - parse_resource_directive(&current_resource, line); + case STATE_SAMPLER: + parse_sampler_directive(current_sampler, line); break; case STATE_TEST: diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 6ed0109e6..60f894583 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -54,6 +54,7 @@ struct sampler enum resource_type { RESOURCE_TYPE_TEXTURE, + RESOURCE_TYPE_UAV, RESOURCE_TYPE_VERTEX_BUFFER, }; @@ -130,6 +131,7 @@ struct shader_runner_ops void fatal_error(const char *format, ...) VKD3D_NORETURN VKD3D_PRINTF_FUNC(1, 2); unsigned int get_vb_stride(const struct shader_runner *runner, unsigned int slot); +void init_resource(struct resource *resource, const struct resource_params *params); void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const struct shader_runner_ops *ops); diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 6edbdf75e..b80a8b65f 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -44,6 +44,7 @@ struct d3d11_resource ID3D11Resource *resource; ID3D11ShaderResourceView *srv; + ID3D11UnorderedAccessView *uav; }; static struct d3d11_resource *d3d11_resource(struct resource *r) @@ -374,13 +375,12 @@ static struct resource *d3d11_runner_create_resource(struct shader_runner *r, co HRESULT hr; resource = calloc(1, sizeof(*resource)); - - resource->r.slot = params->slot; - resource->r.type = params->type; + init_resource(&resource->r, params); switch (params->type) { case RESOURCE_TYPE_TEXTURE: + case RESOURCE_TYPE_UAV: { D3D11_TEXTURE2D_DESC desc = {0}; @@ -391,7 +391,10 @@ static struct resource *d3d11_runner_create_resource(struct shader_runner *r, co desc.Format = params->format; desc.SampleDesc.Count = 1; desc.Usage = D3D11_USAGE_DEFAULT; - desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + if (params->type == RESOURCE_TYPE_UAV) + desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + else + desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; resource_data.pSysMem = params->data; resource_data.SysMemPitch = params->width * params->texel_size; @@ -399,8 +402,11 @@ static struct resource *d3d11_runner_create_resource(struct shader_runner *r, co hr = ID3D11Device_CreateTexture2D(device, &desc, &resource_data, (ID3D11Texture2D **)&resource->resource); ok(hr == S_OK, "Failed to create texture, hr %#lx.\n", hr); - hr = ID3D11Device_CreateShaderResourceView(device, resource->resource, NULL, &resource->srv); - ok(hr == S_OK, "Failed to create shader resource view, hr %#lx.\n", hr); + if (params->type == RESOURCE_TYPE_UAV) + hr = ID3D11Device_CreateUnorderedAccessView(device, resource->resource, NULL, &resource->uav); + else + hr = ID3D11Device_CreateShaderResourceView(device, resource->resource, NULL, &resource->srv); + ok(hr == S_OK, "Failed to create view, hr %#lx.\n", hr); break; } @@ -420,14 +426,18 @@ static void d3d11_runner_destroy_resource(struct shader_runner *r, struct resour ID3D11Resource_Release(resource->resource); if (resource->srv) ID3D11ShaderResourceView_Release(resource->srv); + if (resource->uav) + ID3D11UnorderedAccessView_Release(resource->uav); free(resource); } static bool d3d11_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) { + ID3D11UnorderedAccessView *uavs[D3D11_PS_CS_UAV_REGISTER_COUNT] = {0}; struct d3d11_shader_runner *runner = d3d11_shader_runner(r); ID3D11DeviceContext *context = runner->immediate_context; + unsigned int min_uav_slot = ARRAY_SIZE(uavs); ID3D11Device *device = runner->device; ID3D10Blob *vs_code, *ps_code; ID3D11Buffer *cb = NULL; @@ -472,6 +482,11 @@ static bool d3d11_runner_draw(struct shader_runner *r, ID3D11DeviceContext_PSSetShaderResources(context, resource->r.slot, 1, &resource->srv); break; + case RESOURCE_TYPE_UAV: + uavs[resource->r.slot] = resource->uav; + min_uav_slot = min(min_uav_slot, resource->r.slot); + break; + case RESOURCE_TYPE_VERTEX_BUFFER: ID3D11DeviceContext_IASetVertexBuffers(context, resource->r.slot, 1, (ID3D11Buffer **)&resource->resource, &stride, &offset); @@ -479,6 +494,10 @@ static bool d3d11_runner_draw(struct shader_runner *r, } } + ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews(context, + D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL, NULL, NULL, + min_uav_slot, ARRAY_SIZE(uavs) - min_uav_slot, &uavs[min_uav_slot], NULL); + for (i = 0; i < runner->r.sampler_count; ++i) { struct sampler *sampler = &runner->r.samplers[i]; diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 22c9b2266..ec08fea54 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -79,7 +79,7 @@ static ID3D10Blob *compile_shader(const struct d3d12_shader_runner *runner, cons return blob; } -#define MAX_RESOURCE_DESCRIPTORS 256 +#define MAX_RESOURCE_DESCRIPTORS (MAX_RESOURCES * 2) static struct resource *d3d12_runner_create_resource(struct shader_runner *r, const struct resource_params *params) { @@ -90,9 +90,7 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co struct d3d12_resource *resource; resource = calloc(1, sizeof(*resource)); - resource->r.slot = params->slot; - resource->r.type = params->type; - resource->r.size = params->data_size; + init_resource(&resource->r, params); switch (params->type) { @@ -101,9 +99,6 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co runner->heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, MAX_RESOURCE_DESCRIPTORS); - if (params->slot >= MAX_RESOURCE_DESCRIPTORS) - fatal_error("Resource slot %u is too high; please increase MAX_RESOURCE_DESCRIPTORS.\n", params->slot); - resource->resource = create_default_texture(device, params->width, params->height, params->format, 0, D3D12_RESOURCE_STATE_COPY_DEST); resource_data.pData = params->data; @@ -116,6 +111,23 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co NULL, get_cpu_descriptor_handle(test_context, runner->heap, resource->r.slot)); break; + case RESOURCE_TYPE_UAV: + if (!runner->heap) + runner->heap = create_gpu_descriptor_heap(device, + D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, MAX_RESOURCE_DESCRIPTORS); + + resource->resource = create_default_texture(device, params->width, params->height, + params->format, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + resource_data.pData = params->data; + resource_data.SlicePitch = resource_data.RowPitch = params->width * params->texel_size; + upload_texture_data(resource->resource, &resource_data, 1, test_context->queue, test_context->list); + reset_command_list(test_context->list, test_context->allocator); + transition_resource_state(test_context->list, resource->resource, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + ID3D12Device_CreateUnorderedAccessView(device, resource->resource, + NULL, NULL, get_cpu_descriptor_handle(test_context, runner->heap, resource->r.slot + MAX_RESOURCES)); + break; + case RESOURCE_TYPE_VERTEX_BUFFER: resource->resource = create_upload_buffer(device, params->data_size, params->data); break; @@ -192,6 +204,7 @@ static bool d3d12_runner_draw(struct shader_runner *r, switch (resource->r.type) { case RESOURCE_TYPE_TEXTURE: + case RESOURCE_TYPE_UAV: range = &resource->descriptor_range; resource->root_index = root_signature_desc.NumParameters++; @@ -201,7 +214,10 @@ static bool d3d12_runner_draw(struct shader_runner *r, root_param->DescriptorTable.pDescriptorRanges = range; root_param->ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; - range->RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + if (resource->r.type == RESOURCE_TYPE_UAV) + range->RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV; + else + range->RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; range->NumDescriptors = 1; range->BaseShaderRegister = resource->r.slot; range->RegisterSpace = 0; @@ -281,6 +297,11 @@ static bool d3d12_runner_draw(struct shader_runner *r, get_gpu_descriptor_handle(test_context, runner->heap, resource->r.slot)); break; + case RESOURCE_TYPE_UAV: + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, resource->root_index, + get_gpu_descriptor_handle(test_context, runner->heap, resource->r.slot + MAX_RESOURCES)); + break; + case RESOURCE_TYPE_VERTEX_BUFFER: vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(resource->resource); vbv.StrideInBytes = get_vb_stride(&runner->r, resource->r.slot); diff --git a/tests/shader_runner_d3d9.c b/tests/shader_runner_d3d9.c index b9ec55b4e..417d68750 100644 --- a/tests/shader_runner_d3d9.c +++ b/tests/shader_runner_d3d9.c @@ -222,9 +222,7 @@ static struct resource *d3d9_runner_create_resource(struct shader_runner *r, con void *data; resource = calloc(1, sizeof(*resource)); - resource->r.slot = params->slot; - resource->r.type = params->type; - resource->r.size = params->data_size; + init_resource(&resource->r, params); switch (params->type) { @@ -257,6 +255,10 @@ static struct resource *d3d9_runner_create_resource(struct shader_runner *r, con ok(hr == D3D_OK, "Failed to unmap texture, hr %#lx.\n", hr); break; + case RESOURCE_TYPE_UAV: + fatal_error("UAVs are not supported.\n"); + break; + case RESOURCE_TYPE_VERTEX_BUFFER: hr = IDirect3DDevice9_CreateVertexBuffer(device, params->data_size, D3DUSAGE_DYNAMIC, 0, D3DPOOL_DEFAULT, &resource->vb, NULL); @@ -366,6 +368,10 @@ static bool d3d9_runner_draw(struct shader_runner *r, ok(hr == D3D_OK, "Failed to set texture, hr %#lx.\n", hr); break; + case RESOURCE_TYPE_UAV: + assert(0); + break; + case RESOURCE_TYPE_VERTEX_BUFFER: for (j = 0; j < runner->r.input_element_count; ++j) { diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index 601eb5a17..f5a0e7ec3 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -245,17 +245,25 @@ static struct resource *vulkan_runner_create_resource(struct shader_runner *r, c void *data; resource = calloc(1, sizeof(*resource)); - - resource->r.slot = params->slot; - resource->r.type = params->type; + init_resource(&resource->r, params); switch (params->type) { case RESOURCE_TYPE_TEXTURE: + case RESOURCE_TYPE_UAV: + { + VkImageUsageFlagBits usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT; + VkImageLayout layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + format = vkd3d_get_vk_format(params->format); - resource->image = create_2d_image(runner, params->width, params->height, - VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, format, &resource->memory); + if (params->type == RESOURCE_TYPE_UAV) + { + layout = VK_IMAGE_LAYOUT_GENERAL; + usage |= VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT; + } + + resource->image = create_2d_image(runner, params->width, params->height, usage, format, &resource->memory); resource->view = create_2d_image_view(runner, resource->image, format); staging_buffer = create_buffer(runner, params->data_size, @@ -277,14 +285,14 @@ static struct resource *vulkan_runner_create_resource(struct shader_runner *r, c VK_CALL(vkCmdCopyBufferToImage(runner->cmd_buffer, staging_buffer, resource->image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region)); - transition_image_layout(runner, resource->image, - VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL); + transition_image_layout(runner, resource->image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, layout); end_command_buffer(runner); VK_CALL(vkFreeMemory(device, staging_memory, NULL)); VK_CALL(vkDestroyBuffer(device, staging_buffer, NULL)); break; + } case RESOURCE_TYPE_VERTEX_BUFFER: resource->buffer = create_buffer(runner, params->data_size, VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, @@ -383,8 +391,12 @@ static bool compile_shader(const struct vulkan_shader_runner *runner, const char break; case RESOURCE_TYPE_TEXTURE: + case RESOURCE_TYPE_UAV: binding = &bindings[interface_info.binding_count++]; - binding->type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; + if (resource->r.type == RESOURCE_TYPE_UAV) + binding->type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; + else + binding->type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; binding->register_space = 0; binding->register_index = resource->r.slot; binding->shader_visibility = VKD3D_SHADER_VISIBILITY_ALL; @@ -557,6 +569,7 @@ static VkPipeline create_pipeline(const struct vulkan_shader_runner *runner, switch (resource->r.type) { case RESOURCE_TYPE_TEXTURE: + case RESOURCE_TYPE_UAV: break; case RESOURCE_TYPE_VERTEX_BUFFER: @@ -662,12 +675,16 @@ static VkDescriptorSetLayout create_descriptor_set_layout(struct vulkan_shader_r break; case RESOURCE_TYPE_TEXTURE: + case RESOURCE_TYPE_UAV: binding = &bindings[set_desc.bindingCount++]; resource->binding = binding_index++; binding->binding = resource->binding; - binding->descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; + if (resource->r.type == RESOURCE_TYPE_UAV) + binding->descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; + else + binding->descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; binding->descriptorCount = 1; binding->stageFlags = VK_SHADER_STAGE_ALL; binding->pImmutableSamplers = NULL; @@ -729,6 +746,7 @@ static void bind_resources(struct vulkan_shader_runner *runner, VkPipelineBindPo switch (resource->r.type) { case RESOURCE_TYPE_TEXTURE: + case RESOURCE_TYPE_UAV: image_info.imageView = resource->view; image_info.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; @@ -739,6 +757,12 @@ static void bind_resources(struct vulkan_shader_runner *runner, VkPipelineBindPo write.descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; write.pImageInfo = &image_info; + if (resource->r.type == RESOURCE_TYPE_UAV) + { + image_info.imageLayout = VK_IMAGE_LAYOUT_GENERAL; + write.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; + } + VK_CALL(vkUpdateDescriptorSets(runner->device, 1, &write, 0, NULL)); break; @@ -967,7 +991,7 @@ static bool init_vulkan_runner(struct vulkan_shader_runner *runner) VkInstanceCreateInfo instance_desc = {.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO}; VkDeviceCreateInfo device_desc = {.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO}; VkPhysicalDeviceFeatures ret_features, features; - VkDescriptorPoolSize descriptor_pool_sizes[2]; + VkDescriptorPoolSize descriptor_pool_sizes[3]; VkAttachmentDescription attachment_desc = {0}; static const float queue_priority = 1.0f; VkSubpassDescription subpass_desc = {0}; @@ -1049,7 +1073,9 @@ static bool init_vulkan_runner(struct vulkan_shader_runner *runner) } \ features.x = VK_TRUE + ENABLE_FEATURE(fragmentStoresAndAtomics); ENABLE_FEATURE(shaderImageGatherExtended); + ENABLE_FEATURE(shaderStorageImageWriteWithoutFormat); if ((vr = VK_CALL(vkCreateDevice(runner->phys_device, &device_desc, NULL, &device)))) { @@ -1115,6 +1141,8 @@ static bool init_vulkan_runner(struct vulkan_shader_runner *runner) descriptor_pool_sizes[0].descriptorCount = MAX_RESOURCES; descriptor_pool_sizes[1].type = VK_DESCRIPTOR_TYPE_SAMPLER; descriptor_pool_sizes[1].descriptorCount = MAX_SAMPLERS; + descriptor_pool_sizes[2].type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; + descriptor_pool_sizes[2].descriptorCount = MAX_RESOURCES; descriptor_pool_desc.maxSets = 1; descriptor_pool_desc.poolSizeCount = ARRAY_SIZE(descriptor_pool_sizes); -- 2.36.1

3 18

[PATCH] shell32: Implement SHBindToFolderIDListParent.
by Dmitry Timoshkov 09 Jun '22

09 Jun '22

Based on SHBindToParent and SHBindToObject implementations. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/pidl.c | 56 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.spec | 1 + 2 files changed, 57 insertions(+) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index f9c91a79132..f004b2ff1b6 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1364,6 +1364,62 @@ HRESULT WINAPI SHBindToObject(IShellFolder *psf, LPCITEMIDLIST pidl, IBindCtx *p } +HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, + REFIID riid, void **ppv, LPCITEMIDLIST *ppidlLast) +{ + IShellFolder *psfDesktop = NULL; + LPITEMIDLIST pidlChild; + LPITEMIDLIST pidlParent; + HRESULT hr; + + TRACE_(shell)("%p,%p,%s,%p,%p\n", psf, pidl, debugstr_guid(riid), ppv, ppidlLast); + pdump(pidl); + + if (!ppv) + return E_INVALIDARG; + + *ppv = NULL; + + if (!psf) + { + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + psf = psfDesktop; + } + + if (ppidlLast) + *ppidlLast = NULL; + + if (_ILIsPidlSimple(pidl)) + { + /* we are on desktop level */ + if (ppidlLast) + *ppidlLast = ILClone(pidl); + hr = SHGetDesktopFolder((IShellFolder **)ppv); + } + else + { + pidlChild = ILClone(ILFindLastID(pidl)); + pidlParent = ILClone(pidl); + ILRemoveLastID(pidlParent); + + hr = IShellFolder_BindToObject(psf, pidlParent, NULL, riid, ppv); + if (SUCCEEDED(hr) && ppidlLast) + *ppidlLast = pidlChild; + else + ILFree(pidlChild); + ILFree(pidlParent); + } + + if (psfDesktop) + IShellFolder_Release(psfDesktop); + + TRACE_(shell)("-- ppv=%p ret=0x%08lx\n", *ppv, hr); + return hr; +} + + /************************************************************************* * SHParseDisplayName [SHELL32.@] */ diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f8bf8f246e8..5b812774e1f 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -334,6 +334,7 @@ @ stdcall SHAssocEnumHandlers(wstr long ptr) @ stdcall SHBindToObject(ptr ptr ptr ptr ptr) @ stdcall SHBindToParent(ptr ptr ptr ptr) +@ stdcall SHBindToFolderIDListParent(ptr ptr ptr ptr ptr) @ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA @ stdcall SHBrowseForFolderA(ptr) @ stdcall SHBrowseForFolderW(ptr) -- 2.36.1

2 2

[PATCH 0/3] MR216: uiautomationcore: More UiaProviderFromIAccessible work.
by Connor McAdams (＠cmcadams) 09 Jun '22

09 Jun '22

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

3 10

[PATCH] include: Add IDXGIDebug1 declaration in dxgidebug.idl.
by Biswapriyo Nath 09 Jun '22

09 Jun '22

1 0

[PATCH 0/1] MR215: winevulkan: Update to VK spec version 1.3.217.
by Georg Lehmann (＠DadSchoorse) 09 Jun '22

09 Jun '22

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

2 1

[PATCH v2 0/5] MR201: ntdll: Implement RtlSetUserValueHeap.
by Rémi Bernon (＠rbernon) 09 Jun '22

09 Jun '22

And prepare HLOCAL allocation to use it. -- v2: kernelbase: Use RtlSetUserValueHeap to store HLOCAL. ntdll: Implement RtlSetUserValueHeap. kernelbase: Use HEAP_ADD_USER_INFO for HLOCAL allocations. ntdll: Add block padding when HEAP_ADD_USER_INFO flag is set. ole32/tests: Update IStream_SetSize with large size test result. https://gitlab.winehq.org/wine/wine/-/merge_requests/201

2 6

[PATCH resend] comctl32: Add partial support for LVM_SETBKIMAGE.
by Dmitry Timoshkov 09 Jun '22

09 Jun '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/listview.c | 65 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 59 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 730bf4aaddd..3ca76c2ef05 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -91,7 +91,7 @@ * * Messages: * -- LVM_ENABLEGROUPVIEW - * -- LVM_GETBKIMAGE, LVM_SETBKIMAGE + * -- LVM_GETBKIMAGE * -- LVM_GETGROUPINFO, LVM_SETGROUPINFO * -- LVM_GETGROUPMETRICS, LVM_SETGROUPMETRICS * -- LVM_GETINSERTMARK, LVM_SETINSERTMARK @@ -297,6 +297,7 @@ typedef struct tagLISTVIEW_INFO COLORREF clrBk; COLORREF clrText; COLORREF clrTextBk; + HBITMAP hBkBitmap; /* font */ HFONT hDefaultFont; @@ -4567,11 +4568,30 @@ static INT LISTVIEW_GetTopIndex(const LISTVIEW_INFO *infoPtr) */ static inline BOOL LISTVIEW_FillBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) { - if (!infoPtr->hBkBrush) return FALSE; + if (infoPtr->hBkBitmap) + { + HDC hdc_src = CreateCompatibleDC(hdc); + + TRACE("(hdc=%p, lprcBox=%s, hBkBitmap=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBitmap); + + SelectObject(hdc_src, infoPtr->hBkBitmap); + BitBlt(hdc, lprcBox->left, lprcBox->top, + lprcBox->right - lprcBox->left, + lprcBox->bottom - lprcBox->top, + hdc_src, lprcBox->left, lprcBox->top, SRCCOPY); + + DeleteDC(hdc_src); - TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); + return TRUE; + } + else if (infoPtr->hBkBrush) + { + TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); - return FillRect(hdc, lprcBox, infoPtr->hBkBrush); + return FillRect(hdc, lprcBox, infoPtr->hBkBrush); + } + + return FALSE; } /* Draw main item or subitem */ @@ -8028,7 +8048,37 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW_INFO *infoPtr, COLORREF color) return TRUE; } -/* LISTVIEW_SetBkImage */ +static BOOL LISTVIEW_SetBkImage(LISTVIEW_INFO *infoPtr, const LVBKIMAGEW *image, BOOL isW) +{ + TRACE("%08lx,%p,%p,%u,%d,%d\n", image->ulFlags, image->hbm, image->pszImage, + image->cchImageMax, image->xOffsetPercent, image->yOffsetPercent); + + if (image->ulFlags & ~LVBKIF_SOURCE_MASK) + FIXME("not supported flags %08lx\n", image->ulFlags & ~LVBKIF_SOURCE_MASK); + + if (image->xOffsetPercent || image->yOffsetPercent) + FIXME("not supported offset %d,%d\n", image->xOffsetPercent, image->yOffsetPercent); + + switch (image->ulFlags & LVBKIF_SOURCE_MASK) + { + case LVBKIF_SOURCE_NONE: + if (infoPtr->hBkBitmap) DeleteObject(infoPtr->hBkBitmap); + infoPtr->hBkBitmap = 0; + return TRUE; + + case LVBKIF_SOURCE_HBITMAP: + if (infoPtr->hBkBitmap) DeleteObject(infoPtr->hBkBitmap); + infoPtr->hBkBitmap = image->hbm; + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + return TRUE; + + case LVBKIF_SOURCE_URL: + FIXME("LVBKIF_SOURCE_URL: %s\n", isW ? debugstr_w(image->pszImage) : debugstr_a((LPCSTR)image->pszImage)); + break; + } + + return FALSE; +} /*** Helper for {Insert,Set}ColumnT *only* */ static void column_fill_hditem(const LISTVIEW_INFO *infoPtr, HDITEMW *lphdi, INT nColumn, @@ -10406,6 +10456,7 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) infoPtr->hFont = 0; if (infoPtr->hDefaultFont) DeleteObject(infoPtr->hDefaultFont); if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); + if (infoPtr->hBkBitmap) DeleteObject(infoPtr->hBkBitmap); SetWindowLongPtrW(infoPtr->hwndSelf, 0, 0); @@ -11554,7 +11605,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_SETBKCOLOR: return LISTVIEW_SetBkColor(infoPtr, (COLORREF)lParam); - /* case LVM_SETBKIMAGE: */ + case LVM_SETBKIMAGEA: + case LVM_SETBKIMAGEW: + return LISTVIEW_SetBkImage(infoPtr, (LVBKIMAGEW *)lParam, uMsg == LVM_SETBKIMAGEW); case LVM_SETCALLBACKMASK: infoPtr->uCallbackMask = (UINT)wParam; -- 2.35.3

1 2

[PATCH v2 0/3] MR208: Draft: dinput/tests: Cleanup old tests and merge more dinput8 / dinput tests together.
by Rémi Bernon (＠rbernon) 09 Jun '22

09 Jun '22

-- v2: dinput/tests: Merge device.c tests into device8.c. dinput/tests: Use dinput_test_(init|exit) for all tests. dinput/tests: Avoid requiring foreground window in SetCooperativeLevel tests. https://gitlab.winehq.org/wine/wine/-/merge_requests/208

3 6

[PATCH] sechost: Support decimal access rights in ConvertStringSecurityDescriptorToSecurityDescriptor.
by Dmitry Timoshkov 09 Jun '22

09 Jun '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/tests/security.c | 1 + dlls/sechost/security.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ed91ccc39d3..1a874de75c4 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4240,6 +4240,7 @@ static void test_ConvertStringSecurityDescriptor(void) { "D:(D;;GA;;;WD )", SDDL_REVISION_1, TRUE }, /* test ACE string access rights */ { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;1;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;RCSDWDWO;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;RPWPCCDCLCSWLODTCR;;;WD)", SDDL_REVISION_1, TRUE }, diff --git a/dlls/sechost/security.c b/dlls/sechost/security.c index 6916b3ad662..f6fcffd9cfc 100644 --- a/dlls/sechost/security.c +++ b/dlls/sechost/security.c @@ -903,6 +903,9 @@ static DWORD parse_ace_right( const WCHAR **string_ptr ) if (string[0] == '0' && string[1] == 'x') return wcstoul( string, (WCHAR **)string_ptr, 16 ); + if (iswdigit( string[0] )) + return wcstoul( string, (WCHAR **)string_ptr, 10 ); + for (i = 0; i < ARRAY_SIZE(ace_rights); ++i) { if (!wcsncmp( string, ace_rights[i].str, 2 )) -- 2.36.1

1 0

[PATCH] wbemprox: Add a few properties to Win32_QuickFixEngineering.
by Louis Lenders 09 Jun '22

09 Jun '22

2 1

[PATCH v2 0/2] MR210: winhttp: Use completion port for overlapped send.
by Paul Gofman (＠gofman) 09 Jun '22

09 Jun '22

There are a few issues with the way it is done now: 1. We queue overlapped WSARecv from one (user) thread and then await completion on another. As it became apparent the completions queued by a thread are canceled when thread terminates. That is currently not the case in Wine, but I have a pending MR for that: https://gitlab.winehq.org/wine/wine/-/merge_requests/135. User may use WinhttpWebSocketSend() and close the thread, if it gets to async send path that send may be canceled before it is complete. The only condition when the async operation is not canceled is that the queued async IO has a completion port and no event (which becomes the case with these patches). I tested on Windows that terminating the thread which called WinhttpWebSocketSend() doesn't cancel the async send, while I am reproducing this case with Wine and the refernced patch. 2. Using overlapped WSASend without a completion port or an event is fragile: the socket may potentially be signaled by a parallel async operation (or maybe instead not singaled until that operation completes; I think Wine and Windows currently don't agree in lot of details how that works, including maybe the higher level WSAGetOverlappedResult). This is more of theoretical point as currently we don't queue any overlapped receives. 3. WSAGetOverlappedResult is currently buggy in a funny way. It doesn't check for valid socket handle, and so if called with an overlapped without an event it waits on socket, and if socket is -1 it is current process pseudo handle and the wait hangs forever. I've sent a patch for winsock for that: https://gitlab.winehq.org/wine/wine/-/merge_requests/203. But since we need completion port for 1 anyway it also seems to also solve the potential race issue between setting socket to -1 when aborting operation and starting wait for overlapped IO on it without additional complications. -- v2: winhttp: Use completion port for async send. winhttp: Introduce netconn_wait_overlapped_result() helper. https://gitlab.winehq.org/wine/wine/-/merge_requests/210

3 3

[PATCH 0/7] MR211: win32u: user32 conversion
by Jacek Caban (＠jacek) 09 Jun '22

09 Jun '22

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

4 13

[PATCH 0/2] MR214: ntdll: tests: Test returning an exception handler on arm/arm64
by Martin Storsjö (＠mstorsjo) 09 Jun '22

09 Jun '22

Also fix up the error message printed for the handler data. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/214

2 2

[PATCH 0/2] MR209: mfreadwrite: Base new MF_SOURCE_READER_ANY_STREAM behavior off timestamps
by Derek Lesho (＠dlesho) 09 Jun '22

09 Jun '22

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

3 3

[PATCH] msvcrt: Avoid passing an invalid LCID to LCMapStringW.
by Akihiro Sagawa 09 Jun '22

09 Jun '22

Because it complains as follows on startup in Japanese locale: 002c:err:msvcrt:create_mbcinfo WideCharToMultiByte failed for cp 932, ret=0 (exp 196), error=122 This happens after commit c2a455a20d7b5124bab0086df75178d8c53f27ef. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/msvcrt/mbcs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH v2] po: Update Traditional Chinese translation.
by Chilung Chan 09 Jun '22

09 Jun '22

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- v2: Fix line 6988 and add Signed-off-by back po/zh_TW.po | 66 +++++++++++++++++------------------------------------ 1 file changed, 21 insertions(+), 45 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index e1e2c09a37e..f7bd3501244 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-12-23 14:09+0800\n" +"PO-Revision-Date: 2022-06-09 03:15+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -3924,13 +3924,11 @@ msgstr "無法在這個物件更改屬性描述符中的 'writable' 屬性為 't #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "循環的 __proto__ 值" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "無法定義屬性 '|': 物件不能擴展" +msgstr "無法為不可擴展的物件建立屬性" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible" @@ -3945,10 +3943,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "無法修改不可寫入的屬性 '|'" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "'this' 不是 Map 物件" +msgstr "'this' 不是一個 | 物件" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value" @@ -3965,45 +3961,39 @@ msgstr "Wine" #: dlls/kernelbase/kernelbase.rc:29 msgid "Western Europe and United States" -msgstr "" +msgstr "西歐和美國" #: dlls/kernelbase/kernelbase.rc:30 -#, fuzzy -#| msgid "Central European" msgid "Central Europe" msgstr "中歐語言" #: dlls/kernelbase/kernelbase.rc:34 -#, fuzzy -#| msgid "Turkish" msgid "Turkic" -msgstr "土耳其語" +msgstr "突厥語" #: dlls/kernelbase/kernelbase.rc:36 msgid "Korean" -msgstr "" +msgstr "韓語" #: dlls/kernelbase/kernelbase.rc:37 -#, fuzzy -#| msgid "Operation Ceased" msgid "Traditional Chinese" -msgstr "作業已停止" +msgstr "繁體中文" #: dlls/kernelbase/kernelbase.rc:38 msgid "Simplified Chinese" -msgstr "" +msgstr "簡體中文" #: dlls/kernelbase/kernelbase.rc:43 msgid "Indic" -msgstr "" +msgstr "印度語" #: dlls/kernelbase/kernelbase.rc:44 msgid "Georgian" -msgstr "" +msgstr "喬治亞語" #: dlls/kernelbase/kernelbase.rc:45 msgid "Armenian" -msgstr "" +msgstr "亞美尼亞語" #: dlls/kernelbase/winerror.mc:28 msgid "Success.\n" @@ -6962,54 +6952,40 @@ msgid "This network connection does not exist.\n" msgstr "這個網路連線不存在。\n" #: dlls/kernelbase/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "於插斷時間無效。\n" +msgstr "呼叫已中斷。\n" #: dlls/kernelbase/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "無效的控制代碼。\n" +msgstr "無效的檔案控制代碼。\n" #: dlls/kernelbase/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "無效的網路位址。\n" +msgstr "無效的指標位址。\n" #: dlls/kernelbase/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "無效的名稱。\n" +msgstr "無效的引數。\n" #: dlls/kernelbase/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "連線被同儕節點重設。\n" #: dlls/kernelbase/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "找不到點。\n" +msgstr "找不到主機。\n" #: dlls/kernelbase/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "找不到屬性。\n" +msgstr "找不到未授權的主機。\n" #: dlls/kernelbase/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "發生致命錯誤。\n" +msgstr "無法復原的錯誤。\n" #: dlls/kernelbase/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "名稱有效，無資料記錄。\n" #: dlls/kernelbase/winerror.mc:3817 msgid "Not implemented.\n" @@ -7695,7 +7671,7 @@ msgstr "不支援的狀態轉換。\n" #: dlls/mferror/mferror.mc:291 msgid "Unrecoverable error occurred.\n" -msgstr "發生致命錯誤。\n" +msgstr "發生無法復原的錯誤。\n" #: dlls/mferror/mferror.mc:298 msgid "Sample has too many buffers.\n" -- 2.36.1.windows.1

2 1

[PATCH v2 0/5] MR197: winegstreamer: Add support for zero-copy in wg_transform.
by Rémi Bernon (＠rbernon) 09 Jun '22

09 Jun '22

-- v2: winegstreamer: Support zero-copy in wg_transform_push_data. winegstreamer: Support zero-copy output using the allocator. winegstreamer: Introduce a new custom memory allocator. winegstreamer: Rename mf_(create|destroy)_wg_sample helpers. winegstreamer: Introduce new wg_transform_(push|read)_mf helpers. https://gitlab.winehq.org/wine/wine/-/merge_requests/197

4 9

[PATCH] conhost: Update debug output and comments when loading/saving settings
by Hugh McMaster 09 Jun '22

09 Jun '22

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index cc2df3e6e7b..54719cdb391 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -239,7 +239,7 @@ static void load_config( const WCHAR *key_name, struct console_config *config ) HKEY key, app_key; - TRACE("loading %s registry settings.\n", wine_dbgstr_w( key_name )); + TRACE( "Loading default console settings\n" ); memcpy( config->color_map, color_map, sizeof(color_map) ); memset( config->face_name, 0, sizeof(config->face_name) ); @@ -265,13 +265,15 @@ static void load_config( const WCHAR *key_name, struct console_config *config ) config->win_pos.Y = 0; config->edition_mode = 0; - /* read global settings */ + /* Load default console settings */ if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Console", &key )) { load_registry_key( key, config ); - /* if requested, load part related to console title */ + + /* Load app-specific console settings (if any) */ if (key_name && !RegOpenKeyW( key, key_name, &app_key )) { + TRACE( "Loading %s console settings\n", wine_dbgstr_w(key_name) ); load_registry_key( app_key, config ); RegCloseKey( app_key ); } @@ -408,7 +410,7 @@ static void save_config( const WCHAR *key_name, const struct console_config *con { HKEY key, app_key; - TRACE( "%s %s\n", debugstr_w( key_name ), debugstr_config( config )); + TRACE( "Saving %s console settings\n", key_name ? debugstr_w( key_name ) : "default" ); if (RegCreateKeyW( HKEY_CURRENT_USER, L"Console", &key )) { -- 2.36.1

2 1

[PATCH] conhost: Show caret immediately after reshaping
by Hugh McMaster 09 Jun '22

09 Jun '22

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index cc2df3e6e7b..b72278ddc0e 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -659,8 +659,11 @@ static void update_window( struct console *console ) if (console->win == GetFocus()) { if (console->window->cursor_visible) + { CreateCaret( console->win, console->window->cursor_bitmap, console->active->font.width, console->active->font.height ); + update_window_cursor( console ); + } else DestroyCaret(); } -- 2.36.1

2 1

[PATCH v5 0/2] MR135: Cancel asyncs queued by thread when the thread is terminated
by Paul Gofman (＠gofman) 08 Jun '22

08 Jun '22

Inspired by the discussion for MR 127 (https://www.winehq.org/pipermail/wine-devel/2022-May/217832.html) and is aimed to replace the second patch (ws2_32: Use allocated IO status block in select().) in that MR. When the thread calls server's terminate_thread for itself queuing the system APC though SIGUSR1 might race with the thread exit, there seems no easy and reliable way to be sure that signal is processed before the thread's stack and TEB are freed. Thus I am making the system APCs to be queued to the thread to be processed by server_select() after (terminate_thread) server call. When terminate_thread is called for the other thread the system APC will always be delivered through some other thread. Thread stack and TEB are not freed when the thread is killed externally, so completing the async from another thread should probably be fine. -- v5: ws2_32/tests: Add tests for terminated thread asyncs completion. ntdll: Cancel asyncs when thread is terminated. https://gitlab.winehq.org/wine/wine/-/merge_requests/135

3 4

[PATCH 0/1] MR192: ws2_32: Allow getsockname after AcceptEx
by DavidCurtiss (＠DavidCurtiss) 08 Jun '22

08 Jun '22

.NET 6's HTTP/Socket code queries this. Winsock allows getsockname on the AcceptEx AcceptSocket, but only if SO_UPDATE_ACCEPT_CONTEXT is set. Signed-off-by: David Curtiss <david.curtiss(a)ni.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/192

3 2

[PATCH v2 0/1] MR203: ws2_32: Check for valid socket in WSAGetOverlappedResult().
by Paul Gofman (＠gofman) 08 Jun '22

08 Jun '22

-- v2: ws2_32: Check for valid socket in WSAGetOverlappedResult(). https://gitlab.winehq.org/wine/wine/-/merge_requests/203

3 2

[PATCH] wevtapi: Add stub for EvtCreateRenderContext.
by Louis Lenders 08 Jun '22

08 Jun '22

1 0

[PATCH v4 0/2] MR135: Cancel asyncs queued by thread when the thread is terminated
by Paul Gofman (＠gofman) 08 Jun '22

08 Jun '22

Inspired by the discussion for MR 127 (https://www.winehq.org/pipermail/wine-devel/2022-May/217832.html) and is aimed to replace the second patch (ws2_32: Use allocated IO status block in select().) in that MR. When the thread calls server's terminate_thread for itself queuing the system APC though SIGUSR1 might race with the thread exit, there seems no easy and reliable way to be sure that signal is processed before the thread's stack and TEB are freed. Thus I am making the system APCs to be queued to the thread to be processed by server_select() after (terminate_thread) server call. When terminate_thread is called for the other thread the system APC will always be delivered through some other thread. Thread stack and TEB are not freed when the thread is killed externally, so completing the async from another thread should probably be fine. -- v4: ws2_32/tests: Add tests for terminated thread asyncs completion. ntdll: Cancel asyncs when thread is terminated. https://gitlab.winehq.org/wine/wine/-/merge_requests/135

3 4

[PATCH 0/2] MR210: winhttp: Use completion port for overlapped send.
by Paul Gofman (＠gofman) 08 Jun '22

08 Jun '22

There are a few issues with the way it is done now: 1. We queue overlapped WSARecv from one (user) thread and then await completion on another. As it became apparent the completions queued by a thread are canceled when thread terminates. That is currently not the case in Wine, but I have a pending MR for that: https://gitlab.winehq.org/wine/wine/-/merge_requests/135. User may use WinhttpWebSocketSend() and close the thread, if it gets to async send path that send may be canceled before it is complete. The only condition when the async operation is not canceled is that the queued async IO has a completion port and no event (which becomes the case with these patches). I tested on Windows that terminating the thread which called WinhttpWebSocketSend() doesn't cancel the async send, while I am reproducing this case with Wine and the refernced patch. 2. Using overlapped WSASend without a completion port or an event is fragile: the socket may potentially be signaled by a parallel async operation (or maybe instead not singaled until that operation completes; I think Wine and Windows currently don't agree in lot of details how that works, including maybe the higher level WSAGetOverlappedResult). This is more of theoretical point as currently we don't queue any overlapped receives. 3. WSAGetOverlappedResult is currently buggy in a funny way. It doesn't check for valid socket handle, and so if called with an overlapped without an event it waits on socket, and if socket is -1 it is current process pseudo handle and the wait hangs forever. I've sent a patch for winsock for that: https://gitlab.winehq.org/wine/wine/-/merge_requests/203. But since we need completion port for 1 anyway it also seems to also solve the potential race issue between setting socket to -1 when aborting operation and starting wait for overlapped IO on it without additional complications. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/210

3 4

Re: [PATCH v2 0/6] MR207: UiaProviderFromIAccessible improvements. - approved
by Alexandre Julliard (＠julliard) 08 Jun '22

08 Jun '22

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

1 0

Re: [PATCH v2 0/3] MR206: windows.gaming.input: Implement stub IGamepad2 interface. - approved
by Alexandre Julliard (＠julliard) 08 Jun '22

08 Jun '22

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

1 0

Re: [PATCH v3 0/7] MR195: winhttp: Abort web socket receive operations when the socket handle is closed - approved
by Alexandre Julliard (＠julliard) 08 Jun '22

08 Jun '22

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

1 0

Re: [PATCH v2 0/5] MR204: win32u: Avoid calling PE code with user lock - approved
by Alexandre Julliard (＠julliard) 08 Jun '22

08 Jun '22

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

1 0

Re: [PATCH v2 0/1] MR196: winegstreamer: Return void from align_video_info_planes. - approved
by Alexandre Julliard (＠julliard) 08 Jun '22

08 Jun '22

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

1 0

Re: [PATCH v6 0/1] MR175: d3d11: Do not return uninitialized values on Map() failure. - approved
by Alexandre Julliard (＠julliard) 08 Jun '22

08 Jun '22

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

1 0

[PATCH 0/5] MR197: winegstreamer: Add support for zero-copy in wg_transform.
by Rémi Bernon (＠rbernon) 08 Jun '22

08 Jun '22

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

5 12

[PATCH v2 1/5] mshtml: Set the channel's content type when parsing the header.
by Gabriel Ivăncescu 08 Jun '22

08 Jun '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Needed by 3rd patch. dlls/mshtml/navigate.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e6f2035..5d74cc1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -708,12 +708,26 @@ HRESULT read_stream(BSCallback *This, IStream *stream, void *buf, DWORD size, DW static void parse_content_type(nsChannelBSC *This, const WCHAR *value) { - const WCHAR *ptr; - size_t len; + const WCHAR *ptr, *beg, *end; + size_t len = wcslen(value); + char *content_type; static const WCHAR charsetW[] = {'c','h','a','r','s','e','t','='}; ptr = wcschr(value, ';'); + for(end = ptr ? ptr : value + len; end > value; end--) + if(!iswspace(end[-1])) + break; + for(beg = value; beg < end; beg++) + if(!iswspace(*beg)) + break; + + if((content_type = heap_strndupWtoU(beg, end - beg))) { + heap_free(This->nschannel->content_type); + This->nschannel->content_type = content_type; + strlwr(content_type); + } + if(!ptr) return; -- 2.34.1

2 6

[PATCH] po: Update Traditional Chinese translation.
by Chilung Chan 08 Jun '22

08 Jun '22

--- po/zh_TW.po | 66 +++++++++++++++++------------------------------------ 1 file changed, 21 insertions(+), 45 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index e1e2c09a37e..6d91a2902c9 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-12-23 14:09+0800\n" +"PO-Revision-Date: 2022-06-09 03:05+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -3924,13 +3924,11 @@ msgstr "無法在這個物件更改屬性描述符中的 'writable' 屬性為 't #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "循環的 __proto__ 值" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "無法定義屬性 '|': 物件不能擴展" +msgstr "無法為不可擴展的物件建立屬性" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible" @@ -3945,10 +3943,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "無法修改不可寫入的屬性 '|'" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "'this' 不是 Map 物件" +msgstr "'this' 不是一個 | 物件" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value" @@ -3965,45 +3961,39 @@ msgstr "Wine" #: dlls/kernelbase/kernelbase.rc:29 msgid "Western Europe and United States" -msgstr "" +msgstr "西歐和美國" #: dlls/kernelbase/kernelbase.rc:30 -#, fuzzy -#| msgid "Central European" msgid "Central Europe" msgstr "中歐語言" #: dlls/kernelbase/kernelbase.rc:34 -#, fuzzy -#| msgid "Turkish" msgid "Turkic" -msgstr "土耳其語" +msgstr "突厥語" #: dlls/kernelbase/kernelbase.rc:36 msgid "Korean" -msgstr "" +msgstr "韓語" #: dlls/kernelbase/kernelbase.rc:37 -#, fuzzy -#| msgid "Operation Ceased" msgid "Traditional Chinese" -msgstr "作業已停止" +msgstr "繁體中文" #: dlls/kernelbase/kernelbase.rc:38 msgid "Simplified Chinese" -msgstr "" +msgstr "簡體中文" #: dlls/kernelbase/kernelbase.rc:43 msgid "Indic" -msgstr "" +msgstr "印度語" #: dlls/kernelbase/kernelbase.rc:44 msgid "Georgian" -msgstr "" +msgstr "喬治亞語" #: dlls/kernelbase/kernelbase.rc:45 msgid "Armenian" -msgstr "" +msgstr "亞美尼亞語" #: dlls/kernelbase/winerror.mc:28 msgid "Success.\n" @@ -6962,54 +6952,40 @@ msgid "This network connection does not exist.\n" msgstr "這個網路連線不存在。\n" #: dlls/kernelbase/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "於插斷時間無效。\n" +msgstr "呼叫已中斷。\n" #: dlls/kernelbase/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "無效的控制代碼。\n" +msgstr "無效的檔案控制代碼。\n" #: dlls/kernelbase/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "無效的網路位址。\n" +msgstr "無效的指標位址。\n" #: dlls/kernelbase/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "無效的名稱。\n" +msgstr "無效的引數。\n" #: dlls/kernelbase/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "連線被同儕節點重設。\n" #: dlls/kernelbase/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "找不到點。\n" +msgstr "找不到主機。\n" #: dlls/kernelbase/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "找不到屬性。\n" +msgstr "找不到未授權的主機。\n" #: dlls/kernelbase/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "發生致命錯誤。\n" +msgstr "無法復原的錯誤。\n" #: dlls/kernelbase/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "名稱有效，無資料記錄。" #: dlls/kernelbase/winerror.mc:3817 msgid "Not implemented.\n" @@ -7695,7 +7671,7 @@ msgstr "不支援的狀態轉換。\n" #: dlls/mferror/mferror.mc:291 msgid "Unrecoverable error occurred.\n" -msgstr "發生致命錯誤。\n" +msgstr "發生無法復原的錯誤。\n" #: dlls/mferror/mferror.mc:298 msgid "Sample has too many buffers.\n" -- 2.36.1.windows.1

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel