wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

Zebediah Figura : wmcodecdspuuid: Add static library.
by Alexandre Julliard 10 May '18

10 May '18

Module: wine Branch: master Commit: 7179475dd03b11df124aa345615065203eed0c98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7179475dd03b11df124aa345… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 9 17:31:32 2018 -0500 wmcodecdspuuid: Add static library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++++ configure.ac | 1 + dlls/wmcodecdspuuid/Makefile.in | 4 ++++ dlls/wmcodecdspuuid/wmcodecdspuuid.c | 27 +++++++++++++++++++++++++++ 4 files changed, 36 insertions(+) diff --git a/configure b/configure index d53583d..eda1f7b 100755 --- a/configure +++ b/configure @@ -1594,6 +1594,7 @@ enable_winusb enable_wlanapi enable_wldap32 enable_wmasf +enable_wmcodecdspuuid enable_wmi enable_wmiutils enable_wmp @@ -8839,6 +8840,8 @@ CROSSTARGET="" if test "x$enable_tests" != xno -a "$LIBEXT" != "dll" then case "$host_cpu" in + aarch64*) + ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc" ;; arm*) ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc" ;; i[3456789]86*) @@ -19171,6 +19174,7 @@ wine_fn_config_makefile dlls/wlanapi/tests enable_tests wine_fn_config_makefile dlls/wldap32 enable_wldap32 wine_fn_config_makefile dlls/wldap32/tests enable_tests wine_fn_config_makefile dlls/wmasf enable_wmasf +wine_fn_config_makefile dlls/wmcodecdspuuid enable_wmcodecdspuuid wine_fn_config_makefile dlls/wmi enable_wmi wine_fn_config_makefile dlls/wmiutils enable_wmiutils wine_fn_config_makefile dlls/wmiutils/tests enable_tests diff --git a/configure.ac b/configure.ac index b4a8ef0..bea3aa2 100644 --- a/configure.ac +++ b/configure.ac @@ -3773,6 +3773,7 @@ WINE_CONFIG_MAKEFILE(dlls/wlanapi/tests) WINE_CONFIG_MAKEFILE(dlls/wldap32) WINE_CONFIG_MAKEFILE(dlls/wldap32/tests) WINE_CONFIG_MAKEFILE(dlls/wmasf) +WINE_CONFIG_MAKEFILE(dlls/wmcodecdspuuid) WINE_CONFIG_MAKEFILE(dlls/wmi) WINE_CONFIG_MAKEFILE(dlls/wmiutils) WINE_CONFIG_MAKEFILE(dlls/wmiutils/tests) diff --git a/dlls/wmcodecdspuuid/Makefile.in b/dlls/wmcodecdspuuid/Makefile.in new file mode 100644 index 0000000..d8f5d02 --- /dev/null +++ b/dlls/wmcodecdspuuid/Makefile.in @@ -0,0 +1,4 @@ +MODULE = libwmcodecdspuuid.a + +C_SRCS = \ + wmcodecdspuuid.c diff --git a/dlls/wmcodecdspuuid/wmcodecdspuuid.c b/dlls/wmcodecdspuuid/wmcodecdspuuid.c new file mode 100644 index 0000000..c715641 --- /dev/null +++ b/dlls/wmcodecdspuuid/wmcodecdspuuid.c @@ -0,0 +1,27 @@ +/* + * GUID definitions + * + * Copyright 2018 Zebediah Figura + * + * 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 + */ + +/* Don't define those GUIDs here */ +#include "strmif.h" +#include "mediaobj.h" + +#include "initguid.h" + +#include "wmcodecdsp.h"

1 0

Zebediah Figura : include: Add wmcodecdsp.idl and CMP3DecMediaObject.
by Alexandre Julliard 10 May '18

10 May '18

Module: wine Branch: master Commit: 21ac699f6fb35363480ac151b5169979aa7c0b8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=21ac699f6fb35363480ac151… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 9 17:31:31 2018 -0500 include: Add wmcodecdsp.idl and CMP3DecMediaObject. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wmcodecdsp.idl | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index d816bbf..78ab095 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -701,6 +701,7 @@ SOURCES = \ winuser.rh \ winver.h \ wlanapi.h \ + wmcodecdsp.idl \ wmdrmsdk.idl \ wmistr.h \ wmium.h \ diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl new file mode 100644 index 0000000..8ec303c --- /dev/null +++ b/include/wmcodecdsp.idl @@ -0,0 +1,25 @@ +/* + * Copyright 2018 Zebediah Figura + * + * 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 + */ + +import "mediaobj.idl"; +import "strmif.idl"; + +[ + uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a) +] +coclass CMP3DecMediaObject {}

