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

Jacek Caban : jscript: Make String.length non-writable.
by Alexandre Julliard 10 May '18

10 May '18

Module: wine Branch: master Commit: a9f8c2c7c189aef11e47dede0260f364d49c65ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9f8c2c7c189aef11e47dede… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 19:20:28 2018 +0200 jscript: Make String.length non-writable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/string.c | 10 ++-------- dlls/jscript/tests/api.js | 6 ++++++ dlls/mshtml/tests/es5.js | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index ad978f2..737c878 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -119,12 +119,6 @@ static HRESULT String_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r return S_OK; } -static HRESULT String_set_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("%p\n", jsthis); - return E_NOTIMPL; -} - static HRESULT stringobj_to_string(vdisp_t *jsthis, jsval_t *r) { StringInstance *string; @@ -1539,7 +1533,7 @@ static const builtin_prop_t String_props[] = { {indexOfW, String_indexOf, PROPF_METHOD|2}, {italicsW, String_italics, PROPF_METHOD}, {lastIndexOfW, String_lastIndexOf, PROPF_METHOD|2}, - {lengthW, NULL,0, String_get_length, String_set_length}, + {lengthW, NULL,0, String_get_length}, {linkW, String_link, PROPF_METHOD|1}, {localeCompareW, String_localeCompare, PROPF_METHOD|1}, {matchW, String_match, PROPF_METHOD|1}, @@ -1571,7 +1565,7 @@ static const builtin_info_t String_info = { }; static const builtin_prop_t StringInst_props[] = { - {lengthW, NULL,0, String_get_length, String_set_length} + {lengthW, NULL,0, String_get_length} }; static const builtin_info_t StringInst_info = { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f124c46..f9178a9 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -408,6 +408,12 @@ ok(str.toString() === "", "str.toString() = " + str.toString()); var str = new String("test", "abc"); ok(str.toString() === "test", "str.toString() = " + str.toString()); +str = new String("test"); +ok(str.length === 4, "str.length = " + str.length); +str.length = 3; +str.length = 5; +ok(str.length === 4, "str.length = " + str.length); + var strObj = new Object(); strObj.toString = function() { return "abcd" }; strObj.substr = String.prototype.substr; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index efdfb0a..1096307 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -166,6 +166,7 @@ function test_getOwnPropertyDescriptor() { test_own_data_prop_desc(Math, "PI", false, false, false); var obj = new String(); + test_own_data_prop_desc(obj, "length", false, false, false); ok(Object.getOwnPropertyDescriptor(obj, "slice") === undefined, "getOwnPropertyDescriptor(slice) did not return undefined"); test_own_data_prop_desc(String.prototype, "slice", true, false, true);

1 0

Jacek Caban : jscript: Make Function instance object properties non-writable.
by Alexandre Julliard 10 May '18

10 May '18

Module: wine Branch: master Commit: 7f01473a388529853f1552c15711bdf71c92daa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f01473a388529853f1552c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 19:20:36 2018 +0200 jscript: Make Function instance object properties non-writable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/function.c | 14 ++++---------- dlls/mshtml/tests/es5.js | 4 ++++ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index ac0640f..af0b9a4 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -358,12 +358,6 @@ static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t return S_OK; } -static HRESULT Function_set_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Function_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -588,9 +582,9 @@ static void Function_destructor(jsdisp_t *dispex) static const builtin_prop_t Function_props[] = { {applyW, Function_apply, PROPF_METHOD|2}, - {argumentsW, NULL, 0, Function_get_arguments, builtin_set_const}, + {argumentsW, NULL, 0, Function_get_arguments}, {callW, Function_call, PROPF_METHOD|1}, - {lengthW, NULL, 0, Function_get_length, Function_set_length}, + {lengthW, NULL, 0, Function_get_length}, {toStringW, Function_toString, PROPF_METHOD} }; @@ -604,8 +598,8 @@ static const builtin_info_t Function_info = { }; static const builtin_prop_t FunctionInst_props[] = { - {argumentsW, NULL, 0, Function_get_arguments, builtin_set_const}, - {lengthW, NULL, 0, Function_get_length, Function_set_length} + {argumentsW, NULL, 0, Function_get_arguments}, + {lengthW, NULL, 0, Function_get_length} }; static const builtin_info_t FunctionInst_info = { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 1096307..6b84b40 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -174,6 +174,10 @@ function test_getOwnPropertyDescriptor() { obj = new Array(); test_own_data_prop_desc(obj, "length", true, false, false); + obj = new Function(); + test_own_data_prop_desc(obj, "length", false, false, false); + test_own_data_prop_desc(obj, "arguments", false, false, false); + obj = /test/; test_own_data_prop_desc(obj, "lastIndex", true, false, false);

1 0

Jacek Caban : jscript: Make RegExp object properties non-writable.
by Alexandre Julliard 10 May '18

10 May '18

Module: wine Branch: master Commit: 2538a74c801230941c326f2629ba07962e14fa4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2538a74c801230941c326f26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 19:20:45 2018 +0200 jscript: Make RegExp object properties non-writable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsregexp.c | 40 ++++++++-------------------------------- dlls/mshtml/tests/es5.js | 4 ++++ 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 5798635..821c016 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -256,12 +256,6 @@ static HRESULT RegExp_get_source(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r return S_OK; } -static HRESULT RegExp_set_source(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT RegExp_get_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { TRACE("\n"); @@ -270,12 +264,6 @@ static HRESULT RegExp_get_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r return S_OK; } -static HRESULT RegExp_set_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT RegExp_get_ignoreCase(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { TRACE("\n"); @@ -284,12 +272,6 @@ static HRESULT RegExp_get_ignoreCase(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_ return S_OK; } -static HRESULT RegExp_set_ignoreCase(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT RegExp_get_multiline(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { TRACE("\n"); @@ -298,12 +280,6 @@ static HRESULT RegExp_get_multiline(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t return S_OK; } -static HRESULT RegExp_set_multiline(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static INT index_from_val(script_ctx_t *ctx, jsval_t v) { double n; @@ -607,11 +583,11 @@ static void RegExp_destructor(jsdisp_t *dispex) static const builtin_prop_t RegExp_props[] = { {execW, RegExp_exec, PROPF_METHOD|1}, - {globalW, NULL,0, RegExp_get_global, RegExp_set_global}, - {ignoreCaseW, NULL,0, RegExp_get_ignoreCase, RegExp_set_ignoreCase}, + {globalW, NULL,0, RegExp_get_global}, + {ignoreCaseW, NULL,0, RegExp_get_ignoreCase}, {lastIndexW, NULL,0, RegExp_get_lastIndex, RegExp_set_lastIndex}, - {multilineW, NULL,0, RegExp_get_multiline, RegExp_set_multiline}, - {sourceW, NULL,0, RegExp_get_source, RegExp_set_source}, + {multilineW, NULL,0, RegExp_get_multiline}, + {sourceW, NULL,0, RegExp_get_source}, {testW, RegExp_test, PROPF_METHOD|1}, {toStringW, RegExp_toString, PROPF_METHOD} }; @@ -626,11 +602,11 @@ static const builtin_info_t RegExp_info = { }; static const builtin_prop_t RegExpInst_props[] = { - {globalW, NULL,0, RegExp_get_global, RegExp_set_global}, - {ignoreCaseW, NULL,0, RegExp_get_ignoreCase, RegExp_set_ignoreCase}, + {globalW, NULL,0, RegExp_get_global}, + {ignoreCaseW, NULL,0, RegExp_get_ignoreCase}, {lastIndexW, NULL,0, RegExp_get_lastIndex, RegExp_set_lastIndex}, - {multilineW, NULL,0, RegExp_get_multiline, RegExp_set_multiline}, - {sourceW, NULL,0, RegExp_get_source, RegExp_set_source} + {multilineW, NULL,0, RegExp_get_multiline}, + {sourceW, NULL,0, RegExp_get_source} }; static const builtin_info_t RegExpInst_info = { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 6b84b40..a769a49 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -179,7 +179,11 @@ function test_getOwnPropertyDescriptor() { test_own_data_prop_desc(obj, "arguments", false, false, false); obj = /test/; + test_own_data_prop_desc(obj, "global", false, false, false); + test_own_data_prop_desc(obj, "ignoreCase", false, false, false); test_own_data_prop_desc(obj, "lastIndex", true, false, false); + test_own_data_prop_desc(obj, "multiline", false, false, false); + test_own_data_prop_desc(obj, "source", false, false, false); next_test(); }

1 0

Hans Leidekker : ws2_32: Enable IP_DONTFRAGMENT by default for SOCK_STREAM sockets.
by Alexandre Julliard 10 May '18

10 May '18

Module: wine Branch: master Commit: 6d6b4bffb3f619ae298669b888775350223e281f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d6b4bffb3f619ae298669b8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 10 11:30:10 2018 +0200 ws2_32: Enable IP_DONTFRAGMENT by default for SOCK_STREAM sockets. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 9 ++++++-- dlls/ws2_32/tests/sock.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 387ec54..914df17 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7606,9 +7606,14 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, if (ipxptype > 0) set_ipx_packettype(ret, ipxptype); - /* ensure IP_DONTFRAGMENT is disabled, in Linux the global default can be enabled */ if (unixaf == AF_INET || unixaf == AF_INET6) - set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, FALSE); + { + /* ensure IP_DONTFRAGMENT is disabled for SOCK_DGRAM and SOCK_RAW, enabled for SOCK_STREAM */ + if (unixtype == SOCK_DGRAM || unixtype == SOCK_RAW) /* in Linux the global default can be enabled */ + set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, FALSE); + else if (unixtype == SOCK_STREAM) + set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, TRUE); + } #ifdef IPV6_V6ONLY if (unixaf == AF_INET6) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 05495b4..6dd1491 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1908,6 +1908,59 @@ todo_wine ok(value == 1, "Expected 1, got %d\n", value); closesocket(s); + + s = socket(family, SOCK_STREAM, 0); + if (s == INVALID_SOCKET && i) + { + skip("IPv6 is not supported\n"); + break; + } + ok(s != INVALID_SOCKET, "socket failed with error %d\n", GetLastError()); + + size = sizeof(value); + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 1 || broken(value == 0) /* < vista */, "Expected 1, got %d\n", value); + + size = sizeof(value); + value = 0; + err = setsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 0, "Expected 0, got %d\n", value); + + closesocket(s); + + s = socket(family, SOCK_RAW, 0); + if (s == INVALID_SOCKET) + { + if (WSAGetLastError() == WSAEACCES) skip("SOCK_RAW is not available\n"); + else if (i) skip("IPv6 is not supported\n"); + break; + } + ok(s != INVALID_SOCKET, "socket failed with error %d\n", GetLastError()); + + size = sizeof(value); + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 0, "Expected 0, got %d\n", value); + + size = sizeof(value); + value = 1; + err = setsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 1, "Expected 1, got %d\n", value); + + closesocket(s); } }

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

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: 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

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

Zebediah Figura : msdmo: Return a valid enumerator even if the category doesn't exist.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: 216e1f25a44380bcede2f3ecc7d1a8ace5a21c62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=216e1f25a44380bcede2f3ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 8 18:54:59 2018 -0500 msdmo: Return a valid enumerator even if the category doesn't exist. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 8 +++----- dlls/msdmo/tests/Makefile.in | 2 +- dlls/msdmo/tests/msdmo.c | 36 +++++++++++++++++++++++++++++++++++- 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index ead8864..43b0438 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -390,7 +390,6 @@ static HRESULT IEnumDMO_Constructor( { IEnumDMOImpl* lpedmo; HRESULT hr; - LONG ret; *obj = NULL; @@ -405,6 +404,7 @@ static HRESULT IEnumDMO_Constructor( lpedmo->dwFlags = dwFlags; lpedmo->cInTypes = cInTypes; lpedmo->cOutTypes = cOutTypes; + lpedmo->hkey = NULL; hr = dup_partial_mediatype(pInTypes, cInTypes, &lpedmo->pInTypes); if (FAILED(hr)) @@ -417,8 +417,7 @@ static HRESULT IEnumDMO_Constructor( /* If not filtering by category enum from media objects root */ if (IsEqualGUID(guidCategory, &GUID_NULL)) { - if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &lpedmo->hkey))) - hr = HRESULT_FROM_WIN32(ret); + RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &lpedmo->hkey); } else { @@ -426,8 +425,7 @@ static HRESULT IEnumDMO_Constructor( WCHAR szKey[MAX_PATH]; wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories, GUIDToString(szguid, guidCategory)); - if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey))) - hr = HRESULT_FROM_WIN32(ret); + RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey); } lerr: diff --git a/dlls/msdmo/tests/Makefile.in b/dlls/msdmo/tests/Makefile.in index 105baba..22a8e35 100644 --- a/dlls/msdmo/tests/Makefile.in +++ b/dlls/msdmo/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = msdmo.dll -IMPORTS = msdmo +IMPORTS = advapi32 dmoguids msdmo uuid C_SRCS = \ msdmo.c diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index 00ab656..8cc35d1 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -18,7 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "initguid.h" +#include <stdio.h> +#define COBJMACROS #include "dmo.h" #include "wine/test.h" @@ -27,8 +28,19 @@ static const GUID GUID_unknowndmo = {0x14d99047,0x441f,0x4cd3,{0xbc,0xa8,0x3e,0x static const GUID GUID_unknowncategory = {0x14d99048,0x441f,0x4cd3,{0xbc,0xa8,0x3e,0x67,0x99,0xaf,0x34,0x75}}; static const GUID GUID_wmp1 = {0x13a7995e,0x7d8f,0x45b4,{0x9c,0x77,0x81,0x92,0x65,0x22,0x57,0x63}}; +static const char *guid_to_string(const GUID *guid) +{ + static char buffer[50]; + sprintf(buffer, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + return buffer; +} + static void test_DMOUnregister(void) { + static char buffer[200]; static const WCHAR testdmoW[] = {'t','e','s','t','d','m','o',0}; HRESULT hr; @@ -53,6 +65,10 @@ static void test_DMOUnregister(void) hr = DMOUnregister(&GUID_unknowndmo, &GUID_NULL); ok(hr == S_FALSE, "got 0x%08x\n", hr); + + /* clean up category since Windows doesn't */ + sprintf(buffer, "DirectShow\\MediaObjects\\Categories\\%s", guid_to_string(&GUID_unknowncategory)); + RegDeleteKeyA(HKEY_CLASSES_ROOT, buffer); } static void test_DMOGetName(void) @@ -70,8 +86,26 @@ static void test_DMOGetName(void) ok(name[0] == 'a', "got %x\n", name[0]); } +static void test_DMOEnum(void) +{ + IEnumDMO *enum_dmo; + HRESULT hr; + CLSID clsid; + WCHAR *name; + + 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); + + IEnumDMO_Release(enum_dmo); +} + START_TEST(msdmo) { test_DMOUnregister(); test_DMOGetName(); + test_DMOEnum(); }

1 0

Zebediah Figura : msdmo: Fix pointer checking in IEnumDMO_Next().
by Alexandre Julliard 09 May '18

09 May '18

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