wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Alex Henrie : comctl32/tests: Fix treeview test failures on French Windows XP.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 33e275a1d02a397228e856f2222d3b2f4067e424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e275a1d02a397228e856f22… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 15 23:00:05 2017 -0600 comctl32/tests: Fix treeview test failures on French Windows XP. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index e7ce92c..a014625 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -220,6 +220,9 @@ static const struct message test_right_click_seq[] = { { WM_RBUTTONDOWN, sent|wparam, MK_RBUTTON }, { WM_CAPTURECHANGED, sent|defwinproc }, { TVM_GETNEXTITEM, sent|wparam|lparam|defwinproc, TVGN_CARET, 0 }, + { WM_NCHITTEST, sent|optional }, + { WM_SETCURSOR, sent|optional }, + { WM_MOUSEMOVE, sent|optional }, { 0 } }; @@ -367,6 +370,8 @@ static const struct message parent_vk_return_seq[] = { static const struct message parent_right_click_seq[] = { { WM_NOTIFY, sent|id, 0, 0, NM_RCLICK }, { WM_CONTEXTMENU, sent }, + { WM_NOTIFY, sent|optional }, + { WM_SETCURSOR, sent|optional }, { 0 } };

1 0

Martin Storsjo : api-ms-win-core-libraryloader-l1-2-1: Add dll.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: b739ed68299331db383cb25007c1133897814efe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b739ed68299331db383cb2500… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Oct 16 12:21:23 2017 +0300 api-ms-win-core-libraryloader-l1-2-1: Add dll. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-libraryloader-l1-2-1/Makefile.in | 1 + .../api-ms-win-core-libraryloader-l1-2-1.spec | 3 +++ tools/make_specfiles | 1 + 5 files changed, 8 insertions(+) diff --git a/configure b/configure index 3d798cb..e2c35a9a 100755 --- a/configure +++ b/configure @@ -931,6 +931,7 @@ enable_api_ms_win_core_kernel32_private_l1_1_1 enable_api_ms_win_core_libraryloader_l1_1_0 enable_api_ms_win_core_libraryloader_l1_1_1 enable_api_ms_win_core_libraryloader_l1_2_0 +enable_api_ms_win_core_libraryloader_l1_2_1 enable_api_ms_win_core_libraryloader_l1_2_2 enable_api_ms_win_core_localization_l1_1_0 enable_api_ms_win_core_localization_l1_2_0 @@ -18021,6 +18022,7 @@ wine_fn_config_dll api-ms-win-core-kernel32-private-l1-1-1 enable_api_ms_win_cor wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-0 enable_api_ms_win_core_libraryloader_l1_1_0 wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-1 enable_api_ms_win_core_libraryloader_l1_1_1 wine_fn_config_dll api-ms-win-core-libraryloader-l1-2-0 enable_api_ms_win_core_libraryloader_l1_2_0 +wine_fn_config_dll api-ms-win-core-libraryloader-l1-2-1 enable_api_ms_win_core_libraryloader_l1_2_1 wine_fn_config_dll api-ms-win-core-libraryloader-l1-2-2 enable_api_ms_win_core_libraryloader_l1_2_2 wine_fn_config_dll api-ms-win-core-localization-l1-1-0 enable_api_ms_win_core_localization_l1_1_0 wine_fn_config_dll api-ms-win-core-localization-l1-2-0 enable_api_ms_win_core_localization_l1_2_0 diff --git a/configure.ac b/configure.ac index 74bea22..5873716 100644 --- a/configure.ac +++ b/configure.ac @@ -2783,6 +2783,7 @@ WINE_CONFIG_DLL(api-ms-win-core-kernel32-private-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-2-2) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-0) diff --git a/dlls/api-ms-win-core-libraryloader-l1-2-1/Makefile.in b/dlls/api-ms-win-core-libraryloader-l1-2-1/Makefile.in new file mode 100644 index 0000000..e5c790f --- /dev/null +++ b/dlls/api-ms-win-core-libraryloader-l1-2-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-libraryloader-l1-2-1.dll diff --git a/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec b/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec new file mode 100644 index 0000000..95a765f --- /dev/null +++ b/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec @@ -0,0 +1,3 @@ +@ stdcall FindResourceW(long wstr wstr) kernel32.FindResourceW +@ stdcall LoadLibraryA(str) kernel32.LoadLibraryA +@ stdcall LoadLibraryW(wstr) kernel32.LoadLibraryW diff --git a/tools/make_specfiles b/tools/make_specfiles index a9ffa29..fa1e623 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -226,6 +226,7 @@ my @dll_groups = "api-ms-win-core-kernel32-legacy-l1-1-0", "api-ms-win-core-kernel32-legacy-l1-1-1", "api-ms-win-core-kernel32-private-l1-1-1", + "api-ms-win-core-libraryloader-l1-2-1", "api-ms-win-core-libraryloader-l1-2-2", "api-ms-win-core-localization-l1-1-0", "api-ms-win-core-localization-l1-2-0",

