September 2019 - Wine-commits

Zebediah Figura : winegstreamer: Set bFixedSizeSamples in amt_from_gst_caps_audio().
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: wine Branch: master Commit: 13da4669bd3520ca0ac152d8dcca155abe2a70df URL: https://source.winehq.org/git/wine.git/?a=commit;h=13da4669bd3520ca0ac152d8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 16 19:29:44 2019 -0500 winegstreamer: Set bFixedSizeSamples in amt_from_gst_caps_audio(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9160d12a5a..9abb7bd289 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -138,7 +138,7 @@ static gboolean amt_from_gst_caps_audio(const GstCaps *caps, AM_MEDIA_TYPE *amt) amt->formattype = FORMAT_WaveFormatEx; amt->pbFormat = (BYTE*)wfe; amt->cbFormat = sizeof(*wfe); - amt->bFixedSizeSamples = 0; + amt->bFixedSizeSamples = TRUE; amt->bTemporalCompression = 1; amt->pUnk = NULL;

1 0

Zebediah Figura : winegstreamer: Clear bTemporalCompression in amt_from_gst_caps_audio().
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: wine Branch: master Commit: 19c6b2f26edc0eb9810edb5529dd4c643c2f3016 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c6b2f26edc0eb9810edb55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 16 19:29:45 2019 -0500 winegstreamer: Clear bTemporalCompression in amt_from_gst_caps_audio(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9abb7bd289..60136abaac 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -139,7 +139,7 @@ static gboolean amt_from_gst_caps_audio(const GstCaps *caps, AM_MEDIA_TYPE *amt) amt->pbFormat = (BYTE*)wfe; amt->cbFormat = sizeof(*wfe); amt->bFixedSizeSamples = TRUE; - amt->bTemporalCompression = 1; + amt->bTemporalCompression = FALSE; amt->pUnk = NULL; wfx->wFormatTag = WAVE_FORMAT_EXTENSIBLE;

1 0

Dmitry Timoshkov : rpcrt4: Implement wait_for_incoming_data() for named pipes transport.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: wine Branch: master Commit: bb7c119190a14600d3ac0b47f268f8ea9c419f32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb7c119190a14600d3ac0b47… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 17 18:04:54 2019 +0800 rpcrt4: Implement wait_for_incoming_data() for named pipes transport. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 02fd56ce96..12d15f8654 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -463,10 +463,33 @@ static void rpcrt4_conn_np_cancel_call(RpcConnection *conn) CancelIoEx(connection->pipe, NULL); } -static int rpcrt4_conn_np_wait_for_incoming_data(RpcConnection *Connection) +static int rpcrt4_conn_np_wait_for_incoming_data(RpcConnection *conn) { - /* FIXME: implement when named pipe writes use overlapped I/O */ - return -1; + RpcConnection_np *connection = (RpcConnection_np *)conn; + FILE_PIPE_PEEK_BUFFER buf; + HANDLE event; + NTSTATUS status; + int ret; + + event = get_np_event(connection); + if (!event) return -1; + + status = NtFsControlFile(connection->pipe, event, NULL, NULL, &connection->io_status, FSCTL_PIPE_PEEK, NULL, 0, &buf, sizeof(buf)); + if (status == STATUS_SUCCESS) + ret = 0; + else if (status == STATUS_PENDING) + { + WaitForSingleObject(event, INFINITE); + ret = 0; + } + else + { + WARN("NtFsControlFile error %08x\n", status); + ret = -1; + } + + release_np_event(connection, event); + return ret; } static size_t rpcrt4_ncacn_np_get_top_of_tower(unsigned char *tower_data,

1 0

Zebediah Figura : winegstreamer: Set lSampleSize in amt_from_gst_caps_audio().
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: wine Branch: master Commit: ad791894021282c7fb3cb3e87d89745991ce604f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad791894021282c7fb3cb3e8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 16 19:29:43 2019 -0500 winegstreamer: Set lSampleSize in amt_from_gst_caps_audio(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 397af6ef55..9160d12a5a 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -140,7 +140,6 @@ static gboolean amt_from_gst_caps_audio(const GstCaps *caps, AM_MEDIA_TYPE *amt) amt->cbFormat = sizeof(*wfe); amt->bFixedSizeSamples = 0; amt->bTemporalCompression = 1; - amt->lSampleSize = 0; amt->pUnk = NULL; wfx->wFormatTag = WAVE_FORMAT_EXTENSIBLE; @@ -177,7 +176,7 @@ static gboolean amt_from_gst_caps_audio(const GstCaps *caps, AM_MEDIA_TYPE *amt) wfx->cbSize = 0; } } - wfx->nBlockAlign = wfx->nChannels * wfx->wBitsPerSample/8; + amt->lSampleSize = wfx->nBlockAlign = wfx->nChannels * wfx->wBitsPerSample/8; wfx->nAvgBytesPerSec = wfx->nSamplesPerSec * wfx->nBlockAlign; return TRUE; }

