December 2019 - Wine-Commits

Zebediah Figura : strmbase: Don't hold the filter lock while calling IPin::NewSegment().
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: 3b7ce569082e345445d12621ba351bfac8865b28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b7ce569082e345445d12621… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 30 19:48:31 2019 -0600 strmbase: Don't hold the filter lock while calling IPin::NewSegment(). It's not safe to hold the filter lock from a streaming thread, and anyway we aren't protecting anything that needs locking. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index d39dbbd3ab..7650232c44 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -495,12 +495,10 @@ static HRESULT WINAPI TransformFilter_InputPin_NewSegment(IPin * iface, REFERENC TRACE("iface %p, start %s, stop %s, rate %.16e.\n", iface, debugstr_time(tStart), debugstr_time(tStop), dRate); - EnterCriticalSection(&pTransform->filter.csFilter); if (pTransform->pFuncsTable->pfnNewSegment) hr = pTransform->pFuncsTable->pfnNewSegment(pTransform, tStart, tStop, dRate); if (SUCCEEDED(hr)) hr = BaseInputPinImpl_NewSegment(iface, tStart, tStop, dRate); - LeaveCriticalSection(&pTransform->filter.csFilter); return hr; }

1 0

Anastasios Simeonidis : ntdll/tests: Add relationship tests for NtQuerySystemInformationEx.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: 0b6c3a4460e9fbea8d31b40aec084e4ecba55db2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b6c3a4460e9fbea8d31b40a… Author: Anastasios Simeonidis <symeonidis(a)csd.auth.gr> Date: Mon Nov 25 19:42:51 2019 +0200 ntdll/tests: Add relationship tests for NtQuerySystemInformationEx. Signed-off-by: Anastasios Simeonidis <symeonidis(a)csd.auth.gr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 166 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 146 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b6c3a4460e9fbea8d31…

1 0