1 0

Martin Storsjo : api-ms-win-core-synch-ansi-l1-1-0: Add dll.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 91ad8f5a2eefc094b04fc6e4277f91f5c2ddbfb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ad8f5a2eefc094b04fc6e42… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Oct 16 12:21:22 2017 +0300 api-ms-win-core-synch-ansi-l1-1-0: Add dll. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-synch-ansi-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-synch-ansi-l1-1-0.spec | 7 +++++++ tools/make_specfiles | 1 + 5 files changed, 12 insertions(+) diff --git a/configure b/configure index fa9b75e..3d798cb 100755 --- a/configure +++ b/configure @@ -976,6 +976,7 @@ enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_string_l2_1_0 enable_api_ms_win_core_string_obsolete_l1_1_0 enable_api_ms_win_core_stringansi_l1_1_0 +enable_api_ms_win_core_synch_ansi_l1_1_0 enable_api_ms_win_core_synch_l1_1_0 enable_api_ms_win_core_synch_l1_2_0 enable_api_ms_win_core_synch_l1_2_1 @@ -18065,6 +18066,7 @@ wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l wine_fn_config_dll api-ms-win-core-string-l2-1-0 enable_api_ms_win_core_string_l2_1_0 wine_fn_config_dll api-ms-win-core-string-obsolete-l1-1-0 enable_api_ms_win_core_string_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-stringansi-l1-1-0 enable_api_ms_win_core_stringansi_l1_1_0 +wine_fn_config_dll api-ms-win-core-synch-ansi-l1-1-0 enable_api_ms_win_core_synch_ansi_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-1-0 enable_api_ms_win_core_synch_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_2_0 wine_fn_config_dll api-ms-win-core-synch-l1-2-1 enable_api_ms_win_core_synch_l1_2_1 diff --git a/configure.ac b/configure.ac index 9d33627..74bea22 100644 --- a/configure.ac +++ b/configure.ac @@ -2828,6 +2828,7 @@ WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-stringansi-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-synch-ansi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-1) diff --git a/dlls/api-ms-win-core-synch-ansi-l1-1-0/Makefile.in b/dlls/api-ms-win-core-synch-ansi-l1-1-0/Makefile.in new file mode 100644 index 0000000..acab15b --- /dev/null +++ b/dlls/api-ms-win-core-synch-ansi-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-synch-ansi-l1-1-0.dll diff --git a/dlls/api-ms-win-core-synch-ansi-l1-1-0/api-ms-win-core-synch-ansi-l1-1-0.spec b/dlls/api-ms-win-core-synch-ansi-l1-1-0/api-ms-win-core-synch-ansi-l1-1-0.spec new file mode 100644 index 0000000..eb75146 --- /dev/null +++ b/dlls/api-ms-win-core-synch-ansi-l1-1-0/api-ms-win-core-synch-ansi-l1-1-0.spec @@ -0,0 +1,7 @@ +@ stdcall CreateSemaphoreA(ptr long long str) kernel32.CreateSemaphoreA +@ stdcall CreateSemaphoreExA(ptr long long str long long) kernel32.CreateSemaphoreExA +@ stdcall CreateWaitableTimerA(ptr long str) kernel32.CreateWaitableTimerA +@ stdcall CreateWaitableTimerExA(ptr str long long) kernel32.CreateWaitableTimerExA +@ stdcall OpenMutexA(long long str) kernel32.OpenMutexA +@ stdcall OpenSemaphoreA(long long str) kernel32.OpenSemaphoreA +@ stdcall OpenWaitableTimerA(long long str) kernel32.OpenWaitableTimerA diff --git a/tools/make_specfiles b/tools/make_specfiles index e1c7e1f..a9ffa29 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -201,6 +201,7 @@ my @dll_groups = "api-ms-win-core-sysinfo-l1-1-0", "api-ms-win-core-sysinfo-l1-2-0", "api-ms-win-core-util-l1-1-0", + "api-ms-win-core-synch-ansi-l1-1-0", "api-ms-win-core-synch-l1-1-0", "api-ms-win-core-synch-l1-2-0", "api-ms-win-core-synch-l1-2-1",

