May 2018 - Wine-Commits - list.winehq.org

Daniel Lehman : advapi32/tests: Free subkey.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: 54bcff15ef66fc02ec44f567674da7ada0a031df URL: https://source.winehq.org/git/wine.git/?a=commit;h=54bcff15ef66fc02ec44f567… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu May 3 11:59:34 2018 -0700 advapi32/tests: Free subkey. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index d600163..17b83cb 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3567,6 +3567,7 @@ static void test_RegNotifyChangeKeyValue(void) ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); RegDeleteKeyA(key, "SubKey"); + RegCloseKey(subkey); RegCloseKey(key); /* test different thread without REG_NOTIFY_THREAD_AGNOSTIC */ @@ -3608,6 +3609,7 @@ static void test_RegNotifyChangeKeyValue(void) RegDeleteKeyA(key, "SubKey"); RegDeleteKeyA(key, ""); + RegCloseKey(subkey); RegCloseKey(key); CloseHandle(event); }

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: 9dadf13c4a9487037c7fbecca0a4071ea49fc397 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dadf13c4a9487037c7fbecc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 10 08:14:20 2018 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/po/ru.po b/po/ru.po index ac652df..146b8dd 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ 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-10 10:53+0300\n" +"PO-Revision-Date: 2018-05-10 08:12+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.6\n" +"X-Generator: Poedit 2.0.7\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -8498,10 +8498,8 @@ msgid "&Browse..." msgstr "&Обзор..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Тип файла" +msgstr "Тип файла:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8512,16 +8510,12 @@ msgid "Size:" msgstr "Размер:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Дата создания" +msgstr "Дата создания:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Свойства:" +msgstr "Атрибуты:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8532,28 +8526,20 @@ msgid "&Archive" msgstr "&Архивный" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Открыть:" +msgstr "Открывать в:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "Изменить &значок..." +msgstr "&Изменить..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Изменён" +msgstr "Изменён:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Последнее изменение:" +msgstr "Открыт:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size"

1 0

Zebediah Figura : mp3dmod: Add stub MP3 Decoder DMO.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: 0aff95bfa014d7b793f321255036f2bb8d5bc34a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aff95bfa014d7b793f32125… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 9 17:31:33 2018 -0500 mp3dmod: Add stub MP3 Decoder DMO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/mp3dmod/Makefile.in | 8 + dlls/mp3dmod/mp3dmod.c | 382 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mp3dmod/mp3dmod.idl | 27 ++++ dlls/mp3dmod/mp3dmod.spec | 5 + 6 files changed, 425 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0aff95bfa014d7b793f3…

1 0

