- wine-devel - winehq.org

[PATCH 0/1] MR246: Allow renaming a file/directory to a different case of itself
by Gabriel Ivăncescu (＠insn) 14 Jun '22

14 Jun '22

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

2 1

[PATCH v5 0/9] MR217: windows.media.speech: ISpeechSynthesisStream stub implementation.
by Bernhard Kölbl (＠besentv) 14 Jun '22

14 Jun '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> -- v5: windows.media.speech: Add stub ISpeechSynthesisStream iface. windows.media.speech: Return IAsyncOperation from synthesizer_SynthesizeSsmlToStreamAsync. windows.media.speech: Return IAsyncOperation from synthesizer_SynthesizeTextToStreamAsync. windows.media.speech/tests: Add basic tests for ssml/text to stream functions. windows.media.speech/tests: Handle a possible race condition. windows.media.… [View More]

3 10

[PATCH 0/2] MR244: winex11.drv: Keep GLX pbuffer alive while its drawable is used
by Paul Gofman (＠gofman) 14 Jun '22

14 Jun '22

Other drawable types are ref counted and destroyed only when nothing (e. g., existing contexts) reference them anymore, making sure that if we have a context referencing drawable the GLX drawable is still valid. That was probably left behind for PBuffers. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/244

2 2

[tools] testbot/WineSendLog: Tweak the job report emails.
by Francois Gouget 14 Jun '22

14 Jun '22

