February 2020 - Wine-Commits

Alexandre Julliard : wine.inf: Add registry keys for normalization forms.
by Alexandre Julliard Feb. 18, 2020

Feb. 18, 2020

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 : unicode: Use the standard compression function for the casemap table.
by Alexandre Julliard Feb. 18, 2020

Feb. 18, 2020

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

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

Feb. 18, 2020

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

Zebediah Figura : include: Add IDMOQualityControl and IDMOVideoOutputOptimizations.
by Alexandre Julliard Feb. 18, 2020

Feb. 18, 2020

Module: wine Branch: master Commit: 3f3fb557d274a3444117ebe7890d4949f2f53578 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f3fb557d274a3444117ebe7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 17 17:30:56 2020 -0600 include: Add IDMOQualityControl and IDMOVideoOutputOptimizations. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mediaobj.idl | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/include/mediaobj.idl b/include/mediaobj.idl index 7759921485..793e1bcf8e 100644 --- a/include/mediaobj.idl +++ b/include/mediaobj.idl @@ -21,9 +21,6 @@ import "unknwn.idl"; import "objidl.idl"; import "strmif.idl"; -interface IDMOQualityControl; -interface IDMOVideoOutputOptimizations; - typedef struct _DMOMediaType { GUID majortype; @@ -252,3 +249,38 @@ interface IMediaObjectInPlace : IUnknown { [out] REFERENCE_TIME *pLatencyTime ); } + +enum _DMO_QUALITY_STATUS_FLAGS +{ + DMO_QUALITY_STATUS_ENABLED = 0x00000001, +}; + +[ + object, + uuid(65abea96-cf36-453f-af8a-705e98f16260), + local +] +interface IDMOQualityControl : IUnknown +{ + HRESULT SetNow([in] REFERENCE_TIME now); + HRESULT SetStatus([in] DWORD flags); + HRESULT GetStatus([out] DWORD *flags); +} + +enum _DMO_VIDEO_OUTPUT_STREAM_FLAGS +{ + DMO_VOSF_NEEDS_PREVIOUS_SAMPLE = 0x00000001, +}; + +[ + object, + uuid(be8f4f4e-5b16-4d29-b350-7f6b5d9298ac), + local +] +interface IDMOVideoOutputOptimizations : IUnknown +{ + HRESULT QueryOperationModePreferences(ULONG index, DWORD *flags); + HRESULT SetOperationMode(ULONG index, DWORD flags); + HRESULT GetCurrentOperationMode(ULONG index, DWORD *flags); + HRESULT GetCurrentSampleRequirements(ULONG index, DWORD *flags); +}

1 0

Liam Middlebrook : winevulkan: Fix two spelling errors in make_vulkan.
by Alexandre Julliard Feb. 18, 2020

Feb. 18, 2020

Module: wine Branch: master Commit: 35a0154eba4d4605b99e1b46789d00622236bc37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35a0154eba4d4605b99e1b46… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Feb 17 15:14:52 2020 -0800 winevulkan: Fix two spelling errors in make_vulkan. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Robert Morell <rmorell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 52ef25948c..3593410041 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -296,7 +296,7 @@ class VkDefine(object): # Perform minimal parsing for Vulkan constants, which we don't need, but are referenced # elsewhere in vk.xml. # - VK_API_VERSION is a messy, deprecated constant and we don't want generate code for it. - # - AHardwareBuffer/ANativeWindow are forard declarations for Android types, which leaked + # - AHardwareBuffer/ANativeWindow are forward declarations for Android types, which leaked # into the define region. if name in ["VK_API_VERSION", "AHardwareBuffer", "ANativeWindow", "CAMetalLayer"]: return VkDefine(name, None) @@ -2729,7 +2729,7 @@ class VkRegistry(object): VkRegistry._require_type(member.type_info["data"]) def _parse_extensions(self, root): - """ Parse extensions section and pull in any types and commands for this extensioin. """ + """ Parse extensions section and pull in any types and commands for this extension. """ extensions = [] exts = root.findall("./extensions/extension") for ext in exts:

1 0

Zebediah Figura : qasf/dmowrapper: Add a stub IDMOWrapperFilter interface.
by Alexandre Julliard Feb. 18, 2020

Feb. 18, 2020