1 0

Martin Storsjo : api-ms-win-core-file-l1-2-2: Add dll.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 987c8ccfcbdf15bf08f692d221ff05fad5619326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=987c8ccfcbdf15bf08f692d22… Author: Martin Storsjo <martin(a)martin.st> Date: Sun Oct 15 22:08:44 2017 +0300 api-ms-win-core-file-l1-2-2: Add dll. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-file-l1-2-2/Makefile.in | 1 + .../api-ms-win-core-file-l1-2-2.spec | 10 ++++++++++ tools/make_specfiles | 1 + 5 files changed, 15 insertions(+) diff --git a/configure b/configure index 238d7ff..fa9b75e 100755 --- a/configure +++ b/configure @@ -910,6 +910,7 @@ enable_api_ms_win_core_fibers_l1_1_1 enable_api_ms_win_core_file_l1_1_0 enable_api_ms_win_core_file_l1_2_0 enable_api_ms_win_core_file_l1_2_1 +enable_api_ms_win_core_file_l1_2_2 enable_api_ms_win_core_file_l2_1_0 enable_api_ms_win_core_file_l2_1_1 enable_api_ms_win_core_file_l2_1_2 @@ -17998,6 +17999,7 @@ wine_fn_config_dll api-ms-win-core-fibers-l1-1-1 enable_api_ms_win_core_fibers_l wine_fn_config_dll api-ms-win-core-file-l1-1-0 enable_api_ms_win_core_file_l1_1_0 wine_fn_config_dll api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_0 wine_fn_config_dll api-ms-win-core-file-l1-2-1 enable_api_ms_win_core_file_l1_2_1 +wine_fn_config_dll api-ms-win-core-file-l1-2-2 enable_api_ms_win_core_file_l1_2_2 wine_fn_config_dll api-ms-win-core-file-l2-1-0 enable_api_ms_win_core_file_l2_1_0 wine_fn_config_dll api-ms-win-core-file-l2-1-1 enable_api_ms_win_core_file_l2_1_1 wine_fn_config_dll api-ms-win-core-file-l2-1-2 enable_api_ms_win_core_file_l2_1_2 diff --git a/configure.ac b/configure.ac index 76c7af5..9d33627 100644 --- a/configure.ac +++ b/configure.ac @@ -2762,6 +2762,7 @@ WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-file-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-1) +WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-2) WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1) WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-2) diff --git a/dlls/api-ms-win-core-file-l1-2-2/Makefile.in b/dlls/api-ms-win-core-file-l1-2-2/Makefile.in new file mode 100644 index 0000000..22cfea1 --- /dev/null +++ b/dlls/api-ms-win-core-file-l1-2-2/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-file-l1-2-2.dll diff --git a/dlls/api-ms-win-core-file-l1-2-2/api-ms-win-core-file-l1-2-2.spec b/dlls/api-ms-win-core-file-l1-2-2/api-ms-win-core-file-l1-2-2.spec new file mode 100644 index 0000000..bb58af1 --- /dev/null +++ b/dlls/api-ms-win-core-file-l1-2-2/api-ms-win-core-file-l1-2-2.spec @@ -0,0 +1,10 @@ +@ stdcall AreFileApisANSI() kernel32.AreFileApisANSI +@ stub FindFirstFileNameW +@ stub FindFirstStreamW +@ stub FindNextFileNameW +@ stub FindNextStreamW +@ stdcall GetTempFileNameA(str str long ptr) kernel32.GetTempFileNameA +@ stdcall GetTempPathA(long ptr) kernel32.GetTempPathA +@ stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationA +@ stdcall SetFileApisToANSI() kernel32.SetFileApisToANSI +@ stdcall SetFileApisToOEM() kernel32.SetFileApisToOEM diff --git a/tools/make_specfiles b/tools/make_specfiles index d5747c4..e1c7e1f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -209,6 +209,7 @@ my @dll_groups = "api-ms-win-core-file-l1-1-0", "api-ms-win-core-file-l1-2-1", "api-ms-win-core-file-l1-2-0", + "api-ms-win-core-file-l1-2-2", "api-ms-win-core-file-l2-1-0", "api-ms-win-core-file-l2-1-1", "api-ms-win-core-file-l2-1-2",