Don't assume that jobs coming from the patches website necessarily have a sender email address. Update the patches website in all cases. Also mark a patch as failed in the patches website when the job has skipped tasks or TestBot errors. Clearly identify the new failures in the report sent to the developer. Provide more details about the job result, particularly TestBot errors, the presence of skipped tasks, and consequences. Call for help fixing preexisting failures. Signed-off-by: Francois … [View More]Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 340 ++++++++++++++++++++++++------------- testbot/tests/TestWTBS | 7 +- 2 files changed, 226 insertions(+), 121 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 9351d5d6f..3897ac034 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -173,146 +173,220 @@ sub SendLog($) { my ($Job) = @_; - my $To = $WinePatchToOverride || $Job->GetEMailRecipient(); - if (! defined($To)) - { - return; - } - - my $StepsTasks = CreateStepsTasks(undef, $Job); - my $SortedStepsTasks = $StepsTasks->GetSortedItems(); - - my $JobURL = MakeOfficialURL("/JobDetails.pl?Key=". $Job->GetKey()); - - # - # Send a job summary and all the logs as attachments to the developer + # Collect and count the new and old failures, etc. # - Debug("-------------------- Developer email --------------------\n"); - my $Sendmail; - if ($Debug) - { - open($Sendmail, ">>&=", 1); - } - else - { - open($Sendmail, "|-", "/usr/sbin/sendmail -oi -t -odq"); - } - print $Sendmail "From: $RobotEMail\n"; - print $Sendmail "To: $To\n"; - my $Subject = "TestBot job " . $Job->Id . " results"; - my $Description = $Job->GetDescription(); - if ($Description) - { - $Subject .= ": " . $Description; - } - print $Sendmail "Subject: $Subject\n"; - if ($Job->Patch and $Job->Patch->MessageId) - { - print $Sendmail "In-Reply-To: ", $Job->Patch->MessageId, "\n"; - print $Sendmail "References: ", $Job->Patch->MessageId, "\n"; - } + my (@New, $JobInfo); + my ($NewCount, $OldCount, $BotCount, $NotRun) = (0, 0, 0, 0); + my $FileType = "test executable"; - print $Sendmail "\n"; - print $Sendmail "VM Status Failures Command\n"; + my $StepsTasks = CreateStepsTasks(undef, $Job); + my $SortedStepsTasks = $StepsTasks->GetSortedItems(); foreach my $StepTask (@$SortedStepsTasks) { - my $TestFailures = $StepTask->TestFailures; - $TestFailures = "" if (!defined $TestFailures); - my $Status = $StepTask->Status; - $Status = $TestFailures ? "failed" : "success" if ($Status eq "completed"); - my $Cmd = ""; - $Cmd = $StepTask->FileName ." " if ($StepTask->FileType =~ /^exe/); - $Cmd .= $StepTask->CmdLineArg if (defined $StepTask->CmdLineArg); - - printf $Sendmail "%-20s %-8s %-8s %s\n", $StepTask->VM->Name, $Status, - $TestFailures, $Cmd; - } - - print $Sendmail "\nThe full results can be found at:\n$JobURL\n\n"; + if ($StepTask->Status =~ /^(?:canceled|skipped)$/) + { + $NotRun++; + next; + } - # Print the job summary - my $JobErrors; - foreach my $StepTask (@$SortedStepsTasks) - { - my $Id = $StepTask->Id; my $TaskDir = $StepTask->GetTaskDir(); my $LogNames = GetLogFileNames($TaskDir); - $JobErrors->{$Id}->{LogNames} = $LogNames; + $JobInfo->{$StepTask->Id}->{LogNames} = $LogNames; + $JobInfo->{$StepTask->Id}->{NewCount} = 0; + $JobInfo->{$StepTask->Id}->{OldCount} = 0; + if ($StepTask->Status eq "boterror") + { + $JobInfo->{$StepTask->Id}->{BotCount} = 1; + $BotCount++; + } + $FileType = "patch" if ($StepTask->FileType eq "patch"); + foreach my $LogName (@$LogNames) { my $LogInfo = LoadLogErrors("$TaskDir/$LogName"); next if (!defined $LogInfo->{BadLog} and !$LogInfo->{ErrCount}); - $JobErrors->{$Id}->{HasErrors} = 1; - $JobErrors->{$Id}->{$LogName} = $LogInfo; - - print $Sendmail "\n=== ", GetTitle($StepTask, $LogName), " ===\n"; - print $Sendmail "$LogInfo->{BadLog}\n" if (defined $LogInfo->{BadLog}); + $JobInfo->{$StepTask->Id}->{$LogName} = $LogInfo; + my $HasLogHeader; foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { - print $Sendmail ($GroupName ? "\n$GroupName:\n" : "\n"); + my $HasGroupHeader; my $Group = $LogInfo->{ErrGroups}->{$GroupName}; - print $Sendmail "$_\n" for (@{$Group->{Errors}}); + foreach my $ErrIndex (0..$#{$Group->{Errors}}) + { + if ($Group->{IsNew}->[$ErrIndex]) + { + if (!$HasLogHeader) + { + push @New, "\n=== ". GetTitle($StepTask, $LogName) ." ===\n"; + $HasLogHeader = 1; + } + if (!$HasGroupHeader) + { + push @New, ($GroupName ? "\n$GroupName:\n" : "\n"); + $HasGroupHeader = 1; + } + push @New, "$Group->{Errors}->[$ErrIndex]\n"; + $JobInfo->{$StepTask->Id}->{NewCount}++; + } + else + { + $JobInfo->{$StepTask->Id}->{OldCount}++; + } + } } + $NewCount += $JobInfo->{$StepTask->Id}->{NewCount}; + $OldCount += $JobInfo->{$StepTask->Id}->{OldCount}; } } - close($Sendmail); - - # This is all for jobs submitted from the website - if (!defined $Job->Patch) - { - Debug("Not a mailing list patch -> all done.\n"); - return; - } - # - # Build a job summary with only the new errors + # Send a job summary to the developer # - # Note that this may be a bit inaccurate right after a Wine commit if this - # job's patch got compiled on top of the new Wine before all the reference - # WineTest results were updated. This is made more likely by the job - # priorities: high for Wine updates, and low for WineTest runs. - # However in practice this would only be an issue if the patch reintroduced - # an error that just disappeared in the latest Wine which is highly unlikely. - my @Messages; - foreach my $StepTask (@$SortedStepsTasks) + my $JobURL = MakeOfficialURL("/JobDetails.pl?Key=". $Job->GetKey()); + my $To = $WinePatchToOverride || $Job->GetEMailRecipient(); + if (defined $To) { - my $Id = $StepTask->Id; - next if (!$JobErrors->{$Id}->{HasErrors}); + Debug("-------------------- Developer email --------------------\n"); + my $Sendmail; + if ($Debug) + { + open($Sendmail, ">>&=", 1); + } + else + { + open($Sendmail, "|-", "/usr/sbin/sendmail -oi -t -odq"); + } + print $Sendmail "From: $RobotEMail\n"; + print $Sendmail "To: $To\n"; + my $Subject = "TestBot job " . $Job->Id . " results"; + my $Description = $Job->GetDescription(); + if ($Description) + { + $Subject .= ": " . $Description; + } + print $Sendmail "Subject: $Subject\n"; + if ($Job->Patch and $Job->Patch->MessageId) + { + print $Sendmail "In-Reply-To: ", $Job->Patch->MessageId, "\n"; + print $Sendmail "References: ", $Job->Patch->MessageId, "\n"; + } + print $Sendmail "\nHi,\n\n"; - # Note: We could check $StepTask->Status for TestBot errors. However, - # whether they are caused by the patch or not, they prevent the TestBot - # from checking for new errors which justifies sending an email to the - # mailing list so that the patch receives greater scrutiny. + if ($NewCount) + { + print $Sendmail <<"EOF"; +It looks like your $FileType introduces some new failures. Please +investigate and fix them if they are indeed new. Note that rare +failures and failures with always changing text (e.g. because of memory +addresses) can cause false positives. If this is what happened, then +fixing those would really help. - foreach my $LogName (@{$JobErrors->{$Id}->{LogNames}}) +EOF + } + if ($BotCount) { - my $LogInfo = $JobErrors->{$Id}->{$LogName}; - # Skip if there are no errors - next if (!$LogInfo->{NewCount}); + print $Sendmail <<"EOF"; +$BotCount TestBot errors prevented a full analysis of your $FileType. +If the test caused the operating system (e.g. Windows) to crash or +reboot you will probably have to modify it to avoid that. +Other issues should be reported to the TestBot administrators. - push @Messages, "\n=== ". GetTitle($StepTask, $LogName) ." ===\n"; +EOF + } + elsif (!$NewCount and !$NotRun) + { + print $Sendmail <<"EOF"; +Congratulations! +It looks like your $FileType passed the tests with flying colors. - foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) +EOF + } + if ($OldCount) + { + print $Sendmail <<"EOF"; +Some preexisting failures (not caused by your $FileType) happened. +If you know how to fix them that would be helpful. + +EOF + } + + print $Sendmail " Failures\n"; + print $Sendmail "VM Status New / Old Command\n"; + foreach my $StepTask (@$SortedStepsTasks) + { + next if ($StepTask->Status =~ /^(?:canceled|skipped)$/); + + my $TestFailures = $StepTask->TestFailures; + $TestFailures = "" if (!defined $TestFailures); + my $Status = $StepTask->Status ne "completed" ? $StepTask->Status : + $TestFailures ? "failed" : + "success"; + my $Cmd = ""; + $Cmd = $StepTask->FileName ." " if ($StepTask->FileType =~ /^exe/); + $Cmd .= $StepTask->CmdLineArg if (defined $StepTask->CmdLineArg); + + printf $Sendmail "%-20s %-8s %4s / %4s %s\n", $StepTask->VMName, + $Status, $JobInfo->{$StepTask->Id}->{NewCount}, + $JobInfo->{$StepTask->Id}->{OldCount}, $Cmd; + } + if ($NotRun) + { + print $Sendmail <<"EOF"; + +Note that $NotRun additional tasks could not be run due to previous +errors. A full run may uncover more issues. + +EOF + } + + print $Sendmail <<"EOF"; + +The full results can be found at: +$JobURL + +Your paranoid android. + +EOF + + # Print the failures + foreach my $StepTask (@$SortedStepsTasks) + { + my $TaskInfo = $JobInfo->{$StepTask->Id}; + my $TaskDir = $StepTask->GetTaskDir(); + foreach my $LogName (@{$TaskInfo->{LogNames}}) { - my $Group = $LogInfo->{ErrGroups}->{$GroupName}; - next if (!$Group->{NewCount}); + my $LogInfo = LoadLogErrors("$TaskDir/$LogName"); + next if (!defined $LogInfo->{BadLog} and !$LogInfo->{ErrCount}); - push @Messages, ($GroupName ? "\n$GroupName:\n" : "\n"); - foreach my $ErrIndex (0..$#{$Group->{Errors}}) + print $Sendmail "\n=== ", GetTitle($StepTask, $LogName), " ===\n"; + print $Sendmail "$LogInfo->{BadLog}\n" if (defined $LogInfo->{BadLog}); + + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { - if ($Group->{IsNew}->[$ErrIndex]) + print $Sendmail ($GroupName ? "\n$GroupName:\n" : "\n"); + my $Group = $LogInfo->{ErrGroups}->{$GroupName}; + foreach my $ErrIndex (0..$#{$Group->{Errors}}) { - push @Messages, "$Group->{Errors}->[$ErrIndex]\n"; + my $Prefix = $Group->{IsNew}->[$ErrIndex] ? "new" : "old"; + print $Sendmail "[$Prefix] $Group->{Errors}->[$ErrIndex]\n"; } } } } + + close($Sendmail); + } + + # This is all for jobs submitted from the website + if (!defined $Job->Patch) + { + Debug("Not a mailing list patch -> all done.\n"); + return; } @@ -322,8 +396,13 @@ sub SendLog($) Debug("\n-------------------- Mailing list email --------------------\n"); - if (@Messages) + if (!$NewCount) { + Debug("Found no error to report to the mailing list\n"); + } + else + { + my $Sendmail; if ($Debug) { open($Sendmail, ">>&=", 1); @@ -333,36 +412,63 @@ sub SendLog($) open($Sendmail, "|-", "/usr/sbin/sendmail -oi -t -odq"); } print $Sendmail "From: $RobotEMail\n"; - print $Sendmail "To: $To\n"; - print $Sendmail "Cc: $WinePatchCc\n"; + if (defined $To) + { + print $Sendmail "To: $To\n"; + print $Sendmail "Cc: $WinePatchCc\n"; + } + else + { + print $Sendmail "To: $WinePatchCc\n"; + } print $Sendmail "Subject: Re: ", $Job->Patch->Subject, "\n"; if ($Job->Patch->MessageId) { print $Sendmail "In-Reply-To: ", $Job->Patch->MessageId, "\n"; print $Sendmail "References: ", $Job->Patch->MessageId, "\n"; } - print $Sendmail <<"EOF"; + print $Sendmail "\nHi,\n\n"; -Hi, + if ($NewCount) + { + print $Sendmail <<"EOF"; +It looks like your $FileType introduced the new failures shown below. +Please investigate and fix them if they are indeed new. Note that rare +failures and failures with always changing text (e.g. because of memory +addresses) can cause false positives. If this is what happened, then +fixing those would really help. -While running your changed tests, I think I found new failures. -Being a bot and all I'm not very good at pattern recognition, so I might be -wrong, but could you please double-check? +EOF + } + if ($BotCount) + { + print $Sendmail <<"EOF"; +$BotCount TestBot errors prevented a full analysis of your $FileType. +If the test caused the operating system (e.g. Windows) to crash or +reboot you will probably have to modify it to avoid that. +Other issues should be reported to the TestBot administrators. -Full results can be found at: +EOF + } + if ($OldCount) + { + print $Sendmail <<"EOF"; +The tests also ran into some preexisting test failures. If you know how +to fix them that would be helpful. See the TestBot job for the details: + +EOF + } + print $Sendmail <<"EOF"; +The full results can be found at: $JobURL Your paranoid android. EOF - print $Sendmail $_ for (@Messages); + print $Sendmail $_ for (@New); close($Sendmail); } - else - { - Debug("Found no error to report to the mailing list\n"); - } # @@ -379,14 +485,14 @@ EOF { # Only take into account new errors to decide whether the job was # successful or not. - DebugTee($Result, "Status: ". (@Messages ? "Failed" : "OK") ."\n"); + DebugTee($Result, "Status: ". ($NewCount + $BotCount + $NotRun ? "Failed" : "OK") ."\n"); DebugTee($Result, "Job-ID: ". $Job->Id ."\n"); DebugTee($Result, "URL: $JobURL\n"); foreach my $StepTask (@$SortedStepsTasks) { my $TaskDir = $StepTask->GetTaskDir(); - foreach my $LogName (@{$JobErrors->{$StepTask->Id}->{LogNames}}) + foreach my $LogName (@{$JobInfo->{$StepTask->Id}->{LogNames}}) { print $Result "=== ", GetTitle($StepTask, $LogName), " ===\n"; DumpLogAndErr($Result, "$TaskDir/$LogName"); diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 139f011ef..5663f956c 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -611,13 +611,12 @@ sub LoadMbox($) $State->{JobIdLine} = $LineNo; } } - elsif ($Line =~ /^Content-Disposition: attachment; filename=([^-]+)-/) + elsif ($Line =~ /^([a-zA-Z0-9_]+)\s+(?:success|failed)\s+\d+/) { my $VM = $1; - # This could match attachments in other emails $State->{ResVMs}->{$VM}++ if ($State->{HasResEmail}); } - elsif ($Line =~ /I found new failures/) + elsif ($Line =~ /\bintroduces .* new failures\b/) { $State->{HasFailedEmail} = $LineNo; } @@ -1190,7 +1189,7 @@ sub CheckJobTree($;$) my $VMName = $Task->VM->Name; if ($Task->Status !~ /^(?:canceled|skipped)$/ and $Email->{HasResEmail}) { - ok($Email->{ResVMs}->{$VMName}, "Expecting $VMName logs / reports in the job $JobId results email"); + ok($Email->{ResVMs}->{$VMName}, "Expecting a $VMName error summary in the job $JobId results email"); } } -- 2.30.2 [View Less]