1 0

Dmitry Timoshkov : rpcrt4: Implement NdrAsyncServerCall.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: wine Branch: master Commit: 29fa835687cd708b63db39ab0614508a3534d27c URL: https://source.winehq.org/git/wine.git/?a=commit;h=29fa835687cd708b63db39ab… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 13 13:34:33 2019 +0800 rpcrt4: Implement NdrAsyncServerCall. Based on NdrStubCall2 and NdrAsyncClientCall implementations. In order to test asynchronous RPC I used dlls/rpcrt4/tests/server.c as a base, converted int_return() and sum() to use asynchronous RPC on both client and server sides (server.idl doesn't need any changes), and added server.acf: interface IServer { [async] int_return(); [async] sum(); } With this implementation these tests pass under Wine. Since widl doesn't support asynchronous RPC it's impossible to add appropriate Wine tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 190 +++++++++++++++++++++++++++++++++++++++++---- dlls/rpcrt4/ndr_stubless.h | 15 ++++ dlls/rpcrt4/rpc_async.c | 11 ++- 3 files changed, 199 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 90537515ea..70a26dd5b3 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1559,21 +1559,6 @@ void WINAPI NdrServerCallAll( PRPC_MESSAGE msg ) FIXME("%p stub\n", msg); } -struct async_call_data -{ - MIDL_STUB_MESSAGE *pStubMsg; - const NDR_PROC_HEADER *pProcHeader; - PFORMAT_STRING pHandleFormat; - PFORMAT_STRING pParamFormat; - RPC_BINDING_HANDLE hBinding; - /* size of stack */ - unsigned short stack_size; - /* number of parameters. optional for client to give it to us */ - unsigned int number_of_params; - /* correlation cache */ - ULONG_PTR NdrCorrCache[256]; -}; - /* Helper for ndr_async_client_call, to factor out the part that may or may not be * guarded by a try/except block. */ static void do_ndr_async_client_call( const MIDL_STUB_DESC *pStubDesc, PFORMAT_STRING pFormat, void **stack_top ) @@ -1922,5 +1907,178 @@ RPCRTAPI LONG RPC_ENTRY NdrAsyncStubCall(struct IRpcStubBuffer* pThis, void RPC_ENTRY NdrAsyncServerCall(PRPC_MESSAGE pRpcMsg) { - FIXME("unimplemented, %p\n", pRpcMsg); + const MIDL_SERVER_INFO *pServerInfo; + const MIDL_STUB_DESC *pStubDesc; + PFORMAT_STRING pFormat; + /* pointer to start of stack to pass into stub implementation */ + unsigned char *args; + /* header for procedure string */ + const NDR_PROC_HEADER *pProcHeader; + struct async_call_data *async_call_data; + PRPC_ASYNC_STATE pAsync; + RPC_STATUS status; + + TRACE("%p\n", pRpcMsg); + + pServerInfo = ((RPC_SERVER_INTERFACE *)pRpcMsg->RpcInterfaceInformation)->InterpreterInfo; + + pStubDesc = pServerInfo->pStubDesc; + pFormat = pServerInfo->ProcString + pServerInfo->FmtStringOffset[pRpcMsg->ProcNum]; + pProcHeader = (const NDR_PROC_HEADER *)&pFormat[0]; + + TRACE("NDR Version: 0x%x\n", pStubDesc->Version); + + async_call_data = I_RpcAllocate(sizeof(*async_call_data) + sizeof(MIDL_STUB_MESSAGE) + sizeof(RPC_MESSAGE)); + if (!async_call_data) RpcRaiseException(RPC_X_NO_MEMORY); + async_call_data->pProcHeader = pProcHeader; + + async_call_data->pStubMsg = (PMIDL_STUB_MESSAGE)(async_call_data + 1); + *(PRPC_MESSAGE)(async_call_data->pStubMsg + 1) = *pRpcMsg; + + if (pProcHeader->Oi_flags & Oi_HAS_RPCFLAGS) + { + const NDR_PROC_HEADER_RPC *header_rpc = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; + async_call_data->stack_size = header_rpc->stack_size; + pFormat += sizeof(NDR_PROC_HEADER_RPC); + } + else + { + async_call_data->stack_size = pProcHeader->stack_size; + pFormat += sizeof(NDR_PROC_HEADER); + } + + TRACE("Oi_flags = 0x%02x\n", pProcHeader->Oi_flags); + + /* binding */ + switch (pProcHeader->handle_type) + { + /* explicit binding: parse additional section */ + case 0: + switch (*pFormat) /* handle_type */ + { + case FC_BIND_PRIMITIVE: /* explicit primitive */ + pFormat += sizeof(NDR_EHD_PRIMITIVE); + break; + case FC_BIND_GENERIC: /* explicit generic */ + pFormat += sizeof(NDR_EHD_GENERIC); + break; + case FC_BIND_CONTEXT: /* explicit context */ + pFormat += sizeof(NDR_EHD_CONTEXT); + break; + default: + ERR("bad explicit binding handle type (0x%02x)\n", pProcHeader->handle_type); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + break; + case FC_BIND_GENERIC: /* implicit generic */ + case FC_BIND_PRIMITIVE: /* implicit primitive */ + case FC_CALLBACK_HANDLE: /* implicit callback */ + case FC_AUTO_HANDLE: /* implicit auto handle */ + break; + default: + ERR("bad implicit binding handle type (0x%02x)\n", pProcHeader->handle_type); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + + if (pProcHeader->Oi_flags & Oi_OBJECT_PROC) + { + ERR("objects not supported\n"); + I_RpcFree(async_call_data); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + + NdrServerInitializeNew(pRpcMsg, async_call_data->pStubMsg, pStubDesc); + + /* create the full pointer translation tables, if requested */ + if (pProcHeader->Oi_flags & Oi_FULL_PTR_USED) + async_call_data->pStubMsg->FullPtrXlatTables = NdrFullPointerXlatInit(0, XLAT_SERVER); + + /* use alternate memory allocation routines */ + if (pProcHeader->Oi_flags & Oi_RPCSS_ALLOC_USED) +#if 0 + NdrRpcSsEnableAllocate(&stubMsg); +#else + FIXME("Set RPCSS memory allocation routines\n"); +#endif + + TRACE("allocating memory for stack of size %x\n", async_call_data->stack_size); + + args = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, async_call_data->stack_size); + async_call_data->pStubMsg->StackTop = args; /* used by conformance of top-level objects */ + + pAsync = I_RpcAllocate(sizeof(*pAsync)); + if (!pAsync) RpcRaiseException(RPC_X_NO_MEMORY); + + status = RpcAsyncInitializeHandle(pAsync, sizeof(*pAsync)); + if (status != RPC_S_OK) + RpcRaiseException(status); + + pAsync->StubInfo = async_call_data; + TRACE("pAsync %p, pAsync->StubInfo %p, pFormat %p\n", pAsync, pAsync->StubInfo, async_call_data->pHandleFormat); + + /* add the implicit pAsync pointer as the first arg to the function */ + *(void **)args = pAsync; + + if (is_oicf_stubdesc(pStubDesc)) + { + const NDR_PROC_PARTIAL_OIF_HEADER *pOIFHeader = (const NDR_PROC_PARTIAL_OIF_HEADER *)pFormat; + /* cache of Oif_flags from v2 procedure header */ + INTERPRETER_OPT_FLAGS Oif_flags; + /* cache of extension flags from NDR_PROC_HEADER_EXTS */ + INTERPRETER_OPT_FLAGS2 ext_flags = { 0 }; + + Oif_flags = pOIFHeader->Oi2Flags; + async_call_data->number_of_params = pOIFHeader->number_of_params; + + pFormat += sizeof(NDR_PROC_PARTIAL_OIF_HEADER); + + TRACE("Oif_flags = %s\n", debugstr_INTERPRETER_OPT_FLAGS(Oif_flags) ); + + if (Oif_flags.HasExtensions) + { + const NDR_PROC_HEADER_EXTS *pExtensions = (const NDR_PROC_HEADER_EXTS *)pFormat; + ext_flags = pExtensions->Flags2; + pFormat += pExtensions->Size; + } + + if (Oif_flags.HasPipes) + { + FIXME("pipes not supported yet\n"); + RpcRaiseException(RPC_X_WRONG_STUB_VERSION); /* FIXME: remove when implemented */ + /* init pipes package */ + /* NdrPipesInitialize(...) */ + } + if (ext_flags.HasNewCorrDesc) + { + /* initialize extra correlation package */ + NdrCorrelationInitialize(async_call_data->pStubMsg, async_call_data->NdrCorrCache, sizeof(async_call_data->NdrCorrCache), 0); + if (ext_flags.Unused & 0x2) /* has range on conformance */ + async_call_data->pStubMsg->CorrDespIncrement = 12; + } + } + else + { + pFormat = convert_old_args( async_call_data->pStubMsg, pFormat, async_call_data->stack_size, + pProcHeader->Oi_flags & Oi_OBJECT_PROC, + /* reuse the correlation cache, it's not needed for v1 format */ + async_call_data->NdrCorrCache, sizeof(async_call_data->NdrCorrCache), &async_call_data->number_of_params ); + } + + /* convert strings, floating point values and endianness into our + * preferred format */ + if ((pRpcMsg->DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) + NdrConvert(async_call_data->pStubMsg, pFormat); + + async_call_data->pHandleFormat = pFormat; + + /* 1. UNMARSHAL */ + TRACE("UNMARSHAL\n"); + stub_do_args(async_call_data->pStubMsg, pFormat, STUBLESS_UNMARSHAL, async_call_data->number_of_params); + + /* 2. CALLSERVER */ + TRACE("CALLSERVER\n"); + if (pServerInfo->ThunkTable && pServerInfo->ThunkTable[pRpcMsg->ProcNum]) + pServerInfo->ThunkTable[pRpcMsg->ProcNum](async_call_data->pStubMsg); + else + call_server_func(pServerInfo->DispatchTable[pRpcMsg->ProcNum], args, async_call_data->stack_size); } diff --git a/dlls/rpcrt4/ndr_stubless.h b/dlls/rpcrt4/ndr_stubless.h index 606513ff24..fc67cf9020 100644 --- a/dlls/rpcrt4/ndr_stubless.h +++ b/dlls/rpcrt4/ndr_stubless.h @@ -224,6 +224,21 @@ typedef struct _NDR_EHD_CONTEXT #include "poppack.h" +struct async_call_data +{ + MIDL_STUB_MESSAGE *pStubMsg; + const NDR_PROC_HEADER *pProcHeader; + PFORMAT_STRING pHandleFormat; + PFORMAT_STRING pParamFormat; + RPC_BINDING_HANDLE hBinding; + /* size of stack */ + unsigned short stack_size; + /* number of parameters. optional for client to give it to us */ + unsigned int number_of_params; + /* correlation cache */ + ULONG_PTR NdrCorrCache[256]; +}; + enum stubless_phase { STUBLESS_UNMARSHAL, diff --git a/dlls/rpcrt4/rpc_async.c b/dlls/rpcrt4/rpc_async.c index 891fc5ad72..9c3d90cfba 100644 --- a/dlls/rpcrt4/rpc_async.c +++ b/dlls/rpcrt4/rpc_async.c @@ -110,6 +110,8 @@ RPC_STATUS WINAPI RpcAsyncGetCallStatus(PRPC_ASYNC_STATE pAsync) */ RPC_STATUS WINAPI RpcAsyncCompleteCall(PRPC_ASYNC_STATE pAsync, void *Reply) { + struct async_call_data *data; + TRACE("(%p, %p)\n", pAsync, Reply); if (!valid_async_handle(pAsync)) @@ -117,7 +119,14 @@ RPC_STATUS WINAPI RpcAsyncCompleteCall(PRPC_ASYNC_STATE pAsync, void *Reply) /* FIXME: check completed */ - return NdrpCompleteAsyncClientCall(pAsync, Reply); + TRACE("pAsync %p, pAsync->StubInfo %p\n", pAsync, pAsync->StubInfo); + + data = pAsync->StubInfo; + if (data->pStubMsg->IsClient) + return NdrpCompleteAsyncClientCall(pAsync, Reply); + + FIXME("not implemented for server side\n"); + return RPC_S_CALL_FAILED; } /***********************************************************************

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: Clean up handling of the 'other' VMs.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: tools Branch: master Commit: 73912a3cd7a214f89230ddfeb7ee9640edee15b9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=73912a3cd7a214f89230ddf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 17 12:33:37 2019 +0200 testbot/CheckForWinetestUpdate: Clean up handling of the 'other' VMs. The job is called 'WineTest: other VMs' so calling the corresponding option 'other32' is clearer. Also, setting $BaseJob to 'other' when appropriate simplifies building the job description. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 590226c..b4672a7 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -67,7 +67,7 @@ my %WineTestUrls = ( my %TaskTypes = (build => "Update and rebuild Wine on the build VMs.", base32 => "Run WineTest on the 32 bit Windows VMs with the 'base' role.", - winetest32 => "Run WineTest on the 32 bit Windows VMs with the 'winetest' role.", + other32 => "Run WineTest on the 32 bit Windows VMs with the 'winetest' role.", all64 => "Run WineTest on the all the 64 bit Windows VMs.", wine => "Update, rebuild and run WineTest on the Wine VMs."); @@ -171,7 +171,7 @@ sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Build) = @_; - my $Remarks = ($Build eq "exe64" ? "64-bit" : $BaseJob ? "base" : "other"); + my $Remarks = $Build eq "exe64" ? "64-bit" : $BaseJob; $Remarks = "WineTest: $Remarks VMs"; Debug("Creating the '$Remarks' job\n"); @@ -181,7 +181,7 @@ sub AddJob($$$) $VMs->AddFilter("Type", ["win64"]); $VMs->AddFilter("Role", ["base", "winetest"]); } - elsif ($BaseJob) + elsif ($BaseJob eq "base") { $VMs->AddFilter("Type", ["win32", "win64"]); $VMs->AddFilter("Role", ["base"]); @@ -202,7 +202,7 @@ sub AddJob($$$) my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); - $NewJob->Priority($BaseJob && $Build eq "exe32" ? 8 : 9); + $NewJob->Priority($BaseJob eq "base" and $Build eq "exe32" ? 8 : 9); $NewJob->Remarks($Remarks); # Add a task for each VM @@ -458,7 +458,7 @@ if (defined $Usage) # my $Rc = 0; -if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32} or +if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{other32} or $OptTypes{wine}) { my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, "exe32"); @@ -473,7 +473,7 @@ if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32} or # arbitrarily do it only for 32-bit executables to avoid redundant updates. $Rc = 1 if ($OptTypes{build} and !AddReconfigJob("build")); $Rc = 1 if ($OptTypes{base32} and !AddJob("base", $LatestBaseName, "exe32")); - $Rc = 1 if ($OptTypes{winetest32} and !AddJob("", $LatestBaseName, "exe32")); + $Rc = 1 if ($OptTypes{other32} and !AddJob("other", $LatestBaseName, "exe32")); $Rc = 1 if ($OptTypes{wine} and !AddReconfigJob("wine")); }