1 0

Francois Gouget : testbot: Better avoid race conditions in VMs::RunRevert( ).
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: tools Branch: master Commit: fc96df4c171a80dc1df960c44d9c8734d987348c URL: http://source.winehq.org/git/tools.git/?a=commit;h=fc96df4c171a80dc1df960c4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 16 03:43:19 2017 +0200 testbot: Better avoid race conditions in VMs::RunRevert(). In order to use LibvirtTool for more than reverts, avoiding race conditions cannot rely on the special relationship between Status=reverting and ChildPid. So avoid the race conditions the right way in VMs::RunRevert(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 97 ++++++++++++++++++++++++++++++++---------- 1 file changed, 75 insertions(+), 22 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 629d408..86dee6c 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -142,6 +142,8 @@ are undergoing maintenance. =cut +use File::Basename; + use ObjectModel::BackEnd; use WineTestBot::Config; use WineTestBot::Engine::Notify; @@ -309,38 +311,89 @@ sub RunRevert($) { my ($self) = @_; - $self->Status("reverting"); - my ($ErrProperty, $ErrMessage) = $self->Save(); - return $ErrMessage if (defined $ErrMessage); - - # Make sure the child process does not inherit the database connection + my $Tool = "LibvirtTool.pl"; + my $Args = ["$BinDir/$Tool", "--log-only", "revert", $self->GetKey()]; + + # There are two $VM->ChildPid race conditions to avoid: + # - Between the child process and new calls to ScheduleJobs(). + # We cannot leave setting ChildPid to the child process because then it + # may still not be set by the time the next ScheduleJobs() call happens, + # which would result in a new child being started. + # Note that the status is not guaranteed to change in _RunVMTool() so it + # cannot be relied on to avoid this race. + # - Between RunRevert() and the exit of the child process. + # The child process may exit before RunRevert() gets around to setting + # ChildPid after the fork(). This would result in ChildPid remaining set + # indefinitely. + # So set ChildPid in the parent and synchronize with the child so it only + # starts once this is done. + + # Make sure the child process will use its own database connection $self->GetBackEnd()->Close(); - my $Pid = fork; + use Fcntl; + my ($fd_read, $fd_write); + pipe($fd_read, $fd_write); # For synchronization + + my $Pid = fork(); if (!defined $Pid) { + close($fd_read); + close($fd_write); return "Unable to start child process: $!"; } - elsif (!$Pid) + if ($Pid) { - $ENV{PATH} = "/usr/bin:/bin"; - delete $ENV{ENV}; - require WineTestBot::Log; - WineTestBot::Log::SetupRedirects(); - exec("$BinDir/LibvirtTool.pl", "--log-only", "revert", $self->GetKey()) or - WineTestBot::Log::LogMsg("Unable to exec LibvirtTool.pl: $!\n"); - exit(1); + close($fd_read); + + # Set the Status and ChildPid + $self->Status("reverting"); + $self->ChildPid($Pid); + my ($ErrProperty, $ErrMessage) = $self->Save(); + if ($ErrMessage) + { + close($fd_write); + return "Could not set the $Tool pid: $ErrMessage ($ErrProperty)"; + } + + # Let the child go + close($fd_write); + + return undef; } - # Note that if the child process completes quickly (typically due to some - # error), it may set ChildPid to undef before we get here. So we may end up - # with non-reverting VMs for which ChildPid is set. That's ok because - # ChildPid should be ignored anyway if Status is not 'reverting' or - # 'sleeping'. - $self->ChildPid($Pid); - $self->Save(); + # Wait for the parent to set $VM->ChildPid + close($fd_write); + sysread($fd_read, $fd_write, 1); + close($fd_read); + + # Get up-to-date information on the VM and verify the pid. If the parent + # failed to set the pid it may try to start another process at any time. + # So abort in order avoid interference. + require WineTestBot::VMs; + my $VM = WineTestBot::VMs::CreateVMs()->GetItem($self->GetKey()); + exit 1 if (($VM->ChildPid || 0) != $$); + $self->GetBackEnd()->Close(); + + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Starting child: @$Args\n"); + + # Set up the file descriptors for the new process + WineTestBot::Log::SetupRedirects(); + + $ENV{PATH} = "/usr/bin:/bin"; + exec(@$Args) or + WineTestBot::Log::LogMsg("Unable to exec $Tool: $!\n"); - return undef; + # Reset the Status and ChildPid since the exec failed + $self->Status("offline"); + $self->ChildPid(undef); + my ($ErrProperty, $ErrMessage) = $self->Save(); + if ($ErrMessage) + { + WineTestBot::Log::LogMsg("Could not remove the $Tool pid: $ErrMessage ($ErrProperty)\n"); + } + exit 1; }

