January 2020 - Wine-devel - list.winehq.org

[PATCH 5/6] jscript/tests: Use wide char string literals instead of strcmp_wa.
by Jacek Caban 14 Jan '20

14 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/run.c | 111 ++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 60 deletions(-)

1 0

[PATCH 4/6] jscript/tests: Use wide char string literals instead of a2bstr.
by Jacek Caban 14 Jan '20

14 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/run.c | 135 +++++++++++++++------------------------ 1 file changed, 53 insertions(+), 82 deletions(-)

1 0

[PATCH 3/6] jscript/tests: Use wide char string literals instead of parse_script_a.
by Jacek Caban 14 Jan '20

14 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/run.c | 245 ++++++++++++++++++--------------------- 1 file changed, 115 insertions(+), 130 deletions(-)

1 0

[PATCH 2/6] jscript/tests: Use wide char string literals instead of parse_htmlscript_a.
by Jacek Caban 14 Jan '20

14 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/run.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-)

1 0

[PATCH 1/6] jscript/tests: Use wide char string literals instead of parse_script_with_error_a.
by Jacek Caban 14 Jan '20

14 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/run.c | 81 ++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 45 deletions(-)

1 0

[PATCH] xaudio2_7: Trace FAudio version being used
by Alistair Leslie-Hughes 14 Jan '20

14 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xaudio2_7/xaudio_dll.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index a87e0124d3..ae18a72e2b 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -90,6 +90,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) case DLL_PROCESS_ATTACH: instance = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); + + TRACE("Using FAudio version %d\n", FAudioLinkedVersion() ); break; } return TRUE; -- 2.17.1

2 1

[PATCH] testbot: Standardize building the reference report filenames.
by Francois Gouget 14 Jan '20