1 0

Francois Gouget : testbot: Modify ParseTaskLog() so it can return more information.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: tools Branch: master Commit: ef3bcca59c61b4cfc3d56235e783ed808fb4eefc URL: https://source.winehq.org/git/tools.git/?a=commit;h=ef3bcca59c61b4cfc3d5623… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 17 12:34:38 2019 +0200 testbot: Modify ParseTaskLog() so it can return more information. This also makes the 'NoLog' error case a bit cleaner. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 10 +++++----- testbot/bin/WineRunReconfig.pl | 8 ++++---- testbot/bin/WineRunWineTest.pl | 12 ++++++------ testbot/lib/WineTestBot/LogUtils.pm | 28 +++++++++++++++++++--------- 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 1d57c44..a8b7803 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -391,23 +391,23 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Build.log'\n"); if ($TA->GetFile("Build.log", "$TaskDir/log")) { - my ($Result, $_Type) = ParseTaskLog("$TaskDir/log"); - if ($Result eq "ok") + my $Summary = ParseTaskLog("$TaskDir/log"); + if ($Summary->{Task} eq "ok") { # We must have gotten the full log and the build did succeed. # So forget any prior error. $NewStatus = "completed"; $TAError = $ErrMessage = undef; } - elsif ($Result eq "badpatch") + elsif ($Summary->{Task} eq "badpatch") { # This too is conclusive enough to ignore other errors. $NewStatus = "badpatch"; $TAError = $ErrMessage = undef; } - elsif ($Result =~ s/^nolog://) + elsif ($Summary->{NoLog}) { - FatalError("$Result\n", "retry"); + FatalError("$Summary->{NoLog}\n", "retry"); } else { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index bad5f76..ed3dd90 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -391,17 +391,17 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Reconfig.log'\n"); if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) { - my ($Result, $_Type) = ParseTaskLog("$TaskDir/log"); - if ($Result eq "ok") + my $Summary = ParseTaskLog("$TaskDir/log"); + if ($Summary->{Task} eq "ok") { # We must have gotten the full log and the build did succeed. # So forget any prior error. $NewStatus = "completed"; $TAError = $ErrMessage = undef; } - elsif ($Result =~ s/^nolog://) + elsif ($Summary->{NoLog}) { - FatalError("$Result\n", "retry"); + FatalError("$Summary->{NoLog}\n", "retry"); } else { diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 508605b..514c57c 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -512,8 +512,8 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); if ($TA->GetFile("Task.log", "$TaskDir/log")) { - my ($Result, $Type) = ParseTaskLog("$TaskDir/log"); - if ($Result eq "ok") + my $Summary = ParseTaskLog("$TaskDir/log"); + if ($Summary->{Task} eq "ok") { # We must have gotten the full log and the task completed successfully # (with or without test failures). So clear any previous errors, including @@ -521,17 +521,17 @@ if ($TA->GetFile("Task.log", "$TaskDir/log")) $NewStatus = "completed"; $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; } - elsif ($Result eq "badpatch") + elsif ($Summary->{Task} eq "badpatch") { # This too is conclusive enough to ignore other errors. $NewStatus = "badpatch"; $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; } - elsif ($Result =~ s/^nolog://) + elsif ($Summary->{NoLog}) { - FatalError("$Result\n", "retry"); + FatalError("$Summary->{NoLog}\n", "retry"); } - elsif ($Type eq "build") + elsif ($Summary->{Type} eq "build") { # The error happened before the tests started so blame the build. $NewStatus = "badbuild"; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 21f7dd0..a18c463 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -69,7 +69,17 @@ sub _IsPerlError($) =item C<ParseTaskLog()> -Returns ok if the task was successful and an error code otherwise. +Returns a hashtable containing a summary of the task log: +=over + +=item Type +'tests' if the task ran Wine tests and 'build' otherwise. + +=item Task +Either 'ok' if the task was successful or a code indicating why it failed. + +=item NoLog +Contains an error message if the task log could not be read. =back =cut @@ -80,33 +90,33 @@ sub ParseTaskLog($) if (open(my $LogFile, "<", $FileName)) { - my $Result; - my $Type = "build"; + my $Summary = {Type => "build"}; foreach my $Line (<$LogFile>) { chomp $Line; if ($Line eq "Task: tests") { - $Type = "tests"; + $Summary->{Type} = "tests"; } elsif ($Line eq "Task: ok") { - $Result ||= "ok"; + $Summary->{Task} ||= "ok"; } elsif ($Line eq "Task: Patch failed to apply") { - $Result = "badpatch"; + $Summary->{Task} = "badpatch"; last; # Should be the last and most specific message } elsif ($Line =~ /^Task: / or _IsPerlError($Line)) { - $Result = "failed"; + $Summary->{Task} = "failed"; } } close($LogFile); - return ($Result || "missing", $Type); + $Summary->{Task} ||= "missing"; + return $Summary; } - return ("nolog:Unable to open the task log for reading: $!", undef); + return {NoLog => "Unable to open the task log for reading: $!"}; }