1 0

Francois Gouget : testbot: Add functions wrapping the VM::ChildPid field.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: tools Branch: master Commit: dfd3c1911f1befa6df35e6e327f936f1e07f4407 URL: http://source.winehq.org/git/tools.git/?a=commit;h=dfd3c1911f1befa6df35e6e3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 16 03:43:12 2017 +0200 testbot: Add functions wrapping the VM::ChildPid field. They allow checking if the VM status is compatible with having a child process, checking if the VM has a running process and killing the VM's child process if any. This makes the relevant code more readable and more maintanable by factorizing these operations. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 18 +++++++-------- testbot/lib/WineTestBot/VMs.pm | 51 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 10 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index ee496e2..b9c6ceb 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -71,8 +71,8 @@ sub FatalError(@) =item C<Cleanup()> -The Cleanup() function gets the tasks and VMs in a consistent state on the -Engine startup or cleanly stops the tasks and VMs on shutdown. +The Cleanup() function gets the Tasks and VMs in a consistent state on the +Engine startup or cleanly stops the Tasks and VMs on shutdown. It has to contend with three main scenarios: - The Engine being restarted. Any task started just before that is still running should still have its process and powered on VM and should be left @@ -81,15 +81,14 @@ It has to contend with three main scenarios: - The Engine startup after a reboot. All task processes will be dead and need to be requeued. But the VMs are likely to be hosted on a separate machine so it is quite possible that they will still be running. Hopefully any running - process matching a task's ChildPid will belong to another user so we don't + process matching a Task's ChildPid will belong to another user so we don't mistake that case for the previous one. -- A shutdown of the Engine and its tasks / VMs. In this case it's used to +- A shutdown of the Engine and its Tasks / VMs. In this case it's used to kill the running tasks and requeue them, and/or power off the VMs. In all cases we only trust that a VM status field is still valid if: -- It is 'running' and used by a task that is still running. -- It is 'reverting' or 'sleeping', is powered on and the revert process is - still running. +- It is 'running' and used by a Task that is still running. +- It can have a running process and that process is still running. - It is 'idle' and powered on. In all other cases the VM will be powered off and marked as such. @@ -187,15 +186,14 @@ sub Cleanup(;$$) { if ($KillVMs) { - kill("TERM", $VM->ChildPid) if (defined $VM->ChildPid); + $VM->KillChild(); } elsif ($VM->Status eq "idle") { # Assume these are still ready for use next; } - elsif (($VM->Status eq "reverting" or $VM->Status eq "sleeping") and - defined $VM->ChildPid and !kill(0, $VM->ChildPid)) + elsif ($VM->CanHaveChild() and $VM->HasRunningChild()) { # This VM is still being reverted. Let that process run its course. LogMsg "$VMKey is being reverted\n"; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index af052d9..629d408 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -226,6 +226,57 @@ sub Status($;$) return $NewStatus; } +=pod +=over 12 + +=item C<CanHaveChild()> + +Returns true if the VM status is compatible with ChildPid being set. + +=back +=cut + +sub CanHaveChild($) +{ + my ($self) = @_; + return ($self->Status =~ /^(?:reverting|sleeping)$/); +} + +=pod +=over 12 + +=item C<HasRunningChild()> + +Returns true if ChildPid is set and still identifies a running process. + +=back +=cut + +sub HasRunningChild($) +{ + my ($self) = @_; + return undef if (!$self->ChildPid); + return kill(0, $self->ChildPid); +} + +=pod +=over 12 + +=item C<KillChild()> + +If ChildPid is set, kills the corresponding process and unsets ChildPid. +It is up to the caller to save the updated VM object. + +=back +=cut + +sub KillChild($) +{ + my ($self) = @_; + kill("TERM", $self->ChildPid) if ($self->ChildPid); + $self->ChildPid(undef); +} + sub Validate($) { my ($self) = @_;