Module: wine Branch: master Commit: 90af4d2863ef89c5fce61ddd9d1fe08997e6fa37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90af4d2863ef89c5fce61ddd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 17 17:30:58 2020 -0600 qasf/dmowrapper: Add a stub IDMOWrapperFilter interface. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34622 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/dmowrapper.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ dlls/qasf/tests/dmowrapper.c | 2 +- 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index c7c5d3df9e..d4547d4ba3 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qasf); struct dmo_wrapper { struct strmbase_filter filter; + IDMOWrapperFilter IDMOWrapperFilter_iface; }; static inline struct dmo_wrapper *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -32,6 +33,44 @@ static inline struct dmo_wrapper *impl_from_strmbase_filter(struct strmbase_filt return CONTAINING_RECORD(iface, struct dmo_wrapper, filter); } +static inline struct dmo_wrapper *impl_from_IDMOWrapperFilter(IDMOWrapperFilter *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_wrapper, IDMOWrapperFilter_iface); +} + +static HRESULT WINAPI dmo_wrapper_filter_QueryInterface(IDMOWrapperFilter *iface, REFIID iid, void **out) +{ + struct dmo_wrapper *filter = impl_from_IDMOWrapperFilter(iface); + return IUnknown_QueryInterface(filter->filter.outer_unk, iid, out); +} + +static ULONG WINAPI dmo_wrapper_filter_AddRef(IDMOWrapperFilter *iface) +{ + struct dmo_wrapper *filter = impl_from_IDMOWrapperFilter(iface); + return IUnknown_AddRef(filter->filter.outer_unk); +} + +static ULONG WINAPI dmo_wrapper_filter_Release(IDMOWrapperFilter *iface) +{ + struct dmo_wrapper *filter = impl_from_IDMOWrapperFilter(iface); + return IUnknown_Release(filter->filter.outer_unk); +} + +static HRESULT WINAPI dmo_wrapper_filter_Init(IDMOWrapperFilter *iface, REFCLSID clsid, REFCLSID category) +{ + FIXME("iface %p, clsid %s, category %s, stub!\n", + iface, wine_dbgstr_guid(clsid), wine_dbgstr_guid(category)); + return E_NOTIMPL; +} + +static const IDMOWrapperFilterVtbl dmo_wrapper_filter_vtbl = +{ + dmo_wrapper_filter_QueryInterface, + dmo_wrapper_filter_AddRef, + dmo_wrapper_filter_Release, + dmo_wrapper_filter_Init, +}; + static struct strmbase_pin *dmo_wrapper_get_pin(struct strmbase_filter *iface, unsigned int index) { return NULL; @@ -45,10 +84,25 @@ static void dmo_wrapper_destroy(struct strmbase_filter *iface) free(filter); } +static HRESULT dmo_wrapper_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) +{ + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface); + + if (IsEqualGUID(iid, &IID_IDMOWrapperFilter)) + { + *out = &filter->IDMOWrapperFilter_iface; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; + } + + return E_NOINTERFACE; +} + static struct strmbase_filter_ops filter_ops = { .filter_get_pin = dmo_wrapper_get_pin, .filter_destroy = dmo_wrapper_destroy, + .filter_query_interface = dmo_wrapper_query_interface, }; HRESULT dmo_wrapper_create(IUnknown *outer, IUnknown **out) @@ -61,6 +115,8 @@ HRESULT dmo_wrapper_create(IUnknown *outer, IUnknown **out) /* Always pass NULL as the outer object; see test_aggregation(). */ strmbase_filter_init(&object->filter, NULL, &CLSID_DMOWrapperFilter, &filter_ops); + object->IDMOWrapperFilter_iface.lpVtbl = &dmo_wrapper_filter_vtbl; + TRACE("Created DMO wrapper %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 397980b376..e061ca2417 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -62,7 +62,7 @@ static void test_interfaces(void) IBaseFilter *filter = create_dmo_wrapper(); check_interface(filter, &IID_IBaseFilter, TRUE); - todo_wine check_interface(filter, &IID_IDMOWrapperFilter, TRUE); + check_interface(filter, &IID_IDMOWrapperFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); check_interface(filter, &IID_IPersist, TRUE); todo_wine check_interface(filter, &IID_IPersistStream, TRUE);

1 0

Zebediah Figura : qasf: Add a stub DMO wrapper filter.
by Alexandre Julliard Feb. 18, 2020

Feb. 18, 2020

Module: wine Branch: master Commit: dbb53beb86a544f755178bb9b883695894141638 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbb53beb86a544f755178bb9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 17 17:30:57 2020 -0600 qasf: Add a stub DMO wrapper filter. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 + configure.ac | 2 + dlls/qasf/Makefile.in | 11 +++ dlls/qasf/dmowrapper.c | 68 ++++++++++++++++ dlls/qasf/qasf.spec | 4 + dlls/qasf/qasf_classes.idl | 27 +++++++ dlls/qasf/qasf_main.c | 137 ++++++++++++++++++++++++++++++++ dlls/qasf/qasf_private.h | 34 ++++++++ dlls/qasf/tests/Makefile.in | 5 ++ dlls/qasf/tests/dmowrapper.c | 182 +++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 473 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dbb53beb86a544f75517…

1 0

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

Feb. 18, 2020

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 Feb. 18, 2020

Feb. 18, 2020

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

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

Feb. 18, 2020

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