February 2020 - Wine-commits

Zebediah Figura : qasf/dmowrapper: Add an initial implementation of IDMOWrapperFilter::Init().
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 93767b3ed9a32785914632652e99c61d97194a6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=93767b3ed9a3278591463265… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 17 17:30:59 2020 -0600 qasf/dmowrapper: Add an initial implementation of IDMOWrapperFilter::Init(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/Makefile.in | 2 +- dlls/qasf/dmowrapper.c | 26 +++- dlls/qasf/tests/Makefile.in | 2 +- dlls/qasf/tests/dmowrapper.c | 307 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 332 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=93767b3ed9a327859146…

1 0

Sven Baars : gdi32/tests: Add some more GetCharacterPlacement tests.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 7ef3d8015a56f2d4ac31939e5fd9d26956e94c9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ef3d8015a56f2d4ac31939e… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Feb 17 16:28:51 2020 +0100 gdi32/tests: Add some more GetCharacterPlacement tests. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ea1bb960df..c96d8b1b56 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4926,6 +4926,7 @@ static void test_GetCharacterPlacement(void) GCP_RESULTSA result; DWORD size, size2; WCHAR glyphs[20]; + int pos[20]; HDC hdc; hdc = CreateCompatibleDC(0); @@ -4933,11 +4934,26 @@ static void test_GetCharacterPlacement(void) memset(&result, 0, sizeof(result)); result.lStructSize = sizeof(result); + result.lpCaretPos = pos; result.lpGlyphs = glyphs; result.nGlyphs = 20; + pos[0] = -1; + glyphs[0] = '!'; size = GetCharacterPlacementA(hdc, "Wine Test", 9, 0, &result, 0); ok(size, "GetCharacterPlacementA failed!\n"); + ok(result.nGlyphs == 9, "Unexpected number of glyphs %u\n", result.nGlyphs); + ok(glyphs[0] == 'W', "Unexpected first glyph %s\n", wine_dbgstr_wn(glyphs, 1)); + ok(pos[0] == 0, "Unexpected caret position %d\n", pos[0]); + + pos[0] = -1; + glyphs[0] = '!'; + result.nGlyphs = 20; + size2 = GetCharacterPlacementA(hdc, "Wine Test", 0, 0, &result, 0); + ok(!size2, "Expected GetCharacterPlacementA to fail\n"); + todo_wine ok(result.nGlyphs == 20, "Unexpected number of glyphs %u\n", result.nGlyphs); + ok(glyphs[0] == '!', "Unexpected first glyph %s\n", wine_dbgstr_wn(glyphs, 1)); + todo_wine ok(pos[0] == -1, "Unexpected caret position %d\n", pos[0]); size2 = GetCharacterPlacementA(hdc, "Wine Test", 9, 0, NULL, 0); ok(size2, "GetCharacterPlacementA failed!\n"); @@ -4947,9 +4963,15 @@ static void test_GetCharacterPlacement(void) ok(size2, "GetCharacterPlacementA failed!\n"); ok(size == size2, "GetCharacterPlacementA returned different result: %u vs %u\n", size2, size); + pos[0] = -1; + glyphs[0] = '!'; + result.nGlyphs = 20; size = GetCharacterPlacementA(hdc, "Wine Test", 9, 1024, &result, GCP_REORDER); ok(size, "GetCharacterPlacementA failed!\n"); ok(size == size2, "GetCharacterPlacementA returned different result: %u vs %u\n", size2, size); + ok(result.nGlyphs == 9, "Unexpected number of glyphs %u\n", result.nGlyphs); + ok(glyphs[0] == 'W', "Unexpected first glyph %s\n", wine_dbgstr_wn(glyphs, 1)); + todo_wine ok(pos[0] == 0, "Unexpected caret position %d\n", pos[0]); DeleteDC(hdc); }

1 0