1 0

Martin Storsjo : configure: Detect MinGW-w64 ARM64 toolchains.
by Alexandre Julliard 10 May '18

10 May '18

Module: wine Branch: master Commit: 31de3c69075ea123eb36d1fb82155d58165a2675 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31de3c69075ea123eb36d1fb… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 10 00:50:41 2018 +0300 configure: Detect MinGW-w64 ARM64 toolchains. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aclocal.m4 b/aclocal.m4 index 6ad8363..289ee92 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -191,6 +191,8 @@ dnl Usage: WINE_CHECK_MINGW_PROG(variable,[value-if-not-found],[path]) dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [case "$host_cpu" in + aarch64*) + ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc" ;; arm*) ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc" ;; i[[3456789]]86*)

1 0

Martin Storsjo : arm64: Use __builtin_ms_va_list and __attribute__((ms_abi )) on arm64.
by Alexandre Julliard 10 May '18

10 May '18

Module: wine Branch: master Commit: 8fb8cc03c3edb599dd98f369e14a08f899cbff95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fb8cc03c3edb599dd98f369… Author: Martin Storsjo <martin(a)martin.st> Date: Wed May 9 23:34:57 2018 +0300 arm64: Use __builtin_ms_va_list and __attribute__((ms_abi)) on arm64. Windows uses a different ABI for va_list on arm64 just like on x86_64. On x86_64, the calling convention for windows functions is completely different from the one on other platforms. On arm64, they're mostly the same, with the only exception being variadic functions (where all float arguments are passed in integer registers, since the va_list is a single pointer). Any functions using __builtin_ms_va_start need to be decorated with __attribute__((ms_abi)). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 24 ++++++++++++++++++++++++ configure.ac | 7 +++++++ include/msvcrt/crtdefs.h | 6 +++++- include/windef.h | 6 +++++- include/wine/test.h | 4 ++-- 5 files changed, 43 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 30d53da..d53583d 100755 --- a/configure +++ b/configure @@ -5409,6 +5409,30 @@ rm -f core conftest.err conftest.$ac_objext \ TARGETFLAGS="-marm -mfloat-abi=$float_abi" ;; + aarch64*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports __builtin_ms_va_list" >&5 +$as_echo_n "checking whether $CC supports __builtin_ms_va_list... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stdarg.h> +int +main () +{ +void func(__builtin_ms_va_list *args); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "You need clang >= 5.0 to build Wine for arm64." "$LINENO" 5 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; i[3456789]86*) enable_win16=${enable_win16:-yes} ;; diff --git a/configure.ac b/configure.ac index 54c31d8..b4a8ef0 100644 --- a/configure.ac +++ b/configure.ac @@ -205,6 +205,13 @@ case $host in CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" AC_SUBST(TARGETFLAGS,"-marm -mfloat-abi=$float_abi") ;; + aarch64*) + AC_MSG_CHECKING([whether $CC supports __builtin_ms_va_list]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.])]) + ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} ;; diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index a9edef5..0c0b087 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -62,6 +62,8 @@ # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) +# elif defined(__aarch64__) && defined (__GNUC__) +# define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -82,13 +84,15 @@ # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __cdecl __attribute__((pcs("aapcs-vfp"))) +# elif defined(__aarch64__) && defined (__GNUC__) +# define __cdecl __attribute__((ms_abi)) # elif !defined(_MSC_VER) # define __cdecl # endif #endif /* __cdecl */ #ifndef __ms_va_list -# if defined(__x86_64__) && defined (__GNUC__) +# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) diff --git a/include/windef.h b/include/windef.h index 40028f3..8e8a08a 100644 --- a/include/windef.h +++ b/include/windef.h @@ -71,6 +71,8 @@ extern "C" { # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) +# elif defined(__aarch64__) && defined (__GNUC__) +# define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -91,13 +93,15 @@ extern "C" { # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __cdecl __attribute__((pcs("aapcs-vfp"))) +# elif defined(__aarch64__) && defined (__GNUC__) +# define __cdecl __attribute__((ms_abi)) # elif !defined(_MSC_VER) # define __cdecl # endif #endif /* __cdecl */ #ifndef __ms_va_list -# if defined(__x86_64__) && defined (__GNUC__) +# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) diff --git a/include/wine/test.h b/include/wine/test.h index 21e2ac7..e3e4bcf 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -90,7 +90,7 @@ static inline int winetest_strcmpW( const WCHAR *str1, const WCHAR *str2 ) #define START_TEST(name) void func_##name(void) #endif -#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) #define __winetest_cdecl __cdecl #define __winetest_va_list __builtin_ms_va_list #else @@ -181,7 +181,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) WINETEST_PRI #include <stdio.h> #include <excpt.h> -#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) # define __winetest_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __winetest_va_end(list) __builtin_ms_va_end(list) #else