1 0

[PATCH v2 0/3] MR241: uiautomationcore: Test fix and MSAA provider navigation patches.
by Connor McAdams (＠cmcadams) 14 Jun '22

14 Jun '22

Opened the previous merge request before the testbot had updated, so it failed to run the tests. Should be updated by now :) -- v2: uiautomationcore: Implement NavigateDirection_{Previous/Next}Sibling for MSAA providers. uiautomationcore: Implement NavigateDirection_{First/Last}Child for MSAA Providers. https://gitlab.winehq.org/wine/wine/-/merge_requests/241

3 5

[tools] testbot/web: Tweak GenerateFullLog() in the job details page.
by Francois Gouget 14 Jun '22

14 Jun '22

Rename %ErrLineNos to %ErrCategory since it contains the error's category indexed by the full log line number. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 36bba0d04..7860a4c9d 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -400,16 +400,14 @@ sub GenerateFullLog($$$$) print … [View More]

1 0

[tools] testbot/web: Fix hiding the branch column on the main page.
by Francois Gouget 14 Jun '22

14 Jun '22

It is hidden when only one branch exists. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Branches are not really supported: there is a table for them, they are referenced by the jobs, but they have never been used in any of the scripts or in the TestBot code. In particular the Reconfig scripts only update and rebuild one Wine tree. But support for multiple branches may work by having one Wine source tree and set of build trees per branch. So I'm keeping what branch … [View More]

1 0

[tools] testbot: Include the filename in LoadLogErrors() error messages.
by Francois Gouget 14 Jun '22

14 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Otherwise there is no way to know which file was bad in case of errors, for instance in UpdateTaskLogs. --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 17cfc3525..2e3de83b8 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1016,6 +1016,10 @@ sub … [View More]

1 0

[PATCH 0/1] MR243: winhttp: Fix default port corner cases in WinHttpCrackUrl().
by Hans Leidekker (＠hans) 14 Jun '22

14 Jun '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/243

2 1

[PATCH 0/3] MR241: uiautomationcore: Test fix and MSAA provider navigation patches.
by Connor McAdams (＠cmcadams) 14 Jun '22

14 Jun '22

Opened the previous merge request before the testbot had updated, so it failed to run the tests. Should be updated by now :) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/241

3 6

Welcome to the GitLab community
by Bryan G. Behrenshausen 14 Jun '22

14 Jun '22

Hello Wine team, I was delighted to read the news [1] that your recent experiment with GitLab has gone well and GitLab will become the primary development platform for Wine. I'm Senior Open Source Program Manager at GitLab [2], and I want to extend my warmest welcome to out community. Should you need anything during your migration, please don't hesitate to reach out. Additionally, please note our GitLab for Open Source [3] and GitLab Open Source Partners programs [4]. If participating in … [View More]

1 0

[PATCH v2 1/8] mfplat/buffer: Fix size for IMC2/IMC4 buffers with odd height.
by Giovanni Mascellani 14 Jun '22