Sven Baars : gdi32: Handle 0 count in GetCharacterPlacementW.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 3c49e3e4c7dd3c483d032cf2ac774abca75ec821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c49e3e4c7dd3c483d032cf2… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Feb 17 16:28:52 2020 +0100 gdi32: Handle 0 count in GetCharacterPlacementW. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 3 +++ dlls/gdi32/tests/font.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d451f30c3e..8788426a2c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3313,6 +3313,9 @@ GetCharacterPlacementW( TRACE("%s, %d, %d, 0x%08x\n", debugstr_wn(lpString, uCount), uCount, nMaxExtent, dwFlags); + if (!uCount) + return 0; + if (!lpResults) return GetTextExtentPoint32W(hdc, lpString, uCount, &size) ? MAKELONG(size.cx, size.cy) : 0; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index c96d8b1b56..bc07f11b2c 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4951,9 +4951,9 @@ static void test_GetCharacterPlacement(void) result.nGlyphs = 20; size2 = GetCharacterPlacementA(hdc, "Wine Test", 0, 0, &result, 0); ok(!size2, "Expected GetCharacterPlacementA to fail\n"); - todo_wine ok(result.nGlyphs == 20, "Unexpected number of glyphs %u\n", result.nGlyphs); + ok(result.nGlyphs == 20, "Unexpected number of glyphs %u\n", result.nGlyphs); ok(glyphs[0] == '!', "Unexpected first glyph %s\n", wine_dbgstr_wn(glyphs, 1)); - todo_wine ok(pos[0] == -1, "Unexpected caret position %d\n", pos[0]); + ok(pos[0] == -1, "Unexpected caret position %d\n", pos[0]); size2 = GetCharacterPlacementA(hdc, "Wine Test", 9, 0, NULL, 0); ok(size2, "GetCharacterPlacementA failed!\n");

1 0

Roman Pišl : ole32: Avoid calling QueryContinueDrag recursively.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 808d8b87a040e4de44e2691d3a9e29f871616ca0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=808d8b87a040e4de44e2691d… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Feb 17 23:59:38 2020 +0100 ole32: Avoid calling QueryContinueDrag recursively. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48569 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 11 ++++++++++ dlls/ole32/tests/dragdrop.c | 53 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 53 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 757458ad20..6653fac342 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -62,6 +62,7 @@ typedef struct tagTrackerWindowInfo DWORD dwOKEffect; DWORD* pdwEffect; BOOL trackingDone; + BOOL inTrackCall; HRESULT returnValue; BOOL escPressed; @@ -766,6 +767,7 @@ HRESULT WINAPI DoDragDrop ( trackerInfo.dwOKEffect = dwOKEffect; trackerInfo.pdwEffect = pdwEffect; trackerInfo.trackingDone = FALSE; + trackerInfo.inTrackCall = FALSE; trackerInfo.escPressed = FALSE; trackerInfo.curTargetHWND = 0; trackerInfo.curDragTarget = 0; @@ -2284,6 +2286,13 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) HWND hwndNewTarget = 0; POINT pt; + /* + * This method may be called from QueryContinueDrag again, + * (i.e. by running message loop) so avoid recursive call chain. + */ + if (trackerInfo->inTrackCall) return; + trackerInfo->inTrackCall = TRUE; + /* * Get the handle of the window under the mouse */ @@ -2329,6 +2338,8 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) } else drag_end( trackerInfo ); + + trackerInfo->inTrackCall = FALSE; } /*** diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 77e47d723d..62ac15d8fc 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -260,6 +260,7 @@ struct method_call call_lists[][30] = }; static int droptarget_refs; +static int test_reentrance; /* helper macros to make tests a bit leaner */ #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -359,7 +360,34 @@ static HRESULT WINAPI DropSource_QueryContinueDrag( BOOL fEscapePressed, DWORD grfKeyState) { - return check_expect(DS_QueryContinueDrag, 0, NULL); + HRESULT hr = check_expect(DS_QueryContinueDrag, 0, NULL); + if (test_reentrance) + { + MSG msg; + BOOL r; + int num = 0; + + HWND hwnd = GetCapture(); + ok(hwnd != 0, "Expected capture window\n"); + + /* send some fake events that should be ignored */ + r = PostMessageA(hwnd, WM_MOUSEMOVE, 0, 0); + r &= PostMessageA(hwnd, WM_LBUTTONDOWN, 0, 0); + r &= PostMessageA(hwnd, WM_LBUTTONUP, 0, 0); + r &= PostMessageA(hwnd, WM_KEYDOWN, VK_ESCAPE, 0); + ok(r, "Unable to post messages\n"); + + /* run the message loop for this thread */ + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + num++; + } + + ok(num >= 4, "Expected at least 4 messages but %d were processed\n", num); + } + return hr; } static HRESULT WINAPI DropSource_GiveFeedback( @@ -701,17 +729,20 @@ static void test_DoDragDrop(void) GetWindowRect(hwnd, &rect); ok(SetCursorPos(rect.left+50, rect.top+50), "SetCursorPos failed\n"); - for (seq = 0; seq < ARRAY_SIZE(call_lists); seq++) + for (test_reentrance = 0; test_reentrance < 2; test_reentrance++) { - DWORD effect_in; - trace("%d\n", seq); - call_ptr = call_lists[seq]; - effect_in = call_ptr->set_param; - call_ptr++; - - hr = DoDragDrop(&DataObject, &DropSource, effect_in, &effect); - check_expect(DoDragDrop_ret, hr, NULL); - check_expect(DoDragDrop_effect_out, effect, NULL); + for (seq = 0; seq < ARRAY_SIZE(call_lists); seq++) + { + DWORD effect_in; + trace("%d\n", seq); + call_ptr = call_lists[seq]; + effect_in = call_ptr->set_param; + call_ptr++; + + hr = DoDragDrop(&DataObject, &DropSource, effect_in, &effect); + check_expect(DoDragDrop_ret, hr, NULL); + check_expect(DoDragDrop_effect_out, effect, NULL); + } } OleUninitialize();

