- Wine-Devel - list.winehq.org

[tools] testbot/cgi: Rename the per-item action list variables.
by Francois Gouget March 3, 2022

March 3, 2022

Rename it to $ItemActions to avoid confusion with the global actions list ($Actions). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 54 ++++++++++++++----- .../ObjectModel/CGI/CollectionBlockForPage.pm | 8 +-- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 8 +-- 3 files changed, 48 insertions(+), 22 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index effd039fb2..3af2a14ce5 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -108,8 +108,8 @@ EOF print "<table border='0' cellpadding='5' cellspacing='0' summary='" . "Overview of " . $Collection->GetCollectionName() . "'>\n"; print "<thead>\n"; - my $Actions = $self->CallGetItemActions(); - $self->CallGenerateHeaderRow($PropertyDescriptors, $Actions); + my $ItemActions = $self->CallGetItemActions(); + $self->CallGenerateHeaderRow($PropertyDescriptors, $ItemActions); print "</thead>\n"; print "<tbody>\n"; @@ -121,7 +121,7 @@ EOF my $Class = ($Row % 2) == 0 ? "even" : "odd"; my $Item = $self->{Collection}->GetItem($Key); $self->CallGenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, - $Class, $Actions); + $Class, $ItemActions); $Row++; } if (@$Keys == 0) @@ -132,7 +132,7 @@ EOF print "</tbody>\n"; print "</table>\n"; - if (@$Actions != 0 && @$Keys != 0) + if (@$ItemActions != 0 && @$Keys != 0) { print <<EOF; <div class='CollectionBlockActions'> @@ -153,7 +153,7 @@ document.write("<a href='javascript:void(0)' onClick='ToggleAll();'>Toggle All<\ </script> EOF print "For selected ", $self->{Collection}->GetCollectionName() . ":"; - foreach my $Action (@$Actions) + foreach my $Action (@$ItemActions) { print " <input type='submit' name='Action' value='" . $self->escapeHTML($Action) . "' />"; @@ -162,7 +162,7 @@ EOF print "</div>\n"; } - $Actions = $self->CallGetActions(); + my $Actions = $self->CallGetActions(); if (@$Actions != 0) { print "<div class='CollectionBlockActions'>\n"; @@ -231,17 +231,17 @@ sub GenerateFormEnd($) sub CallGenerateHeaderRow($$$) { - my ($self, $PropertyDescriptors, $Actions) = @_; + my ($self, $PropertyDescriptors, $ItemActions) = @_; - $self->GenerateHeaderRow($PropertyDescriptors, $Actions); + $self->GenerateHeaderRow($PropertyDescriptors, $ItemActions); } sub GenerateHeaderRow($$$) { - my ($self, $PropertyDescriptors, $Actions) = @_; + my ($self, $PropertyDescriptors, $ItemActions) = @_; print "<tr>\n"; - if (@$Actions != 0) + if (@$ItemActions != 0) { print "<th> </th>\n"; } @@ -272,9 +272,9 @@ sub GenerateHeaderCell($$) sub CallGenerateDataRow($$$$$$) { - my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions) = @_; + my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; - $self->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions); + $self->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); } sub SelName($$) @@ -287,10 +287,10 @@ sub SelName($$) sub GenerateDataRow($$$$$$) { - my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions) = @_; + my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; print "<tr class='$Class'>\n"; - if (@$Actions != 0) + if (@$ItemActions != 0) { print "<td><input name='", $self->SelName($Item->GetKey()), "' type='checkbox' /></td>\n"; @@ -369,6 +369,19 @@ sub CallGetItemActions($) return $self->GetItemActions(); } +=pod +=over 12 + +=item C<GetItemActions()> + +Returns the list of per-item actions. + +This is a set of actions that is applied to each selected item in the +collection. + +=back +=cut + sub GetItemActions($) { #my ($self) = @_; @@ -382,6 +395,19 @@ sub CallGetActions($) return $self->GetActions(); } +=pod +=over 12 + +=item C<GetActions()> + +Returns the list of global actions. + +This is a set of actions that do not impact any specific item in the +collection. + +=back +=cut + sub GetActions($) { my ($self) = @_; diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm index 03a45082f0..13ad5a8752 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm @@ -54,16 +54,16 @@ sub CallGenerateHeaderCell($$) sub CallGenerateHeaderRow($$$) { - my ($self, $PropertyDescriptors, $Actions) = @_; + my ($self, $PropertyDescriptors, $ItemActions) = @_; - $self->{EnclosingPage}->GenerateHeaderRow($self, $PropertyDescriptors, $Actions); + $self->{EnclosingPage}->GenerateHeaderRow($self, $PropertyDescriptors, $ItemActions); } sub CallGenerateDataRow($$$$$$) { - my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions) = @_; + my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; - $self->{EnclosingPage}->GenerateDataRow($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions); + $self->{EnclosingPage}->GenerateDataRow($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); } sub CallGenerateDataCell($$$$) diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index 5c48954c68..72bba1bc4e 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -103,16 +103,16 @@ sub GenerateHeaderCell($$$) sub GenerateHeaderRow($$$$) { - my ($self, $CollectionBlock, $PropertyDescriptors, $Actions) = @_; + my ($self, $CollectionBlock, $PropertyDescriptors, $ItemActions) = @_; - $CollectionBlock->GenerateHeaderRow($PropertyDescriptors, $Actions); + $CollectionBlock->GenerateHeaderRow($PropertyDescriptors, $ItemActions); } sub GenerateDataRow($$$$$$$) { - my ($self, $CollectionBlock, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions) = @_; + my ($self, $CollectionBlock, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; - $CollectionBlock->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions); + $CollectionBlock->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); } sub GenerateDataCell($$$$$) -- 2.30.2

1 0

[PATCH 1/3] winegstreamer: Implement WMA decoder Process(Input|Output) error checks.
by Rémi Bernon March 3, 2022

March 3, 2022

Checking that WMA decoder ignores any incorrectly sized input sample. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I believe this approach works best and doesn't suffer from any of the potential troubles the queue would introduce. It should also be fully synchronous in the general case, although I kept the mutex to be safe. For now, one input buffer can be queued at a time, which is how the WMA decoder transform works, and the output buffers are appended to each other, although they are normally also produced one at a time. Later, and to satisfy the requirements of the H264 transform and the expectations of CoD: BO3, I will change the input to a GstBufferList with a length limit. Even for the zero-copy optimization, I was able to validate that it's still possible, and even simpler to implement as we now do all the processing in ProcessOutput. We can then later consider adding some asynchronicity using queues, but I'm not sure it is going to be useful, and may even cause more problems than it's worth. dlls/mf/tests/mf.c | 23 +++++++++++++--------- dlls/winegstreamer/wma_decoder.c | 33 ++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e61442bb512..0ab46445d9a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6031,6 +6031,7 @@ static void test_wma_decoder(void) MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_WMAudioV8}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_Float}; MFT_OUTPUT_STREAM_INFO output_info; + MFT_OUTPUT_DATA_BUFFER outputs[2]; MFT_INPUT_STREAM_INFO input_info; MFT_OUTPUT_DATA_BUFFER output; const BYTE *wma_encoded_data; @@ -6208,7 +6209,7 @@ static void test_wma_decoder(void) ok(hr == S_OK, "ProcessInput returned %#x\n", hr); ret = IMFSample_Release(sample); ok(ret == 0, "Release returned %u\n", ret); - sample = create_sample(wma_encoded_data + wma_block_size, wma_block_size - wma_block_size / 2); + sample = create_sample(wma_encoded_data, wma_block_size + 1); hr = IMFTransform_ProcessInput(transform, 0, sample, 0); todo_wine ok(hr == S_OK, "ProcessInput returned %#x\n", hr); @@ -6231,16 +6232,13 @@ static void test_wma_decoder(void) status = 0xdeadbeef; memset(&output, 0, sizeof(output)); hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); - todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); ok(output.dwStreamID == 0, "got dwStreamID %u\n", output.dwStreamID); ok(!output.pSample, "got pSample %p\n", output.pSample); - todo_wine ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE || broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE)) /* Win7 */, "got dwStatus %#x\n", output.dwStatus); ok(!output.pEvents, "got pEvents %p\n", output.pEvents); - todo_wine ok(status == 0, "got status %#x\n", status); sample = create_sample(wma_encoded_data, wma_block_size); @@ -6253,16 +6251,25 @@ static void test_wma_decoder(void) status = 0xdeadbeef; memset(&output, 0, sizeof(output)); hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); - todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); ok(!output.pSample, "got pSample %p\n", output.pSample); - todo_wine ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE || broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE)) /* Win7 */, "got dwStatus %#x\n", output.dwStatus); - todo_wine ok(status == 0, "got status %#x\n", status); + status = 0xdeadbeef; + memset(&output, 0, sizeof(output)); + output_info.cbSize = sizeof(wma_decoded_data); + sample = create_sample(NULL, output_info.cbSize); + outputs[0].pSample = sample; + sample = create_sample(NULL, output_info.cbSize); + outputs[1].pSample = sample; + hr = IMFTransform_ProcessOutput(transform, 0, 2, outputs, &status); + ok(hr == E_INVALIDARG, "ProcessOutput returned %#x\n", hr); + IMFSample_Release(outputs[0].pSample); + IMFSample_Release(outputs[1].pSample); + i = 1; status = 0xdeadbeef; output_info.cbSize = sizeof(wma_decoded_data); @@ -6333,7 +6340,6 @@ static void test_wma_decoder(void) ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); ok(output.pSample == sample, "got pSample %p\n", output.pSample); ok(output.dwStatus == 0, "got dwStatus %#x\n", output.dwStatus); - todo_wine ok(status == 0, "got status %#x\n", status); ret = IMFSample_Release(sample); ok(ret == 0, "Release returned %u\n", ret); @@ -6349,7 +6355,6 @@ static void test_wma_decoder(void) ok(output.dwStatus == 0 || broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|7)) /* Win7 */, "got dwStatus %#x\n", output.dwStatus); - todo_wine ok(status == 0, "got status %#x\n", status); check_sample(sample, NULL, 0, NULL); ret = IMFSample_Release(sample); diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 6c198706944..a35da1cdc70 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -520,14 +520,47 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { + struct wma_decoder *decoder = impl_from_IMFTransform(iface); + MFT_INPUT_STREAM_INFO info; + HRESULT hr; + FIXME("iface %p, id %lu, sample %p, flags %#lx stub!\n", iface, id, sample, flags); + + if (!decoder->wg_transform) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = IMFTransform_GetInputStreamInfo(iface, 0, &info))) + return hr; + return E_NOTIMPL; } static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) { + struct wma_decoder *decoder = impl_from_IMFTransform(iface); + MFT_OUTPUT_STREAM_INFO info; + HRESULT hr; + FIXME("iface %p, flags %#lx, count %lu, samples %p, status %p stub!\n", iface, flags, count, samples, status); + + if (count > 1) + return E_INVALIDARG; + + if (!decoder->wg_transform) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(iface, 0, &info))) + return hr; + + *status = 0; + samples[0].dwStatus = 0; + if (!samples[0].pSample) + { + samples[0].dwStatus = MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE; + return MF_E_TRANSFORM_NEED_MORE_INPUT; + } + return E_NOTIMPL; } -- 2.34.1