14 Jun '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: * Remove the multiplier * The missing test cases will be reinsterted in a later commit --- dlls/mfplat/buffer.c | 22 ++++++++++++++++++--- dlls/mfplat/tests/mfplat.c | 40 ++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index eada3df18ad..39407ccc9e2 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.… [View More]c @@ -1351,8 +1351,25 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo if (is_yuv && bottom_up) return MF_E_INVALIDMEDIATYPE; - if (FAILED(hr = MFGetPlaneSize(fourcc, width, height, &plane_size))) - return hr; + switch (fourcc) + { + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','3'): + plane_size = stride * height * 2; + break; + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','4'): + plane_size = stride * 3 / 2 * height; + break; + case MAKEFOURCC('N','V','1','2'): + case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): + plane_size = stride * height * 3 / 2; + break; + default: + plane_size = stride * height; + } if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1377,7 +1394,6 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo case MAKEFOURCC('I','M','C','1'): case MAKEFOURCC('I','M','C','3'): max_length = pitch * height * 2; - plane_size *= 2; break; case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 28b89de4b1f..1b5e8cf7ed5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5723,48 +5723,49 @@ static void test_MFCreate2DMediaBuffer(void) unsigned int fourcc; unsigned int contiguous_length; int pitch; - unsigned int plane_multiplier; unsigned int max_length; } _2d_buffer_tests[] = { - { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64, 0, 192 }, + { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64, 192 }, { 4, 2, MAKEFOURCC('N','V','1','2'), 12, 64 }, { 2, 4, MAKEFOURCC('N','V','1','2'), 12, 64 }, { 1, 3, MAKEFOURCC('N','V','1','2'), 4, 64 }, - { 4, 16, MAKEFOURCC('N','V','1','2'), 96, 64, 0, 1536 }, + { 4, 16, MAKEFOURCC('N','V','1','2'), 96, 64, 1536 }, - { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 0, 384 }, + { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 384 }, { 4, 2, MAKEFOURCC('I','M','C','2'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','2'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','2'), 20, 128 }, { 2, 2, MAKEFOURCC('I','M','C','4'), 6, 128 }, { 4, 2, MAKEFOURCC('I','M','C','4'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','4'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','4'), 20, 128 }, - { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128, 2 }, - { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 2, 4096 }, - { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128, 2 }, + { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128 }, + { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128 }, + { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 4096 }, + { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128 }, - { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128, 2 }, - { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 2, 4096 }, - { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128, 2 }, + { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128 }, + { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128 }, + { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 4096 }, + { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128 }, { 4, 2, MAKEFOURCC('Y','V','1','2'), 12, 128 }, { 4, 4, MAKEFOURCC('Y','V','1','2'), 24, 128 }, - { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128, 0, 3072 }, + { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128, 3072 }, { 4, 2, MAKEFOURCC('A','Y','U','V'), 32, 64 }, { 4, 4, MAKEFOURCC('A','Y','U','V'), 64, 64 }, - { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64, 1024 }, { 4, 2, MAKEFOURCC('Y','U','Y','2'), 16, 64 }, { 4, 4, MAKEFOURCC('Y','U','Y','2'), 32, 64 }, - { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64, 1024 }, { 4, 2, MAKEFOURCC('U','Y','V','Y'), 16, 64 }, { 4, 4, MAKEFOURCC('U','Y','V','Y'), 32, 64 }, - { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64, 1024 }, { 2, 4, D3DFMT_A8R8G8B8, 32, 64 }, { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, @@ -5998,13 +5999,6 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); - hr = pMFGetPlaneSize(ptr->fourcc, ptr->width, ptr->height, &length2); - ok(hr == S_OK, "Failed to get plane size, hr %#lx.\n", hr); - if (ptr->plane_multiplier) - length2 *= ptr->plane_multiplier; - ok(length2 == length, "%d: contiguous length %lu does not match plane size %lu, %u x %u, format %s.\n", i, length, - length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); - hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); -- 2.36.1 [View Less]

2 15

[PATCH 1/5] mfplat/buffer: Fix size for IMC2/IMC4 buffers with odd height.
by Giovanni Mascellani 14 Jun '22

14 Jun '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/buffer.c | 22 +++++++++++++++++++--- dlls/mfplat/tests/mfplat.c | 9 ++------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index eada3df18ad..39407ccc9e2 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1351,8 +1351,25 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo if (is_yuv &… [View More]amp;& bottom_up) return MF_E_INVALIDMEDIATYPE; - if (FAILED(hr = MFGetPlaneSize(fourcc, width, height, &plane_size))) - return hr; + switch (fourcc) + { + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','3'): + plane_size = stride * height * 2; + break; + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','4'): + plane_size = stride * 3 / 2 * height; + break; + case MAKEFOURCC('N','V','1','2'): + case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): + plane_size = stride * height * 3 / 2; + break; + default: + plane_size = stride * height; + } if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1377,7 +1394,6 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo case MAKEFOURCC('I','M','C','1'): case MAKEFOURCC('I','M','C','3'): max_length = pitch * height * 2; - plane_size *= 2; break; case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 28b89de4b1f..8fddef8fd40 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5736,9 +5736,11 @@ static void test_MFCreate2DMediaBuffer(void) { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 0, 384 }, { 4, 2, MAKEFOURCC('I','M','C','2'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','2'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','2'), 20, 128 }, { 2, 2, MAKEFOURCC('I','M','C','4'), 6, 128 }, { 4, 2, MAKEFOURCC('I','M','C','4'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','4'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','4'), 20, 128 }, { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128, 2 }, { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128, 2 }, @@ -5998,13 +6000,6 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); - hr = pMFGetPlaneSize(ptr->fourcc, ptr->width, ptr->height, &length2); - ok(hr == S_OK, "Failed to get plane size, hr %#lx.\n", hr); - if (ptr->plane_multiplier) - length2 *= ptr->plane_multiplier; - ok(length2 == length, "%d: contiguous length %lu does not match plane size %lu, %u x %u, format %s.\n", i, length, - length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); - hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); -- 2.36.1 [View Less]

3 15

Gitlab experiment status
by Alexandre Julliard 14 Jun '22

14 Jun '22

Folks, The Gitlab experiment seems to be going well. For the last release, more than half the patches were submitted as Gitlab merge requests, so that seems to be working well for us. There are still improvements we can make, and of course many more Gitlab features that we could start using, but before investing more effort we need to decide whether we want to use it going forward. So now that you have had a chance to try it, what do you people think? Should we adopt Gitlab as our … [View More]

13 21

[PATCH v4 0/9] MR217: windows.media.speech: ISpeechSynthesisStream stub implementation.
by Bernhard Kölbl (＠besentv) 14 Jun '22

14 Jun '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> -- v4: windows.media.speech: Add stub ISpeechSynthesisStream iface. windows.media.speech: Return IAsyncOperation from synthesizer_SynthesizeSsmlToStreamAsync. windows.media.speech: Return IAsyncOperation from synthesizer_SynthesizeTextToStreamAsync. windows.media.speech/tests: Add basic tests for ssml/text to stream functions. windows.media.speech/tests: Handle a possible race condition. windows.media.… [View More]

3 17

ntdll: Fix the return value of NtQueryKey.
by 杨堃 14 Jun '22

14 Jun '22

Signed-off-by: Kun Yang <yangkun(a)uniontech.com> --- dlls/ntdll/tests/reg.c | 2 +- dlls/ntdll/unix/registry.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 2c158be17b4..ab6f7914e4b 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1831,7 +1831,7 @@ static void test_NtQueryKey(void) pNtClose(key); return; } - todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, … [View More]

2 1

[PATCH] ntdll: Fix the return value of NtQueryKey.
by 杨堃 14 Jun '22

14 Jun '22

From bc084bfcf6c342e483f77090593261ac76b6f513 Mon Sep 17 00:00:00 2001 From: Kun Yang <yangkun(a)uniontech.com> Date: Tue, 14 Jun 2022 16:16:53 +0800 Subject: [PATCH] ntdll: Fix the return value of NtQueryKey. Signed-off-by: Kun Yang <yangkun(a)uniontech.com> --- dlls/ntdll/tests/reg.c | 2 +- dlls/ntdll/unix/registry.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 2c158be17b4..ab6f7914e4b … [View More]

2 1

[PATCH v2 0/5] MR240: win32u: menu conversion
by Jacek Caban (＠jacek) 14 Jun '22

14 Jun '22

-- v2: user32: Reimplement GetMenuContextHelpId on top of GetMenuInfo. win32u: Move PopupMenuWndProc implementation from user32. https://gitlab.winehq.org/wine/wine/-/merge_requests/240

4 9

[PATCH] ntdll: Fix the return value of NtQueryKey
by 杨堃 14 Jun '22

14 Jun '22

diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 2c158be17b4..ab6f7914e4b 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1831,7 +1831,7 @@ static void test_NtQueryKey(void) pNtClose(key); return; } - todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); info = HeapAlloc(GetProcessHeap(), 0, length); /*… [View More]

2 1

[patch 2/2]ntdll/tests: Add tests for _allshl and _allshr.
by Zhao Yi 14 Jun '22

14 Jun '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/ntdll/tests/large_int.c | 57 ++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c index 9635cac24ad..793696f1e4d 100644 --- a/dlls/ntdll/tests/large_int.c +++ b/dlls/ntdll/tests/large_int.c @@ -40,6 +40,9 @@ static LONGLONG (WINAPI *p_allmul)( LONGLONG a, LONGLONG b ); static ULONGLONG (WINAPI *p_aulldiv)( ULONGLONG a, ULONGLONG b ); … [View More]static ULONGLONG (WINAPI *p_aullrem)( ULONGLONG a, ULONGLONG b ); +static LONGLONG (CDECL *p_allshl)(void); +static LONGLONG (CDECL *p_allshr)(void); + static void InitFunctionPtrs(void) { hntdll = LoadLibraryA("ntdll.dll"); @@ -56,6 +59,8 @@ static void InitFunctionPtrs(void) p_allmul = (void *)GetProcAddress(hntdll, "_allmul"); p_aulldiv = (void *)GetProcAddress(hntdll, "_aulldiv"); p_aullrem = (void *)GetProcAddress(hntdll, "_aullrem"); + p_allshl = (void *)GetProcAddress(hntdll, "_allshl"); + p_allshr = (void *)GetProcAddress(hntdll, "_allshr"); } /* if */ } @@ -492,6 +497,56 @@ static void test_builtins(void) #endif /* __i386__ */ } +static void test_allshl(void) +{ + int c = 0; + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x4,%cl"); + c = p_allshl(); + ok(c == 0x56677880, "1. _allshl returned 0x%x\n", c); + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x28,%cl"); + c = p_allshl(); + ok(c == 0, "2. _allshl returned 0x%x\n", c); + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x46,%cl"); + c = p_allshl(); + ok(c == 0, "3. _allshl returned 0x%x\n", c); + + return; +} + +static void test_allshr(void) +{ + int c = 0; + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x4,%cl"); + c = p_allshr(); + ok(c == 0x45566778, "1. _allshr returned 0x%x\n", c); + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x28,%cl"); + c = p_allshr(); + ok(c == 0x112233, "2. _allshr returned 0x%x\n", c); + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x46,%cl"); + c = p_allshr(); + ok(c == 0, "3. _allshr returned 0x%x\n", c); + + return; +} + START_TEST(large_int) { InitFunctionPtrs(); @@ -503,4 +558,6 @@ START_TEST(large_int) if (pRtlLargeIntegerToChar) test_RtlLargeIntegerToChar(); test_builtins(); + test_allshl(); + test_allshr(); } -- 2.20.1 [View Less]

2 1

[PATCH 1/2]ntdll: Reimplement function _allshl and _allshr.
by Zhao Yi 14 Jun '22

14 Jun '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> ntoskrnl.exe: Redeclare function _allshl and _allshr. Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/ntdll/large_int.c | 46 ++++++++++++++++++++++++----- dlls/ntdll/ntdll.spec | 4 +-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +-- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index b38074158c8..2f6e27eff10 100644 --- a/dlls/… [View More]ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -821,10 +821,25 @@ ULONGLONG WINAPI _aulldiv( ULONGLONG a, ULONGLONG b ) * RETURNS * The left-shifted value. */ -LONGLONG WINAPI _allshl( LONGLONG a, LONG b ) -{ - return a << b; -} +__ASM_GLOBAL_FUNC( _allshl, +"cmp $0x40, %cl\n\t" +"jnb 1f\n\t" +"cmp $0x20, %cl\n\t" +"jnb 2f\n\t" +"shld %cl, %eax, %edx\n\t" +"shl %cl, %eax\n\t" +"ret\n\t" +"2:\n\t" +"mov %eax, %edx\n\t" +"xor %eax, %eax\n\t" +"and $0x1f, %cl\n\t" +"shl %cl, %edx\n\t" +"ret\n\t" +"1:\n\t" +"xor %eax, %eax\n\t" +"xor %edx, %edx\n\t" +"ret\n\t" +) /****************************************************************************** * _allshr (NTDLL.@) @@ -838,10 +853,25 @@ LONGLONG WINAPI _allshl( LONGLONG a, LONG b ) * RETURNS * The right-shifted value. */ -LONGLONG WINAPI _allshr( LONGLONG a, LONG b ) -{ - return a >> b; -} +__ASM_GLOBAL_FUNC( _allshr, +"cmp $0x40, %cl\n\t" +"jnb 1f\n\t" +"cmp $0x20, %cl\n\t" +"jnb 2f\n\t" +"shrd %cl,%edx,%eax\n\t" +"sar %cl,%edx\n\t" +"ret\n\t" +"2:\n\t" +"mov %edx,%eax\n\t" +"sar $0x1f,%edx\n\t" +"and $0x1f,%cl\n\t" +"sar %cl,%eax\n\t" +"ret\n\t" +"1:\n\t" +"sar $0x1f,%edx\n\t" +"mov %edx,%eax\n\t" +"ret\n\t" +) /****************************************************************************** * _alldvrm (NTDLL.@) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b1650ab4306..6b96b0433fd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1492,8 +1492,8 @@ @ cdecl -norelay -arch=i386 -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -norelay _alloca_probe() @ cdecl -norelay -arch=i386 -ret64 _allrem(int64 int64) -@ stdcall -arch=i386 -ret64 _allshl(int64 long) -@ stdcall -arch=i386 -ret64 _allshr(int64 long) +@ cdecl -arch=i386 -ret64 _allshl() +@ cdecl -arch=i386 -ret64 _allshr() @ cdecl -ret64 _atoi64(str) @ cdecl -norelay -arch=i386 -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8ae4bc1f5a9..5d3238200a3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1540,8 +1540,8 @@ @ cdecl -arch=i386 -norelay -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -norelay _alloca_probe() @ cdecl -arch=i386 -norelay -ret64 _allrem(int64 int64) -@ stdcall -arch=i386 -ret64 _allshl(int64 long) -@ stdcall -arch=i386 -ret64 _allshr(int64 long) +@ cdecl -arch=i386 -ret64 _allshl() +@ cdecl -arch=i386 -ret64 _allshr() @ cdecl -arch=i386 -norelay -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) @ cdecl -arch=i386 -norelay -ret64 _aullrem(int64 int64) -- 2.20.1 [View Less]

1 0

[PATCH 0/6] MR226: winegstreamer: Leave stream_cs when calling the async reader callbacks.
by Rémi Bernon (＠rbernon) 14 Jun '22

14 Jun '22

For https://gitlab.winehq.org/wine/wine/-/merge_requests/140 we will want to be able to enter the ASF Reader filter CS in the callbacks, for instance when a sample is received, or to notify about EOS. At the same time, another thread will possibly try to stop the filter, calling `IWMReader_Stop` which will try to enter the stream_cs as well and wait on the stream thread. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/226

3 7

[PATCH 0/1] MR229: comctl32: Always paint SS_BITMAP static control background with WM_CTLCOLORSTATIC brush.
by Jinoh Kang (＠iamahuman) 14 Jun '22

14 Jun '22

This is consistent with the behaviour of other static control styles. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/229

3 2

[PATCH v4] comctl32/listview: Add partial support for LVM_SETBKIMAGE.
by Zhiyi Zhang 14 Jun '22