Zebediah Figura : strmbase/transform: Hold the streaming lock for the entirety of Receive().
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: 3a7f54947e77e6a3bed4f74ae61759f731b1451a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a7f54947e77e6a3bed4f74a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 30 19:48:32 2019 -0600 strmbase/transform: Hold the streaming lock for the entirety of Receive(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 4 ---- dlls/quartz/avidec.c | 22 +++++++++------------- dlls/strmbase/transform.c | 2 +- dlls/winegstreamer/gsttffilter.c | 3 --- 4 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 64e0018980..8eea6ab147 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -66,12 +66,10 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam LONGLONG tStart = -1, tStop = -1, tMed; LONGLONG mtStart = -1, mtStop = -1, mtMed; - EnterCriticalSection(&This->tf.csReceive); hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { ERR("Cannot get pointer to sample data (%x)\n", hr); - LeaveCriticalSection(&This->tf.csReceive); return hr; } @@ -107,7 +105,6 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam if (FAILED(hr)) { ERR("Unable to get delivery buffer (%x)\n", hr); - LeaveCriticalSection(&This->tf.csReceive); return hr; } IMediaSample_SetPreroll(pOutSample, preroll); @@ -224,7 +221,6 @@ error: This->lasttime_real = tStop; This->lasttime_sent = tMed; - LeaveCriticalSection(&This->tf.csReceive); return hr; } diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index cbe109df2b..32969a3473 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -111,12 +111,11 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) LONGLONG tStart, tStop; DWORD flags = 0; - EnterCriticalSection(&This->tf.csReceive); hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { ERR("Cannot get pointer to sample data (%x)\n", hr); - goto error; + return hr; } cbSrcStream = IMediaSample_GetActualDataLength(pSample); @@ -129,7 +128,7 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) hr = BaseOutputPinImpl_GetDeliveryBuffer(&This->tf.source, &pOutSample, NULL, NULL, 0); if (FAILED(hr)) { ERR("Unable to get delivery buffer (%x)\n", hr); - goto error; + return hr; } hr = IMediaSample_SetActualDataLength(pOutSample, 0); @@ -138,13 +137,14 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) hr = IMediaSample_GetPointer(pOutSample, &pbDstStream); if (FAILED(hr)) { ERR("Unable to get pointer to buffer (%x)\n", hr); - goto error; + IMediaSample_Release(pOutSample); + return hr; } cbDstStream = IMediaSample_GetSize(pOutSample); if (cbDstStream < This->pBihOut->biSizeImage) { ERR("Sample size is too small %d < %d\n", cbDstStream, This->pBihOut->biSizeImage); - hr = E_FAIL; - goto error; + IMediaSample_Release(pOutSample); + return E_FAIL; } if (IMediaSample_IsPreroll(pSample) == S_OK) @@ -161,8 +161,8 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) /* Drop sample if it's intended to be dropped */ if (flags & ICDECOMPRESS_HURRYUP) { - hr = S_OK; - goto error; + IMediaSample_Release(pOutSample); + return S_OK; } IMediaSample_SetActualDataLength(pOutSample, This->pBihOut->biSizeImage); @@ -187,11 +187,7 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) ERR("Error sending sample (%x)\n", hr); -error: - if (pOutSample) - IMediaSample_Release(pOutSample); - - LeaveCriticalSection(&This->tf.csReceive); + IMediaSample_Release(pOutSample); return hr; } diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 7650232c44..9e2582a0db 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -82,12 +82,12 @@ static HRESULT WINAPI TransformFilter_Input_Receive(struct strmbase_sink *This, return S_FALSE; } - LeaveCriticalSection(&pTransform->csReceive); if (pTransform->pFuncsTable->pfnReceive) hr = pTransform->pFuncsTable->pfnReceive(pTransform, pInSample); else hr = S_FALSE; + LeaveCriticalSection(&pTransform->csReceive); return hr; } diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index baa4c0c2c5..9ff5f8741d 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -227,7 +227,6 @@ static HRESULT WINAPI Gstreamer_transform_ProcessData(TransformFilter *iface, IM mark_wine_thread(); - EnterCriticalSection(&This->tf.csReceive); IMediaSample_GetPointer(sample, &data); IMediaSample_AddRef(sample); @@ -235,7 +234,6 @@ static HRESULT WINAPI Gstreamer_transform_ProcessData(TransformFilter *iface, IM buf = gst_buffer_new_wrapped_full(0, data, bufsize, 0, bufsize, sample, release_sample_wrapper); if (!buf) { IMediaSample_Release(sample); - LeaveCriticalSection(&This->tf.csReceive); return S_OK; } @@ -259,7 +257,6 @@ static HRESULT WINAPI Gstreamer_transform_ProcessData(TransformFilter *iface, IM GST_BUFFER_FLAG_SET(buf, GST_BUFFER_FLAG_LIVE); if (IMediaSample_IsSyncPoint(sample) != S_OK) GST_BUFFER_FLAG_SET(buf, GST_BUFFER_FLAG_DELTA_UNIT); - LeaveCriticalSection(&This->tf.csReceive); ret = gst_pad_push(This->my_src, buf); if (ret) WARN("Sending returned: %i\n", ret);

1 0

Anastasios Simeonidis : ntdll: Move relationship filtering to create_logical_proc_info.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: 9885b0acbb0c6173a3c9e308503d697fad584cc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9885b0acbb0c6173a3c9e308… Author: Anastasios Simeonidis <symeonidis(a)csd.auth.gr> Date: Mon Nov 25 19:42:52 2019 +0200 ntdll: Move relationship filtering to create_logical_proc_info. Signed-off-by: Anastasios Simeonidis <symeonidis(a)csd.auth.gr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index cdc893b6a2..c4c0ce7506 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1693,7 +1693,7 @@ static BOOL sysfs_count_list_elements(const char *filename, DWORD *result) /* for 'data', max_len is the array count. for 'dataex', max_len is in bytes */ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, - SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **dataex, DWORD *max_len) + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **dataex, DWORD *max_len, DWORD relation) { static const char core_info[] = "/sys/devices/system/cpu/cpu%u/topology/%s"; static const char cache_info[] = "/sys/devices/system/cpu/cpu%u/cache/index%u/%s"; @@ -1704,6 +1704,9 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** char op, name[MAX_PATH]; ULONG_PTR all_cpus_mask = 0; + if (relation != RelationAll) + FIXME("Relationship filtering not implemented: 0x%x\n", relation); + /* On systems with a large number of CPU cores (32 or 64 depending on 32-bit or 64-bit), * we have issues parsing processor information: * - ULONG_PTR masks as used in data structures can't hold all cores. Requires splitting @@ -1913,7 +1916,7 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** #elif defined(__APPLE__) /* for 'data', max_len is the array count. for 'dataex', max_len is in bytes */ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, - SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **dataex, DWORD *max_len) + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **dataex, DWORD *max_len, DWORD relation) { DWORD pkgs_no, cores_no, lcpu_no, lcpu_per_core, cores_per_package, assoc, len = 0; DWORD cache_ctrs[10] = {0}; @@ -1923,6 +1926,9 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** size_t size; DWORD p,i,j,k; + if (relation != RelationAll) + FIXME("Relationship filtering not implemented: 0x%x\n", relation); + lcpu_no = NtCurrentTeb()->Peb->NumberOfProcessors; size = sizeof(pkgs_no); @@ -2048,7 +2054,7 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** } #else static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, - SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **dataex, DWORD *max_len) + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **dataex, DWORD *max_len, DWORD relation) { FIXME("stub\n"); return STATUS_NOT_IMPLEMENTED; @@ -2970,7 +2976,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( break; } - ret = create_logical_proc_info(&buf, NULL, &len); + ret = create_logical_proc_info(&buf, NULL, &len, RelationAll); if( ret != STATUS_SUCCESS ) { RtlFreeHeap(GetProcessHeap(), 0, buf); @@ -3059,9 +3065,6 @@ NTSTATUS WINAPI NtQuerySystemInformationEx(SYSTEM_INFORMATION_CLASS SystemInform break; } - if (*(DWORD*)Query != RelationAll) - FIXME("Relationship filtering not implemented: 0x%x\n", *(DWORD*)Query); - len = 3 * sizeof(*buf); buf = RtlAllocateHeap(GetProcessHeap(), 0, len); if (!buf) @@ -3070,7 +3073,7 @@ NTSTATUS WINAPI NtQuerySystemInformationEx(SYSTEM_INFORMATION_CLASS SystemInform break; } - ret = create_logical_proc_info(NULL, &buf, &len); + ret = create_logical_proc_info(NULL, &buf, &len, *(DWORD*)Query); if (ret != STATUS_SUCCESS) { RtlFreeHeap(GetProcessHeap(), 0, buf); @@ -3082,7 +3085,7 @@ NTSTATUS WINAPI NtQuerySystemInformationEx(SYSTEM_INFORMATION_CLASS SystemInform if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION; else - memcpy( SystemInformation, buf, len); + memcpy(SystemInformation, buf, len); } else ret = STATUS_INFO_LENGTH_MISMATCH;