14 Jan '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunTask.pl | 2 +- testbot/bin/WineRunWineTest.pl | 2 +- testbot/bin/WineSendLog.pl | 7 ++++--- testbot/lib/WineTestBot/StepsTasks.pm | 7 +++++++ testbot/lib/WineTestBot/Tasks.pm | 6 ++++++ testbot/web/JobDetails.pl | 4 ++-- 7 files changed, 22 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index f33b7bde6..ce8f40f05 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -510,7 +510,7 @@ foreach my $TestStep (@{$Job->Steps->GetItems()}) { foreach my $TestTask (@{$TestStep->Tasks->GetItems()}) { - my $RefReport = $TestTask->VM->Name ."_". $TestStep->FileType .".report"; + my $RefReport = $TestTask->GetRefReportName($TestStep->FileType .".report"); for my $Suffix ("", ".err") { if (-f "$LatestDir/$RefReport$Suffix") diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 6a30de3d3..8df5282b8 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -305,7 +305,7 @@ sub WrapUpAndExit($;$$$$) if (-f "$TaskDir/$RptFileName" and !-z "$TaskDir/$RptFileName") { # Update the VM's reference WineTest results for WineSendLog.pl - my $RefReport = "$DataDir/latest/". $Task->VM->Name ."_$RptFileName"; + my $RefReport = "$DataDir/latest/". $Task->GetRefReportName($RptFileName); unlink($RefReport); link("$TaskDir/$RptFileName", $RefReport); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index a2297cb5b..7f8012b37 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -630,7 +630,7 @@ if ($NewStatus eq 'completed') foreach my $Mission (@{$TaskMissions->{Missions}}) { my $RptFileName = GetMissionBaseName($Mission) .".report"; - my $RefReport = $Task->VM->Name ."_$RptFileName"; + my $RefReport = $Task->GetRefReportName($RptFileName); for my $Suffix ("", ".err") { if (-f "$LatestDir/$RefReport$Suffix") diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 98bfc4c0f..1ec7db1bd 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -238,8 +238,9 @@ Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit EOF + # Prepend the VM name to get unique attachment filenames for this email. print $Sendmail "Content-Disposition: attachment; filename=", - $StepTask->VM->Name, "_$LogName\n\n"; + $StepTask->VM->Name, "-$LogName\n\n"; if ($Debug) { print $Sendmail "Not dumping logs in debug mode\n"; @@ -290,8 +291,8 @@ EOF # Skip if there are no errors next if (!$LogErrors->{Groups}); - my $RefFileName = $StepTask->GetFullFileName($StepTask->VM->Name ."_$LogName"); - my ($NewGroups, $NewErrors, $_NewIndices) = GetNewLogErrors($RefFileName, $LogErrors->{Groups}, $LogErrors->{Errors}); + my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($LogName)); + my ($NewGroups, $NewErrors, $_NewIndices) = GetNewLogErrors($RefReportPath, $LogErrors->{Groups}, $LogErrors->{Errors}); if (!$NewGroups) { # Test reports should have reference WineTest results and if not diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 463f15078..bad0e2437 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -67,6 +67,13 @@ sub GetTaskDir($) return $self->GetStepDir() ."/". $self->TaskNo; } +# Keep in sync with WineTestBot::Task::GetRefReportName() +sub GetRefReportName($$) +{ + my ($self, $ReportName) = @_; + return $self->VM->Name ."_$ReportName"; +} + sub GetTitle($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index f9e84d471..0c26904e1 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -108,6 +108,12 @@ sub RmTree($) rmtree($Dir); } +sub GetRefReportName($$) +{ + my ($self, $ReportName) = @_; + return $self->VM->Name ."_$ReportName"; +} + sub _SetupTask($$) { my ($VM, $self) = @_; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index a59fa000d..4d08a862c 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -529,8 +529,8 @@ EOF if ($LogName =~ /\.report$/) { # Identify new errors in test reports - my $RefFileName = $StepTask->GetFullFileName($VM->Name ."_$LogName"); - (my $_NewGroups, my $_NewErrors, $New) = GetNewLogErrors($RefFileName, $Summary->{Groups}, $Summary->{Errors}); + my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($LogName)); + (my $_NewGroups, my $_NewErrors, $New) = GetNewLogErrors($RefReportPath, $Summary->{Groups}, $Summary->{Errors}); } foreach my $GroupName (@{$Summary->{Groups}}) -- 2.20.1

1 0

[PATCH] testbot/Janitor: Notify the administrator when unknown files are found.
by Francois Gouget 14 Jan '20

14 Jan '20

Report unknown files as soon as they are detected. This means they no longer need an extra week to live. Also the WineTest reports of deleted VMs no longer get reported as 'suspicious'. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 54 ++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 4eda071fa..579a43275 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -265,34 +265,24 @@ if (opendir(my $dh, "$DataDir/staging")) foreach my $Entry (@Entries) { next if ($Entry eq "." or $Entry eq ".."); + $Entry =~ m%^([^/]+)$%; # untaint my $FileName = "$DataDir/staging/$1"; my $Age = int((-M $FileName) + 0.5); + my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; - if ($Entry !~ /^[0-9a-f]{32}-websubmit_/) + if ($Entry =~ /^[0-9a-f]{32}-websubmit_/) { - if ($Entry !~ /^[0-9a-f]{32}_(?:patch|patch\.diff|wine-patches|winetest(?:64)?-latest\.exe|work)$/) - { - Trace "Found a suspicious staging file: $Entry\n"; - } - - if ($JobPurgeDays != 0) - { - if ($Age >= $JobPurgeDays + 7) - { - DeletePath($FileName); - } - elsif ($Age > $JobPurgeDays) - { - Error "'$FileName' is $Age days old and should have been deleted already. It will be deleted in ", $JobPurgeDays + 7 - $Age, " day(s).\n"; - } - } + # These files always expire after one day + $TTL = 1 - $Age; } - elsif ($Age >= 1) + elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch|patch\.diff|wine-patches|winetest(?:64)?-latest\.exe|work)$/) { - # The user abandoned the submit procedure half-way through - DeletePath($FileName); + my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; + Error "Found a suspicious file$Deletion: staging/$Entry\n"; } + + DeletePath($FileName) if (defined $TTL and $TTL <= 0); } } else @@ -319,6 +309,11 @@ if (opendir(my $dh, "$DataDir/latest")) next if ($Entry =~ /^TestLauncher[0-9]*\.exe$/); next if ($Entry =~ /^winetest[0-9]*-latest\.exe$/); + $Entry =~ m%^([^/]+)$%; # untaint + my $FileName = "$DataDir/latest/$1"; + my $Age = int((-M $FileName) + 0.5); + my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; + if ($Entry =~ /^([a-zA-Z0-9_]+)_(?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report(?:\.err)?$/) { # Keep the reference WineTest reports for all VMs even if they are @@ -326,22 +321,13 @@ if (opendir(my $dh, "$DataDir/latest")) my $VMName = $1; next if ($AllVMs->GetItem($VMName)); } - - Trace "Found a suspicious latest file: $Entry\n"; - if ($JobPurgeDays != 0) + else { - $Entry =~ m%^([^/]+)$%; # untaint - my $FileName = "$DataDir/latest/$1"; - my $Age = int((-M $FileName) + 0.5); - if ($Age >= $JobPurgeDays + 7) - { - DeletePath($FileName); - } - elsif ($Age > $JobPurgeDays) - { - Trace "'$FileName' will be deleted in ", $JobPurgeDays + 7 - $Age, " day(s).\n"; - } + my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; + Error "Found a suspicious file$Deletion: latest/$Entry\n"; } + + DeletePath($FileName) if (defined $TTL and $TTL <= 0); } } else -- 2.20.1

1 0

[PATCH] testbot/WineRun{Task,WineTest}: Fix parsing error reporting.
by Francois Gouget 14 Jan '20

14 Jan '20

Use the error message returned by ParseWineTestReport() when it could not open the report instead of recreating it from scratch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/WineRunWineTest.pl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 8df5282b8..62bd162ee 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -562,8 +562,8 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { # Could not open the file $NewStatus = 'boterror'; - Error "Unable to open '$RptFileName' for reading: $!\n"; - LogTaskError("Unable to open '$RptFileName' for reading: $!\n"); + Error "$LogErrors->[0]\n"; + LogTaskError("$LogErrors->[0]\n"); } else { diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 7f8012b37..245128a73 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -584,8 +584,8 @@ foreach my $Mission (@{$TaskMissions->{Missions}}) { # Could not open the file $NewStatus = 'boterror'; - Error "Unable to open '$RptFileName' for reading: $!\n"; - LogTaskError("Unable to open '$RptFileName' for reading: $!\n"); + Error "$LogErrors->[0]\n"; + LogTaskError("$LogErrors->[0]\n"); } else { -- 2.20.1

1 0

[PATCH] comctl32/tests: Add some more ListView customdraw tests.
by Nikolay Sivov 14 Jan '20

14 Jan '20

Based on patch by Michael Müller. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/listview.c | 51 ++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 87f644abd1..20b9873d30 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1916,6 +1916,8 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM NMHDR *nmhdr = (NMHDR*)lParam; if(nmhdr->code == NM_CUSTOMDRAW) { NMLVCUSTOMDRAW *nmlvcd = (NMLVCUSTOMDRAW*)nmhdr; + BOOL showsel_always = !!(GetWindowLongA(nmlvcd->nmcd.hdr.hwndFrom, GWL_STYLE) & LVS_SHOWSELALWAYS); + BOOL is_selected = !!(nmlvcd->nmcd.uItemState & CDIS_SELECTED); struct message msg; msg.message = message; @@ -1931,21 +1933,40 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM SetBkColor(nmlvcd->nmcd.hdc, c0ffee); return CDRF_NOTIFYITEMDRAW|CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPREPAINT: + clr = GetBkColor(nmlvcd->nmcd.hdc); + todo_wine_if(nmlvcd->iSubItem) + ok(clr == c0ffee, "Unexpected background color %#x.\n", clr); nmlvcd->clrTextBk = CLR_DEFAULT; nmlvcd->clrText = RGB(0, 255, 0); return CDRF_NOTIFYSUBITEMDRAW|CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPREPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); - ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk); - ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); + todo_wine_if(showsel_always && is_selected && nmlvcd->iSubItem) + { + ok(nmlvcd->clrTextBk == CLR_DEFAULT, "Unexpected text background %#x.\n", nmlvcd->clrTextBk); + ok(nmlvcd->clrText == RGB(0, 255, 0), "Unexpected text color %#x.\n", nmlvcd->clrText); + } + if (showsel_always && is_selected && nmlvcd->iSubItem) + ok(clr == GetSysColor(COLOR_3DFACE), "Unexpected background color %#x.\n", clr); + else todo_wine_if(nmlvcd->iSubItem) ok(clr == c0ffee, "clr=%.8x\n", clr); return CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); - todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); - ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk); - ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); + if (showsel_always && is_selected) + ok(clr == GetSysColor(COLOR_3DFACE), "Unexpected background color %#x.\n", clr); + else + { + todo_wine + ok(clr == c0ffee, "Unexpected background color %#x.\n", clr); + } + + todo_wine_if(showsel_always) + { + ok(nmlvcd->clrTextBk == CLR_DEFAULT, "Unexpected text background color %#x.\n", nmlvcd->clrTextBk); + ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); + } return CDRF_DODEFAULT; } return CDRF_DODEFAULT; @@ -1959,6 +1980,7 @@ static void test_customdraw(void) { HWND hwnd; WNDPROC oldwndproc; + LVITEMA item; hwnd = create_listview_control(LVS_REPORT); @@ -1978,6 +2000,25 @@ static void test_customdraw(void) UpdateWindow(hwnd); ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, "parent customdraw, LVS_REPORT", FALSE); + /* Check colors when item is selected. */ + item.mask = LVIF_STATE; + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + InvalidateRect(hwnd, NULL, TRUE); + UpdateWindow(hwnd); + ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, + "parent customdraw, item selected, LVS_REPORT, selection", FALSE); + + SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) | LVS_SHOWSELALWAYS); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + InvalidateRect(hwnd, NULL, TRUE); + UpdateWindow(hwnd); + ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, + "parent customdraw, item selected, LVS_SHOWSELALWAYS, LVS_REPORT", FALSE); + DestroyWindow(hwnd); hwnd = create_listview_control(LVS_LIST); -- 2.24.1

1 0