1 0

Alexandre Julliard : unicode: Use the standard compression function for the casemap table.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: b507fe49ea66dda809b53102b05bf2383a01d727 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b507fe49ea66dda809b53102… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 18 11:14:58 2020 +0100 unicode: Use the standard compression function for the casemap table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/casemap.c | 724 +++++++++++++++++++++++----------------------------- tools/make_unicode | 55 +--- 2 files changed, 326 insertions(+), 453 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b507fe49ea66dda809b5…

1 0

Alexandre Julliard : wine.inf: Add registry keys for normalization forms.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: c388ad357a3e54fe6526ab9af4abf2aed530a649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c388ad357a3e54fe6526ab9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 18 11:23:28 2020 +0100 wine.inf: Add registry keys for normalization forms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 2 ++ loader/wine.inf.in | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 27dceaf8e7..07cf54576c 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -407,6 +407,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) static const WCHAR normnfdW[] = {'n','o','r','m','n','f','d','.','n','l','s',0}; static const WCHAR normnfkcW[] = {'n','o','r','m','n','f','k','c','.','n','l','s',0}; static const WCHAR normnfkdW[] = {'n','o','r','m','n','f','k','d','.','n','l','s',0}; + static const WCHAR normidnaW[] = {'n','o','r','m','i','d','n','a','.','n','l','s',0}; DWORD size; HANDLE handle; @@ -471,6 +472,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) case NormalizationD: name = normnfdW; break; case NormalizationKC: name = normnfkcW; break; case NormalizationKD: name = normnfkdW; break; + case 13: name = normidnaW; break; } break; } diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1b5c6ba95c..3a73f1fd04 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -1153,6 +1153,12 @@ HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00021004",,"a" HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00021404",,"9" HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00030404",,"9" +HKLM,System\CurrentControlSet\Control\Nls\Normalization,"1",,"normnfc.nls" +HKLM,System\CurrentControlSet\Control\Nls\Normalization,"2",,"normnfd.nls" +HKLM,System\CurrentControlSet\Control\Nls\Normalization,"5",,"normnfkc.nls" +HKLM,System\CurrentControlSet\Control\Nls\Normalization,"6",,"normnfkd.nls" +HKLM,System\CurrentControlSet\Control\Nls\Normalization,"d",,"normidna.nls" + [OLE] HKLM,"Software\Microsoft\OLE","EnableDCOM",,"Y" HKLM,"Software\Microsoft\OLE","EnableRemoteConnect",,"N"

1 0

Alexandre Julliard : kernel32/tests: Add more normalization tests.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 84b05383bb5f5253525e80183f9067cc90ff4469 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84b05383bb5f5253525e8018… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 18 19:59:16 2020 +0100 kernel32/tests: Add more normalization tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 67b1982395..097cd1fcb4 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -6104,6 +6104,14 @@ static void test_NormalizeString(void) ok( str_cmp == 0, "%s:%d: string incorrect got %s expect %s\n", wine_dbgstr_w(ptest->str), i, wine_dbgstr_w(dst), wine_dbgstr_w(ptest->expected[i]) ); ret = FALSE; + status = pRtlIsNormalizedString( norm_forms[i], ptest->str, -1, &ret ); + todo_wine ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); + if (!wcscmp( ptest->str, dst )) + todo_wine + ok( ret, "%s:%d: not normalized\n", wine_dbgstr_w(ptest->str), i ); + else + ok( !ret, "%s:%d: normalized (dst %s)\n", wine_dbgstr_w(ptest->str), i, wine_dbgstr_w(dst) ); + ret = FALSE; status = pRtlIsNormalizedString( norm_forms[i], dst, dstlen, &ret ); todo_wine ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); todo_wine ok( ret, "%s:%d: not normalized\n", wine_dbgstr_w(ptest->str), i ); @@ -6301,7 +6309,7 @@ static void test_NormalizeString(void) { char *p, buffer[1024]; WCHAR str[3], srcW[32], dstW[32], resW[4][32]; - int i, line = 0, part = 0, ch; + int line = 0, part = 0, ch; char tested[0x110000 / 8]; while (fgets( buffer, sizeof(buffer), f )) @@ -6334,6 +6342,28 @@ static void test_NormalizeString(void) ok( !wcscmp( dstW, resW[i] ), "line %u form %u: wrong result %s for %s expected %s\n", line, i, wine_dbgstr_w( dstW ), wine_dbgstr_w( srcW ), wine_dbgstr_w( resW[i] )); + + ret = FALSE; + status = pRtlIsNormalizedString( norm_forms[i], srcW, -1, &ret ); + ok( !status, "line %u form %u: RtlIsNormalizedString failed %x\n", line, i, status ); + if (!wcscmp( srcW, dstW )) + ok( ret, "line %u form %u: source not normalized %s\n", line, i, wine_dbgstr_w(srcW) ); + else + ok( !ret, "line %u form %u: source normalized %s\n", line, i, wine_dbgstr_w(srcW) ); + ret = FALSE; + status = pRtlIsNormalizedString( norm_forms[i], dstW, -1, &ret ); + ok( !status, "line %u form %u: RtlIsNormalizedString failed %x\n", line, i, status ); + ok( ret, "line %u form %u: dest not normalized %s\n", line, i, wine_dbgstr_w(dstW) ); + + for (j = 0; j < 4; j++) + { + int expect = i | (j & 2); + memset( dstW, 0xcc, sizeof(dstW) ); + dstlen = pNormalizeString( norm_forms[i], resW[j], -1, dstW, ARRAY_SIZE(dstW) ); + ok( !wcscmp( dstW, resW[expect] ), + "line %u form %u res %u: wrong result %s for %s expected %s\n", line, i, j, + wine_dbgstr_w( dstW ), wine_dbgstr_w( resW[j] ), wine_dbgstr_w( resW[expect] )); + } } } fclose( f );

