September 2023 - Wine-Commits

Biswapriyo Nath : include: Add ID3D12VideoDecoder in d3d12video.idl.
by Alexandre Julliard Sept. 22, 2023

Sept. 22, 2023

Module: wine Branch: master Commit: e7824f105b1b0bbeadea4c0f7546ded4e45f2e7d URL: https://gitlab.winehq.org/wine/wine/-/commit/e7824f105b1b0bbeadea4c0f7546de… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Sep 22 13:22:57 2023 +0000 include: Add ID3D12VideoDecoder in d3d12video.idl. --- include/Makefile.in | 1 + include/d3d12video.idl | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index d2df2383ea2..7d7697bc015 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -132,6 +132,7 @@ SOURCES = \ d3d12.idl \ d3d12sdklayers.idl \ d3d12shader.idl \ + d3d12video.idl \ d3d8.h \ d3d8caps.h \ d3d8types.h \ diff --git a/include/d3d12video.idl b/include/d3d12video.idl new file mode 100644 index 00000000000..1c75b4b3f06 --- /dev/null +++ b/include/d3d12video.idl @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2023 Biswapriyo Nath + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "dxgicommon.idl"; +import "d3d12.idl"; + +typedef enum D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE +{ + D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE_NONE = 0, + D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE_FIELD_BASED = 1, +} D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE; + +typedef enum D3D12_BITSTREAM_ENCRYPTION_TYPE +{ + D3D12_BITSTREAM_ENCRYPTION_TYPE_NONE = 0, +} D3D12_BITSTREAM_ENCRYPTION_TYPE; + +typedef struct D3D12_VIDEO_DECODE_CONFIGURATION +{ + GUID DecodeProfile; + D3D12_BITSTREAM_ENCRYPTION_TYPE BitstreamEncryption; + D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE InterlaceType; +} D3D12_VIDEO_DECODE_CONFIGURATION; + +typedef struct D3D12_VIDEO_DECODER_DESC +{ + UINT NodeMask; + D3D12_VIDEO_DECODE_CONFIGURATION Configuration; +} D3D12_VIDEO_DECODER_DESC; + +[ + uuid(c59b6bdc-7720-4074-a136-17a156037470), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoDecoder : ID3D12Pageable +{ + D3D12_VIDEO_DECODER_DESC GetDesc(); +}

1 0

Alexandre Julliard : vkd3d: Import upstream release 1.9.
by Alexandre Julliard Sept. 22, 2023

Sept. 22, 2023

Module: wine Branch: master Commit: 3c186a5ed0d1932349b96b7897cae0851718a2b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c186a5ed0d1932349b96b7897cae0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 25 13:29:32 2023 +0200 vkd3d: Import upstream release 1.9. --- dlls/d3dcompiler_43/tests/blob.c | 2 +- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 4 +- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 43 +- libs/vkd3d/AUTHORS | 4 + libs/vkd3d/Makefile.in | 7 +- libs/vkd3d/config.h | 4 +- libs/vkd3d/include/private/vkd3d_common.h | 23 + libs/vkd3d/include/private/vkd3d_debug.h | 2 +- libs/vkd3d/include/private/vkd3d_shader_utils.h | 67 + libs/vkd3d/include/vkd3d.h | 37 + libs/vkd3d/include/vkd3d_shader.h | 307 +- libs/vkd3d/libs/vkd3d-common/debug.c | 21 +- .../vkd3d/libs/vkd3d-shader/{trace.c => d3d_asm.c} | 75 +- libs/vkd3d/libs/vkd3d-shader/d3dbc.c | 1521 +++++- libs/vkd3d/libs/vkd3d-shader/dxbc.c | 1813 +------ libs/vkd3d/libs/vkd3d-shader/dxil.c | 2968 +++++++++++ libs/vkd3d/libs/vkd3d-shader/hlsl.c | 896 +++- libs/vkd3d/libs/vkd3d-shader/hlsl.h | 293 +- libs/vkd3d/libs/vkd3d-shader/hlsl.l | 8 + libs/vkd3d/libs/vkd3d-shader/hlsl.y | 3815 ++++++++----- libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c | 2391 ++++++--- libs/vkd3d/libs/vkd3d-shader/hlsl_constant_ops.c | 799 ++- libs/vkd3d/libs/vkd3d-shader/hlsl_sm1.c | 980 ---- libs/vkd3d/libs/vkd3d-shader/hlsl_sm4.c | 2531 --------- libs/vkd3d/libs/vkd3d-shader/ir.c | 1294 +++++ libs/vkd3d/libs/vkd3d-shader/preproc.l | 146 +- libs/vkd3d/libs/vkd3d-shader/sm4.h | 552 -- libs/vkd3d/libs/vkd3d-shader/spirv.c | 1718 +++--- libs/vkd3d/libs/vkd3d-shader/tpf.c | 5619 ++++++++++++++++++++ libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c | 599 ++- .../vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h | 205 +- libs/vkd3d/libs/vkd3d/command.c | 810 ++- libs/vkd3d/libs/vkd3d/device.c | 440 +- libs/vkd3d/libs/vkd3d/resource.c | 1235 +++-- libs/vkd3d/libs/vkd3d/state.c | 18 +- libs/vkd3d/libs/vkd3d/vkd3d_main.c | 4 +- libs/vkd3d/libs/vkd3d/vkd3d_private.h | 352 +- 37 files changed, 20833 insertions(+), 10770 deletions(-)