1 0

Francois Gouget : testbot/TestAgent: Fix handling of connection timeouts.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: tools Branch: master Commit: a47a8ac5a1bdafee182e1e6814d5d30f9de4146e URL: https://source.winehq.org/git/tools.git/?a=commit;h=a47a8ac5a1bdafee182e1e6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 17 12:34:47 2019 +0200 testbot/TestAgent: Fix handling of connection timeouts. $@ does not just contain the die string we provided but also where die was called. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index a4a2f49..d3d7137 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -938,7 +938,7 @@ sub _Connect($) if ($@) { - if ($@ eq "timeout") + if ($@ =~ /^timeout /) { $self->_SetError($FATAL, "Timed out in $Step while connecting to $self->{connection}"); }

1 0

Francois Gouget : testbot/Engine: Ignore ChildPid & ChildDeadline for maintenance VMs.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: tools Branch: master Commit: 30c30200c7caff683b0c93455212d4390dd0137e URL: https://source.winehq.org/git/tools.git/?a=commit;h=30c30200c7caff683b0c934… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 17 12:35:15 2019 +0200 testbot/Engine: Ignore ChildPid & ChildDeadline for maintenance VMs. For debugging it is useful to set a VM in maintenance mode and then manually run scripts operating on that VM. When doing so ChildPid is undefined since it is normally set by the Engine when starting the script. But the scripts may modify other VM fields, including ChildDeadline. But when the Scheduler sees such a 'left-over' ChildDeadline field it normally marks the VM as dirty and powers it off, thus interfering with the script being tested. So modify the Scheduler to ignore ChildDeadline for maintenance VMs whether for cleanup or to compute when to reschedule next. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 3ec51d2..569dff7 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -350,8 +350,13 @@ sub _CheckAndClassifyVMs() } else { - if (defined $VM->ChildPid or defined $VM->ChildDeadline or - $VM->Status =~ /^(?:running|reverting|sleeping)$/) + if ($VM->Status eq "maintenance") + { + # Don't touch the VM while the administrator is working on it + $Sched->{busyvms}->{$VMKey} = 1; + } + elsif (defined $VM->ChildPid or defined $VM->ChildDeadline or + $VM->Status =~ /^(?:running|reverting|sleeping)$/) { # The VM is missing its child process or it died unexpectedly. Mark # the VM dirty so a revert or shutdown brings it back to a known state. @@ -381,11 +386,6 @@ sub _CheckAndClassifyVMs() # Ignore the VM for this round since we cannot use it $Sched->{busyvms}->{$VMKey} = 1; } - elsif ($VM->Status eq "maintenance") - { - # Don't touch the VM while the administrator is working on it - $Sched->{busyvms}->{$VMKey} = 1; - } elsif ($VM->Status ne "off") { LogMsg "Unexpected $VMKey status ". $VM->Status ."\n"; @@ -1025,7 +1025,7 @@ sub ScheduleJobs() $VMs->FilterEnabledRole(); foreach my $VM (@{$VMs->GetItems()}) { - if (defined $VM->ChildDeadline and + if ($VM->Status ne "maintenance" and defined $VM->ChildDeadline and (!defined $FirstDeadline or $VM->ChildDeadline < $FirstDeadline)) { $FirstDeadline = $VM->ChildDeadline;