1 0

Francois Gouget : testbot: Reschedule at the latest when the next task times out.
by Alexandre Julliard 10 May '18

10 May '18

Module: tools Branch: master Commit: 2cd1475bf6269db4979499e8a63a6873f4e74362 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2cd1475bf6269db4979499e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 11 00:15:22 2018 +0200 testbot: Reschedule at the latest when the next task times out. This ensures we catch stuck tasks in a timely fashion. Note that we still reschedule every 10 minutes to catch any issues but the scheduler handles this itself instead of relying on SafetyNet(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 14 ++++++++------ testbot/lib/WineTestBot/Engine/Scheduler.pm | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index c3db46b..0f8de82 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -611,11 +611,10 @@ sub ClientRead($) This is called on startup and regularly after that to catch things that fall through the cracks, possibly because of an Engine restart. -Specifically it updates the status of all the current Jobs, Steps and -Tasks, then schedules Tasks to be run, checks the staging directory for -wine-patches emails dropped by WinePatchesMLSubmit.pl, for notifications of -changes on Wine's Patches web site dropped by WinePatchesWebSubmit.pl, and -checks whether any pending patchsets are now complete and thus can be scheduled. +Specifically it checks the staging directory for wine-patches emails dropped +by WinePatchesMLSubmit.pl, for notifications of changes on Wine's Patches web +site dropped by WinePatchesWebSubmit.pl, and checks whether any pending +patchsets are now complete and thus can be scheduled. =back =cut @@ -623,7 +622,6 @@ checks whether any pending patchsets are now complete and thus can be scheduled. sub SafetyNet() { CheckJobs(); - ScheduleJobs(); HandleWinePatchWebSubmission(); my $Set = CreatePendingPatchSets(); @@ -760,6 +758,10 @@ sub main() SaveRecord('engine', 'start'); Cleanup(1); + # Cleanup starts processes to update the VMs. Run ScheduleJobs() now so it + # can detect if these processes get stuck. + ScheduleJobs(); + # Check for patches that arrived while the server was off. HandleWinePatchMLSubmission(); diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 52e7619..a191f0e 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -31,6 +31,7 @@ use Exporter 'import'; our @EXPORT = qw(ScheduleJobs CheckJobs); use WineTestBot::Config; +use WineTestBot::Engine::Events; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::RecordGroups; @@ -971,6 +972,29 @@ sub ScheduleJobs() { $Sched->{recordgroups}->DeleteItem($Sched->{recordgroup}); } + + # Reschedule at the latest when the next task times out + my $FirstDeadline; + foreach my $VM (@{$Sched->{VMs}->GetItems()}) + { + if (defined $VM->ChildDeadline and + (!defined $FirstDeadline or $VM->ChildDeadline < $FirstDeadline)) + { + $FirstDeadline = $VM->ChildDeadline; + } + } + my $Timeout; + if ($FirstDeadline) + { + $Timeout = $FirstDeadline - time(); + $Timeout = 1 if ($Timeout <= 0); + } + if (!$Timeout or $Timeout > 600) + { + # Reschedule regularly as a safety net + $Timeout = 600; + } + AddEvent("ScheduleJobs", $Timeout, 0, \&ScheduleJobs); }

1 0

Francois Gouget : testbot: Let the scheduler log scheduling errors.
by Alexandre Julliard 10 May '18

10 May '18

Module: tools Branch: master Commit: c294f36434c103070e5501626c89780174c41911 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c294f36434c103070e55016… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 11 00:15:06 2018 +0200 testbot: Let the scheduler log scheduling errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 24 ++++------------------ testbot/lib/WineTestBot/Engine/Scheduler.pm | 32 +++++++++-------------------- 2 files changed, 14 insertions(+), 42 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index fae4067..c3db46b 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -351,11 +351,7 @@ sub HandleJobCancel($) return "0$ErrMessage"; } - $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleJobCancel: $ErrMessage\n"; - } + ScheduleJobs(); return "1OK"; } @@ -381,22 +377,14 @@ sub HandleJobRestart($) return "0$ErrMessage"; } - $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleJobRestart: $ErrMessage\n"; - } + ScheduleJobs(); return "1OK"; } sub HandleRescheduleJobs() { - my $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleRescheduleJobs: $ErrMessage\n"; - } + ScheduleJobs(); return "1OK"; } @@ -411,11 +399,7 @@ sub HandleVMStatusChange($$$) return "0Invalid status"; } - my $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleVMStatusChange: $ErrMessage\n"; - } + ScheduleJobs(); return "1OK"; } diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 52a6ced..52e7619 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -354,7 +354,7 @@ sub _CheckAndClassifyVMs() if (_CanScheduleOnVM($Sched, $VM)) { my $ErrMessage = $VM->RunMonitor(); - return ($ErrMessage, undef) if (defined $ErrMessage); + LogMsg "$ErrMessage\n" if (defined $ErrMessage); } # Ignore the VM for this round since we cannot use it $Sched->{busyvms}->{$VMKey} = 1; @@ -389,7 +389,7 @@ sub _CheckAndClassifyVMs() # continuing with the scheduling. CheckJobs() if ($FoundVMErrors); - return (undef, $Sched); + return $Sched; } =pod @@ -627,7 +627,7 @@ sub _ScheduleTasks($) $Sched->{busyvms}->{$VMKey} = 1; $VM->RecordStatus($Sched->{records}, join(" ", "running", $Job->Id, $Step->No, $Task->No)); my $ErrMessage = $Task->Run($Step); - return ($ErrMessage, undef) if (defined $ErrMessage); + LogMsg "$ErrMessage\n" if (defined $ErrMessage); $Job->UpdateStatus(); $Host->{idle}--; @@ -660,7 +660,7 @@ sub _ScheduleTasks($) _AddNeededVM($NeededVMs, $VM, $Niceness); } - return (undef, $NeededVMs); + return $NeededVMs; } =pod @@ -865,12 +865,11 @@ sub _RevertVMs($$) delete $Sched->{lambvms}->{$VMKey}; $Sched->{busyvms}->{$VMKey} = 1; my $ErrMessage = $VM->RunRevert(); - return $ErrMessage if (defined $ErrMessage); + LogMsg "$ErrMessage\n" if (defined $ErrMessage); $Host->{active}++ if ($VMStatus eq "off"); $Host->{reverting}++; } } - return undef; } sub _PowerOffDirtyVMs($) @@ -886,9 +885,8 @@ sub _PowerOffDirtyVMs($) $VM->RecordStatus($Sched->{records}, "dirty poweroff"); my $ErrMessage = $VM->RunPowerOff(); - return $ErrMessage if (defined $ErrMessage); + LogMsg "$ErrMessage\n" if (defined $ErrMessage); } - return undef; } my $_LastTaskCounts = ""; @@ -949,18 +947,10 @@ kept on standby so they are ready when their turn comes. sub ScheduleJobs() { - my ($ErrMessage, $Sched) = _CheckAndClassifyVMs(); - return $ErrMessage if ($ErrMessage); - - my $NeededVMs; - ($ErrMessage, $NeededVMs) = _ScheduleTasks($Sched); - return $ErrMessage if ($ErrMessage); - - $ErrMessage = _RevertVMs($Sched, $NeededVMs); - return $ErrMessage if ($ErrMessage); - - $ErrMessage = _PowerOffDirtyVMs($Sched); - return $ErrMessage if ($ErrMessage); + my $Sched = _CheckAndClassifyVMs(); + my $NeededVMs = _ScheduleTasks($Sched); + _RevertVMs($Sched, $NeededVMs); + _PowerOffDirtyVMs($Sched); # Note that any VM Status or Role change will trigger ScheduleJobs() so this # records all not yet recorded VM state changes, even those not initiated by @@ -981,8 +971,6 @@ sub ScheduleJobs() { $Sched->{recordgroups}->DeleteItem($Sched->{recordgroup}); } - - return undef; }