14 Jun '22

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Formatting fixes, add some tests. v3: Add v6 tests, make v6 behaviour the default one. v4: Supersede 238455. I was wrong and LVM_SETBKIMAGE should repaint the control. Also the background bitmap should be painted in LISTVIEW_EraseBkgnd() when the background color is CLR_NONE. dlls/comctl32/listview.c | 90 ++++++++++++++++++++++++++++++---- dlls/comctl32/tests/… [View More]listview.c | 78 +++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 730bf4aaddd..ab328b3e798 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; @@ -4551,6 +4552,21 @@ static INT LISTVIEW_GetTopIndex(const LISTVIEW_INFO *infoPtr) return nItem; } +static void LISTVIEW_DrawBackgroundBitmap(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) +{ + HDC mem_hdc; + + if (!infoPtr->hBkBitmap) + return; + + TRACE("(hdc=%p, lprcBox=%s, hBkBitmap=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBitmap); + + mem_hdc = CreateCompatibleDC(hdc); + SelectObject(mem_hdc, infoPtr->hBkBitmap); + BitBlt(hdc, lprcBox->left, lprcBox->top, lprcBox->right - lprcBox->left, + lprcBox->bottom - lprcBox->top, mem_hdc, lprcBox->left, lprcBox->top, SRCCOPY); + DeleteDC(mem_hdc); +} /*** * DESCRIPTION: @@ -4565,13 +4581,17 @@ static INT LISTVIEW_GetTopIndex(const LISTVIEW_INFO *infoPtr) * Success: TRUE * Failure: FALSE */ -static inline BOOL LISTVIEW_FillBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) +static BOOL LISTVIEW_FillBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) { - if (!infoPtr->hBkBrush) return FALSE; + if (infoPtr->hBkBrush) + { + TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); - TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); + FillRect(hdc, lprcBox, infoPtr->hBkBrush); + } - return FillRect(hdc, lprcBox, infoPtr->hBkBrush); + LISTVIEW_DrawBackgroundBitmap(infoPtr, hdc, lprcBox); + return TRUE; } /* Draw main item or subitem */ @@ -8028,7 +8048,53 @@ 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("unsupported flags %08lx\n", image->ulFlags & ~LVBKIF_SOURCE_MASK); + + if (image->xOffsetPercent || image->yOffsetPercent) + FIXME("unsupported 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 = NULL; + } + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + break; + + case LVBKIF_SOURCE_HBITMAP: + { + BITMAP bm; + + if (infoPtr->hBkBitmap) + { + DeleteObject(infoPtr->hBkBitmap); + infoPtr->hBkBitmap = NULL; + } + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + if (GetObjectW(image->hbm, sizeof(bm), &bm) == sizeof(bm)) + { + infoPtr->hBkBitmap = image->hbm; + return TRUE; + } + break; + } + + 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, @@ -9641,10 +9707,11 @@ static inline BOOL LISTVIEW_EraseBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc) if (infoPtr->clrBk == CLR_NONE) { if (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTBKGND) - return SendMessageW(infoPtr->hwndNotify, WM_PRINTCLIENT, - (WPARAM)hdc, PRF_ERASEBKGND); + SendMessageW(infoPtr->hwndNotify, WM_PRINTCLIENT, (WPARAM)hdc, PRF_ERASEBKGND); else - return SendMessageW(infoPtr->hwndNotify, WM_ERASEBKGND, (WPARAM)hdc, 0); + SendMessageW(infoPtr->hwndNotify, WM_ERASEBKGND, (WPARAM)hdc, 0); + LISTVIEW_DrawBackgroundBitmap(infoPtr, hdc, &rc); + return TRUE; } /* for double buffered controls we need to do this during refresh */ @@ -10406,6 +10473,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 +11622,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; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6ac7f53137d..ed5222a5ee8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <windows.h> #include <commctrl.h> +#include <objbase.h> #include "wine/test.h" #include "v6util.h" @@ -6924,6 +6925,81 @@ static void test_LVM_GETNEXTITEMINDEX(void) DestroyWindow(hwnd); } +static void test_LVM_SETBKIMAGE(BOOL is_v6) +{ + LVBKIMAGEA image; + HBITMAP hbmp; + BITMAP bm; + HWND hwnd; + int ret; + + CoInitialize(NULL); + + hbmp = CreateBitmap(32, 32, 1, 1, NULL); + hwnd = create_listview_control(LVS_REPORT); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + image.pszImage = NULL; + image.cchImageMax = 0; + image.xOffsetPercent = 0; + image.yOffsetPercent = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + if (is_v6) + ok(ret, "got %d\n", ret); + else + todo_wine ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(!ret, "got %d\n", ret); + + hbmp = CreateBitmap(32, 32, 1, 1, NULL); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + if (is_v6) + ok(ret, "got %d\n", ret); + else + todo_wine ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(!ret, "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + DestroyWindow(hwnd); + + CoUninitialize(); +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6987,6 +7063,7 @@ START_TEST(listview) test_LVN_ENDLABELEDIT(); test_LVM_GETCOUNTPERPAGE(); test_item_state_change(); + test_LVM_SETBKIMAGE(FALSE); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -7034,6 +7111,7 @@ START_TEST(listview) test_item_state_change(); test_selected_column(); test_LVM_GETNEXTITEMINDEX(); + test_LVM_SETBKIMAGE(TRUE); unload_v6_module(ctx_cookie, hCtx); -- 2.34.1 [View Less]

1 0

[PATCH v2 resend 0/6] Fix LVS_OWNERDATA list view multi select.
by Angelo Haller 14 Jun '22

14 Jun '22

From: Angelo Haller <angelo(a)szanni.org> The following patches fix sending of the LVN_ODSTATECHANGED notification for LVS_OWNERDATA list views. A few more refined tests have been added, some wine_todos removed, and bugs fixed. This is a v2 resend. Warning: I have had access to the Windows Research Kernel (WRK) 1.2 ~10 years ago. These changes are regarding comctrl32 & tests which are NOT part of the WRK. As outlined in https://wiki.winehq.org/Developer_FAQ this should therefore … [View More]

2 25

Questions about the GitLab patch review process
by Alex Henrie 14 Jun '22

14 Jun '22

Dear developers, I have a couple of questions about how patch reviews on GitLab are intended to work: * Can I request a review from anyone? * Does requesting a review improve the patch's chances of being accepted? Thanks for your help. -Alex

2 2

[PATCH 0/5] MR240: win32u: menu conversion
by Jacek Caban (＠jacek) 14 Jun '22

14 Jun '22

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

3 10

[PATCH 0/1] MR149: user32: Plug icon handle leak in MDI_AugmentFrameMenu (Coverity).
by Alex Henrie (＠alexhenrie) 14 Jun '22

14 Jun '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/149

3 2

[PATCH 0/3] MR239: uiautomationcore: Test fix and MSAA provider navigation patches.
by Connor McAdams (＠cmcadams) 13 Jun '22

13 Jun '22

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

3 6

Re: [PATCH v2 0/1] MR238: ntdll: Move SEH exception info logs back to the seh channel. - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

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

1 0

Re: [PATCH v3 0/6] MR220: winegstreamer: Add zero-copy support to quartz_transform. - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

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

1 0

Re: [PATCH v4 0/3] MR225: server: Fix races related to socket errors - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

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

1 0

Re: [PATCH v6 0/3] MR227: riched20: Fix for #52752 (use IViewObject implementation) - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

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

1 0

Re: [PATCH v2 0/1] MR236: winebus.sys: Implement SOCD neutral cleaning for hatswitches. - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

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