3 5

[PATCH 1/6] ws2_32/tests: Add tests for setting and getting socket options with shorter length.
by Paul Gofman March 3, 2022

March 3, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The aim of the patchset is to fix setting and getting 32bit sized socket options when the beaviour is different between Windows and Linux setsockopt() and getsockopt(). That behaviour partially regressed on the move from ws2_32 to ntdll: setsockopt() had the code which would adjust the size for option with the provided length less than 4 bytes (which helped, e. g., SO_REUSEADDR and SO_KEEPALIVE and Killing Floor 2 depended on that). ALthough, as my tests show, that was not universally correct across all the options and the details of getsockopt() were also different. I have another 16 patches on top of this series addressing the other options. dlls/ws2_32/tests/sock.c | 86 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6b6267dc153..0eece82bfb1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1155,8 +1155,27 @@ static const LINGER linger_testvals[] = { static void test_set_getsockopt(void) { + static struct + { + int af; + int type; + int level; + int optname; + BOOL accepts_short_len; + unsigned int sizes[3]; + DWORD values[3]; + } + test_optsize[] = + { + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}}, + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_TTL, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TOS, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TTL, TRUE, {1, 1, 4}}, + }; SOCKET s, s2; - int i, err, lasterr; + int i, j, err, lasterr; int timeout; LINGER lingval; int size; @@ -1375,6 +1394,71 @@ static void test_set_getsockopt(void) err, WSAGetLastError()); closesocket(s); + + /* Test option short length. */ + for (i = 0; i < ARRAY_SIZE(test_optsize); ++i) + { + s2 = socket( test_optsize[i].af, test_optsize[i].type, 0 ); + ok(s2 != INVALID_SOCKET, "socket() failed error %d\n", WSAGetLastError()); + for (j = 0; j < 3; ++j) + { + DWORD expected_last_error, expected_value, expected_size, save_value; + int expected_err; + + winetest_push_context("i %u, level %d, optname %d, len %u", + i, test_optsize[i].level, test_optsize[i].optname, 1 << j); + + size = sizeof(save_value); + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&save_value, &size); + ok(!err, "Unexpected getsockopt result %d.\n", err); + + if (test_optsize[i].accepts_short_len || j == 2) + { + expected_err = 0; + expected_last_error = ERROR_SUCCESS; + expected_size = test_optsize[i].sizes[j] ? test_optsize[i].sizes[j] : 4; + if (test_optsize[i].values[j]) + expected_value = test_optsize[i].values[j]; + else if (expected_size == 4) + expected_value = 1; + else + expected_value = (0xdeadbeef & ~((1 << expected_size * 8) - 1)) | 1; + } + else + { + expected_err = -1; + expected_last_error = WSAEFAULT; + expected_size = test_optsize[i].sizes[j]; + if (test_optsize[i].values[j]) + expected_value = test_optsize[i].values[j]; + else + expected_value = 0xdeadbeef; + } + + value = 1; + SetLastError(0xdeadbeef); + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, 1 << j); + ok(err == expected_err, "Unexpected setsockopt result %d.\n", err); + ok(WSAGetLastError() == expected_last_error, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + + value = 0xdeadbeef; + SetLastError(0xdeadbeef); + size = 1 << j; + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, &size); + ok(err == expected_err, "Unexpected getsockopt result %d.\n", err); + ok(WSAGetLastError() == expected_last_error, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + ok(value == expected_value, "Got unexpected value %#x, expected %#x.\n", value, expected_value); + ok(size == expected_size, "Got unexpected size %u, expected %u.\n", size, expected_size); + + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, + (char*)&save_value, sizeof(save_value)); + ok(!err, "Unexpected getsockopt result %d.\n", err); + + winetest_pop_context(); + } + closesocket(s2); + } + /* Test with the closed socket */ SetLastError(0xdeadbeef); size = sizeof(i); -- 2.35.1

1 5