1 0

Brendan Shanks : winecoreaudio: Use os_unfair_lock when available instead of OSSpinLock.
by Alexandre Julliard Sept. 22, 2023

Sept. 22, 2023

Module: wine Branch: master Commit: 3d32cb9cbe25cb8e0bb6933dd0cefbacdef5b074 URL: https://gitlab.winehq.org/wine/wine/-/commit/3d32cb9cbe25cb8e0bb6933dd0cefb… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Sep 15 15:45:33 2023 -0700 winecoreaudio: Use os_unfair_lock when available instead of OSSpinLock. --- dlls/winecoreaudio.drv/coreaudio.c | 78 +++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 35 deletions(-)

1 0

Jacek Caban : mshtml: Remove unused functions.
by Alexandre Julliard Sept. 22, 2023

Sept. 22, 2023

Module: wine Branch: master Commit: 3b5aef662f80e944555797b1616bc911a3518029 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b5aef662f80e944555797b1616bc9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 22 11:19:49 2023 +0200 mshtml: Remove unused functions. --- dlls/mshtml/htmltable.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index e1431dddebb..85d1858fed7 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -441,11 +441,6 @@ static const IHTMLTableCellVtbl HTMLTableCellVtbl = { HTMLTableCell_get_cellIndex }; -static inline HTMLTableCell *HTMLTableCell_from_HTMLDOMNode(HTMLDOMNode *iface) -{ - return CONTAINING_RECORD(iface, HTMLTableCell, element.node); -} - static inline HTMLTableCell *HTMLTableCell_from_DispatchEx(DispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLTableCell, element.node.event_target.dispex); @@ -871,11 +866,6 @@ static const IHTMLTableRowVtbl HTMLTableRowVtbl = { HTMLTableRow_deleteCell }; -static inline HTMLTableRow *HTMLTableRow_from_HTMLDOMNode(HTMLDOMNode *iface) -{ - return CONTAINING_RECORD(iface, HTMLTableRow, element.node); -} - static inline HTMLTableRow *HTMLTableRow_from_DispatchEx(DispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLTableRow, element.node.event_target.dispex); @@ -1875,11 +1865,6 @@ static const IHTMLTable3Vtbl HTMLTable3Vtbl = { HTMLTable3_get_summary }; -static inline HTMLTable *impl_from_HTMLDOMNode(HTMLDOMNode *iface) -{ - return CONTAINING_RECORD(iface, HTMLTable, element.node); -} - static inline HTMLTable *impl_from_DispatchEx(DispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLTable, element.node.event_target.dispex);

1 0

Nikolay Sivov : d3d10/effect: Implement instructions used for signed integer division.
by Alexandre Julliard Sept. 22, 2023

Sept. 22, 2023