1 0

Alexandre Julliard : Wine release 2.19
by Alexandre Julliard 13 Oct '17

13 Oct '17

Module: website Branch: master Commit: 8003a9b7de67821a6ee69b86035734b5c353cb00 URL: http://source.winehq.org/git/website.git/?a=commit;h=8003a9b7de67821a6ee69b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 01:44:25 2017 +0200 Wine release 2.19 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017101401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2017101401.xml b/news/en/2017101401.xml new file mode 100644 index 0000000..d88a985 --- /dev/null +++ b/news/en/2017101401.xml @@ -0,0 +1,17 @@ +<news> +<date>October 14, 2017</date> +<title>Wine 2.19 Released</title> +<body> + The Wine development release 2.19 is now available. + <a href="{$root}/announce/2.19">What's new</a> in this release: +<ul> + <li>Support for 32-bit float audio on Android.</li> + <li>Named pipes now fully handled by the Wine server.</li> + <li>Support for a new Microsoft root certificate.</li> + <li>More transform fixes in GdiPlus.</li> + <li>Some heap allocation optimizations.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.19.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-2.19 : Alexandre Julliard : Release 2.19
by Alexandre Julliard 13 Oct '17

13 Oct '17

Module: wine Branch: refs/tags/wine-2.19 Tag: e935bd1ea20bf8819896c90666c41784a4b45188 URL: http://source.winehq.org/git/wine.git/?a=tag;h=e935bd1ea20bf8819896c90666c4… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 01:41:54 2017 +0200 Release 2.19

1 0

Alexandre Julliard : Release 2.19.
by Alexandre Julliard 13 Oct '17

13 Oct '17

Module: wine Branch: master Commit: cf5616ffbb39df7ad3ac0a41e55777ab6c1abab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5616ffbb39df7ad3ac0a41e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 01:40:20 2017 +0200 Release 2.19. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 593 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 279 insertions(+), 335 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf5616ffbb39df7ad3ac0…

1 0

Nikolay Sivov : gdiplus/metafile: Support solid brushes in EmfPlusRecordTypeObject record playback.
by Alexandre Julliard 13 Oct '17

13 Oct '17

Module: wine Branch: master Commit: ce315b9f86b4acb0759e7b4bcf085059d5df3d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce315b9f86b4acb0759e7b4bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 13 14:10:26 2017 +0300 gdiplus/metafile: Support solid brushes in EmfPlusRecordTypeObject record playback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/metafile.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index d6ccb95..95445e8 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -393,6 +393,7 @@ typedef enum EmfPlusObjectType struct emfplus_object { EmfPlusObjectType type; union { + GpBrush *brush; GpImageAttributes *image_attributes; void *object; } u; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 78ea854..de208a8 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -364,6 +364,9 @@ static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id) { case ObjectTypeInvalid: break; + case ObjectTypeBrush: + GdipDeleteBrush(object->u.brush); + break; case ObjectTypeImageAttributes: GdipDisposeImageAttributes(object->u.image_attributes); break; @@ -1443,6 +1446,33 @@ static void metafile_set_object_table_entry(GpMetafile *metafile, BYTE id, BYTE metafile->objtable[id].u.object = object; } +static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_size, GpBrush **brush) +{ + static const UINT header_size = FIELD_OFFSET(EmfPlusBrush, BrushData); + EmfPlusBrush *data = (EmfPlusBrush *)record_data; + GpStatus status; + + *brush = NULL; + + if (data_size < header_size) + return InvalidParameter; + + switch (data->Type) + { + case BrushTypeSolidColor: + if (data_size != header_size + sizeof(EmfPlusSolidBrushData)) + return InvalidParameter; + + status = GdipCreateSolidFill(*(ARGB *)&data->BrushData.solid.SolidColor, (GpSolidFill **)brush); + break; + default: + FIXME("brush type %u is not supported.\n", data->Type); + return NotImplemented; + } + + return status; +} + static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT data_size, const BYTE *record_data) { BYTE type = (flags >> 8) & 0xff; @@ -1455,6 +1485,9 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d switch (type) { + case ObjectTypeBrush: + status = metafile_deserialize_brush(record_data, data_size, (GpBrush **)&object); + break; case ObjectTypeImageAttributes: { EmfPlusImageAttributes *data = (EmfPlusImageAttributes *)record_data;

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
48
Older →

Jump to page:

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-commits October 2017