September 2019 - Wine-commits

Zebediah Figura : quartz/tests: Add tests for sample presentation time for the video renderer.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: wine Branch: master Commit: 78f6d6715320724735b9fbb0160498637806569e URL: https://source.winehq.org/git/wine.git/?a=commit;h=78f6d6715320724735b9fbb0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 29 19:03:29 2019 -0500 quartz/tests: Add tests for sample presentation time for the video renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 88 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index a3ca8038bc..3919b419e1 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -663,11 +663,11 @@ static DWORD WINAPI frame_thread(void *arg) return hr; } -static HANDLE send_frame(IMemInputPin *sink) +static HANDLE send_frame_time(IMemInputPin *sink, REFERENCE_TIME start_time, unsigned char color) { struct frame_thread_params *params = heap_alloc(sizeof(*params)); - REFERENCE_TIME start_time, end_time; IMemAllocator *allocator; + REFERENCE_TIME end_time; IMediaSample *sample; HANDLE thread; HRESULT hr; @@ -681,12 +681,12 @@ static HANDLE send_frame(IMemInputPin *sink) hr = IMediaSample_GetPointer(sample, &data); ok(hr == S_OK, "Got hr %#x.\n", hr); - memset(data, 0x55, 32 * 16 * 2); + memset(data, color, 32 * 16 * 2); hr = IMediaSample_SetActualDataLength(sample, 32 * 16 * 2); ok(hr == S_OK, "Got hr %#x.\n", hr); - start_time = 0; + start_time *= 10000000; end_time = start_time + 10000000; hr = IMediaSample_SetTime(sample, &start_time, &end_time); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -699,6 +699,11 @@ static HANDLE send_frame(IMemInputPin *sink) return thread; } +static HANDLE send_frame(IMemInputPin *sink) +{ + return send_frame_time(sink, 0, 0x55); /* purple */ +} + static HRESULT join_thread_(int line, HANDLE thread) { DWORD ret; @@ -912,6 +917,80 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) IMediaControl_Release(control); } +static void test_sample_time(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) +{ + IMediaControl *control; + OAFilterState state; + HANDLE thread; + HRESULT hr; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame_time(input, 1, 0x11); /* dark blue */ + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(thread, 500) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Sample time is relative to the time passed to Run(). Thus a sample + * stamped at or earlier than 1s will now be displayed immediately, because + * that time has already passed. + * One may manually verify that all of the frames in this function are + * rendered, including (by adding a Sleep() after sending the frame) the + * dark and light green frames. Thus the video renderer does not attempt to + * drop any frames that it considers late. This remains true if the frames + * are marked as discontinuous. */ + + hr = join_thread(send_frame_time(input, 1, 0x22)); /* dark green */ + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame_time(input, 0, 0x33)); /* light green */ + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame_time(input, -2, 0x44)); /* dark red */ + ok(hr == S_OK, "Got hr %#x.\n", hr); + + thread = send_frame_time(input, 2, 0x66); /* orange */ + ok(WaitForSingleObject(thread, 800) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + thread = send_frame_time(input, 1000000, 0xff); /* white */ + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + thread = send_frame_time(input, 1000000, 0xff); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IMediaControl_Release(control); +} + static void test_connect_pin(void) { VIDEOINFOHEADER vih = @@ -1017,6 +1096,7 @@ static void test_connect_pin(void) test_filter_state(input, graph); test_flushing(pin, input, graph); + test_sample_time(pin, input, graph); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Piotr Caban : kernel32: Don't use uninitialized ofs->szPathName in OpenFile.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: wine Branch: master Commit: 392648dda225c06955cbc9d57e12bb3f00d9e7bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=392648dda225c06955cbc9d5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 27 20:00:32 2019 +0200 kernel32: Don't use uninitialized ofs->szPathName in OpenFile. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 2b6a13fc0d..bdf429cc05 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1166,6 +1166,7 @@ HFILE WINAPI OpenFile( LPCSTR name, OFSTRUCT *ofs, UINT mode ) HANDLE handle; FILETIME filetime; WORD filedatetime[2]; + DWORD len; if (!ofs) return HFILE_ERROR; @@ -1201,7 +1202,13 @@ HFILE WINAPI OpenFile( LPCSTR name, OFSTRUCT *ofs, UINT mode ) /* the watcom 10.6 IDE relies on a valid path returned in ofs->szPathName Are there any cases where getting the path here is wrong? Uwe Bonnes 1997 Apr 2 */ - if (!GetFullPathNameA( name, sizeof(ofs->szPathName), ofs->szPathName, NULL )) goto error; + len = GetFullPathNameA( name, sizeof(ofs->szPathName), ofs->szPathName, NULL ); + if (!len) goto error; + if (len >= sizeof(ofs->szPathName)) + { + SetLastError(ERROR_INVALID_DATA); + goto error; + } /* OF_PARSE simply fills the structure */ @@ -1224,8 +1231,13 @@ HFILE WINAPI OpenFile( LPCSTR name, OFSTRUCT *ofs, UINT mode ) { /* Now look for the file */ - if (!SearchPathA( NULL, name, NULL, sizeof(ofs->szPathName), ofs->szPathName, NULL )) + len = SearchPathA( NULL, name, NULL, sizeof(ofs->szPathName), ofs->szPathName, NULL ); + if (!len) goto error; + if (len >= sizeof(ofs->szPathName)) + { + SetLastError(ERROR_INVALID_DATA); goto error; + } TRACE("found %s\n", debugstr_a(ofs->szPathName) );

