November 2019 - Wine-devel - list.winehq.org

[PATCH] include: Add more date formatting flags.
by Zhiyi Zhang 27 Nov '19

27 Nov '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/winnls.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnls.h b/include/winnls.h index b233f7f917..c7c2cfb240 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -411,6 +411,8 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define DATE_YEARMONTH 0x08 /* Year/month format */ #define DATE_LTRREADING 0x10 /* Add LTR reading marks */ #define DATE_RTLREADING 0x20 /* Add RTL reading marks */ +#define DATE_AUTOLAYOUT 0x40 /* Add LTR or RTL reading marks automatically */ +#define DATE_MONTHDAY 0x80 /* Month/day format */ #define TIME_FORCE24HOURFORMAT 0x08 /* Always use 24 hour clock */ #define TIME_NOTIMEMARKER 0x04 /* show no AM/PM */ -- 2.24.0

1 0

[PATCH] ntdll: Fix tick count calculation on Mac.
by Chip Davis 27 Nov '19

27 Nov '19

Inspired by a patch by Andrew Eikum. macOS's mach_absolute_time() stops counting when the computer goes to sleep/suspend/hibernate/etc. However, Windows's GetTickCount() does not stop counting. mach_continuous_time() matches Windows's behavior. BSD's CLOCK_MONOTONIC already counts asleep time. Unfortunately, there is no clock source on Linux which does exactly what we want. CLOCK_MONOTONIC_RAW is unaffected by NTP adjustment, but like mach_absolute_time() doesn't keep ticking when the computer is asleep. CLOCK_BOOTTIME does keep ticking, but it is affected by NTP adjustments. CLOCK_MONOTONIC has both problems. What's needed is a CLOCK_BOOTTIME_RAW, which would not be slewed by adjtimex(2) and would count time spent asleep. To avoid issues with skew and performance, this patch falls back to mach_absolute_time() on macOS if mach_continuous_time() is unavailable. Note that mach_continuous_time() was introduced in macOS 10.12, meaning that if the minimum version required is less than that, it will be linked weakly. Therefore we must check that it is nonnull before attempting to call it. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- configure.ac | 1 + dlls/ntdll/time.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index 754dbe8b36e..2a049909a65 100644 --- a/configure.ac +++ b/configure.ac @@ -2206,6 +2206,7 @@ AC_CHECK_FUNCS(\ getopt_long_only \ kqueue \ lstat \ + mach_continuous_time \ pipe2 \ poll \ port_create \ diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 91e5887b879..4e3d5583c7b 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -111,6 +111,10 @@ static inline ULONGLONG monotonic_counter(void) static mach_timebase_info_data_t timebase; if (!timebase.denom) mach_timebase_info( &timebase ); +#ifdef HAVE_MACH_CONTINUOUS_TIME + if (&mach_continuous_time != NULL) + return mach_continuous_time() * timebase.numer / timebase.denom / 100; +#endif return mach_absolute_time() * timebase.numer / timebase.denom / 100; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; -- 2.21.0

2 2

[PATCH v3] comctl32: Improve LISTVIEW_Update?Scroll() a bit.
by Serge Gautherie 27 Nov '19

27 Nov '19

--- Adding '> 0' to 'if (infoPtr->nItemWidth)' is correct, isn't it? Are the two (different) comments correct as they are? --- dlls/comctl32/listview.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index acf6f31..0684d34 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2033,12 +2033,14 @@ static INT LISTVIEW_UpdateHScroll(LISTVIEW_INFO *infoPtr) INT nPerCol = LISTVIEW_GetCountPerColumn(infoPtr); horzInfo.nMax = (infoPtr->nItemCount + nPerCol - 1) / nPerCol; - /* scroll by at least one column per page */ - if(horzInfo.nPage < infoPtr->nItemWidth) - horzInfo.nPage = infoPtr->nItemWidth; - - if (infoPtr->nItemWidth) - horzInfo.nPage /= infoPtr->nItemWidth; + if (infoPtr->nItemWidth > 0) + { + /* scroll by at least one column per page */ + if (horzInfo.nPage <= infoPtr->nItemWidth) + horzInfo.nPage = 1; + else + horzInfo.nPage /= infoPtr->nItemWidth; + } } else if (infoPtr->uView == LV_VIEW_DETAILS) { @@ -2097,13 +2099,15 @@ static INT LISTVIEW_UpdateVScroll(LISTVIEW_INFO *infoPtr) if (infoPtr->uView == LV_VIEW_DETAILS) { vertInfo.nMax = infoPtr->nItemCount; - - /* scroll by at least one page */ - if(vertInfo.nPage < infoPtr->nItemHeight) - vertInfo.nPage = infoPtr->nItemHeight; if (infoPtr->nItemHeight > 0) - vertInfo.nPage /= infoPtr->nItemHeight; + { + /* scroll by at least one page */ + if (vertInfo.nPage <= infoPtr->nItemHeight) + vertInfo.nPage = 1; + else + vertInfo.nPage /= infoPtr->nItemHeight; + } } else if (infoPtr->uView != LV_VIEW_LIST) /* LV_VIEW_ICON, or LV_VIEW_SMALLICON */ { -- 2.10.0.windows.1

1 0

[PATCH v2 1/5] wined3d: Export wined3d_stateblock_init_contained_states().
by Zebediah Figura 27 Nov '19

27 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 2 +- dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.h | 1 + 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 87db701d157..5983281f932 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4131,7 +4131,7 @@ HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device) return WINED3DERR_INVALIDCALL; } - stateblock_init_contained_states(stateblock); + wined3d_stateblock_init_contained_states(stateblock); wined3d_stateblock_decref(device->recording); device->recording = NULL; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 898a4bc93d4..dc714914ec3 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -283,7 +283,7 @@ static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *state memset(states->vs_consts_f, TRUE, sizeof(BOOL) * num_constants); } -void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) +void CDECL wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock) { const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; unsigned int i, j; @@ -2032,7 +2032,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, break; } - stateblock_init_contained_states(stateblock); + wined3d_stateblock_init_contained_states(stateblock); wined3d_stateblock_capture(stateblock); /* According to the tests, stream offset is not updated in the captured state if diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ea04c85d385..29bcd759264 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -262,6 +262,7 @@ @ cdecl wined3d_stateblock_create(ptr long ptr) @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) +@ cdecl wined3d_stateblock_init_contained_states(ptr) @ cdecl wined3d_stateblock_reset(ptr) @ cdecl wined3d_stateblock_set_base_vertex_index(ptr long) @ cdecl wined3d_stateblock_set_blend_factor(ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f6d25aa6d88..8ebf377b114 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3974,8 +3974,6 @@ struct wined3d_stateblock unsigned int num_contained_sampler_states; }; -void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; - void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, const struct wined3d_device *device, DWORD flags) DECLSPEC_HIDDEN; void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fac9eef5be2..37e012b979d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2667,6 +2667,7 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_reset(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_base_vertex_index(struct wined3d_stateblock *stateblock, INT base_index); void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock, -- 2.23.0

4 12

[PATCH] comctl32: Improve LISTVIEW_Update?Scroll() a bit. --- Adding '> 0' to 'if (infoPtr->nItemWidth)' is correct, isn't it? Are the two (different) comments correct as they are?
by Serge Gautherie 27 Nov '19

27 Nov '19

--- dlls/comctl32/listview.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index acf6f31..0684d34 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2033,12 +2033,14 @@ static INT LISTVIEW_UpdateHScroll(LISTVIEW_INFO *infoPtr) INT nPerCol = LISTVIEW_GetCountPerColumn(infoPtr); horzInfo.nMax = (infoPtr->nItemCount + nPerCol - 1) / nPerCol; - /* scroll by at least one column per page */ - if(horzInfo.nPage < infoPtr->nItemWidth) - horzInfo.nPage = infoPtr->nItemWidth; - - if (infoPtr->nItemWidth) - horzInfo.nPage /= infoPtr->nItemWidth; + if (infoPtr->nItemWidth > 0) + { + /* scroll by at least one column per page */ + if (horzInfo.nPage <= infoPtr->nItemWidth) + horzInfo.nPage = 1; + else + horzInfo.nPage /= infoPtr->nItemWidth; + } } else if (infoPtr->uView == LV_VIEW_DETAILS) { @@ -2097,13 +2099,15 @@ static INT LISTVIEW_UpdateVScroll(LISTVIEW_INFO *infoPtr) if (infoPtr->uView == LV_VIEW_DETAILS) { vertInfo.nMax = infoPtr->nItemCount; - - /* scroll by at least one page */ - if(vertInfo.nPage < infoPtr->nItemHeight) - vertInfo.nPage = infoPtr->nItemHeight; if (infoPtr->nItemHeight > 0) - vertInfo.nPage /= infoPtr->nItemHeight; + { + /* scroll by at least one page */ + if (vertInfo.nPage <= infoPtr->nItemHeight) + vertInfo.nPage = 1; + else + vertInfo.nPage /= infoPtr->nItemHeight; + } } else if (infoPtr->uView != LV_VIEW_LIST) /* LV_VIEW_ICON, or LV_VIEW_SMALLICON */ { -- 2.10.0.windows.1

1 0

[PATCH] comctl32: Improve LISTVIEW_Update?Scroll() a bit. --- Adding '> 0' to 'if (infoPtr->nItemWidth)' is correct, isn't it? Are the two (different) comments correct as they are?
by Serge Gautherie 27 Nov '19

27 Nov '19

--- dlls/comctl32/listview.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index acf6f31..45d584b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2033,12 +2033,14 @@ static INT LISTVIEW_UpdateHScroll(LISTVIEW_INFO *infoPtr) INT nPerCol = LISTVIEW_GetCountPerColumn(infoPtr); horzInfo.nMax = (infoPtr->nItemCount + nPerCol - 1) / nPerCol; - /* scroll by at least one column per page */ - if(horzInfo.nPage < infoPtr->nItemWidth) - horzInfo.nPage = infoPtr->nItemWidth; - - if (infoPtr->nItemWidth) - horzInfo.nPage /= infoPtr->nItemWidth; + if (infoPtr->nItemWidth > 0) + { + /* scroll by at least one column per page */ + if (horzInfo.nPage < infoPtr->nItemWidth) + horzInfo.nPage = 1; + else + horzInfo.nPage /= infoPtr->nItemWidth; + } } else if (infoPtr->uView == LV_VIEW_DETAILS) { @@ -2097,13 +2099,15 @@ static INT LISTVIEW_UpdateVScroll(LISTVIEW_INFO *infoPtr) if (infoPtr->uView == LV_VIEW_DETAILS) { vertInfo.nMax = infoPtr->nItemCount; - - /* scroll by at least one page */ - if(vertInfo.nPage < infoPtr->nItemHeight) - vertInfo.nPage = infoPtr->nItemHeight; if (infoPtr->nItemHeight > 0) - vertInfo.nPage /= infoPtr->nItemHeight; + { + /* scroll by at least one page */ + if (vertInfo.nPage < infoPtr->nItemHeight) + vertInfo.nPage = 1; + else + vertInfo.nPage /= infoPtr->nItemHeight; + } } else if (infoPtr->uView != LV_VIEW_LIST) /* LV_VIEW_ICON, or LV_VIEW_SMALLICON */ { -- 2.10.0.windows.1

1 0

[PATCH 2/2] dmime/tests: Add some IDirectMusicSegment_GetTrack() tests
by Michael Stefaniuc 26 Nov '19

26 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/dmime.c | 81 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 3fb0e8afd8..f561eb391e 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -524,6 +524,86 @@ static void test_segment(void) while (IDirectMusicSegment_Release(dms)); } +static void _add_track(IDirectMusicSegment8 *seg, REFCLSID class, const char *name, DWORD group) +{ + IDirectMusicTrack *track; + HRESULT hr; + + hr = CoCreateInstance(class, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, + (void**)&track); + ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", name, hr); + hr = IDirectMusicSegment8_InsertTrack(seg, track, group); + if (group) + ok(hr == S_OK, "Inserting %s failed: %08x, expected S_OK\n", name, hr); + else + ok(hr == E_INVALIDARG, "Inserting %s failed: %08x, expected E_INVALIDARG\n", name, hr); + IDirectMusicTrack_Release(track); +} + +#define add_track(seg, class, group) _add_track(seg, &CLSID_DirectMusic ## class, #class, group) + +static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char *name, DWORD group, + DWORD index) +{ + IDirectMusicTrack *track; + IPersistStream *ps; + CLSID class; + HRESULT hr; + + hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, group, index, &track); + if (!expect) { + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + return; + } + + ok(hr == S_OK, "GetTrack failed: %08x, expected S_OK\n", hr); + hr = IDirectMusicTrack_QueryInterface(track, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, expect), "For group %#x index %u: Expected class %s got %s\n", + group, index, name, wine_dbgstr_guid(&class)); + + IPersistStream_Release(ps); + IDirectMusicTrack_Release(track); +} + +#define expect_track(seg, class, group, index) _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index) + +static void test_track_identify(void) +{ + IDirectMusicSegment8 *seg; + IDirectMusicTrack *track; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegment8, (void**)&seg); + ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + + add_track(seg, LyricsTrack, 0x0); /* failure */ + add_track(seg, LyricsTrack, 0x1); /* idx 0 group 1 */ + add_track(seg, ParamControlTrack, 0x3); /* idx 1 group 1, idx 0 group 2 */ + add_track(seg, SegmentTriggerTrack, 0x2); /* idx 1 group 2 */ + add_track(seg, SeqTrack, 0x1); /* idx 2 group 1 */ + add_track(seg, TempoTrack, 0x7); /* idx 3 group 1, idx 2 group 2, idx 0 group 3 */ + + hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, 0, 0, &track); + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + + expect_track(seg, LyricsTrack, 0x1, 0); + expect_track(seg, ParamControlTrack, 0x1, 1); + expect_track(seg, SeqTrack, 0x1, 2); + expect_track(seg, TempoTrack, 0x1, 3); + _expect_track(seg, NULL, "", 0x1, 4); + expect_track(seg, ParamControlTrack, 0x2, 0); + expect_track(seg, SegmentTriggerTrack, 0x3, 2); /* groups 1+2 combined index */ + expect_track(seg, SeqTrack, 0x3, 3); /* groups 1+2 combined index */ + expect_track(seg, TempoTrack, 0x7, 4); /* groups 1+2+3 combined index */ + expect_track(seg, TempoTrack, 0xffffffff, 4); /* all groups combined index */ + + IDirectMusicSegment8_Release(seg); +} + static void test_track(void) { IDirectMusicTrack *dmt; @@ -956,6 +1036,7 @@ START_TEST(dmime) test_audiopathconfig(); test_graph(); test_segment(); + test_track_identify(); test_track(); test_parsedescriptor(); -- 2.20.1

1 0

[PATCH 1/2] dmime: The group for a track in a segment cannot be zero
by Michael Stefaniuc 26 Nov '19

26 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- This one should be good for regressions... dlls/dmime/segment.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 3c0d4ac567..e3acafe979 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -235,7 +235,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrackGroup(IDirectMusicSegment } static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 *iface, - IDirectMusicTrack *pTrack, DWORD dwGroupBits) + IDirectMusicTrack *pTrack, DWORD group) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); DWORD i = 0; @@ -243,7 +243,10 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; LPDMUS_PRIVATE_SEGMENT_TRACK pNewSegTrack = NULL; - TRACE("(%p, %p, %#x)\n", This, pTrack, dwGroupBits); + TRACE("(%p, %p, %#x)\n", This, pTrack, group); + + if (!group) + return E_INVALIDARG; LIST_FOR_EACH (pEntry, &This->Tracks) { i++; @@ -259,7 +262,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 if (NULL == pNewSegTrack) return E_OUTOFMEMORY; - pNewSegTrack->dwGroupBits = dwGroupBits; + pNewSegTrack->dwGroupBits = group; pNewSegTrack->pTrack = pTrack; IDirectMusicTrack_Init(pTrack, (IDirectMusicSegment *)iface); IDirectMusicTrack_AddRef(pTrack); -- 2.20.1

1 0

[PATCH 1/5] qcap/avico: Call IMemInputPin::Receive() directly.
by Zebediah Figura 26 Nov '19

26 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/avico.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 2e81a6b0c4..f0f60ae439 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -415,6 +415,7 @@ static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMediaSample *pSample) { AVICompressor *This = impl_from_strmbase_pin(&base->pin); + IMemInputPin *meminput = This->source.pMemInputPin; VIDEOINFOHEADER *src_videoinfo; REFERENCE_TIME start, stop; IMediaSample *out_sample; @@ -429,6 +430,12 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia TRACE("(%p)->(%p)\n", base, pSample); + if (!meminput) + { + WARN("Source is not connected, returning VFW_E_NOT_CONNECTED.\n"); + return VFW_E_NOT_CONNECTED; + } + if(!This->hic) { FIXME("Driver not loaded\n"); return E_UNEXPECTED; @@ -490,7 +497,7 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia else IMediaSample_SetMediaTime(out_sample, NULL, NULL); - hres = BaseOutputPinImpl_Deliver(&This->source, out_sample); + hres = IMemInputPin_Receive(meminput, out_sample); if(FAILED(hres)) WARN("Deliver failed: %08x\n", hres); -- 2.24.0

1 4

[PATCH] kernel32/tests: Georgian and Hindi now get a thread codepage of CP_UTF8.
by Francois Gouget 26 Nov '19

26 Nov '19

As returned by a call to GetCPInfoExA(CP_THREAD_ACP...) in Windows 10 >=1809. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- The new behavior seems ok to me so I marked the old one as broken and added a todo_wine. I can reverse this if the old behavior seems better. dlls/kernel32/tests/codepage.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 8fcc575a29e..bb6c09a26d5 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1151,9 +1151,9 @@ static void test_threadcp(void) if (lcids[i].threadcp) ok(cpi.CodePage == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", cpi.CodePage, lcids[i].lcid, lcids[i].threadcp); - else - ok(cpi.CodePage == acp, "wrong codepage %u for lcid %04x, should be %u\n", - cpi.CodePage, lcids[i].lcid, acp); + else todo_wine + ok(broken(cpi.CodePage == acp) || cpi.CodePage == CP_UTF8, "wrong codepage %u for lcid %04x, should be CP_UTF8\n", + cpi.CodePage, lcids[i].lcid); /* WideCharToMultiByte - CP_THREAD_ACP */ num = WideCharToMultiByte(CP_THREAD_ACP, 0, foobarW, -1, NULL, 0, NULL, NULL); -- 2.20.1

2 1