March 2021 - Wine-commits - list.winehq.org

Zebediah Figura : d3d11: Use wined3d_device_context_set_predication().
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: ac0f240ac6f296d915916746c13f503e42fdd9a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac0f240ac6f296d915916746… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 23:16:39 2021 -0500 d3d11: Use wined3d_device_context_set_predication(). 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/d3d11/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4f59a2e41a5..6e0ae6d695b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -879,7 +879,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_GetData(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_immediate_context_SetPredication(ID3D11DeviceContext1 *iface, ID3D11Predicate *predicate, BOOL value) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_query *query; TRACE("iface %p, predicate %p, value %#x.\n", iface, predicate, value); @@ -887,7 +887,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SetPredication(ID3D11Devic query = unsafe_impl_from_ID3D11Query((ID3D11Query *)predicate); wined3d_mutex_lock(); - wined3d_device_set_predication(device->wined3d_device, query ? query->wined3d_query : NULL, value); + wined3d_device_context_set_predication(context->wined3d_context, query ? query->wined3d_query : NULL, value); wined3d_mutex_unlock(); } @@ -2637,7 +2637,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon { wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); } - wined3d_device_set_predication(device->wined3d_device, NULL, FALSE); + wined3d_device_context_set_predication(context->wined3d_context, NULL, FALSE); wined3d_mutex_unlock(); }

1 0

