October 2019 - Wine-Commits

Francois Gouget : testbot/WineRunTask: Capture the cmd errors.
by Alexandre Julliard Oct. 27, 2019

Oct. 27, 2019

Module: tools Branch: master Commit: 6be509ccd0a8a723591a9bded6d0c20424219ad1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6be509ccd0a8a723591a9bd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 24 00:11:22 2019 +0200 testbot/WineRunTask: Capture the cmd errors. This can help diagnose why the test executable fails to run, such as when there is a side-by-side assembly issue. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 1ee1c12..6744952 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -442,7 +442,7 @@ if (!$TA->SendFile($Step->GetFullFileName(), $FileName, 0)) my $Keepalive; my $Timeout = $Task->Timeout; -my $Script = "\@echo off\r\nset WINETEST_DEBUG=" . $Step->DebugLevel . +my $Script = "set WINETEST_DEBUG=" . $Step->DebugLevel . "\r\n"; if ($Step->ReportSuccessfulTests) { @@ -508,7 +508,7 @@ if (!$TA->SendFileFromString($Script, "script.bat", $TestAgent::SENDFILE_EXE)) # Debug(Elapsed($Start), " Starting the script\n"); -my $Pid = $TA->Run(["./script.bat"], 0); +my $Pid = $TA->Run(["./script.bat"], 0, undef, "Task.log", "Task.log"); if (!$Pid) { FatalTAError($TA, "Failed to start the test"); @@ -539,6 +539,12 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) } } +Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); +if (!$TA->GetFile("Task.log", "$TaskDir/log") and !defined $TAError) +{ + $TAError = "An error occurred while retrieving the task log: ". $TA->GetLastError(); +} + Debug(Elapsed($Start), " Retrieving the report file to '$RptFileName'\n"); if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) {

1 0

Francois Gouget : testbot: Always update the VM guest time after a revert.
by Alexandre Julliard Oct. 27, 2019

Oct. 27, 2019

Module: tools Branch: master Commit: de71fa30a51a81128688dda2c7912a33e5d5f8da URL: https://source.winehq.org/git/tools.git/?a=commit;h=de71fa30a51a81128688dda… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 24 14:12:05 2019 +0200 testbot: Always update the VM guest time after a revert. All VMs support it nowadays and having the current time is important not only for the tests but also for builds (due to a ccache bug). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 16 ++++++++++++++++ testbot/bin/WineRunTask.pl | 13 ------------- testbot/bin/WineRunWineTest.pl | 13 ------------- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index d590191..127c15c 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -420,6 +420,22 @@ sub SetupTestAgentd($$$$) # A side effect is that it will force TestAgentd.exe.old to stay around. } + # Always update the guest's system time + # This is needed not only for the tests (date is important when checking + # HTTPS certificates), but also for the build (if the time moves forward + # during the build some ccache versions will return a compilation error). + if (!$TA->SetTime()) + { + # Not a fatal error. Try the next port in case the VM runs a privileged + # TestAgentd daemon there. + my $PrivilegedTA = $VM->GetAgent(1); + if (!$PrivilegedTA->SetTime()) + { + FatalError("Unable to set the VM system time: ". $PrivilegedTA->GetLastError() ."\n"); + } + $PrivilegedTA->Disconnect(); + } + if ($Booting and $VM->Type eq "wine") { # Make sure the X session has had time to start diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 81a2996..1ee1c12 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -433,19 +433,6 @@ my $Mission = $Missions->[0]->{Missions}->[0]; # my $TA = $VM->GetAgent(); -Debug(Elapsed($Start), " Setting the time\n"); -if (!$TA->SetTime()) -{ - # Not a fatal error. Try the next port in case the VM runs a privileged - # TestAgentd daemon there. - my $PrivilegedTA = $VM->GetAgent("privileged"); - if (!$PrivilegedTA->SetTime()) - { - LogTaskError("Unable to set the VM system time: ". $PrivilegedTA->GetLastError() .". Maybe the TestAgentd process is missing the required privileges.\n"); - $PrivilegedTA->Disconnect(); - } -} - my $FileName = $Step->FileName; Debug(Elapsed($Start), " Sending '". $Step->GetFullFileName() ."'\n"); if (!$TA->SendFile($Step->GetFullFileName(), $FileName, 0)) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index ff5317c..a2297cb 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -432,19 +432,6 @@ $TaskMissions = $Missions->[0]; # Setup the VM # my $TA = $VM->GetAgent(); -Debug(Elapsed($Start), " Setting the time\n"); -if (!$TA->SetTime()) -{ - # Not a fatal error. Try the next port in case the VM runs a privileged - # TestAgentd daemon there. - my $PrivilegedTA = $VM->GetAgent(1); - if (!$PrivilegedTA->SetTime()) - { - LogTaskError("Unable to set the VM system time: ". $PrivilegedTA->GetLastError() .". Maybe the TestAgentd process is missing the required privileges.\n"); - $PrivilegedTA->Disconnect(); - } -} - my $FileName = $Step->FileName; if (defined $FileName) {

1 0

Francois Gouget : testbot/web: Allow specifying how many days to analyze for the statistics.
by Alexandre Julliard Oct. 27, 2019

Oct. 27, 2019

Module: tools Branch: master Commit: 35af603ddf512e82c758128a569a06f0e6f9d08b URL: https://source.winehq.org/git/tools.git/?a=commit;h=35af603ddf512e82c758128… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 24 14:13:35 2019 +0200 testbot/web: Allow specifying how many days to analyze for the statistics. Building statistics on the full job retention period may not be what's needed. Also, the longer the period analyzed the longer it takes to generate this page. So let the user specify which period to analyze and default to 7 days, a reasonable period to get values that are not unduly influenced by short-term patch storms, but also short enough to reflect current trends. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Stats.pl | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 3 deletions(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 91106bb..b08c738 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -21,9 +21,10 @@ use strict; package StatsPage; -use ObjectModel::CGI::Page; -our @ISA = qw(ObjectModel::CGI::Page); +use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); +use ObjectModel::BasicPropertyDescriptor; use ObjectModel::Collection; use WineTestBot::Config; use WineTestBot::Activity; @@ -36,10 +37,33 @@ sub _initialize($$$) { my ($self, $Request, $RequiredRole) = @_; + $self->{Days} = $self->GetParam("Days"); + $self->Validate(); + $self->{start} = Time(); $self->SUPER::_initialize($Request, $RequiredRole); } +sub Validate($) +{ + my ($self) = @_; + + if (!defined $self->{Days}) + { + $self->{Days} = 7; + $self->{NoStats} = 1; + } + elsif ($self->{Days} !~ /^[0-9]{1,2}$/) + { + $self->{ErrField} = "Days"; + $self->{ErrMessage} = "The number of days must be between 1 and 99"; + $self->{NoStats} = 1; + $self->{Days} = 7; + return undef; + } + return $self->SUPER::Validate(); +} + sub GetPageTitle($$) { my ($self, $Page) = @_; @@ -168,7 +192,15 @@ sub GenerateBody($) { my ($self) = @_; + return $self->SUPER::GenerateBody() if ($self->{NoStats}); + print "<h1>${ProjectName} Test Bot activity statistics</h1>\n"; + $self->GenerateFormStart(); + $self->GenerateFields(); + $self->GenerateRequiredLegend(); + $self->GenerateActions(); + $self->GenerateFormEnd(); + print "<div class='Content'>\n"; ### Get the sorted VMs list @@ -176,7 +208,7 @@ sub GenerateBody($) my $VMs = CreateVMs(); $VMs->FilterEnabledRole(); my @SortedVMs = sort _CompareVMs @{$VMs->GetItems()}; - my $Stats = GetStatistics($VMs); + my $Stats = GetStatistics($VMs, $self->{Days} * 24 * 60 * 60); ### Show global statistics @@ -342,9 +374,51 @@ sub GenerateBody($) print "</tbody></table></div>\n"; } +sub GetPropertyDescriptors($) +{ + my ($self) = @_; + + $self->{PropertyDescriptors} ||= [ + CreateBasicPropertyDescriptor("Days", "Days to analyze", !1, !1, "N", 2), + ]; + + return $self->SUPER::GetPropertyDescriptors(); +} + +sub GetDisplayValue($$) +{ + my ($self, $PropertyDescriptor) = @_; + + return $self->{$PropertyDescriptor->GetName()}; +} + +sub GetActions($) +{ + my ($self) = @_; + + my $Actions = $self->SUPER::GetActions(); + push @$Actions, "Update"; + return $Actions; +} + +sub OnAction($$) +{ + my ($self, $Action) = @_; + + if ($Action eq "Update") + { + return $self->Validate() ? 1 : undef; + } + + return $self->SUPER::OnAction($Action); +} + sub GenerateFooter($) { my ($self) = @_; + + return $self->SUPER::GenerateFooter() if ($self->{NoStats}); + print "<p></p><div class='CollectionBlock'><table>\n"; print "<thead><tr><th class='Record'>Legend</th></tr></thead>\n"; print "<tbody><tr><td class='Record'>\n";

1 0

Rémi Bernon : user32/tests: Update input test result for w1064v1809.
by Alexandre Julliard Oct. 23, 2019

Oct. 23, 2019

Module: wine Branch: master Commit: 96f0d1ae7d91bada5a39569d21785f52e21a880f URL: https://source.winehq.org/git/wine.git/?a=commit;h=96f0d1ae7d91bada5a39569d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 23 12:34:07 2019 +0200 user32/tests: Update input test result for w1064v1809. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d0dc4a8bcf..d768e64cdc 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1409,7 +1409,9 @@ static void test_mouse_ll_hook(void) ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); mouse_event(MOUSEEVENTF_MOVE, 0, 0, 0, 0); GetCursorPos(&pt_old); - ok(pt_old.x == 150 && pt_old.y == 150, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + ok((pt_old.x == 150 && pt_old.y == 150) || + broken(pt_old.x == 149 && pt_old.y == 149) /* w1064v1809 */, + "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); mouse_event(MOUSEEVENTF_MOVE, 0, 0, 0, 0); GetCursorPos(&pt_old); todo_wine

1 0

Michael Stefaniuc : comctl32/tests: Don't read past the end of the buffer.
by Alexandre Julliard Oct. 23, 2019

Oct. 23, 2019

Module: wine Branch: master Commit: 717109ce79bbf92b5e3e93e49f96b78ece00a952 URL: https://source.winehq.org/git/wine.git/?a=commit;h=717109ce79bbf92b5e3e93e4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 23 21:51:08 2019 +0200 comctl32/tests: Don't read past the end of the buffer. Fixes test failures uncovered by f8979fee1fa2e6aeed5a5026465dffa680c0848f. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 30005c88fa..fba3cb8bef 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -1010,8 +1010,9 @@ static void test_notify_generic_text_helper(HWND pager, const struct generic_tex if (data->return_text) { if (para->flags & CONVERT_RECEIVE) - ok(!lstrcmpW(data->return_text, *para->text), "Code 0x%08x sub test %d expect %s, got %s\n", - para->code_unicode, i, wine_dbgstr_w((WCHAR *)data->return_text), wine_dbgstr_w(*para->text)); + ok(!wcsncmp(data->return_text, *para->text, *para->text_max), + "Code 0x%08x sub test %d expect %s, got %s\n", para->code_unicode, i, + wine_dbgstr_w((WCHAR *)data->return_text), wine_dbgstr_w(*para->text)); else ok(!lstrcmpA(data->return_text, (CHAR *)*para->text), "Code 0x%08x sub test %d expect %s, got %s\n", para->code_unicode, i, (CHAR *)data->return_text, (CHAR *)*para->text);

1 0

Alexandre Julliard : ntdll: Fix unwinding of leaf functions on ARM64.
by Alexandre Julliard Oct. 23, 2019

Oct. 23, 2019

Module: wine Branch: master Commit: 5c101ed58f5d7653221bfb49ac6ad43e5502cf1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c101ed58f5d7653221bfb49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 23 21:09:38 2019 +0200 ntdll: Fix unwinding of leaf functions on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index d6d5f15c87..17af494e29 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -508,14 +508,19 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) + if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { - WARN( "no info found for %lx ip %lx-%lx rc %d\n", ip, info.start_ip, info.end_ip, rc ); + TRACE( "no info found for %lx ip %lx-%lx, assuming leaf function\n", + ip, info.start_ip, info.end_ip ); + *handler = NULL; + *frame = context->Sp; + context->Pc = context->u.s.Lr; + context->Sp = context->Sp + sizeof(ULONG64); return STATUS_SUCCESS; } @@ -523,14 +528,10 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX ip, (unsigned long)info.start_ip, (unsigned long)info.end_ip, (unsigned long)info.handler, (unsigned long)info.lsda, (unsigned long)info.unwind_info ); - if (!(rc = unw_step( &cursor ))) - { - WARN( "last frame\n" ); - return STATUS_SUCCESS; - } + rc = unw_step( &cursor ); if (rc < 0) { - WARN( "failed to unwind: %d\n", rc ); + WARN( "failed to unwind: %d %d\n", rc, UNW_ENOINFO ); return STATUS_INVALID_DISPOSITION; } @@ -571,7 +572,7 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX unw_get_reg( &cursor, UNW_AARCH64_X30, (unw_word_t *)&context->u.s.Lr ); unw_get_reg( &cursor, UNW_AARCH64_SP, (unw_word_t *)&context->Sp ); - TRACE( "next function pc=%016lx\n", context->Pc ); + TRACE( "next function pc=%016lx%s\n", context->Pc, rc ? "" : " (last frame)" ); TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", context->u.s.X0, context->u.s.X1, context->u.s.X2, context->u.s.X3 ); TRACE(" x4=%016lx x5=%016lx x6=%016lx x7=%016lx\n",