1 0

Francois Gouget : testbot/Engine: Let event handlers add / remove events.
by Alexandre Julliard 10 May '18

10 May '18

Module: tools Branch: master Commit: a5d7bc263b1e355ee8b522812c8a0961d1d9d116 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a5d7bc263b1e355ee8b5228… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 11 00:14:52 2018 +0200 testbot/Engine: Let event handlers add / remove events. This makes it possible to handle events that happen at irregular intervals: the event is created as non-repeating and the event handler computes when the next event should happen and adds it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Events.pm | 70 ++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Events.pm b/testbot/lib/WineTestBot/Engine/Events.pm index 677debf..f1ab39a 100644 --- a/testbot/lib/WineTestBot/Engine/Events.pm +++ b/testbot/lib/WineTestBot/Engine/Events.pm @@ -37,10 +37,11 @@ sub AddEvent($$$$) { my ($Name, $Timeout, $Repeat, $HandlerFunc) = @_; - $Events{$Name} = {Expires => time() + $Timeout, - Timeout => $Timeout, - Repeat => $Repeat, - HandlerFunc => $HandlerFunc}; + $Events{$Name} = { Name => $Name, + Expires => time() + $Timeout, + Timeout => $Timeout, + Repeat => $Repeat, + HandlerFunc => $HandlerFunc }; } sub DeleteEvent($) @@ -54,42 +55,51 @@ sub EventScheduled($) { my ($Name) = @_; - return defined($Events{$Name}); + return exists $Events{$Name}; } sub RunEvents() { my $Now = time(); - my $Next = undef; - foreach my $Name (keys %Events) + # Run expired events in their expiration order. + # Note that callbacks may add / remove events. + my @SortedEvents = sort { $a->{Expires} <=> $b->{Expires} } values %Events; + foreach my $Event (@SortedEvents) { - my $Event = $Events{$Name}; - if (defined($Event)) + if (!exists $Events{$Event->{Name}}) + { + # This event got removed by a callback + next; + } + + if ($Event->{Expires} > $Now) + { + # Since the events are sorted by expiration order, + # there is no other event to run. + last; + } + + if ($Event->{Repeat}) { - if ($Event->{Expires} <= $Now) - { - if ($Event->{Repeat}) - { - $Event->{Expires} += $Event->{Timeout}; - if (! defined($Next) || $Event->{Expires} - $Now < $Next) - { - $Next = $Event->{Expires} - $Now; - } - } - else - { - delete $Events{$Name}; - } - &{$Event->{HandlerFunc}}(); - } - elsif (! defined($Next) || $Event->{Expires} - $Now < $Next) - { - $Next = $Event->{Expires} - $Now; - } + $Event->{Expires} += $Event->{Timeout}; } + else + { + delete $Events{$Event->{Name}}; + } + &{$Event->{HandlerFunc}}(); } - return $Next; + # Determine when the next event is due + my $Next = undef; + foreach my $Event (values %Events) + { + if (!defined $Next or $Event->{Expires} - $Now < $Next) + { + $Next = $Event->{Expires} - $Now; + } + } + return $Next <= 0 ? 1 : $Next; } 1;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: 8f46ac233ed96f7286f6aacd1f8fb2626d3ed1c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f46ac233ed96f7286f6aacd… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed May 9 21:13:09 2018 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/po/lt.po b/po/lt.po index 1435191..6ee4a36 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-04-06 08:19+0300\n" +"PO-Revision-Date: 2018-05-09 21:12+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -8494,10 +8494,8 @@ msgid "&Browse..." msgstr "&Parinkti..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Failo tipas" +msgstr "Failo tipas:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8508,16 +8506,12 @@ msgid "Size:" msgstr "Dydis:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Sukūrimo data" +msgstr "Sukūrimo data:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "A&tributai:" +msgstr "Atributai:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8528,28 +8522,20 @@ msgid "&Archive" msgstr "&Archyvuotinas" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Atverti:" +msgstr "Atverti su:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "Keisti &piktogramą..." +msgstr "&Keisti..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Modifikuotas" +msgstr "Paskutinis pakeitimas:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Pask. keitimas:" +msgstr "Paskutinė prieiga:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size"

1 0

Fabian Maurer : wineconsole: When loading settings for an application, respect a 0 in FontSize.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: 37654ceba8cf4bf2d654f94d51c7551f9f52af5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=37654ceba8cf4bf2d654f94d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Apr 22 23:34:38 2018 +0200 wineconsole: When loading settings for an application, respect a 0 in FontSize. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/registry.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index 080431a..92c53a7 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -126,8 +126,17 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) count = sizeof(val); if (!RegQueryValueExW(hConKey, wszFontSize, 0, &type, (LPBYTE)&val, &count)) { - cfg->cell_height = HIWORD(val); - cfg->cell_width = LOWORD(val); + int height = HIWORD(val); + int width = LOWORD(val); + /* A value of zero reflects the default settings */ + if (height != 0) + { + cfg->cell_height = height; + } + if (width != 0) + { + cfg->cell_width = width; + } } count = sizeof(val);

1 0

Piotr Caban : msvcr110: Try SNAME when matching locale.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: 7122c9d41da7954acc51c5df3ac028ede95811e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7122c9d41da7954acc51c5df… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 9 17:36:17 2018 +0200 msvcr110: Try SNAME when matching locale. Based on patch by Daniel Lehman. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/tests/msvcr110.c | 8 +- dlls/msvcrt/locale.c | 199 ++++++++++++++++++++++++++++++----------- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 5 +- 4 files changed, 155 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7122c9d41da7954acc51…

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
72
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 May 2018