1 0

Gabriel Ivăncescu : msscript.ocx: Move set_script_state to the top.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: wine Branch: master Commit: e076f84ccc31337e0978171e6c8c6af3d62640e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e076f84ccc31337e0978171e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 30 15:43:25 2019 +0300 msscript.ocx: Move set_script_state to the top. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 816a99dd6c..9cb8282aa2 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -200,6 +200,16 @@ static struct named_item *host_get_named_item(ScriptHost *host, const WCHAR *nam return NULL; } +static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) +{ + HRESULT hr; + + hr = IActiveScript_SetScriptState(host->script, state); + if (SUCCEEDED(hr)) + host->script_state = state; + return hr; +} + static inline ScriptControl *impl_from_IScriptControl(IScriptControl *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptControl_iface); @@ -954,16 +964,6 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, return hr; } -static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) -{ - HRESULT hr; - - hr = IActiveScript_SetScriptState(host->script, state); - if (SUCCEEDED(hr)) - host->script_state = state; - return hr; -} - static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) { ScriptControl *This = impl_from_IScriptControl(iface);

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptControl::Run.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: wine Branch: master Commit: 5a67b266c0837b80e02b3dd42e990907ca671c2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a67b266c0837b80e02b3dd4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 30 15:43:26 2019 +0300 msscript.ocx: Implement IScriptControl::Run. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 100 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 89 insertions(+), 11 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 9cb8282aa2..c4c6485980 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -20,12 +20,14 @@ #include "windows.h" #include "initguid.h" +#include "dispex.h" #include "ole2.h" #include "olectl.h" #include "objsafe.h" #include "activscp.h" #include "rpcproxy.h" #include "msscript.h" +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "wine/debug.h" #include "wine/heap.h" @@ -71,6 +73,7 @@ typedef struct ScriptHost { IActiveScript *script; IActiveScriptParse *parse; + IDispatch *script_dispatch; SCRIPTSTATE script_state; CLSID clsid; @@ -200,6 +203,17 @@ static struct named_item *host_get_named_item(ScriptHost *host, const WCHAR *nam return NULL; } +static HRESULT get_script_dispatch(struct ScriptControl *control, IDispatch **disp) +{ + if (!control->host->script_dispatch) + { + HRESULT hr = IActiveScript_GetScriptDispatch(control->host->script, NULL, &control->host->script_dispatch); + if (FAILED(hr)) return hr; + } + *disp = control->host->script_dispatch; + return S_OK; +} + static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) { HRESULT hr; @@ -210,6 +224,19 @@ static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) return hr; } +static HRESULT start_script(struct ScriptControl *control) +{ + HRESULT hr = S_OK; + + if (!control->host || control->state != Initialized) + return E_FAIL; + + if (control->host->script_state != SCRIPTSTATE_STARTED) + hr = set_script_state(control->host, SCRIPTSTATE_STARTED); + + return hr; +} + static inline ScriptControl *impl_from_IScriptControl(IScriptControl *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptControl_iface); @@ -316,7 +343,10 @@ static void release_script_engine(ScriptHost *host) if (host->parse) IActiveScriptParse_Release(host->parse); + if (host->script_dispatch) + IDispatch_Release(host->script_dispatch); + host->script_dispatch = NULL; host->parse = NULL; host->script = NULL; @@ -539,6 +569,7 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) host->ref = 1; host->script = NULL; host->parse = NULL; + host->script_dispatch = NULL; host->clsid = *clsid; list_init(&host->named_items); @@ -982,15 +1013,8 @@ static HRESULT parse_script_text(ScriptControl *control, BSTR script_text, DWORD EXCEPINFO excepinfo; HRESULT hr; - if (!control->host || control->state != Initialized) - return E_FAIL; - - if (control->host->script_state != SCRIPTSTATE_STARTED) - { - hr = set_script_state(control->host, SCRIPTSTATE_STARTED); - if (FAILED(hr)) - return hr; - } + hr = start_script(control); + if (FAILED(hr)) return hr; hr = IActiveScriptParse_ParseScriptText(control->host->parse, script_text, NULL, NULL, NULL, 0, 1, flag, res, &excepinfo); @@ -1032,8 +1056,62 @@ static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR static HRESULT WINAPI ScriptControl_Run(IScriptControl *iface, BSTR procedure_name, SAFEARRAY **parameters, VARIANT *res) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(procedure_name), parameters, res); - return E_NOTIMPL; + IDispatchEx *dispex; + IDispatch *disp; + SAFEARRAY *sa; + DISPPARAMS dp; + DISPID dispid; + HRESULT hr; + UINT i; + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(procedure_name), parameters, res); + + if (!parameters || !res) return E_POINTER; + if (!(sa = *parameters)) return E_POINTER; + + V_VT(res) = VT_EMPTY; + if (sa->cDims == 0) return DISP_E_BADINDEX; + if (!(sa->fFeatures & FADF_VARIANT)) return DISP_E_BADVARTYPE; + + hr = start_script(This); + if (FAILED(hr)) return hr; + + hr = get_script_dispatch(This, &disp); + if (FAILED(hr)) return hr; + + hr = IDispatch_GetIDsOfNames(disp, &IID_NULL, &procedure_name, 1, LOCALE_USER_DEFAULT, &dispid); + if (FAILED(hr)) return hr; + + dp.cArgs = sa->rgsabound[0].cElements; + dp.rgdispidNamedArgs = NULL; + dp.cNamedArgs = 0; + dp.rgvarg = heap_alloc(dp.cArgs * sizeof(*dp.rgvarg)); + if (!dp.rgvarg) return E_OUTOFMEMORY; + + hr = SafeArrayLock(sa); + if (SUCCEEDED(hr)) + { + /* The DISPPARAMS are stored in reverse order */ + for (i = 0; i < dp.cArgs; i++) + dp.rgvarg[i] = *(VARIANT*)((char*)(sa->pvData) + (dp.cArgs - i - 1) * sa->cbElements); + SafeArrayUnlock(sa); + + hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if (FAILED(hr)) + { + hr = IDispatch_Invoke(disp, dispid, &IID_NULL, LOCALE_USER_DEFAULT, + DISPATCH_METHOD, &dp, res, NULL, NULL); + } + else + { + hr = IDispatchEx_InvokeEx(dispex, dispid, LOCALE_USER_DEFAULT, + DISPATCH_METHOD, &dp, res, NULL, NULL); + IDispatchEx_Release(dispex); + } + } + heap_free(dp.rgvarg); + + return hr; } static const IScriptControlVtbl ScriptControlVtbl = {

1 0

Francois Gouget : testbot/Submit: Preserve the old Submit page before replacing it.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: tools Branch: master Commit: 29d39851738347adfffd5f88b570e4652969597d URL: https://source.winehq.org/git/tools.git/?a=commit;h=29d39851738347adfffd5f8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 26 16:32:41 2019 +0200 testbot/Submit: Preserve the old Submit page before replacing it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 +- testbot/web/OldSubmit.pl | 1043 +++++++++++++++++++++++++++++++ 2 files changed, 1044 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=29d39851738347adfff…

1 0

Francois Gouget : testbot/Submit: Rewrite the submit job page.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: tools Branch: master Commit: 879d6af4dac1888debed7746cafccfe9ec4ff89a URL: https://source.winehq.org/git/tools.git/?a=commit;h=879d6af4dac1888debed774… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 26 16:35:55 2019 +0200 testbot/Submit: Rewrite the submit job page. Preserve all parameters as the user moves from one step to the next and back. This includes preserving and showing the selected extra VMs even when the other extra VMs are hidden. Also validate the parameters whenever the user moves forward so the page never uses an invalid parameter. Introduce a new VMRow structure to store information about which VMs are compatible with the current job, which VMs to show, etc. This also provides the basis for future extensions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 5 +- testbot/web/Submit.pl | 1186 ++++++++++++++++--------------- 2 files changed, 627 insertions(+), 564 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=879d6af4dac1888debe…

1 0

Francois Gouget : testbot: Tweak the name of the Windows WineTest jobs.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: tools Branch: master Commit: dff8b522a4c4e69eb0dd984a177d75ef50ff31fd URL: https://source.winehq.org/git/tools.git/?a=commit;h=dff8b522a4c4e69eb0dd984… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 30 03:23:31 2019 +0200 testbot: Tweak the name of the Windows WineTest jobs. Better separate the bitness of the WineTest executable from the Windows bitness. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- testbot/lib/WineTestBot/SpecialJobs.pm | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index c3ec3a4..94d9750 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -400,7 +400,7 @@ if ($OptTypes{all64}) } elsif ($Create == 1) { - $Rc = 1 if ($OptTypes{all64} and !DoWindowsTest($OptVMKey, "exe64", "", $LatestBaseName)); + $Rc = 1 if ($OptTypes{all64} and !DoWindowsTest($OptVMKey, "exe64", "all", $LatestBaseName)); } } diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm index 0371084..360e1ff 100644 --- a/testbot/lib/WineTestBot/SpecialJobs.pm +++ b/testbot/lib/WineTestBot/SpecialJobs.pm @@ -148,10 +148,9 @@ sub AddWindowsTestJob($$$$$) my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); $NewJob->Priority(($BaseJob eq "base" and $Build eq "exe32") ? 8 : 9); - my $Remarks = defined $VMKey ? "$VMKey VM" : - $Build eq "exe64" ? "64 bit VMs" : - "$BaseJob VMs"; - $NewJob->Remarks("WineTest: $Remarks"); + my $Remarks = ($Build eq "exe32" ? "32" : "64") ." bit WineTest: ". + (defined $VMKey ? "$VMKey VM" : "$BaseJob VMs"); + $NewJob->Remarks($Remarks); # Add a task for each VM my $Tasks;

1 0

Francois Gouget : testbot/WineRun*: Cannot put the VM offline if its Status is wrong.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: tools Branch: master Commit: f9e6e4f773420fb529992c85f72bf09e6bb6c98f URL: https://source.winehq.org/git/tools.git/?a=commit;h=f9e6e4f773420fb529992c8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 30 03:51:26 2019 +0200 testbot/WineRun*: Cannot put the VM offline if its Status is wrong. These scripts should not modify a VM if its status is not 'running'. This includes not putting it offline. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 7 ++----- testbot/bin/WineRunReconfig.pl | 7 ++----- testbot/bin/WineRunTask.pl | 7 ++----- testbot/bin/WineRunWineTest.pl | 7 ++----- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 3a1b649..c4c1365 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -331,12 +331,9 @@ if ($VM->Type ne "build") if (!$Debug and $VM->Status ne "running") { # Maybe the administrator tinkered with the VM state? In any case the VM - # is not ours to use so requeue the task and abort. + # is not ours to use so requeue the task and abort. Note that the VM will + # not be put offline (again, not ours). Error("The VM is not ready for use (" . $VM->Status . ")\n"); - NotifyAdministrator("Putting the ". $VM->Name ." VM offline", - "The VM status should be 'running' but is '". $VM->Status ."' instead.\n". - "The VM has been put offline and the TestBot will try to regain\n". - "access to it."); WrapUpAndExit('queued'); } if (!$VM->GetDomain()->IsPoweredOn()) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index edbafbc..4a17e65 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -334,12 +334,9 @@ if ($VM->Type ne "build" and $VM->Type ne "wine") if (!$Debug and $VM->Status ne "running") { # Maybe the administrator tinkered with the VM state? In any case the VM - # is not ours to use so requeue the task and abort. + # is not ours to use so requeue the task and abort. Note that the VM will + # not be put offline (again, not ours). Error("The VM is not ready for use (" . $VM->Status . ")\n"); - NotifyAdministrator("Putting the ". $VM->Name ." VM offline", - "The VM status should be 'running' but is '". $VM->Status ."' instead.\n". - "The VM has been put offline and the TestBot will try to regain\n". - "access to it."); WrapUpAndExit('queued'); } my $Domain = $VM->GetDomain(); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 53aa578..1ffd875 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -389,12 +389,9 @@ if ($VM->Type ne "win32" and $VM->Type ne "win64") if (!$Debug and $VM->Status ne "running") { # Maybe the administrator tinkered with the VM state? In any case the VM - # is not ours to use so requeue the task and abort. + # is not ours to use so requeue the task and abort. Note that the VM will + # not be put offline (again, not ours). Error("The VM is not ready for use (" . $VM->Status . ")\n"); - NotifyAdministrator("Putting the ". $VM->Name ." VM offline", - "The VM status should be 'running' but is '". $VM->Status ."' instead.\n". - "The VM has been put offline and the TestBot will try to regain\n". - "access to it."); WrapUpAndExit('queued'); } my $Domain = $VM->GetDomain(); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index e3db279..c6770aa 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -389,12 +389,9 @@ if ($VM->Type ne "wine") if (!$Debug and $VM->Status ne "running") { # Maybe the administrator tinkered with the VM state? In any case the VM - # is not ours to use so requeue the task and abort. + # is not ours to use so requeue the task and abort. Note that the VM will + # not be put offline (again, not ours). Error("The VM is not ready for use (" . $VM->Status . ")\n"); - NotifyAdministrator("Putting the ". $VM->Name ." VM offline", - "The VM status should be 'running' but is '". $VM->Status ."' instead.\n". - "The VM has been put offline and the TestBot will try to regain\n". - "access to it."); WrapUpAndExit('queued'); } my $Domain = $VM->GetDomain();

1 0

Francois Gouget : testbot/WineRun*: Specify why a VM is put offline when it is off.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: tools Branch: master Commit: 9e9d165b326a5ba66f82cbe580f0259f56a2c0e3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9e9d165b326a5ba66f82cbe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 30 03:51:44 2019 +0200 testbot/WineRun*: Specify why a VM is put offline when it is off. The reason will appear in the Activity page, thus providing easily understandable diagnostic data. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 9 +++++---- testbot/bin/WineRunReconfig.pl | 9 +++++---- testbot/bin/WineRunTask.pl | 9 +++++---- testbot/bin/WineRunWineTest.pl | 9 +++++---- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index c4c1365..89582a1 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -192,11 +192,12 @@ sub LogTaskError($) umask($OldUMask); } -sub WrapUpAndExit($;$$) +sub WrapUpAndExit($;$$$) { - my ($Status, $Retry, $TimedOut) = @_; + my ($Status, $Retry, $TimedOut, $Reason) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; - my $VMResult = $Status eq "boterror" ? "boterror" : + my $VMResult = defined $Reason ? $Reason : + $Status eq "boterror" ? "boterror" : $Status eq "queued" ? "error" : $TimedOut ? "timeout" : ""; @@ -346,7 +347,7 @@ if (!$VM->GetDomain()->IsPoweredOn()) "The VM is not powered on despite its status being 'running'.\n". "The VM has been put offline and the TestBot will try to regain\n". "access to it."); - WrapUpAndExit('queued'); + WrapUpAndExit('queued', undef, undef, 'boterror vm off'); } if ($Step->Type ne "build") diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 4a17e65..df8b7df 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -194,12 +194,13 @@ sub LogTaskError($) umask($OldUMask); } -sub WrapUpAndExit($;$$) +sub WrapUpAndExit($;$$$) { - my ($Status, $Retry, $TimedOut) = @_; + my ($Status, $Retry, $TimedOut, $Reason) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : $Status eq 'completed' ? 'idle' : 'dirty'; - my $VMResult = $Status eq "boterror" ? "boterror" : + my $VMResult = defined $Reason ? $Reason : + $Status eq "boterror" ? "boterror" : $Status eq "queued" ? "error" : $TimedOut ? "timeout" : ""; @@ -352,7 +353,7 @@ if (!$Domain->IsPoweredOn()) MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n\n". "So the VM has been put offline and the TestBot will try to regain\n". "access to it."); - WrapUpAndExit('queued'); + WrapUpAndExit('queued', undef, undef, 'boterror vm off'); } if ($Step->Type ne "reconfig") diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 1ffd875..81a2996 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -224,11 +224,12 @@ sub LogTaskError($) umask($OldUMask); } -sub WrapUpAndExit($;$$$) +sub WrapUpAndExit($;$$$$) { - my ($Status, $TestFailures, $Retry, $TimedOut) = @_; + my ($Status, $TestFailures, $Retry, $TimedOut, $Reason) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; - my $VMResult = $Status eq "boterror" ? "boterror" : + my $VMResult = $Reason ? $Reason : + $Status eq "boterror" ? "boterror" : $Status eq "queued" ? "error" : $TimedOut ? "timeout" : ""; @@ -407,7 +408,7 @@ if (!$Domain->IsPoweredOn()) MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n\n". "So the VM has been put offline and the TestBot will try to regain\n". "access to it."); - WrapUpAndExit('queued'); + WrapUpAndExit('queued', undef, undef, undef, 'boterror vm off'); } if ($Step->Type ne "single" and $Step->Type ne "suite") diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index c6770aa..beb0502 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -220,11 +220,12 @@ sub LogTaskError($) my $TaskMissions; -sub WrapUpAndExit($;$$$) +sub WrapUpAndExit($;$$$$) { - my ($Status, $TestFailures, $Retry, $TimedOut) = @_; + my ($Status, $TestFailures, $Retry, $TimedOut, $Reason) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; - my $VMResult = $Status eq "boterror" ? "boterror" : + my $VMResult = defined $Reason ? $Reason : + $Status eq "boterror" ? "boterror" : $Status eq "queued" ? "error" : $TimedOut ? "timeout" : ""; @@ -407,7 +408,7 @@ if (!$Domain->IsPoweredOn()) MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n\n". "So the VM has been put offline and the TestBot will try to regain\n". "access to it."); - WrapUpAndExit('queued'); + WrapUpAndExit('queued', undef, undef, 'boterror vm off'); } if ($Step->Type ne "suite" and $Step->Type ne "single")

1 0

Alexandre Julliard : Wine release 4.17
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: website Branch: master Commit: 02ce44f9c2b3746f696718d4eeaa3d790f99dda5 URL: https://source.winehq.org/git/website.git/?a=commit;h=02ce44f9c2b3746f69671… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 22:56:49 2019 +0200 Wine release 4.17 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019092701.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2019092701.xml b/news/en/2019092701.xml new file mode 100644 index 00000000..2d996a5e --- /dev/null +++ b/news/en/2019092701.xml @@ -0,0 +1,18 @@ +<news> +<date>September 27, 2019</date> +<title>Wine 4.17 Released</title> +<body> + The Wine development release 4.17 is now available. + <a href="{$root}/announce/4.17">What's new</a> in this release: +<ul> + <li>New version of the Mono engine with upstream fixes.</li> + <li>Support for DXTn compressed textures.</li> + <li>Initial version of the Windows Script runtime library.</li> + <li>Support for XRandR device change notifications.</li> + <li>Support for generating RSA keys.</li> + <li>Stubless proxies support on ARM64.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.17.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