Module: wine Branch: master Commit: d49a6ab0ded661297e59c686fc6709c970baf72b URL: https://gitlab.winehq.org/wine/wine/-/commit/d49a6ab0ded661297e59c686fc6709… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 17 11:49:50 2023 +0200 d3d10/effect: Implement instructions used for signed integer division. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 30 ++++++++++ dlls/d3d10/tests/effect.c | 141 +++++++++++++++++++++++++++++++--------------- 2 files changed, 125 insertions(+), 46 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add signed integer compare instructions for expressions.
by Alexandre Julliard Sept. 22, 2023

Sept. 22, 2023

Module: wine Branch: master Commit: 6ce99d16a6445705a7a0cfc6f8835930b8c25292 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ce99d16a6445705a7a0cfc6f88359… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 17 12:05:37 2023 +0200 d3d10/effect: Add signed integer compare instructions for expressions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 60 +++++++++++++++++++++++++++++++++++ dlls/d3d10/tests/effect.c | 81 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 136 insertions(+), 5 deletions(-)

1 0

Francois Gouget : testbot/web: Add support for filtering the failures list.
by Alexandre Julliard Sept. 22, 2023

Sept. 22, 2023

Module: tools Branch: master Commit: 8327729fa149fbf23678a29fe85a1ecf9321d49a URL: https://gitlab.winehq.org/winehq/tools/-/commit/8327729fa149fbf23678a29fe85… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 1 12:30:40 2023 +0200 testbot/web: Add support for filtering the failures list. In particular this can be used to look up the bug corresponding to a failure line if any. --- testbot/web/FailuresList.pl | 76 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/testbot/web/FailuresList.pl b/testbot/web/FailuresList.pl index d1f8de6d..505b7e3a 100644 --- a/testbot/web/FailuresList.pl +++ b/testbot/web/FailuresList.pl @@ -50,6 +50,37 @@ sub Create($$) return FailuresBlock->new($Collection, $EnclosingPage); } +sub GenerateFormStart() +{ + my ($self) = @_; + $self->SUPER::GenerateFormStart(); + + my $Config = $self->escapeHTML($self->{EnclosingPage}->GetParam("Config") || ""); + my $Module = $self->escapeHTML($self->{EnclosingPage}->GetParam("Module") || ""); + my $Line = $self->escapeHTML($self->{EnclosingPage}->GetParam("Line") || ""); + print <<EOF; + <div class='ItemProperty'><label><a class='title' title="Optionally add the architecture after a ':'">Test configuration</a></label> + <div class='ItemValue'> + <input type='text' name='Config' placeholder='VM name' maxlength='20' size='20' value='$Config' /> + </div> + </div> + <div class='ItemProperty'><label><a class='title' title='or "Report validation errors"'>Module</a></label> + <div class='ItemValue'> + <input type='text' name='Module' placeholder='Dll or program name' maxlength='64' size='64' value='$Module' /> + </div> + </div> + <div class='ItemProperty'><label>Failure line</label> + <div class='ItemValue'> + <input type='text' name='Line' placeholder='Failure, unhandled exception, validation error, ...' maxlength='512' size='64' value='$Line' /> + </div> + </div> + <div class='ItemActions'> + <input type='submit' value='Filter'/> + </div> +<p></p> +EOF +} + sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; @@ -114,6 +145,51 @@ sub GenerateDataView($$$) } } +sub GetSortedItems($) +{ + my ($self) = @_; + my $Items = $self->{Collection}->GetSortedItems(); + + my $Config = $self->{EnclosingPage}->GetParam("Config"); + my $Module = $self->{EnclosingPage}->GetParam("Module"); + my $Line = $self->{EnclosingPage}->GetParam("Line"); + if ($Config or $Module or $Line) + { + my $TestUnit; + $TestUnit = $1 if ($Line and $Line =~ /^([_a-z0-9]+)\.c:\d+:/); + + my @Failures; + foreach my $Failure (@$Items) + { + next if ($Module and $Module ne $Failure->ErrorGroup); + next if ($TestUnit and $TestUnit ne $Failure->TestUnit); + + if ($Config) + { + my $RegExp = $Failure->ConfigRegExp; + my $Match = eval { + use warnings FATAL => qw(regexp); + !$RegExp or $Config =~ /$RegExp/; + }; + next if (!$Match); + } + if ($Line) + { + my $RegExp = $Failure->FailureRegExp; + my $Match = eval { + use warnings FATAL => qw(regexp); + !$RegExp or $Line =~ /$RegExp/; + }; + next if (!$Match); + } + + push @Failures, $Failure; + } + $Items = \@Failures; + } + return $Items; +} + sub GetItemActions($) { my ($self) = @_;