1 0

Re: [PATCH v2 0/5] MR235: ntdll: Preparation for heap region factorization. - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

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

1 0

[PATCH v2 0/3] MR187: ntdll/tests: Test if RtlFormatMessage modifies va_list on error.
by Daniel Lehman (＠dlehman25) 13 Jun '22

13 Jun '22

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> -- v2: kernelbase: Pass va_list copy to internal RtlFormatMessage. kernel32/tests: Test if FormatMessage modifies va_list on error. ntdll/tests: Test if RtlFormatMessage modifies va_list on error. https://gitlab.winehq.org/wine/wine/-/merge_requests/187

3 4

Re: [PATCH v2 0/1] MR234: d2d1: Update to ID2D1DeviceContext1. - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

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

1 0

Re: [PATCH v3 0/5] MR232: win32u: user32 conversion - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

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

1 0

Re: [PATCH v2 0/3] MR230: UiaProviderFromIAccessible: Initial navigation patches. - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

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

1 0

[PATCH 0/1] MR238: ntdll: Move SEH exception info logs back to the seh channel.
by Tim Clem (＠tclem) 13 Jun '22

13 Jun '22

These were accidentally moved as part of the introduction of +unwind. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/238

3 2

[PATCH v2 0/6] MR220: winegstreamer: Add zero-copy support to quartz_transform.
by Rémi Bernon (＠rbernon) 13 Jun '22

13 Jun '22

-- v2: winegstreamer: Remove copying support from wg_transform_push_data. winegstreamer: Support zero-copy wg_transform_read_data in quartz_transform.c. winegstreamer: Support zero-copy wg_transform_push_data in quartz_transform.c. winegstreamer: Introduce new wg_sample_create_quartz helper for quartz_transform.c. winegstreamer: Use a union in struct sample to keep API pointers. winegstreamer: Split wg_sample wrapper helpers to a separate source. https://gitlab.winehq.org/wine/wine/-/merge_requests/220

3 8

[PATCH v3 0/3] MR225: server: Fix races related to socket errors
by Piotr Caban (＠piotr) 13 Jun '22

13 Jun '22