1 0

Rémi Bernon : user32/tests: Do not expect ToAscii with 'A' vkey to return 'a' on non-us keyboards.
by Alexandre Julliard Oct. 23, 2019

Oct. 23, 2019

Module: wine Branch: master Commit: dd497ffcddaaa95cb87b15371662b9df0102cdd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd497ffcddaaa95cb87b1537… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 23 12:34:09 2019 +0200 user32/tests: Do not expect ToAscii with 'A' vkey to return 'a' on non-us keyboards. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 14399a6aac..130ce49bb5 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1885,6 +1885,7 @@ static void test_ToAscii(void) const BYTE SC_RETURN = 0x1c, SC_A = 0x1e; const BYTE HIGHEST_BIT = 0x80; int ret; + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); memset(state, 0, sizeof(state)); @@ -1896,7 +1897,7 @@ static void test_ToAscii(void) character = 0; ret = ToAscii('A', SC_A, state, &character, 0); ok(ret == 1, "ToAscii for character 'A' didn't return 1 (was %i)\n", ret); - ok(character == 'a', "ToAscii for character 'A' was %i (expected %i)\n", character, 'a'); + if (us_kbd) ok(character == 'a', "ToAscii for character 'A' was %i (expected %i)\n", character, 'a'); state[VK_CONTROL] |= HIGHEST_BIT; state[VK_LCONTROL] |= HIGHEST_BIT;