1 0

Francois Gouget : testbot/WineRunReconfig: Simplify retrieving the latest reference files.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: tools Branch: master Commit: 59dadc0f2c5c90fba9439e68205353b71a4b576f URL: https://source.winehq.org/git/tools.git/?a=commit;h=59dadc0f2c5c90fba9439e6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 17 12:35:41 2019 +0200 testbot/WineRunReconfig: Simplify retrieving the latest reference files. Both the build and wine VMs produce the native TestLauncher binaries now. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index ed3dd90..d0baccc 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -40,6 +40,7 @@ sub BEGIN my $Name0 = $0; $Name0 =~ s+^.*/++; +use File::Basename; use WineTestBot::Config; use WineTestBot::Jobs; @@ -428,32 +429,20 @@ FatalTAError(undef, $TAError) if (defined $TAError); if ($NewStatus eq "completed") { use File::Copy; - if ($VM->Type eq "build") + foreach my $FileName ("../src/TestLauncher/TestLauncher32.exe", + "../src/TestLauncher/TestLauncher64.exe", + "latest/winefiles.txt", + "latest/wine-parentsrc.txt") { - for my $Bitness ("32", "64") + my $BaseName = basename($FileName); + Debug(Elapsed($Start), " Retrieving '$TaskDir/$BaseName'\n"); + if ($TA->GetFile($FileName, "$TaskDir/$BaseName")) { - Debug(Elapsed($Start), " Retrieving the $Bitness bit TestLauncher to '$TaskDir/TestLauncher$Bitness.exe'\n"); - if ($TA->GetFile("../src/TestLauncher/TestLauncher$Bitness.exe", "$TaskDir/TestLauncher$Bitness.exe")) - { - copy "$TaskDir/TestLauncher$Bitness.exe", "$DataDir/latest/TestLauncher$Bitness.exe"; - } - elsif (!defined $TAError) - { - FatalTAError($TA, "An error occurred while retrieving the $Bitness bit TestLauncher"); - } - } - } - - foreach my $FileName ("winefiles.txt", "wine-parentsrc.txt") - { - Debug(Elapsed($Start), " Retrieving '$TaskDir/$FileName'\n"); - if ($TA->GetFile("latest/$FileName", "$TaskDir/$FileName")) - { - copy "$TaskDir/$FileName", "$DataDir/latest/$FileName"; + copy "$TaskDir/$BaseName", "$DataDir/latest/$BaseName"; } elsif (!defined $TAError) { - FatalTAError($TA, "An error occurred while retrieving '$TaskDir/$FileName'"); + FatalTAError($TA, "An error occurred while retrieving '$TaskDir/$BaseName'"); } } }

1 0