1 0

Anastasios Simeonidis : ntdll: Implement relationship filtering for create_logical_proc_info on linux.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: 440a06f7f5651c2eac1289778c3e5ce0ac2b9068 URL: https://source.winehq.org/git/wine.git/?a=commit;h=440a06f7f5651c2eac128977… Author: Anastasios Simeonidis <symeonidis(a)csd.auth.gr> Date: Mon Nov 25 19:42:53 2019 +0200 ntdll: Implement relationship filtering for create_logical_proc_info on linux. Also calculate all_cpus_mask on first pass. Signed-off-by: Anastasios Simeonidis <symeonidis(a)csd.auth.gr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 254 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 128 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=440a06f7f5651c2eac12…

1 0

Jactry Zeng : sapi: Implement ISpeechVoice stub.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: 474a20a0b0a315594456aba88e60374e481dd6b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=474a20a0b0a315594456aba8… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Nov 18 10:17:51 2019 +0800 sapi: Implement ISpeechVoice stub. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/Makefile.in | 3 +- dlls/sapi/main.c | 3 + dlls/sapi/sapi_classes.idl | 13 ++ dlls/sapi/sapi_private.h | 1 + dlls/sapi/tests/Makefile.in | 3 +- dlls/sapi/tests/tts.c | 71 ++++++++ dlls/sapi/tts.c | 414 ++++++++++++++++++++++++++++++++++++++++++++ include/sapi.idl | 11 +- 8 files changed, 516 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=474a20a0b0a315594456…