1 0

Zebediah Figura : d3d9: Retrieve the material from the primary stateblock.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 85b6123c81719b4cd3c9bd41016a059709a213f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85b6123c81719b4cd3c9bd41… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 17 17:19:50 2020 -0600 d3d9: Retrieve the material from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 447aa26844..802a974f34 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2208,7 +2208,7 @@ static HRESULT WINAPI d3d9_device_GetMaterial(IDirect3DDevice9Ex *iface, D3DMATE /* Note: D3DMATERIAL9 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); - wined3d_device_get_material(device->wined3d_device, (struct wined3d_material *)material); + memcpy(material, &wined3d_stateblock_get_state(device->state)->material, sizeof(*material)); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetMaterial().
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 824e27090f3f3bdd1e09837c2c8b47c9946ca05f URL: https://source.winehq.org/git/wine.git/?a=commit;h=824e27090f3f3bdd1e09837c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 17 17:19:51 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetMaterial(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 802a974f34..ac03c7e241 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2193,8 +2193,6 @@ static HRESULT WINAPI d3d9_device_SetMaterial(IDirect3DDevice9Ex *iface, const D /* Note: D3DMATERIAL9 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); wined3d_stateblock_set_material(device->update_state, (const struct wined3d_material *)material); - if (!device->recording) - wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); wined3d_mutex_unlock(); return D3D_OK;

1 0

Francois Gouget : testbot/UpdateTaskLogs: Fix moving reference reports to latest/.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: tools Branch: master Commit: b2c3783a8f411441e12bb09a001037eb80df2407 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b2c3783a8f411441e12bb09… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 18 17:31:20 2020 +0100 testbot/UpdateTaskLogs: Fix moving reference reports to latest/. When saving an existing reference report from a task directory to the latest/ directory, its file name should be preserved to avoid duplicating it. This means UpdateLatestReport() should not rebuild it from scratch. Fortunately this bug has been hidden so far because GetRefReportName() does not yet depend on the Task's job id. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index d29b42a..395c202 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -234,7 +234,7 @@ sub DoUpdateLatestReport($$$) # Add the reference report to latest/ Debug("latest: Adding $RefReportName from ". Path2TaskKey($SrcReportPath) ."\n"); - my $ErrMessages = UpdateLatestReport($Task, $ReportName, $SrcReportPath); + my $ErrMessages = UpdateLatestReport($RefReportName, $SrcReportPath); foreach my $ErrMessage (@$ErrMessages) { Error "$ErrMessage\n"; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 601ff0f..dc2acca 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1225,12 +1225,11 @@ sub SnapshotLatestReport($$) return \@ErrMessages; } -sub UpdateLatestReport($$$) +sub UpdateLatestReport($$) { - my ($Task, $ReportName, $SrcReportPath) = @_; + my ($RefReportName, $SrcReportPath) = @_; my @ErrMessages; - my $RefReportName = $Task->GetRefReportName($ReportName); foreach my $Suffix ("", ".errors") { # Add the new reference file even if it is empty. @@ -1272,7 +1271,8 @@ sub UpdateLatestReports($$) foreach my $ReportName (@$ReportNames) { next if (!-f "$TaskDir/$ReportName" or -z _); - push @ErrMessages, @{UpdateLatestReport($Task, $ReportName, "$TaskDir/$ReportName")}; + my $RefReportName = $Task->GetRefReportName($ReportName); + push @ErrMessages, @{UpdateLatestReport($RefReportName, "$TaskDir/$ReportName")}; } return \@ErrMessages; }

1 0