Giovanni Mascellani : mfreadwrite: Unset seeking flag also on SourceStarted and SourceStopped.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: 1a7be75656003f2fe0dfdde609a6ebf7c8bc07cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a7be75656003f2fe0dfdde6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Mar 22 15:59:49 2021 +0100 mfreadwrite: Unset seeking flag also on SourceStarted and SourceStopped. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 2 ++ dlls/mfreadwrite/tests/mfplat.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index cb4166265a0..7ce4674f940 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -550,9 +550,11 @@ static HRESULT source_reader_source_state_handler(struct source_reader *reader, { case MESourceStarted: reader->source_state = SOURCE_STATE_STARTED; + reader->flags &= ~SOURCE_READER_SEEKING; break; case MESourceStopped: reader->source_state = SOURCE_STATE_STOPPED; + reader->flags &= ~SOURCE_READER_SEEKING; break; case MESourceSeeked: reader->flags &= ~SOURCE_READER_SEEKING; diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index c6191767164..25aa29ac272 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -902,6 +902,7 @@ static void test_source_reader_from_media_source(void) IMFAttributes *attributes; ULONG refcount; int i; + PROPVARIANT pos; source = create_test_source(); ok(!!source, "Failed to create test source.\n"); @@ -916,6 +917,11 @@ static void test_source_reader_from_media_source(void) hr = IMFSourceReader_SetStreamSelection(reader, 1, TRUE); ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + pos.vt = VT_I8; + pos.hVal.QuadPart = 0; + hr = IMFSourceReader_SetCurrentPosition(reader, &GUID_NULL, &pos); + ok(hr == S_OK, "Failed to seek to beginning of stream, hr %#x.\n", hr); + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr);

1 0

Jacek Caban : include: Don't default to WINE_NO_NAMELESS_EXTENSION for Wine build.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: b39b9eea39b19a8f91543b8350ed822d0fd9eef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b39b9eea39b19a8f91543b83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 22 18:31:25 2021 +0100 include: Don't default to WINE_NO_NAMELESS_EXTENSION for Wine build. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/Makefile.in | 1 + dlls/combase/Makefile.in | 1 + dlls/d3d11/Makefile.in | 1 + dlls/devenum/Makefile.in | 1 + dlls/dsound/Makefile.in | 1 + dlls/dsound/tests/Makefile.in | 1 + dlls/dwrite/Makefile.in | 1 + dlls/dxdiagn/Makefile.in | 1 + dlls/gdiplus/Makefile.in | 1 + dlls/ieframe/Makefile.in | 1 + dlls/inetcomm/Makefile.in | 1 + dlls/inetcomm/tests/Makefile.in | 1 + dlls/iphlpapi/Makefile.in | 1 + dlls/mfplat/Makefile.in | 1 + dlls/mfreadwrite/Makefile.in | 1 + dlls/mmdevapi/Makefile.in | 1 + dlls/mmdevapi/tests/Makefile.in | 1 + dlls/msi/Makefile.in | 1 + dlls/ole32/Makefile.in | 2 +- dlls/propsys/Makefile.in | 1 + dlls/propsys/tests/Makefile.in | 1 + dlls/qcap/Makefile.in | 1 + dlls/qedit/Makefile.in | 1 + dlls/quartz/Makefile.in | 1 + dlls/sechost/Makefile.in | 1 + dlls/shell32/Makefile.in | 2 +- dlls/shell32/tests/Makefile.in | 1 + dlls/windowscodecs/Makefile.in | 1 + dlls/winealsa.drv/Makefile.in | 1 + dlls/winegstreamer/Makefile.in | 1 + dlls/winepulse.drv/Makefile.in | 1 + dlls/wininet/Makefile.in | 2 +- dlls/wininet/tests/Makefile.in | 1 + dlls/winmm/Makefile.in | 2 +- include/winnt.h | 2 +- programs/services/Makefile.in | 1 + programs/winecfg/Makefile.in | 1 + programs/winemenubuilder/Makefile.in | 1 + 38 files changed, 38 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b39b9eea39b19a8f9154…

1 0

Nikolay Sivov : mfreadwrite/reader: Consider audio block alignment when creating output buffers for the decoder.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: ca143521ed2deaa141fdeb95e151bb276b3105b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca143521ed2deaa141fdeb95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 22 10:33:42 2021 +0300 mfreadwrite/reader: Consider audio block alignment when creating output buffers for the decoder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index ab959c26165..cb4166265a0 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -105,11 +105,17 @@ enum media_stream_flags STREAM_FLAG_PRESENTED = 0x4, /* Set if stream was selected last time Start() was called. */ }; +struct stream_transform +{ + IMFTransform *transform; + unsigned int min_buffer_size; +}; + struct media_stream { IMFMediaStream *stream; IMFMediaType *current; - IMFTransform *decoder; + struct stream_transform decoder; IMFVideoSampleAllocatorEx *allocator; IMFVideoSampleAllocatorNotify notify_cb; unsigned int id; @@ -643,12 +649,13 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s { MFT_OUTPUT_STREAM_INFO stream_info = { 0 }; MFT_OUTPUT_DATA_BUFFER out_buffer; + unsigned int buffer_size; IMFMediaBuffer *buffer; LONGLONG timestamp; DWORD status; HRESULT hr; - if (FAILED(hr = IMFTransform_GetOutputStreamInfo(stream->decoder, 0, &stream_info))) + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(stream->decoder.transform, 0, &stream_info))) { WARN("Failed to get output stream info, hr %#x.\n", hr); return hr; @@ -663,7 +670,9 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s if (FAILED(hr = MFCreateSample(&out_buffer.pSample))) break; - if (FAILED(hr = MFCreateAlignedMemoryBuffer(stream_info.cbSize, stream_info.cbAlignment, &buffer))) + buffer_size = max(stream_info.cbSize, stream->decoder.min_buffer_size); + + if (FAILED(hr = MFCreateAlignedMemoryBuffer(buffer_size, stream_info.cbAlignment, &buffer))) { IMFSample_Release(out_buffer.pSample); break; @@ -673,7 +682,7 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s IMFMediaBuffer_Release(buffer); } - if (FAILED(hr = IMFTransform_ProcessOutput(stream->decoder, 0, 1, &out_buffer, &status))) + if (FAILED(hr = IMFTransform_ProcessOutput(stream->decoder.transform, 0, 1, &out_buffer, &status))) { if (out_buffer.pSample) IMFSample_Release(out_buffer.pSample); @@ -700,7 +709,7 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct LONGLONG timestamp; HRESULT hr; - if (!stream->decoder) + if (!stream->decoder.transform) { timestamp = 0; if (FAILED(IMFSample_GetSampleTime(sample, &timestamp))) @@ -715,7 +724,7 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct hr = source_reader_pull_stream_samples(reader, stream); if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) { - if (FAILED(hr = IMFTransform_ProcessInput(stream->decoder, 0, sample, 0))) + if (FAILED(hr = IMFTransform_ProcessInput(stream->decoder.transform, 0, sample, 0))) { WARN("Transform failed to process input, hr %#x.\n", hr); return hr; @@ -812,7 +821,7 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re stream->state = STREAM_STATE_EOS; stream->flags &= ~STREAM_FLAG_SAMPLE_REQUESTED; - if (stream->decoder && SUCCEEDED(IMFTransform_ProcessMessage(stream->decoder, + if (stream->decoder.transform && SUCCEEDED(IMFTransform_ProcessMessage(stream->decoder.transform, MFT_MESSAGE_COMMAND_DRAIN, 0))) { if ((hr = source_reader_pull_stream_samples(reader, stream)) != MF_E_TRANSFORM_NEED_MORE_INPUT) @@ -1161,8 +1170,8 @@ static void source_reader_flush_stream(struct source_reader *reader, DWORD strea struct media_stream *stream = &reader->streams[stream_index]; source_reader_release_responses(reader, stream); - if (stream->decoder) - IMFTransform_ProcessMessage(stream->decoder, MFT_MESSAGE_COMMAND_FLUSH, 0); + if (stream->decoder.transform) + IMFTransform_ProcessMessage(stream->decoder.transform, MFT_MESSAGE_COMMAND_FLUSH, 0); stream->requests = 0; } @@ -1378,8 +1387,8 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) IMFMediaStream_Release(stream->stream); if (stream->current) IMFMediaType_Release(stream->current); - if (stream->decoder) - IMFTransform_Release(stream->decoder); + if (stream->decoder.transform) + IMFTransform_Release(stream->decoder.transform); if (stream->allocator) IMFVideoSampleAllocatorEx_Release(stream->allocator); } @@ -1672,8 +1681,10 @@ static HRESULT source_reader_configure_decoder(struct source_reader *reader, DWO IMFMediaType *input_type, IMFMediaType *output_type) { IMFMediaTypeHandler *type_handler; + unsigned int block_alignment = 0; IMFTransform *transform = NULL; IMFMediaType *type = NULL; + GUID major = { 0 }; DWORD flags; HRESULT hr; int i = 0; @@ -1710,12 +1721,15 @@ static HRESULT source_reader_configure_decoder(struct source_reader *reader, DWO if (FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)reader->streams[index].current))) WARN("Failed to copy attributes, hr %#x.\n", hr); + if (SUCCEEDED(IMFMediaType_GetMajorType(type, &major)) && IsEqualGUID(&major, &MFMediaType_Audio)) + IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &block_alignment); IMFMediaType_Release(type); - if (reader->streams[index].decoder) - IMFTransform_Release(reader->streams[index].decoder); + if (reader->streams[index].decoder.transform) + IMFTransform_Release(reader->streams[index].decoder.transform); - reader->streams[index].decoder = transform; + reader->streams[index].decoder.transform = transform; + reader->streams[index].decoder.min_buffer_size = block_alignment; return S_OK; } @@ -2082,7 +2096,7 @@ static HRESULT WINAPI src_reader_GetServiceForStream(IMFSourceReader *iface, DWO hr = MF_E_INVALIDSTREAMNUMBER; else { - obj = (IUnknown *)reader->streams[index].decoder; + obj = (IUnknown *)reader->streams[index].decoder.transform; if (!obj) hr = E_NOINTERFACE; } break;

1 0

Nikolay Sivov : dwrite: Return complete outline data from freetype integration code.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: ae3422c61513367927dda5352ebe317cdbfea5af URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae3422c61513367927dda535… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 22 10:59:16 2021 +0300 dwrite: Return complete outline data from freetype integration code. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 33 +++++++++++- dlls/dwrite/font.c | 71 ++++++++++++++++++++++++- dlls/dwrite/freetype.c | 123 ++++++++++++++++++++++++------------------- 3 files changed, 168 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae3422c61513367927dd…

1 0

Gijs Vermeulen : kernelbase: Reject SORT_DIGITSASNUMBERS in CompareStringA().
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: ed61ff43f499ca75798a040cfdc8e8bf9de7ac32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed61ff43f499ca75798a040c… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Mar 20 17:58:43 2021 +0100 kernelbase: Reject SORT_DIGITSASNUMBERS in CompareStringA(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 34 +++++++++++++++++++++------------- dlls/kernelbase/locale.c | 7 +++++++ 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 42e14eb736f..f82c4cd9564 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1790,6 +1790,7 @@ struct comparestringa_entry { const char *second; int second_len; int ret; + DWORD le; }; static const struct comparestringa_entry comparestringa_data[] = { @@ -1837,6 +1838,15 @@ static const struct comparestringa_entry comparestringa_data[] = { { LOCALE_SYSTEM_DEFAULT, 0, "a", 2, "a\0x", 4, CSTR_LESS_THAN }, { LOCALE_SYSTEM_DEFAULT, 0, "a\0x", 4, "a", 1, CSTR_GREATER_THAN }, { LOCALE_SYSTEM_DEFAULT, 0, "a\0x", 4, "a", 2, CSTR_GREATER_THAN }, + /* flag tests */ + { LOCALE_SYSTEM_DEFAULT, LOCALE_USE_CP_ACP, "NULL", -1, "NULL", -1, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, LINGUISTIC_IGNORECASE, "NULL", -1, "NULL", -1, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, LINGUISTIC_IGNOREDIACRITIC, "NULL", -1, "NULL", -1, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, NORM_IGNOREKANATYPE, "NULL", -1, "NULL", -1, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, NORM_IGNORENONSPACE, "NULL", -1, "NULL", -1, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, NORM_IGNOREWIDTH, "NULL", -1, "NULL", -1, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, NORM_LINGUISTIC_CASING, "NULL", -1, "NULL", -1, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, SORT_DIGITSASNUMBERS, "NULL", -1, "NULL", -1, 0, ERROR_INVALID_FLAGS } }; static void test_CompareStringA(void) @@ -1851,9 +1861,15 @@ static void test_CompareStringA(void) { const struct comparestringa_entry *entry = &comparestringa_data[i]; + SetLastError(0xdeadbeef); ret = CompareStringA(entry->lcid, entry->flags, entry->first, entry->first_len, entry->second, entry->second_len); +todo_wine_if (entry->flags == LINGUISTIC_IGNOREDIACRITIC) +{ ok(ret == entry->ret, "%d: got %d, expected %d\n", i, ret, entry->ret); + ok(GetLastError() == (ret ? 0xdeadbeef : entry->le), "%d: got last error %d, expected %d\n", + i, GetLastError(), (ret ? 0xdeadbeef : entry->le)); +} } ret = CompareStringA(lcid, NORM_IGNORECASE, "Salut", -1, "Salute", -1); @@ -1879,19 +1895,6 @@ static void test_CompareStringA(void) ret = CompareStringA(lcid, NORM_IGNORECASE, "Salut", 5, "saLuT", -1); ok (ret == CSTR_EQUAL, "(Salut/saLuT) Expected CSTR_EQUAL, got %d\n", ret); - /* test for CompareStringA flags */ - SetLastError(0xdeadbeef); - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0x8, "NULL", -1, "NULL", -1); - ok(GetLastError() == ERROR_INVALID_FLAGS, - "unexpected error code %d\n", GetLastError()); - ok(!ret, "CompareStringA must fail with invalid flag\n"); - - SetLastError(0xdeadbeef); - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, LOCALE_USE_CP_ACP, "NULL", -1, "NULL", -1); - ok(GetLastError() == 0xdeadbeef, "unexpected error code %d\n", GetLastError()); - ok(ret == CSTR_EQUAL, "CompareStringA error: %d != CSTR_EQUAL\n", ret); - /* end of test for CompareStringA flags */ - ret = lstrcmpA("", ""); ok (ret == 0, "lstrcmpA(\"\", \"\") should return 0, got %d\n", ret); @@ -2031,6 +2034,11 @@ static void test_CompareStringW(void) success = VirtualFree(buf, 0, MEM_RELEASE); ok(success, "VirtualFree failed with %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CompareStringW(CP_ACP, SORT_DIGITSASNUMBERS, L"NULL", -1, L"NULL", -1); + todo_wine ok(ret == CSTR_EQUAL || broken(!ret && GetLastError() == ERROR_INVALID_FLAGS) /* <Win7 */, + "expected CSTR_EQUAL, got %d, last error %d\n", ret, GetLastError()); + ret = CompareStringW(CP_ACP, 0, ABC_EE, 3, ABC_FF, 3); ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); ret = CompareStringW(CP_ACP, 0, ABC_EE, 5, ABC_FF, 3); diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 9e77ca8dd37..55df5598715 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3115,6 +3115,13 @@ INT WINAPI DECLSPEC_HOTPATCH CompareStringA( LCID lcid, DWORD flags, const char SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + + if (flags & SORT_DIGITSASNUMBERS) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + if (len1 < 0) len1 = strlen(str1); if (len2 < 0) len2 = strlen(str2);

1 0

John Zourlios : kernelbase: Accept LINGUISTIC_IGNOREDIACRITIC & SORT_DIGITSASNUMBERS in CompareStringEx().
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: 0a366f7e4a68c9375b54ace5289989bd81b65d22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a366f7e4a68c9375b54ace5… Author: John Zourlios <john.kinigos(a)gmail.com> Date: Sat Mar 20 17:58:44 2021 +0100 kernelbase: Accept LINGUISTIC_IGNOREDIACRITIC & SORT_DIGITSASNUMBERS in CompareStringEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50362 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 5 +---- dlls/kernelbase/locale.c | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f82c4cd9564..75c86bbaf21 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1864,12 +1864,9 @@ static void test_CompareStringA(void) SetLastError(0xdeadbeef); ret = CompareStringA(entry->lcid, entry->flags, entry->first, entry->first_len, entry->second, entry->second_len); -todo_wine_if (entry->flags == LINGUISTIC_IGNOREDIACRITIC) -{ ok(ret == entry->ret, "%d: got %d, expected %d\n", i, ret, entry->ret); ok(GetLastError() == (ret ? 0xdeadbeef : entry->le), "%d: got last error %d, expected %d\n", i, GetLastError(), (ret ? 0xdeadbeef : entry->le)); -} } ret = CompareStringA(lcid, NORM_IGNORECASE, "Salut", -1, "Salute", -1); @@ -2036,7 +2033,7 @@ static void test_CompareStringW(void) SetLastError(0xdeadbeef); ret = CompareStringW(CP_ACP, SORT_DIGITSASNUMBERS, L"NULL", -1, L"NULL", -1); - todo_wine ok(ret == CSTR_EQUAL || broken(!ret && GetLastError() == ERROR_INVALID_FLAGS) /* <Win7 */, + ok(ret == CSTR_EQUAL || broken(!ret && GetLastError() == ERROR_INVALID_FLAGS) /* <Win7 */, "expected CSTR_EQUAL, got %d, last error %d\n", ret, GetLastError()); ret = CompareStringW(CP_ACP, 0, ABC_EE, 3, ABC_FF, 3); diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 55df5598715..7623e387cdf 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3056,7 +3056,8 @@ INT WINAPI CompareStringEx( const WCHAR *locale, DWORD flags, const WCHAR *str1, { DWORD supported_flags = NORM_IGNORECASE | NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS | SORT_STRINGSORT | NORM_IGNOREKANATYPE | NORM_IGNOREWIDTH | LOCALE_USE_CP_ACP; - DWORD semistub_flags = NORM_LINGUISTIC_CASING | LINGUISTIC_IGNORECASE | 0x10000000; + DWORD semistub_flags = NORM_LINGUISTIC_CASING | LINGUISTIC_IGNORECASE | LINGUISTIC_IGNOREDIACRITIC | + SORT_DIGITSASNUMBERS | 0x10000000; /* 0x10000000 is related to diacritics in Arabic, Japanese, and Hebrew */ INT ret; static int once;

1 0

Mark Harmstone : mscvpdb.h: Use official names for CodeView constants.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: e5c289f29da8e1028e2d36b2309ca4b2310f76ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5c289f29da8e1028e2d36b2… Author: Mark Harmstone <mark(a)harmstone.com> Date: Sat Mar 20 13:48:38 2021 +0000 mscvpdb.h: Use official names for CodeView constants. Signed-off-by: Mark Harmstone <mark(a)harmstone.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 220 ++++++++++++++++++++++++------------------------- include/wine/mscvpdb.h | 188 +++++++++++++++++++++--------------------- tools/winedump/msc.c | 158 +++++++++++++++++------------------ 3 files changed, 283 insertions(+), 283 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e5c289f29da8e1028e2d…

1 0

Huw Davies : riched20: Implement ITextServices_OnTxInPlaceActivate().
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: 14f4bd96970f8dac9c0053f0d48c668221d67047 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14f4bd96970f8dac9c0053f0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 22 08:55:49 2021 +0000 riched20: Implement ITextServices_OnTxInPlaceActivate(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 1 + dlls/riched20/editstr.h | 3 ++- dlls/riched20/txtsrv.c | 22 +++++++++++++++++----- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7027b148188..293ac0bad5a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2936,6 +2936,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->texthost = texthost; ed->reOle = NULL; ed->bEmulateVersion10 = bEmulateVersion10; + ed->in_place_active = FALSE; ed->total_rows = 0; ITextHost_TxGetPropertyBits( texthost, TXTBIT_RICHTEXT | TXTBIT_MULTILINE | TXTBIT_READONLY | TXTBIT_USEPASSWORD | TXTBIT_HIDESELECTION | TXTBIT_SAVESELECTION | diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 2d2816340bc..c0fef69547e 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -380,7 +380,8 @@ typedef struct tagME_TextEditor HWND hWnd, hwndParent; ITextHost *texthost; IUnknown *reOle; - BOOL bEmulateVersion10; + unsigned int bEmulateVersion10 : 1; + unsigned int in_place_active : 1; ME_TextBuffer *pBuffer; ME_Cursor *pCursors; DWORD props; diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index d637d52ea3b..d95a3ac4c7e 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -233,12 +233,23 @@ static HRESULT update_client_rect( struct text_services *services, const RECT *c } DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInPlaceActivate,8) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceActivate(ITextServices *iface, LPCRECT prcClient) +DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceActivate( ITextServices *iface, const RECT *client ) { struct text_services *services = impl_from_ITextServices( iface ); + HRESULT hr; + BOOL old_active = services->editor->in_place_active; - FIXME( "%p: STUB\n", services ); - return E_NOTIMPL; + TRACE( "%p: %s\n", services, wine_dbgstr_rect( client ) ); + + services->editor->in_place_active = TRUE; + hr = update_client_rect( services, client ); + if (FAILED( hr )) + { + services->editor->in_place_active = old_active; + return hr; + } + ME_RewrapRepaint( services->editor ); + return S_OK; } DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInPlaceDeactivate,4) @@ -246,8 +257,9 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceDeactivate(ITextServices { struct text_services *services = impl_from_ITextServices( iface ); - FIXME( "%p: STUB\n", services ); - return E_NOTIMPL; + TRACE( "%p\n", services ); + services->editor->in_place_active = FALSE; + return S_OK; } DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIActivate,4)

1 0

Huw Davies : riched20: TxGet[HV]Scroll should return the actual enabled state.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: ef6f58e4bd7af80fdd52ec0bc00f0db4946eacf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef6f58e4bd7af80fdd52ec0b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 22 08:55:50 2021 +0000 riched20: TxGet[HV]Scroll should return the actual enabled state. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/txtsrv.c | 85 ++++++++++++++++++++++++++++++++++++++++---- dlls/riched20/txtsrv.c | 4 +-- 2 files changed, 81 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index de6d8a8df24..20eb318d464 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -85,7 +85,10 @@ typedef struct ITextHostTestImpl { ITextHost ITextHost_iface; LONG refCount; + HWND window; + RECT client_rect; CHARFORMAT2W char_format; + DWORD scrollbars, props; } ITextHostTestImpl; static inline ITextHostTestImpl *impl_from_ITextHost(ITextHost *iface) @@ -93,6 +96,11 @@ static inline ITextHostTestImpl *impl_from_ITextHost(ITextHost *iface) return CONTAINING_RECORD(iface, ITextHostTestImpl, ITextHost_iface); } +static const WCHAR lorem[] = L"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. " + "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. " + "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. " + "Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; + static HRESULT WINAPI ITextHostImpl_QueryInterface(ITextHost *iface, REFIID riid, LPVOID *ppvObject) @@ -133,6 +141,7 @@ static HDC __thiscall ITextHostImpl_TxGetDC(ITextHost *iface) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetDC(%p)\n", This); + if (This->window) return GetDC( This->window ); return NULL; } @@ -140,6 +149,7 @@ static INT __thiscall ITextHostImpl_TxReleaseDC(ITextHost *iface, HDC hdc) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxReleaseDC(%p)\n", This); + if (This->window) return ReleaseDC( This->window, hdc ); return 0; } @@ -287,7 +297,8 @@ static HRESULT __thiscall ITextHostImpl_TxGetClientRect(ITextHost *iface, LPRECT { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetClientRect(%p, prc=%p)\n", This, prc); - return E_NOTIMPL; + *prc = This->client_rect; + return S_OK; } static HRESULT __thiscall ITextHostImpl_TxGetViewInset(ITextHost *iface, LPRECT prc) @@ -333,12 +344,12 @@ static HRESULT __thiscall ITextHostImpl_TxGetMaxLength(ITextHost *iface, DWORD * return E_NOTIMPL; } -static HRESULT __thiscall ITextHostImpl_TxGetScrollBars(ITextHost *iface, DWORD *pdwScrollBar) +static HRESULT __thiscall ITextHostImpl_TxGetScrollBars(ITextHost *iface, DWORD *scrollbars) { ITextHostTestImpl *This = impl_from_ITextHost(iface); - TRACECALL("Call to TxGetScrollBars(%p, pdwScrollBar=%p)\n", - This, pdwScrollBar); - return E_NOTIMPL; + TRACECALL("Call to TxGetScrollBars(%p, scrollbars=%p)\n", This, scrollbars); + *scrollbars = This->scrollbars; + return S_OK; } static HRESULT __thiscall ITextHostImpl_TxGetPasswordChar(ITextHost *iface, WCHAR *pch) @@ -383,7 +394,7 @@ static HRESULT __thiscall ITextHostImpl_TxGetPropertyBits(ITextHost *iface, DWOR ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetPropertyBits(%p, dwMask=0x%08x, pdwBits=%p)\n", This, dwMask, pdwBits); - *pdwBits = 0; + *pdwBits = This->props & dwMask; return S_OK; } @@ -591,9 +602,13 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) } dummyTextHost->ITextHost_iface.lpVtbl = &itextHostVtbl; dummyTextHost->refCount = 1; + dummyTextHost->window = NULL; + SetRectEmpty( &dummyTextHost->client_rect ); memset(&dummyTextHost->char_format, 0, sizeof(dummyTextHost->char_format)); dummyTextHost->char_format.cbSize = sizeof(dummyTextHost->char_format); dummyTextHost->char_format.dwMask = CFM_ALL2; + dummyTextHost->scrollbars = 0; + dummyTextHost->props = 0; hf = GetStockObject(DEFAULT_GUI_FONT); hf_to_cf(hf, &dummyTextHost->char_format); @@ -988,16 +1003,74 @@ static void test_TxGetScroll(void) ITextServices *txtserv; ITextHost *host; HRESULT ret; + LONG min_pos, max_pos, pos, page; + BOOL enabled; + ITextHostTestImpl *host_impl; + RECT client = {0, 0, 100, 100}; if (!init_texthost(&txtserv, &host)) return; + host_impl = impl_from_ITextHost( host ); + ret = ITextServices_TxGetHScroll(txtserv, NULL, NULL, NULL, NULL, NULL); ok(ret == S_OK, "ITextServices_TxGetHScroll failed: 0x%08x.\n", ret); ret = ITextServices_TxGetVScroll(txtserv, NULL, NULL, NULL, NULL, NULL); ok(ret == S_OK, "ITextServices_TxGetVScroll failed: 0x%08x.\n", ret); + ret = ITextServices_TxGetVScroll( txtserv, &min_pos, &max_pos, &pos, &page, &enabled ); + ok( ret == S_OK, "ITextServices_TxGetHScroll failed: 0x%08x.\n", ret ); + ok( min_pos == 0, "got %d\n", min_pos ); + ok( max_pos == 0, "got %d\n", max_pos ); + ok( pos == 0, "got %d\n", pos ); + ok( page == 0, "got %d\n", page ); + ok( !enabled, "got %d\n", enabled ); + + host_impl->scrollbars = WS_VSCROLL; + host_impl->props = TXTBIT_MULTILINE | TXTBIT_RICHTEXT | TXTBIT_WORDWRAP; + ITextServices_OnTxPropertyBitsChange( txtserv, TXTBIT_SCROLLBARCHANGE | TXTBIT_MULTILINE | TXTBIT_RICHTEXT | TXTBIT_WORDWRAP, host_impl->props ); + + host_impl->window = CreateWindowExA( 0, "static", NULL, WS_POPUP | WS_VISIBLE, + 0, 0, 400, 400, 0, 0, 0, NULL ); + host_impl->client_rect = client; + ret = ITextServices_OnTxInPlaceActivate( txtserv, &client ); + ok( ret == S_OK, "got 0x%08x.\n", ret ); + + ret = ITextServices_TxGetVScroll( txtserv, &min_pos, &max_pos, &pos, &page, &enabled ); + ok( ret == S_OK, "ITextServices_TxGetHScroll failed: 0x%08x.\n", ret ); + ok( min_pos == 0, "got %d\n", min_pos ); +todo_wine + ok( max_pos == 0, "got %d\n", max_pos ); + ok( pos == 0, "got %d\n", pos ); + ok( page == client.bottom, "got %d\n", page ); + ok( !enabled, "got %d\n", enabled ); + + ret = ITextServices_TxSetText( txtserv, lorem ); + ok( ret == S_OK, "got 0x%08x.\n", ret ); + + ret = ITextServices_TxGetVScroll( txtserv, &min_pos, &max_pos, &pos, &page, &enabled ); + ok( ret == S_OK, "ITextServices_TxGetHScroll failed: 0x%08x.\n", ret ); + ok( min_pos == 0, "got %d\n", min_pos ); + ok( max_pos > client.bottom, "got %d\n", max_pos ); + ok( pos == 0, "got %d\n", pos ); + ok( page == client.bottom, "got %d\n", page ); + ok( enabled, "got %d\n", enabled ); + + host_impl->scrollbars = WS_VSCROLL | ES_DISABLENOSCROLL; + ITextServices_OnTxPropertyBitsChange( txtserv, TXTBIT_SCROLLBARCHANGE, host_impl->props ); + ITextServices_TxSetText( txtserv, L"short" ); + + ret = ITextServices_TxGetVScroll( txtserv, &min_pos, &max_pos, &pos, &page, &enabled ); + ok( ret == S_OK, "ITextServices_TxGetHScroll failed: 0x%08x.\n", ret ); + ok( min_pos == 0, "got %d\n", min_pos ); +todo_wine + ok( max_pos == 0, "got %d\n", max_pos ); + ok( pos == 0, "got %d\n", pos ); + ok( page == client.bottom, "got %d\n", page ); + ok( !enabled, "got %d\n", enabled ); + + DestroyWindow( host_impl->window ); ITextServices_Release(txtserv); ITextHost_Release(host); } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index d95a3ac4c7e..7bdd6ab924b 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -165,7 +165,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetHScroll( ITextServices *iface, if (max_pos) *max_pos = services->editor->horz_si.nMax; if (pos) *pos = services->editor->horz_si.nPos; if (page) *page = services->editor->horz_si.nPage; - if (enabled) *enabled = (services->editor->scrollbars & WS_HSCROLL) != 0; + if (enabled) *enabled = services->editor->horz_sb_enabled; return S_OK; } @@ -179,7 +179,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetVScroll( ITextServices *iface, if (max_pos) *max_pos = services->editor->vert_si.nMax; if (pos) *pos = services->editor->vert_si.nPos; if (page) *page = services->editor->vert_si.nPage; - if (enabled) *enabled = (services->editor->scrollbars & WS_VSCROLL) != 0; + if (enabled) *enabled = services->editor->vert_sb_enabled; return S_OK; }

1 0