Alexandre Julliard : ws2_32: Add fallback data for getprotobyname/number.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: 5dd1bad730da4a50a6706e31053e02137a64250d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dd1bad730da4a50a6706e31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 10 10:02:19 2018 +0200 ws2_32: Add fallback data for getprotobyname/number. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 128 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 97 insertions(+), 31 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 25ec72a..387ec54 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -635,7 +635,7 @@ static FARPROC blocking_hook = (FARPROC)WSA_DefaultBlockingHook; /* function prototypes */ static struct WS_hostent *WS_create_he(char *name, int aliases, int aliases_size, int addresses, int address_length); static struct WS_hostent *WS_dup_he(const struct hostent* p_he); -static struct WS_protoent *WS_dup_pe(const struct protoent* p_pe); +static struct WS_protoent *WS_create_pe( const char *name, char **aliases, int prot ); static struct WS_servent *WS_dup_se(const struct servent* p_se); static int ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, int *size); @@ -6406,6 +6406,62 @@ struct WS_hostent* WINAPI WS_gethostbyname(const char* name) } +static const struct { int prot; const char *names[3]; } protocols[] = +{ + { 0, { "ip", "IP" }}, + { 1, { "icmp", "ICMP" }}, + { 2, { "igmp", "IGMP" }}, + { 3, { "ggp", "GGP" }}, + { 6, { "tcp", "TCP" }}, + { 8, { "egp", "EGP" }}, + { 9, { "igp", "IGP" }}, + { 12, { "pup", "PUP" }}, + { 17, { "udp", "UDP" }}, + { 20, { "hmp", "HMP" }}, + { 22, { "xns-idp", "XNS-IDP" }}, + { 27, { "rdp", "RDP" }}, + { 29, { "iso-tp4", "ISO-TP4" }}, + { 33, { "dccp", "DCCP" }}, + { 36, { "xtp", "XTP" }}, + { 37, { "ddp", "DDP" }}, + { 38, { "idpr-cmtp", "IDPR-CMTP" }}, + { 41, { "ipv6", "IPv6" }}, + { 43, { "ipv6-route", "IPv6-Route" }}, + { 44, { "ipv6-frag", "IPv6-Frag" }}, + { 45, { "idrp", "IDRP" }}, + { 46, { "rsvp", "RSVP" }}, + { 47, { "gre", "GRE" }}, + { 50, { "esp", "ESP" }}, + { 51, { "ah", "AH" }}, + { 57, { "skip", "SKIP" }}, + { 58, { "ipv6-icmp", "IPv6-ICMP" }}, + { 59, { "ipv6-nonxt", "IPv6-NoNxt" }}, + { 60, { "ipv6-opts", "IPv6-Opts" }}, + { 66, { "rvd", "RVD" }}, + { 73, { "rspf", "RSPF" }}, + { 81, { "vmtp", "VMTP" }}, + { 88, { "eigrp", "EIGRP" }}, + { 89, { "ospf", "OSPFIGP" }}, + { 93, { "ax.25", "AX.25" }}, + { 94, { "ipip", "IPIP" }}, + { 97, { "etherip", "ETHERIP" }}, + { 98, { "encap", "ENCAP" }}, + { 103, { "pim", "PIM" }}, + { 108, { "ipcomp", "IPCOMP" }}, + { 112, { "vrrp", "VRRP" }}, + { 115, { "l2tp", "L2TP" }}, + { 124, { "isis", "ISIS" }}, + { 132, { "sctp", "SCTP" }}, + { 133, { "fc", "FC" }}, + { 135, { "mobility-header", "Mobility-Header" }}, + { 136, { "udplite", "UDPLite" }}, + { 137, { "mpls-in-ip", "MPLS-in-IP" }}, + { 139, { "hip", "HIP" }}, + { 140, { "shim6", "Shim6" }}, + { 141, { "wesp", "WESP" }}, + { 142, { "rohc", "ROHC" }}, +}; + /*********************************************************************** * getprotobyname (WS2_32.53) */ @@ -6416,16 +6472,25 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) struct protoent* proto; EnterCriticalSection( &csWSgetXXXbyYYY ); if( (proto = getprotobyname(name)) != NULL ) + retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); + LeaveCriticalSection( &csWSgetXXXbyYYY ); +#endif + if (!retval) { - retval = WS_dup_pe(proto); + unsigned int i; + for (i = 0; i < sizeof(protocols) / sizeof(protocols[0]); i++) + { + if (strcasecmp( protocols[i].names[0], name )) continue; + retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, + protocols[i].prot ); + break; + } } - else { - MESSAGE("protocol %s not found; You might want to add " - "this to /etc/protocols\n", debugstr_a(name) ); + if (!retval) + { + WARN( "protocol %s not found\n", debugstr_a(name) ); SetLastError(WSANO_DATA); } - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif TRACE( "%s ret %p\n", debugstr_a(name), retval ); return retval; } @@ -6441,16 +6506,25 @@ struct WS_protoent* WINAPI WS_getprotobynumber(int number) struct protoent* proto; EnterCriticalSection( &csWSgetXXXbyYYY ); if( (proto = getprotobynumber(number)) != NULL ) + retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); + LeaveCriticalSection( &csWSgetXXXbyYYY ); +#endif + if (!retval) { - retval = WS_dup_pe(proto); + unsigned int i; + for (i = 0; i < sizeof(protocols) / sizeof(protocols[0]); i++) + { + if (protocols[i].prot != number) continue; + retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, + protocols[i].prot ); + break; + } } - else { - MESSAGE("protocol number %d not found; You might want to add " - "this to /etc/protocols\n", number ); + if (!retval) + { + WARN( "protocol %d not found\n", number ); SetLastError(WSANO_DATA); } - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif TRACE("%i ret %p\n", number, retval); return retval; } @@ -7793,26 +7867,18 @@ static struct WS_hostent *WS_dup_he(const struct hostent* p_he) /* ----- protoent */ -static struct WS_protoent *WS_dup_pe(const struct protoent* p_pe) +static struct WS_protoent *WS_create_pe( const char *name, char **aliases, int prot ) { - char *p; - struct WS_protoent *p_to; + struct WS_protoent *ret; + unsigned int size = sizeof(*ret) + strlen(name) + sizeof(char *) + list_size(aliases, 0); - int size = (sizeof(*p_pe) + - strlen(p_pe->p_name) + 1 + - list_size(p_pe->p_aliases, 0)); - - if (!(p_to = check_buffer_pe(size))) return NULL; - p_to->p_proto = p_pe->p_proto; - - p = (char *)(p_to + 1); - p_to->p_name = p; - strcpy(p, p_pe->p_name); - p += strlen(p) + 1; - - p_to->p_aliases = (char **)p; - list_dup(p_pe->p_aliases, p_to->p_aliases, 0); - return p_to; + if (!(ret = check_buffer_pe( size ))) return NULL; + ret->p_proto = prot; + ret->p_name = (char *)(ret + 1); + strcpy( ret->p_name, name ); + ret->p_aliases = (char **)ret->p_name + strlen(name) / sizeof(char *) + 1; + list_dup( aliases, ret->p_aliases, 0 ); + return ret; } /* ----- servent */