1 0

Francois Gouget : testbot/cgi: Don't bypass CollectionBlock::GetSortedItems().
by Alexandre Julliard Sept. 22, 2023

Sept. 22, 2023

Module: tools Branch: master Commit: efd5ba36a7c45869f1896609add08702a6621a73 URL: https://gitlab.winehq.org/winehq/tools/-/commit/efd5ba36a7c45869f1896609add… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 1 12:24:29 2023 +0200 testbot/cgi: Don't bypass CollectionBlock::GetSortedItems(). In addition to customizing the sort order CollectionBlock::GetSortedItems() also allows subclasses to filter the rows. --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 00295e56..7e7e85ff 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -210,6 +210,20 @@ sub DisplayProperty($$) return $PropertyDescriptor->GetClass eq "Detailref" ? "" : "ro"; } +=pod +=over 12 + +=item C<GetSortedItems()> + +Returns a reference to the list of items to show in the collection block. + +By default it just forwards the call to the collection's GetSortedItems() +method but it can be redefined to customize the sort order or select which +items to show. + +=back +=cut + sub GetSortedItems($$) { my ($self, $Items) = @_; @@ -480,7 +494,7 @@ sub GenerateList($) $HasDT ||= ($PropertyDescriptor->GetClass() eq "Basic" and $PropertyDescriptor->GetType() eq "DT"); } - my $Items = $self->{Collection}->GetSortedItems(); + my $Items = $self->GetSortedItems(); if ($HasDT and @$Items != 0) { $self->{EnclosingPage}->GenerateImportJS(GetDateTimeJSFile());

1 0

Francois Gouget : testbot/cgi: Remove a duplicate initialization in CollectionBlock::GenerateList().
by Alexandre Julliard Sept. 22, 2023

Sept. 22, 2023

Module: tools Branch: master Commit: be1e3b83989e1af04dc1f04ea3c71e57b4642dff URL: https://gitlab.winehq.org/winehq/tools/-/commit/be1e3b83989e1af04dc1f04ea3c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 1 12:23:18 2023 +0200 testbot/cgi: Remove a duplicate initialization in CollectionBlock::GenerateList(). --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index bbff74c6..00295e56 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -490,7 +490,6 @@ sub GenerateList($) $self->GenerateFormStart(); $self->GenerateErrorDiv(); - my $Items = $self->{Collection}->GetSortedItems(); print "<table border='0' cellpadding='5' cellspacing='0' summary='" . "Overview of " . $Collection->GetCollectionName() . "'>\n"; print "<thead>\n";

1 0

Giovanni Mascellani : tests: Mark a bug as resolved on Mesa.
by Alexandre Julliard Sept. 22, 2023

Sept. 22, 2023

Module: vkd3d Branch: master Commit: ca05e57e67306e9b97eb22a35cd77728e3e91db9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ca05e57e67306e9b97eb22a35cd77… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Sep 21 12:43:59 2023 +0200 tests: Mark a bug as resolved on Mesa. --- tests/d3d12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index e9dabf7f..3f2fc91b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9658,7 +9658,7 @@ static void test_shader_instructions(void) {&ps_if, {{0.0f}}, {{1.0f, 0.0f, 0.0f, 1.0f}}}, {&ps_if, {{1.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, - /* FIXME: Ordered/unordered comparisons are broken on Mesa. */ + /* Ordered/unordered comparisons were broken on Mesa. They are fixed at least from 23.1.7. */ {&ps_if_return, {{0.0f, 0.0f, 0.0f, 0.0f}}, {{0.0f, 0.0f, 0.0f, 0.0f}}}, {&ps_if_return, {{ NAN, 0.0f, 0.0f, 0.0f}}, {{1.0f, 0.0f, 0.0f, 0.0f}}, false, true}, {&ps_if_return, {{3.0f, 0.0f, 0.0f, 0.0f}}, {{0.0f, 0.0f, 0.0f, 0.0f}}},

1 0