1 0

Louis Lenders : uianimation: Register interfaces.
by Alexandre Julliard Oct. 23, 2019

Oct. 23, 2019

Module: wine Branch: master Commit: e798001f8621ddcf4fc777ef7c1e788cd3ff4b72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e798001f8621ddcf4fc777ef… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Oct 22 21:29:31 2019 +0000 uianimation: Register interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/Makefile.in | 3 ++ dlls/uianimation/uianimation_reg.idl | 57 ++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in index 85bf1675db..9abb0d6b59 100644 --- a/dlls/uianimation/Makefile.in +++ b/dlls/uianimation/Makefile.in @@ -4,3 +4,6 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ main.c + +IDL_SRCS = \ + uianimation_reg.idl diff --git a/dlls/uianimation/uianimation_reg.idl b/dlls/uianimation/uianimation_reg.idl new file mode 100644 index 0000000000..7b311b50df --- /dev/null +++ b/dlls/uianimation/uianimation_reg.idl @@ -0,0 +1,57 @@ +/* + * UiAnimation register. + * + * Copyright (C) 2018 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +[ + uuid(bfcd4a0c-06b6-4384-b768-0daa792c380e), + threading(both) +] +coclass UIAnimationTimer +{ + [default] interface IUIAnimationTimer; +} + +[ + uuid(4c1fc63a-695c-47e8-a339-1a194be3d0b8), + threading(both) +] +coclass UIAnimationManager +{ + [default] interface IUIAnimationManager; +} + +[ + uuid(8a9b1cdd-fcd7-419c-8b44-42fd17db1887), + threading(both) +] +coclass UIAnimationTransitionFactory +{ + [default] interface IUIAnimationTransitionFactory; +} + +[ + uuid(1d6322ad-aa85-4ef5-a828-86d71067d145), + threading(both) +] +coclass UIAnimationTransitionLibrary +{ + [default] interface IUIAnimationTransitionLibrary; +}

1 0

Rémi Bernon : user32/tests: Do not expect char vkey to return the same char everywhere.
by Alexandre Julliard Oct. 23, 2019

Oct. 23, 2019

Module: wine Branch: master Commit: c56c76e61e1e47faafa31087ee0ea20a78bd388b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c56c76e61e1e47faafa31087… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 23 12:34:08 2019 +0200 user32/tests: Do not expect char vkey to return the same char everywhere. Results may depend on the keyboard layout, and the tests were failing on VMs with non-us layouts. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d768e64cdc..14399a6aac 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1763,15 +1763,16 @@ static const struct tounicode_tests WCHAR expect_buf[4]; } utests[] = { - { 'A', 0, 0, 1, {'a',0}}, - { 'A', ctrl, 0, 1, {1, 0}}, - { 'A', shift|ctrl, 0, 1, {1, 0}}, + { 0, 0, 'a', 1, {'a',0}}, + { 0, shift, 'a', 1, {'A',0}}, + { 0, ctrl, 'a', 1, {1, 0}}, + { 0, shift|ctrl, 'a', 1, {1, 0}}, { VK_TAB, ctrl, 0, 0, {}}, { VK_TAB, shift|ctrl, 0, 0, {}}, { VK_RETURN, ctrl, 0, 1, {'\n', 0}}, { VK_RETURN, shift|ctrl, 0, 0, {}}, - { '4', ctrl, 0, 0, {}}, - { '4', shift|ctrl, 0, 0, {}}, + { 0, ctrl, '4', 0, {}}, + { 0, shift|ctrl, '4', 0, {}}, { 0, ctrl, '!', 0, {}}, { 0, ctrl, '\"', 0, {}}, { 0, ctrl, '#', 0, {}},

1 0

Rémi Bernon : user32/tests: Skip some tests with inconsistent results with non-us kbd.
by Alexandre Julliard Oct. 23, 2019

Oct. 23, 2019

Module: wine Branch: master Commit: 4928f5134a43a868b382393d8730d123b6960288 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4928f5134a43a868b382393d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 23 13:09:30 2019 +0200 user32/tests: Skip some tests with inconsistent results with non-us kbd. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 130ce49bb5..c5cf9556ed 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -284,6 +284,13 @@ static BOOL TestASet( HWND hWnd, int nrkev, const KEV kevdwn[], const KEV kevup[ int i,j,k,l,m,n; static int count=0; KEV kbuf[MAXKEYEVENTS]; + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); + if (!us_kbd) + { + win_skip( "skipping test with inconsistent results on non-us keyboard\n" ); + return TRUE; + } + assert( nrkev==2 || nrkev==3); for(i=0;i<MAXKEYEVENTS;i++) kbuf[i]=0; /* two keys involved gives 4 test cases */ @@ -1184,6 +1191,12 @@ static void test_Input_unicode(void) HHOOK hook; HMODULE hModuleImm32; BOOL (WINAPI *pImmDisableIME)(DWORD); + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); + if (!us_kbd) + { + win_skip( "skipping test with inconsistent results on non-us keyboard\n" ); + return; + } wclass.lpszClassName = classNameW; wclass.style = CS_HREDRAW | CS_VREDRAW;

1 0