1 0

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

May 10, 2018

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 May 10, 2018

May 10, 2018

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 May 10, 2018

May 10, 2018

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 May 9, 2018

May 9, 2018

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

Alex Henrie : msvcrt: Omit pointer coding functions from SOs for newer MSVC versions.
by Alexandre Julliard May 9, 2018

May 9, 2018

Module: wine Branch: master Commit: 9ccc0b1320e619c00a0c8b4ad83874c1f66868e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ccc0b1320e619c00a0c8b4a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue May 8 23:17:51 2018 -0600 msvcrt: Omit pointer coding functions from SOs for newer MSVC versions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/misc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index c197d69..d760e17 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -426,7 +426,7 @@ int CDECL MSVCRT__resetstkoflw(void) return VirtualProtect(&stack_addr, 1, PAGE_GUARD|PAGE_READWRITE, &oldprot); } -#if _MSVCR_VER>=80 +#if _MSVCR_VER>=80 && _MSVCR_VER<=90 /********************************************************************* * _decode_pointer (MSVCR80.@) @@ -444,6 +444,9 @@ void * CDECL MSVCRT_encode_pointer(void * ptr) return EncodePointer(ptr); } +#endif /* _MSVCR_VER>=80 && _MSVCR_VER<=90 */ + +#if _MSVCR_VER>=80 && _MSVCR_VER<=100 /********************************************************************* * _encoded_null (MSVCR80.@) */ @@ -453,8 +456,7 @@ void * CDECL _encoded_null(void) return EncodePointer(NULL); } - -#endif /* _MSVCR_VER>=80 */ +#endif #if _MSVCR_VER>=70 /*********************************************************************

1 0

Zebediah Figura : msdmo: Fix pointer checking in IEnumDMO_Next().
by Alexandre Julliard May 9, 2018

May 9, 2018

Module: wine Branch: master Commit: e2e3f70ed73e6c11598be38eaea55ea6ea4cd28f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2e3f70ed73e6c11598be38e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 8 18:55:00 2018 -0500 msdmo: Fix pointer checking in IEnumDMO_Next(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 9 ++++++--- dlls/msdmo/tests/msdmo.c | 9 ++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 43b0438..255849d3d 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -519,9 +519,12 @@ static HRESULT WINAPI IEnumDMO_fnNext( TRACE("(%p)->(%d %p %p %p)\n", This, cItemsToFetch, pCLSID, Names, pcItemsFetched); - if (!pCLSID || !Names || !pcItemsFetched) + if (!pCLSID || !Names) return E_POINTER; + if (!pcItemsFetched && cItemsToFetch > 1) + return E_INVALIDARG; + while (count < cItemsToFetch) { This->index++; @@ -656,8 +659,8 @@ static HRESULT WINAPI IEnumDMO_fnNext( count++; } - *pcItemsFetched = count; - if (*pcItemsFetched < cItemsToFetch) + if (pcItemsFetched) *pcItemsFetched = count; + if (count < cItemsToFetch) hres = S_FALSE; TRACE("<-- %i found\n",count); diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index 8cc35d1..7617123 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -92,14 +92,21 @@ static void test_DMOEnum(void) HRESULT hr; CLSID clsid; WCHAR *name; + DWORD count; hr = DMOEnum(&GUID_unknowncategory, 0, 0, NULL, 0, NULL, &enum_dmo); ok(hr == S_OK, "DMOEnum() failed with %#x\n", hr); hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); - todo_wine ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + hr = IEnumDMO_Next(enum_dmo, 2, &clsid, &name, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 2, &clsid, &name, &count); + ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + ok(count == 0, "expected 0, got %d\n", count); + IEnumDMO_Release(enum_dmo); }

1 0