Calling ioctl(..., SO_ERROR, ...) clears pending socket error. Because of that we may clear the error in poll_socket or IOCTL_AFD_GET_SO_ERROR. This leads to failures during Battle.net installation (it's a race that I can only reproduce on slow machines). -- v3: server: Don't reset socket error in IOCTL_AFD_GET_SO_ERROR. server: Don't reset socket error in poll_socket. server: Always return Win32 error code from IOCTL_AFD_GET_SO_ERROR. https://gitlab.winehq.org/wine/wine/-/merge_requests/225

3 5

[PATCH v2 0/2] MR231: SetWindowPos() parent window exposure fixes (#53153)
by Jinoh Kang (＠iamahuman) 13 Jun '22

13 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v2: server: Correctly expose composited parent window on SetWindowPos(). user32/tests: Test for parent window exposure by SetWindowPos(). https://gitlab.winehq.org/wine/wine/-/merge_requests/231

3 4

[PATCH v5 0/3] MR227: riched20: Fix for #52752 (use IViewObject implementation)
by Jinoh Kang (＠iamahuman) 13 Jun '22

13 Jun '22

Fixes https://bugs.winehq.org/show_bug.cgi?id=52752. -- v5: riched20: Draw OLE objects with IViewObject implementation. riched20: Fetch extent from object if REOBJECT::sizel is unset. riched20/tests: Add tests for drawing embedded OLE objects. https://gitlab.winehq.org/wine/wine/-/merge_requests/227

3 4

[PATCH 0/1] MR236: winebus.sys: Implement SOCD neutral cleaning for hatswitches.
by Rémi Bernon (＠rbernon) 13 Jun '22

13 Jun '22

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

2 1

[PATCH 0/5] MR235: ntdll: Preparation for heap region factorization.
by Rémi Bernon (＠rbernon) 13 Jun '22

13 Jun '22

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

2 5

[tools 1/3] testbot/WineSendLog: Remove a couple of unused variables.
by Francois Gouget 13 Jun '22

13 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 37949e45f..5affba606 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -247,7 +247,7 @@ EOF print $Sendmail "\nYou can also see the results at:\n$JobURL\n\n"; # Print the job summary - my ($JobErrors, $ReportCounts); + my $JobErrors; … [View More]

1 2

[tools resend] testbot/orm: Make the Itemref columns read-only.
by Francois Gouget 13 Jun '22

13 Jun '22

The columns used by an Itemref should be modified through the Itemref property to ensure that they remain in sync with it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Same as before, just out of the patch series since the other two are deferred. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 3 +- testbot/lib/ObjectModel/Item.pm | 8 ++++++ .../ObjectModel/ItemrefPropertyDescriptor.pm | 28 ++++++++++++++++++- testbot/lib/ObjectModel/… [View More]PropertyDescriptor.pm | 7 +++++ testbot/lib/WineTestBot/CGI/Sessions.pm | 1 + testbot/lib/WineTestBot/Jobs.pm | 1 + testbot/lib/WineTestBot/PendingPatches.pm | 1 + testbot/lib/WineTestBot/StepsTasks.pm | 1 + testbot/lib/WineTestBot/Tasks.pm | 1 + testbot/lib/WineTestBot/UserRoles.pm | 1 + 10 files changed, 50 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 224bf3687..6f3449b5b 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -198,7 +198,8 @@ sub DisplayProperty($$) # type the appropriate key value would also be cumbersome so this is # currently not supported. But they can be displayed. $PropertyDescriptor->GetClass() eq "Itemref" ? "ro" : - # All other properties can displayed, + $PropertyDescriptor->GetIsReadOnly() ? "ro" : + # All other properties can be displayed, !$self->{RW} ? "ro" : # and even edited if in read-write mode... $PropertyDescriptor->GetClass() ne "Basic" ? "rw" : diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index b07b76066..11d09be67 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -270,6 +270,10 @@ sub AUTOLOAD { if (@_) { + if ($PropertyDescriptor->GetIsReadOnly()) + { + die "$PropertyName is read-only"; + } my $Value = shift; if ($self->ValuesDiffer($Value, $self->{ColValues}{$PropertyName})) { @@ -283,6 +287,10 @@ sub AUTOLOAD { if (@_) { + if ($PropertyDescriptor->GetIsReadOnly()) + { + die "$PropertyName is read-only"; + } my $Item = shift; if (!$Item and !$self->{Itemrefs}{$PropertyName}) { diff --git a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm index 6895e801a..171d00a9e 100644 --- a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm @@ -28,7 +28,7 @@ ObjectModel::ItemrefPropertyDescriptor - A property referencing an ObjectModel:: use Exporter 'import'; use ObjectModel::PropertyDescriptor; our @ISA = qw(ObjectModel::PropertyDescriptor); -our @EXPORT = qw(CreateItemrefPropertyDescriptor); +our @EXPORT = qw(CreateItemrefPropertyDescriptor SetupItemrefColumns); sub _initialize($$$) { @@ -78,4 +78,30 @@ sub CreateItemrefPropertyDescriptor($$$$$) return ObjectModel::ItemrefPropertyDescriptor->new($Name, $DisplayName, !1, $IsRequired, $Creator, $RefColNames); } +sub SetupItemrefColumns($) +{ + my ($PropertyDescriptors) = @_; + + my (@Itemrefs, %Properties); + foreach my $PropertyDescriptor (@$PropertyDescriptors) + { + $Properties{$PropertyDescriptor->GetName()} = $PropertyDescriptor; + if ($PropertyDescriptor->GetClass() eq "Itemref") + { + push @Itemrefs, $PropertyDescriptor; + } + } + + # Mark the Itemref columns as read-only so they are only modified + # through the Itemref. + foreach my $Itemref (@Itemrefs) + { + foreach my $ColName (@{$Itemref->GetRefColNames()}) + { + my $ColDescriptor = $Properties{$ColName}; + $ColDescriptor->{IsReadOnly} = 1; + } + } +} + 1; diff --git a/testbot/lib/ObjectModel/PropertyDescriptor.pm b/testbot/lib/ObjectModel/PropertyDescriptor.pm index f13a4b248..2f9411aa2 100644 --- a/testbot/lib/ObjectModel/PropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/PropertyDescriptor.pm @@ -86,6 +86,13 @@ sub GetIsRequired($) return $self->{IsRequired}; } +sub GetIsReadOnly($) +{ + my ($self) = @_; + + return $self->{IsReadOnly}; +} + sub GetClass($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 5ca84e734..8594cfcdf 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -75,6 +75,7 @@ my @PropertyDescriptors = ( CreateItemrefPropertyDescriptor("User", "User", 1, \&CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Permanent", "Permanent session", !1, 1, "B", 1), ); +SetupItemrefColumns(\@PropertyDescriptors); =pod =over 12 diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 140bd572b..7f15a9c57 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -524,6 +524,7 @@ my @PropertyDescriptors = ( CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), CreateDetailrefPropertyDescriptor("Steps", "Steps", \&CreateSteps), ); +SetupItemrefColumns(\@PropertyDescriptors); SetDetailrefKeyPrefix("Job", @PropertyDescriptors); =pod diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index f4768b823..32a6af44f 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -68,6 +68,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("PatchId", "Patch id", !1, 1, "N", 10), CreateItemrefPropertyDescriptor("Patch", "Submitted via patch", 1, \&CreatePatches, ["PatchId"]), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("PendingPatchSetEMail", "EMail of series author", 1, 1, "A", 40), CreateBasicPropertyDescriptor("PendingPatchSetVersion", "Expected version of the series", 1, 1, "N", 2), diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 2533c6a01..87146b277 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -192,6 +192,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); +SetupItemrefColumns(\@PropertyDescriptors); sub CreateStepsTasks(;$$) { diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 5c5813cd9..0360e4ebc 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -363,6 +363,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "N", 10), CreateBasicPropertyDescriptor("StepNo", "Step no", 1, 1, "N", 2), diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index 90c4332c3..900f41fc5 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -61,6 +61,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("RoleName", "Role", 1, 1, "A", 20), CreateItemrefPropertyDescriptor("Role", "Role", 1, \&CreateRoles, ["RoleName"]), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("UserName", "Username", 1, 1, "A", 40), @PropertyDescriptors -- 2.30.2 [View Less]

1 0

[PATCH v4 0/3] MR227: riched20: Fix for #52752 (use IViewObject implementation)
by Jinoh Kang (＠iamahuman) 13 Jun '22

13 Jun '22

Fixes https://bugs.winehq.org/show_bug.cgi?id=52752. -- v4: riched20: Draw OLE objects with IViewObject implementation. riched20: Fetch extent from object if REOBJECT::sizel is unset. https://gitlab.winehq.org/wine/wine/-/merge_requests/227

3 4

[PATCH v2 1/5] d2d1/tests: Add more test xml.
by Ziqing Hui 13 Jun '22

13 Jun '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Add case tests and min/max inputs tests. dlls/d2d1/tests/d2d1.c | 120 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 112 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index bc662b4f8ae..970706bc569 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -99,6 +99,17 @@ L"<?xml version='1.0'?> \ … [View More]</Effect> \ "; +static const WCHAR *effect_xml_inputs_attribute = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs min='1' max='10' deadbeef='abcdef'/> \ + </Effect> \ +"; + static const WCHAR *effect_xml_without_version = L"<Effect> \ <Property name='DisplayName' type='string'/> \ @@ -170,6 +181,90 @@ L"<?xml version='1.0'?> \ </Effect> \ "; +static const WCHAR *effect_xml_wrong_type = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='Author' type='uint32' value='32'/> \ + <Property name='Category' type='string' value='Test'/> \ + <Property name='Description' type='string' value='Test effect.'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_duplicate_property = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_lower_case_effect = +L"<?xml version='1.0'?> \ + <effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs/> \ + </effect> \ +"; + +static const WCHAR *effect_xml_lower_case_property = +L"<?xml version='1.0'?> \ + <Effect> \ + <property name='DisplayName' type='string'/> \ + <property name='Author' type='string'/> \ + <property name='Category' type='string'/> \ + <property name='Description' type='string'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_lower_case_inputs = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_min_max_inputs_a = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Property name='MinInputs' type='uint32' value='1'/> \ + <Property name='MaxInputs' type='uint32' value='2'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_min_max_inputs_b = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs> \ + <Property name='Min' type='uint32' value='1'/> \ + <Property name='Max' type='uint32' value='2'/> \ + </Inputs> \ + </Effect> \ +"; + + static const DWORD test_vs[] = { #if 0 @@ -10604,10 +10699,11 @@ static void test_effect_register(BOOL d3d11) } xml_tests[] = { - {effect_xml_a, S_OK}, - {effect_xml_b, S_OK}, - {effect_xml_c, S_OK}, - {effect_xml_minimum, S_OK}, + {effect_xml_a, S_OK}, + {effect_xml_b, S_OK}, + {effect_xml_c, S_OK}, + {effect_xml_minimum, S_OK}, + {effect_xml_inputs_attribute, S_OK}, {effect_xml_without_version, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, {effect_xml_without_inputs, E_INVALIDARG}, {effect_xml_without_name, E_INVALIDARG}, @@ -10615,6 +10711,13 @@ static void test_effect_register(BOOL d3d11) {effect_xml_without_category, E_INVALIDARG}, {effect_xml_without_description, E_INVALIDARG}, {effect_xml_without_type, E_INVALIDARG}, + {effect_xml_wrong_type, E_INVALIDARG}, + {effect_xml_duplicate_property, E_INVALIDARG}, + {effect_xml_lower_case_effect, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, + {effect_xml_lower_case_property, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, + {effect_xml_lower_case_inputs, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, + {effect_xml_min_max_inputs_a, E_INVALIDARG}, + {effect_xml_min_max_inputs_b, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, }; const D2D1_PROPERTY_BINDING binding[] = @@ -10926,10 +11029,11 @@ static void test_effect_properties(BOOL d3d11) } system_property_tests[] = { - {effect_xml_a, L"TestEffectA", effect_author, effect_category, effect_description, 1, 1}, - {effect_xml_b, L"TestEffectB", effect_author, effect_category, effect_description, 1, 1}, - {effect_xml_c, L"TestEffectC", effect_author, effect_category, effect_description, 1, 1}, - {effect_xml_minimum, L"", L"" ,L"", L"", 0, 0}, + {effect_xml_a, L"TestEffectA", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_b, L"TestEffectB", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_c, L"TestEffectC", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_minimum, L"", L"" ,L"", L"", 0, 0}, + {effect_xml_inputs_attribute, L"", L"" ,L"", L"", 0, 0}, }; if (!init_test_context(&ctx, d3d11)) -- 2.25.1 [View Less]

2 12

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