1 0

Zebediah Figura : winegstreamer/gsttffilter: Don't drop the streaming lock in Gstreamer_transform_ProcessEnd().
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: bdc09fb8b42c20f7f732e4e27a81121b1ab651b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdc09fb8b42c20f7f732e4e2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 30 19:48:33 2019 -0600 winegstreamer/gsttffilter: Don't drop the streaming lock in Gstreamer_transform_ProcessEnd(). This sort of reverts 096da45036959e57ae3aa5b0de0c06f69c651788. The deadlock mentioned there is not spelled out in detail, but likely results from the streaming thread trying to acquire the filter lock while a main thread which is holding the filter lock waits for the streaming thread to finish. However, DirectShow documentation (and manual testing) suggests that the correct way to avoid this problem is simply to never take the filter lock from the streaming thread. Since we currently don't do this anymore, it should be safe to reinstate this lock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gsttffilter.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 9ff5f8741d..ee1851dfdc 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -272,9 +272,7 @@ static HRESULT WINAPI Gstreamer_transform_ProcessEnd(TransformFilter *iface) mark_wine_thread(); - LeaveCriticalSection(&This->tf.csReceive); ret = gst_element_set_state(This->filter, GST_STATE_READY); - EnterCriticalSection(&This->tf.csReceive); TRACE("Returned: %i\n", ret); return S_OK; }

1 0

Derek Lesho : winemac: Set the scan code prefix when necessary.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: d5db609c4c9f3439aab22c6bbf207302cc3941fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5db609c4c9f3439aab22c6b… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Nov 12 14:50:17 2019 -0600 winemac: Set the scan code prefix when necessary. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/keyboard.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index aed4ff0d6e..bb408cb20c 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1392,6 +1392,11 @@ UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) break; } } + + /* set scan code prefix */ + if (wMapType == MAPVK_VK_TO_VSC_EX && + (wCode == VK_RCONTROL || wCode == VK_RMENU)) + ret |= 0xe000; break; case MAPVK_VSC_TO_VK: /* scan-code to vkey-code */

1 0

Derek Lesho : wineandroid: Set the scan code prefix when necessary.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: 6da06330876fde9afaf546844518851fc8b67871 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6da06330876fde9afaf54684… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Nov 12 14:50:18 2019 -0600 wineandroid: Set the scan code prefix when necessary. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 2c37c42e0d..a0f3257f74 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -932,6 +932,11 @@ UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) break; } if (code < ARRAY_SIZE( vkey_to_scancode )) ret = vkey_to_scancode[code]; + + /* set scan code prefix */ + if (maptype == MAPVK_VK_TO_VSC_EX && + (code == VK_RCONTROL || code == VK_RMENU)) + ret |= 0xe000; break; case MAPVK_VSC_TO_VK: case MAPVK_VSC_TO_VK_EX:

1 0

Francois Gouget : testbotwinerunreconfig: Fix formatting of a trace.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: tools Branch: master Commit: 00180486a070bd95e3715db9de974752f2f7cb1b URL: https://source.winehq.org/git/tools.git/?a=commit;h=00180486a070bd95e3715db… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 2 13:51:29 2019 +0100 testbotwinerunreconfig: Fix formatting of a trace. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index df8b7df..5c63913 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -503,7 +503,7 @@ if ($NewStatus eq "completed") my $ErrMessage = $TA->GetLastError(); FatalError("Could not connect to the new ". $VM->Name ." TestAgent: $ErrMessage\n"); } - Debug(Elapsed($Start), "Upgraded testagentd to $Version\n"); + Debug(Elapsed($Start), " Upgraded testagentd to $Version\n"); } }

1 0