February 2020 - Wine-commits

Zebediah Figura : qedit/samplegrabber: Correctly implement sample_grabber_source_get_media_type().
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 114b99fba9c915b135562acb89c58d675d1fa0ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=114b99fba9c915b135562acb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 7 23:51:54 2020 -0600 qedit/samplegrabber: Correctly implement sample_grabber_source_get_media_type(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 18 ++++++++- dlls/qedit/tests/samplegrabber.c | 81 +++++++++++++++++++++------------------- 2 files changed, 58 insertions(+), 41 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 696053b1d5..4e9d5157cf 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -576,12 +576,26 @@ static HRESULT sample_grabber_source_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { SG_Impl *filter = impl_from_source_pin(iface); + IEnumMediaTypes *enummt; + AM_MEDIA_TYPE *pmt; + HRESULT hr; - if (!index) + if (!filter->sink.pin.peer) + return VFW_E_NOT_CONNECTED; + + if (FAILED(hr = IPin_EnumMediaTypes(filter->sink.pin.peer, &enummt))) + return hr; + + if ((!index || IEnumMediaTypes_Skip(enummt, index) == S_OK) + && IEnumMediaTypes_Next(enummt, 1, &pmt, NULL) == S_OK) { - CopyMediaType(mt, &filter->filter_mt); + CopyMediaType(mt, pmt); + DeleteMediaType(pmt); + IEnumMediaTypes_Release(enummt); return S_OK; } + + IEnumMediaTypes_Release(enummt); return VFW_S_NO_MORE_ITEMS; } diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index e8ab1073fb..6c084d3a49 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -486,8 +486,7 @@ static void test_media_types(void) if (hr == S_OK) IEnumMediaTypes_Release(enummt); hr = IPin_EnumMediaTypes(source, &enummt); - todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); - if (hr == S_OK) IEnumMediaTypes_Release(enummt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(sink, &mt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -502,8 +501,7 @@ static void test_media_types(void) if (hr == S_OK) IEnumMediaTypes_Release(enummt); hr = IPin_EnumMediaTypes(source, &enummt); - todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); - if (hr == S_OK) IEnumMediaTypes_Release(enummt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(sink, &mt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -832,7 +830,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(compare_media_types(pmt, &testsource.source_mt), "Media types didn't match.\n"); + ok(compare_media_types(pmt, &testsource.source_mt), "Media types didn't match.\n"); IEnumMediaTypes_Release(enummt); req_mt.majortype = MEDIATYPE_Video; @@ -912,24 +910,18 @@ static void test_connect_pin(void) testsource.source_mt.bTemporalCompression = TRUE; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n"); - ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); - } + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n"); + todo_wine ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); req_mt.majortype = GUID_NULL; req_mt.bTemporalCompression = FALSE; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n"); - ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); - } + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n"); + todo_wine ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); @@ -939,18 +931,20 @@ static void test_connect_pin(void) req_mt.subtype = GUID_NULL; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n"); - ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); - } + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n"); + todo_wine ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); req_mt.formattype = FORMAT_None; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + } req_mt.majortype = MEDIATYPE_Video; req_mt.subtype = MEDIASUBTYPE_RGB8; @@ -971,12 +965,9 @@ static void test_connect_pin(void) req_mt.subtype = GUID_NULL; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n"); - ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); - } + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n"); + todo_wine ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); @@ -987,28 +978,40 @@ static void test_connect_pin(void) testsource.source_mt.majortype = testsource.source_mt.subtype = testsource.source_mt.formattype = GUID_NULL; req_mt.majortype = req_mt.subtype = req_mt.formattype = GUID_NULL; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n"); - ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); - } + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n"); + todo_wine ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); req_mt.majortype = MEDIATYPE_Video; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + } req_mt.majortype = GUID_NULL; req_mt.subtype = MEDIASUBTYPE_RGB8; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + } req_mt.subtype = GUID_NULL; req_mt.formattype = FORMAT_None; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + } req_mt.formattype = GUID_NULL; testsink.sink_mt = &req_mt;

1 0

Zebediah Figura : qedit/samplegrabber: Don't verify the format block in sample_grabber_sink_connect().
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 10c6b08b07f82c9d295d817ef1d0cc39dc6787d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10c6b08b07f82c9d295d817e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 7 23:51:55 2020 -0600 qedit/samplegrabber: Don't verify the format block in sample_grabber_sink_connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 4e9d5157cf..c82f2045ee 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -503,10 +503,6 @@ static HRESULT sample_grabber_sink_connect(struct strmbase_sink *iface, { SG_Impl *filter = impl_from_sink_pin(&iface->pin); - if (!IsEqualGUID(&mt->formattype, &FORMAT_None) - && !IsEqualGUID(&mt->formattype, &GUID_NULL) && !mt->pbFormat) - return VFW_E_INVALIDMEDIATYPE; - if (!IsEqualGUID(&filter->filter_mt.majortype, &GUID_NULL) && !IsEqualGUID(&filter->filter_mt.majortype, &mt->majortype)) return VFW_E_TYPE_NOT_ACCEPTED;

1 0

Zebediah Figura : qedit/samplegrabber: Reconnect the sink pin if necessary.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: e8e4fcc5a78b0954fa8e0aceaf8dc6958f25c863 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8e4fcc5a78b0954fa8e0ace… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 7 23:51:56 2020 -0600 qedit/samplegrabber: Reconnect the sink pin if necessary. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 26 ++++++++++++++++++++++++++ dlls/qedit/tests/samplegrabber.c | 14 +++++++------- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index c82f2045ee..3ec440d155 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -595,9 +595,35 @@ static HRESULT sample_grabber_source_get_media_type(struct strmbase_pin *iface, return VFW_S_NO_MORE_ITEMS; } +static inline BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) +{ + return !memcmp(a, b, offsetof(AM_MEDIA_TYPE, pbFormat)) + && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); +} + static HRESULT WINAPI sample_grabber_source_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { + SG_Impl *filter = impl_from_source_pin(&iface->pin); + const AM_MEDIA_TYPE *mt = &iface->pin.mt; + + if (!compare_media_types(mt, &filter->sink.pin.mt)) + { + IFilterGraph2 *graph; + HRESULT hr; + + if (FAILED(hr = IFilterGraph_QueryInterface(filter->filter.graph, + &IID_IFilterGraph2, (void **)&graph))) + { + ERR("Failed to get IFilterGraph2 interface, hr %#x.\n", hr); + return hr; + } + + hr = IFilterGraph2_ReconnectEx(graph, &filter->sink.pin.IPin_iface, mt); + IFilterGraph2_Release(graph); + return hr; + } + return S_OK; } diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 6c084d3a49..0484221141 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -894,7 +894,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); - todo_wine ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); hr = IFilterGraph2_Disconnect(graph, source); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -912,7 +912,7 @@ static void test_connect_pin(void) hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n"); - todo_wine ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); @@ -921,7 +921,7 @@ static void test_connect_pin(void) hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n"); - todo_wine ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); @@ -933,7 +933,7 @@ static void test_connect_pin(void) hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n"); - todo_wine ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); @@ -967,7 +967,7 @@ static void test_connect_pin(void) hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n"); - todo_wine ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); @@ -980,7 +980,7 @@ static void test_connect_pin(void) hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n"); - todo_wine ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); @@ -1022,7 +1022,7 @@ static void test_connect_pin(void) hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); - todo_wine ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface);

1 0

Michael Stefaniuc : inetcomm/tests: Get rid of strcmp_wa().
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 206128e78208e85485f14cd10f064c28eada0817 URL: https://source.winehq.org/git/wine.git/?a=commit;h=206128e78208e85485f14cd1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Feb 9 16:51:46 2020 +0200 inetcomm/tests: Get rid of strcmp_wa(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 57 +++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 02b93e9911..25ae8b6848 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -126,13 +126,6 @@ static WCHAR *a2w(const char *str) return ret; } -static int strcmp_wa(const WCHAR *strw, const char *stra) -{ - WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); - return lstrcmpW(strw, buf); -} - static void test_CreateVirtualStream(void) { HRESULT hr; @@ -1196,7 +1189,7 @@ static void test_MimeOleGetPropertySchema(void) typedef struct { const char *url; const char *content; - const char *mime; + const WCHAR *mime; const char *data; } mhtml_binding_test_t; @@ -1204,13 +1197,13 @@ static const mhtml_binding_test_t binding_tests[] = { { "mhtml:file://%s", mhtml_page1, - "text/html", + L"text/html", "<HTML></HTML>" }, { "mhtml:file://%s!http://winehq.org/mhtmltest.html", mhtml_page1, - "Image/Jpeg", + L"Image/Jpeg", "Test" } }; @@ -1348,7 +1341,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, switch(ulStatusCode) { case BINDSTATUS_MIMETYPEAVAILABLE: CHECK_EXPECT(ReportProgress_MIMETYPEAVAILABLE); - ok(!strcmp_wa(szStatusText, current_binding_test->mime), "status text %s\n", wine_dbgstr_w(szStatusText)); + ok(!lstrcmpW(szStatusText, current_binding_test->mime), "status text %s\n", wine_dbgstr_w(szStatusText)); return S_OK; case BINDSTATUS_CACHEFILENAMEAVAILABLE: CHECK_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); @@ -1462,41 +1455,41 @@ static void test_mhtml_protocol_binding(const mhtml_binding_test_t *test) static const struct { const char *base_url; const char *relative_url; - const char *expected_result; + const WCHAR *expected_result; BOOL todo; } combine_tests[] = { { "mhtml:file:///c:/dir/test.mht", "http://test.org", - "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org" + L"mhtml:file:///c:/dir/test.mht!x-usc:http://test.org" }, { "mhtml:file:///c:/dir/test.mht", "3D\"http://test.org\"", - "mhtml:file:///c:/dir/test.mht!x-usc:3D\"http://test.org\"" + L"mhtml:file:///c:/dir/test.mht!x-usc:3D\"http://test.org\"" }, { "mhtml:file:///c:/dir/test.mht", "123abc", - "mhtml:file:///c:/dir/test.mht!x-usc:123abc" + L"mhtml:file:///c:/dir/test.mht!x-usc:123abc" }, { "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "123abc", - "mhtml:file:///c:/dir/test.mht!x-usc:123abc" + L"mhtml:file:///c:/dir/test.mht!x-usc:123abc" }, { "MhtMl:file:///c:/dir/test.mht!x-usc:http://test.org/dir/dir2/file.html", "../..", - "mhtml:file:///c:/dir/test.mht!x-usc:../.." + L"mhtml:file:///c:/dir/test.mht!x-usc:../.." }, {"mhtml:file:///c:/dir/test.mht!x-usc:file:///c:/dir/dir2/file.html", "../..", - "mhtml:file:///c:/dir/test.mht!x-usc:../.." + L"mhtml:file:///c:/dir/test.mht!x-usc:../.." }, { "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "", - "mhtml:file:///c:/dir/test.mht" + L"mhtml:file:///c:/dir/test.mht" }, { "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "mhtml:file:///d:/file.html", - "file:///d:/file.html", TRUE + L"file:///d:/file.html", TRUE }, { "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "mhtml:file:///c:/dir2/test.mht!x-usc:http://test.org", - "mhtml:file:///c:/dir2/test.mht!x-usc:http://test.org", TRUE + L"mhtml:file:///c:/dir2/test.mht!x-usc:http://test.org", TRUE }, { "mhtml:file:///c:/dir/test.mht!http://test.org", "123abc", - "mhtml:file:///c:/dir/test.mht!x-usc:123abc" + L"mhtml:file:///c:/dir/test.mht!x-usc:123abc" }, { "mhtml:file:///c:/dir/test.mht!http://test.org", "", - "mhtml:file:///c:/dir/test.mht" + L"mhtml:file:///c:/dir/test.mht" } }; @@ -1524,10 +1517,10 @@ static void test_mhtml_protocol_info(void) todo_wine_if(combine_tests[i].todo) ok(hres == S_OK, "[%u] CombineUrl failed: %08x\n", i, hres); if(SUCCEEDED(hres)) { - exlen = strlen(combine_tests[i].expected_result); + exlen = lstrlenW(combine_tests[i].expected_result); ok(combined_len == exlen, "[%u] combined len is %u, expected %u\n", i, combined_len, exlen); - ok(!strcmp_wa(combined_url, combine_tests[i].expected_result), "[%u] combined URL is %s, expected %s\n", - i, wine_dbgstr_w(combined_url), combine_tests[i].expected_result); + ok(!lstrcmpW(combined_url, combine_tests[i].expected_result), "[%u] combined URL is %s, expected %s\n", + i, wine_dbgstr_w(combined_url), wine_dbgstr_w(combine_tests[i].expected_result)); combined_len = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, base_url, relative_url, ICU_BROWSER_MODE, @@ -1620,12 +1613,12 @@ static void test_MimeOleObjectFromMoniker(void) static const struct { const char *url; - const char *mhtml_url; + const WCHAR *mhtml_url; } tests[] = { - {"file:///x:\\dir\\file.mht", "mhtml:file://x:\\dir\\file.mht"}, - {"file:///x:/dir/file.mht", "mhtml:file://x:\\dir\\file.mht"}, - {"http://www.winehq.org/index.html?query#hash", "mhtml:http://www.winehq.org/index.html?query#hash"}, - {"../test.mht", "mhtml:../test.mht"} + {"file:///x:\\dir\\file.mht", L"mhtml:file://x:\\dir\\file.mht"}, + {"file:///x:/dir/file.mht", L"mhtml:file://x:\\dir\\file.mht"}, + {"http://www.winehq.org/index.html?query#hash", L"mhtml:http://www.winehq.org/index.html?query#hash"}, + {"../test.mht", L"mhtml:../test.mht"} }; for(i = 0; i < ARRAY_SIZE(tests); i++) { @@ -1648,7 +1641,7 @@ static void test_MimeOleObjectFromMoniker(void) hres = IMoniker_GetDisplayName(new_mon, NULL, NULL, &mhtml_url); ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); - ok(!strcmp_wa(mhtml_url, tests[i].mhtml_url), "[%d] unexpected mhtml URL: %s\n", i, wine_dbgstr_w(mhtml_url)); + ok(!lstrcmpW(mhtml_url, tests[i].mhtml_url), "[%d] unexpected mhtml URL: %s\n", i, wine_dbgstr_w(mhtml_url)); CoTaskMemFree(mhtml_url); IUnknown_Release(unk);

1 0

Michael Stefaniuc : inetcomm/tests: Get rid of a2w().
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 7210556b4dcee05c1e21f200bbfc729c3e716bd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7210556b4dcee05c1e21f200… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Feb 9 16:51:47 2020 +0200 inetcomm/tests: Get rid of a2w(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 71 ++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 45 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 25ae8b6848..afd25af015 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -112,20 +112,6 @@ static const char mhtml_page1[] = "\r\n\t\t\t\tVGVzdA==\r\n\r\n" "------=_NextPart_000_00--"; -static WCHAR *a2w(const char *str) -{ - WCHAR *ret; - int len; - - if(!str) - return NULL; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - return ret; -} - static void test_CreateVirtualStream(void) { HRESULT hr; @@ -1453,49 +1439,50 @@ static void test_mhtml_protocol_binding(const mhtml_binding_test_t *test) } static const struct { - const char *base_url; - const char *relative_url; + const WCHAR *base_url; + const WCHAR *relative_url; const WCHAR *expected_result; BOOL todo; } combine_tests[] = { { - "mhtml:file:///c:/dir/test.mht", "http://test.org", + L"mhtml:file:///c:/dir/test.mht", L"http://test.org", L"mhtml:file:///c:/dir/test.mht!x-usc:http://test.org" }, { - "mhtml:file:///c:/dir/test.mht", "3D\"http://test.org\"", + L"mhtml:file:///c:/dir/test.mht", L"3D\"http://test.org\"", L"mhtml:file:///c:/dir/test.mht!x-usc:3D\"http://test.org\"" }, { - "mhtml:file:///c:/dir/test.mht", "123abc", + L"mhtml:file:///c:/dir/test.mht", L"123abc", L"mhtml:file:///c:/dir/test.mht!x-usc:123abc" }, { - "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "123abc", + L"mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", L"123abc", L"mhtml:file:///c:/dir/test.mht!x-usc:123abc" }, { - "MhtMl:file:///c:/dir/test.mht!x-usc:http://test.org/dir/dir2/file.html", "../..", + L"MhtMl:file:///c:/dir/test.mht!x-usc:http://test.org/dir/dir2/file.html", L"../..", L"mhtml:file:///c:/dir/test.mht!x-usc:../.." - }, {"mhtml:file:///c:/dir/test.mht!x-usc:file:///c:/dir/dir2/file.html", "../..", + }, { + L"mhtml:file:///c:/dir/test.mht!x-usc:file:///c:/dir/dir2/file.html", L"../..", L"mhtml:file:///c:/dir/test.mht!x-usc:../.." }, { - "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "", + L"mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", L"", L"mhtml:file:///c:/dir/test.mht" }, { - "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "mhtml:file:///d:/file.html", + L"mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", L"mhtml:file:///d:/file.html", L"file:///d:/file.html", TRUE }, { - "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "mhtml:file:///c:/dir2/test.mht!x-usc:http://test.org", + L"mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", L"mhtml:file:///c:/dir2/test.mht!x-usc:http://test.org", L"mhtml:file:///c:/dir2/test.mht!x-usc:http://test.org", TRUE }, { - "mhtml:file:///c:/dir/test.mht!http://test.org", "123abc", + L"mhtml:file:///c:/dir/test.mht!http://test.org", L"123abc", L"mhtml:file:///c:/dir/test.mht!x-usc:123abc" }, { - "mhtml:file:///c:/dir/test.mht!http://test.org", "", + L"mhtml:file:///c:/dir/test.mht!http://test.org", L"", L"mhtml:file:///c:/dir/test.mht" } }; static void test_mhtml_protocol_info(void) { - WCHAR *base_url, *relative_url, combined_url[INTERNET_MAX_URL_LENGTH]; + WCHAR combined_url[INTERNET_MAX_URL_LENGTH]; IInternetProtocolInfo *protocol_info; DWORD combined_len; unsigned i, exlen; @@ -1508,11 +1495,9 @@ static void test_mhtml_protocol_info(void) ok(hres == S_OK, "Could not create protocol info: %08x\n", hres); for(i = 0; i < ARRAY_SIZE(combine_tests); i++) { - base_url = a2w(combine_tests[i].base_url); - relative_url = a2w(combine_tests[i].relative_url); - combined_len = 0xdeadbeef; - hres = IInternetProtocolInfo_CombineUrl(protocol_info, base_url, relative_url, ICU_BROWSER_MODE, + hres = IInternetProtocolInfo_CombineUrl(protocol_info, combine_tests[i].base_url, + combine_tests[i].relative_url, ICU_BROWSER_MODE, combined_url, ARRAY_SIZE(combined_url), &combined_len, 0); todo_wine_if(combine_tests[i].todo) ok(hres == S_OK, "[%u] CombineUrl failed: %08x\n", i, hres); @@ -1523,14 +1508,12 @@ static void test_mhtml_protocol_info(void) i, wine_dbgstr_w(combined_url), wine_dbgstr_w(combine_tests[i].expected_result)); combined_len = 0xdeadbeef; - hres = IInternetProtocolInfo_CombineUrl(protocol_info, base_url, relative_url, ICU_BROWSER_MODE, + hres = IInternetProtocolInfo_CombineUrl(protocol_info, combine_tests[i].base_url, + combine_tests[i].relative_url, ICU_BROWSER_MODE, combined_url, exlen, &combined_len, 0); ok(hres == E_FAIL, "[%u] CombineUrl returned: %08x\n", i, hres); ok(!combined_len, "[%u] combined_len = %u\n", i, combined_len); } - - HeapFree(GetProcessHeap(), 0, base_url); - HeapFree(GetProcessHeap(), 0, relative_url); } hres = IInternetProtocolInfo_CombineUrl(protocol_info, http_url, http_url, ICU_BROWSER_MODE, @@ -1605,27 +1588,25 @@ static void test_mhtml_protocol(void) static void test_MimeOleObjectFromMoniker(void) { IMoniker *mon, *new_mon; - WCHAR *mhtml_url, *url; + WCHAR *mhtml_url; IBindCtx *bind_ctx; IUnknown *unk; unsigned i; HRESULT hres; static const struct { - const char *url; + const WCHAR *url; const WCHAR *mhtml_url; } tests[] = { - {"file:///x:\\dir\\file.mht", L"mhtml:file://x:\\dir\\file.mht"}, - {"file:///x:/dir/file.mht", L"mhtml:file://x:\\dir\\file.mht"}, - {"http://www.winehq.org/index.html?query#hash", L"mhtml:http://www.winehq.org/index.html?query#hash"}, - {"../test.mht", L"mhtml:../test.mht"} + {L"file:///x:\\dir\\file.mht", L"mhtml:file://x:\\dir\\file.mht"}, + {L"file:///x:/dir/file.mht", L"mhtml:file://x:\\dir\\file.mht"}, + {L"http://www.winehq.org/index.html?query#hash", L"mhtml:http://www.winehq.org/index.html?query#hash"}, + {L"../test.mht", L"mhtml:../test.mht"} }; for(i = 0; i < ARRAY_SIZE(tests); i++) { - url = a2w(tests[i].url); - hres = CreateURLMoniker(NULL, url, &mon); + hres = CreateURLMoniker(NULL, tests[i].url, &mon); ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); - HeapFree(GetProcessHeap(), 0, url); hres = CreateBindCtx(0, &bind_ctx); ok(hres == S_OK, "CreateBindCtx failed: %08x\n", hres);

1 0

Zhiyi Zhang : user32: Move ChangeDisplaySettingsExW() common code to user32.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 981fb4edb371dd2ccf57dd350e76451df50c0a98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=981fb4edb371dd2ccf57dd35… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 10 11:09:22 2020 +0800 user32: Move ChangeDisplaySettingsExW() common code to user32. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 110 +++++++++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/display.c | 36 --------------- dlls/winex11.drv/settings.c | 71 +--------------------------- 3 files changed, 111 insertions(+), 106 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 2ff5b2f909..2523df6bf2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3200,6 +3200,71 @@ LONG WINAPI ChangeDisplaySettingsExA( LPCSTR devname, LPDEVMODEA devmode, HWND h return ret; } +#define _X_FIELD(prefix, bits) \ + if ((fields) & prefix##_##bits) \ + { \ + p += sprintf(p, "%s%s", first ? "" : ",", #bits); \ + first = FALSE; \ + } + +static const CHAR *_CDS_flags(DWORD fields) +{ + BOOL first = TRUE; + CHAR buf[128]; + CHAR *p = buf; + + _X_FIELD(CDS, UPDATEREGISTRY) + _X_FIELD(CDS, TEST) + _X_FIELD(CDS, FULLSCREEN) + _X_FIELD(CDS, GLOBAL) + _X_FIELD(CDS, SET_PRIMARY) + _X_FIELD(CDS, RESET) + _X_FIELD(CDS, SETRECT) + _X_FIELD(CDS, NORESET) + + *p = 0; + return wine_dbg_sprintf("%s", buf); +} + +static const CHAR *_DM_fields(DWORD fields) +{ + BOOL first = TRUE; + CHAR buf[128]; + CHAR *p = buf; + + _X_FIELD(DM, BITSPERPEL) + _X_FIELD(DM, PELSWIDTH) + _X_FIELD(DM, PELSHEIGHT) + _X_FIELD(DM, DISPLAYFLAGS) + _X_FIELD(DM, DISPLAYFREQUENCY) + _X_FIELD(DM, POSITION) + _X_FIELD(DM, DISPLAYORIENTATION) + + *p = 0; + return wine_dbg_sprintf("%s", buf); +} + +#undef _X_FIELD + +static void trace_devmode(const DEVMODEW *devmode) +{ + TRACE("dmFields=%s ", _DM_fields(devmode->dmFields)); + if (devmode->dmFields & DM_BITSPERPEL) + TRACE("dmBitsPerPel=%u ", devmode->dmBitsPerPel); + if (devmode->dmFields & DM_PELSWIDTH) + TRACE("dmPelsWidth=%u ", devmode->dmPelsWidth); + if (devmode->dmFields & DM_PELSHEIGHT) + TRACE("dmPelsHeight=%u ", devmode->dmPelsHeight); + if (devmode->dmFields & DM_DISPLAYFREQUENCY) + TRACE("dmDisplayFrequency=%u ", devmode->dmDisplayFrequency); + if (devmode->dmFields & DM_POSITION) + TRACE("dmPosition=(%d,%d) ", devmode->u1.s2.dmPosition.x, devmode->u1.s2.dmPosition.y); + if (devmode->dmFields & DM_DISPLAYFLAGS) + TRACE("dmDisplayFlags=%#x ", devmode->u2.dmDisplayFlags); + if (devmode->dmFields & DM_DISPLAYORIENTATION) + TRACE("dmDisplayOrientation=%u ", devmode->u1.s2.dmDisplayOrientation); + TRACE("\n"); +} /*********************************************************************** * ChangeDisplaySettingsExW (USER32.@) @@ -3207,7 +3272,50 @@ LONG WINAPI ChangeDisplaySettingsExA( LPCSTR devname, LPDEVMODEA devmode, HWND h LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lparam ) { - return USER_Driver->pChangeDisplaySettingsEx( devname, devmode, hwnd, flags, lparam ); + BOOL def_mode = TRUE; + DEVMODEW dm; + + TRACE("%s %p %p %#x %p\n", debugstr_w(devname), devmode, hwnd, flags, lparam); + TRACE("flags=%s\n", _CDS_flags(flags)); + + if (devmode) + { + trace_devmode(devmode); + + /* This is the minimal dmSize that XP accepts */ + if (devmode->dmSize < FIELD_OFFSET(DEVMODEW, dmFields)) + return DISP_CHANGE_FAILED; + + if (devmode->dmSize >= FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(devmode->dmFields)) + { + if (((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel) || + ((devmode->dmFields & DM_PELSWIDTH) && devmode->dmPelsWidth) || + ((devmode->dmFields & DM_PELSHEIGHT) && devmode->dmPelsHeight) || + ((devmode->dmFields & DM_DISPLAYFREQUENCY) && devmode->dmDisplayFrequency)) + def_mode = FALSE; + } + } + + if (def_mode) + { + dm.dmSize = sizeof(dm); + if (!EnumDisplaySettingsExW(devname, ENUM_REGISTRY_SETTINGS, &dm, 0)) + { + ERR("Default mode not found!\n"); + return DISP_CHANGE_BADMODE; + } + + TRACE("Return to original display mode\n"); + devmode = &dm; + } + + if ((devmode->dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT)) != (DM_PELSWIDTH | DM_PELSHEIGHT)) + { + WARN("devmode doesn't specify the resolution: %#x\n", devmode->dmFields); + return DISP_CHANGE_BADMODE; + } + + return USER_Driver->pChangeDisplaySettingsEx(devname, devmode, hwnd, flags, lparam); } diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index b58a9d172b..4c610c4573 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -755,8 +755,6 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, { LONG ret = DISP_CHANGE_BADMODE; int bpp; - DEVMODEW dm; - BOOL def_mode = TRUE; struct macdrv_display *displays; int num_displays; CFArrayRef display_modes; @@ -770,40 +768,6 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, init_original_display_mode(); - if (devmode) - { - /* this is the minimal dmSize that XP accepts */ - if (devmode->dmSize < FIELD_OFFSET(DEVMODEW, dmFields)) - return DISP_CHANGE_FAILED; - - if (devmode->dmSize >= FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(devmode->dmFields)) - { - if (((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel) || - ((devmode->dmFields & DM_PELSWIDTH) && devmode->dmPelsWidth) || - ((devmode->dmFields & DM_PELSHEIGHT) && devmode->dmPelsHeight) || - ((devmode->dmFields & DM_DISPLAYFREQUENCY) && devmode->dmDisplayFrequency)) - def_mode = FALSE; - } - } - - if (def_mode) - { - if (!macdrv_EnumDisplaySettingsEx(devname, ENUM_REGISTRY_SETTINGS, &dm, 0)) - { - ERR("Default mode not found!\n"); - return DISP_CHANGE_BADMODE; - } - - TRACE("Return to original display mode\n"); - devmode = &dm; - } - - if ((devmode->dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT)) != (DM_PELSWIDTH | DM_PELSHEIGHT)) - { - WARN("devmode doesn't specify the resolution: %04x\n", devmode->dmFields); - return DISP_CHANGE_BADMODE; - } - if (macdrv_get_displays(&displays, &num_displays)) return DISP_CHANGE_FAILED; diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index a4f172037c..24644db620 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -311,30 +311,6 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo return FALSE; } -#define _X_FIELD(prefix, bits) if ((fields) & prefix##_##bits) {p+=sprintf(p, "%s%s", first ? "" : ",", #bits); first=FALSE;} -static const char * _CDS_flags(DWORD fields) -{ - BOOL first = TRUE; - char buf[128]; - char *p = buf; - _X_FIELD(CDS,UPDATEREGISTRY);_X_FIELD(CDS,TEST);_X_FIELD(CDS,FULLSCREEN); - _X_FIELD(CDS,GLOBAL);_X_FIELD(CDS,SET_PRIMARY);_X_FIELD(CDS,RESET); - _X_FIELD(CDS,SETRECT);_X_FIELD(CDS,NORESET); - *p = 0; - return wine_dbg_sprintf("%s", buf); -} -static const char * _DM_fields(DWORD fields) -{ - BOOL first = TRUE; - char buf[128]; - char *p = buf; - _X_FIELD(DM,BITSPERPEL);_X_FIELD(DM,PELSWIDTH);_X_FIELD(DM,PELSHEIGHT); - _X_FIELD(DM,DISPLAYFLAGS);_X_FIELD(DM,DISPLAYFREQUENCY);_X_FIELD(DM,POSITION); - *p = 0; - return wine_dbg_sprintf("%s", buf); -} -#undef _X_FIELD - /*********************************************************************** * ChangeDisplaySettingsEx (X11DRV.@) * @@ -342,57 +318,14 @@ static const char * _DM_fields(DWORD fields) LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid ) { - DWORD i, dwBpp = 0; - DEVMODEW dm; - BOOL def_mode = TRUE; char bpp_buffer[16], freq_buffer[18]; - - TRACE("(%s,%p,%p,0x%08x,%p)\n",debugstr_w(devname),devmode,hwnd,flags,lpvoid); - TRACE("flags=%s\n",_CDS_flags(flags)); - if (devmode) - { - /* this is the minimal dmSize that XP accepts */ - if (devmode->dmSize < FIELD_OFFSET(DEVMODEW, dmFields)) - return DISP_CHANGE_FAILED; - - TRACE("DM_fields=%s\n",_DM_fields(devmode->dmFields)); - TRACE("width=%d height=%d bpp=%d freq=%d (%s)\n", - devmode->dmPelsWidth,devmode->dmPelsHeight, - devmode->dmBitsPerPel,devmode->dmDisplayFrequency, handler_name); - - dwBpp = devmode->dmBitsPerPel; - if (devmode->dmFields & DM_BITSPERPEL) def_mode &= !dwBpp; - if (devmode->dmFields & DM_PELSWIDTH) def_mode &= !devmode->dmPelsWidth; - if (devmode->dmFields & DM_PELSHEIGHT) def_mode &= !devmode->dmPelsHeight; - if (devmode->dmFields & DM_DISPLAYFREQUENCY) def_mode &= !devmode->dmDisplayFrequency; - } - - if (def_mode || !dwBpp) - { - if (!X11DRV_EnumDisplaySettingsEx(devname, ENUM_REGISTRY_SETTINGS, &dm, 0)) - { - ERR("Default mode not found!\n"); - return DISP_CHANGE_BADMODE; - } - if (def_mode) - { - TRACE("Return to original display mode (%s)\n", handler_name); - devmode = &dm; - } - dwBpp = dm.dmBitsPerPel; - } - - if ((devmode->dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT)) != (DM_PELSWIDTH | DM_PELSHEIGHT)) - { - WARN("devmode doesn't specify the resolution: %04x\n", devmode->dmFields); - return DISP_CHANGE_BADMODE; - } + DWORD i; for (i = 0; i < dd_mode_count; i++) { if (devmode->dmFields & DM_BITSPERPEL) { - if (dwBpp != dd_modes[i].bpp) + if (devmode->dmBitsPerPel != dd_modes[i].bpp) continue; } if (devmode->dmFields & DM_PELSWIDTH)

1 0

Zhiyi Zhang : user32: Trace more ChangeDisplaySettingsExW() flags.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 7d94e9d0c3f072df213f5f28443f2ff02357df75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d94e9d0c3f072df213f5f28… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 10 11:09:32 2020 +0800 user32: Trace more ChangeDisplaySettingsExW() flags. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 5 ++++- include/winuser.h | 20 +++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 2523df6bf2..0a0a2c70bd 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3218,8 +3218,11 @@ static const CHAR *_CDS_flags(DWORD fields) _X_FIELD(CDS, FULLSCREEN) _X_FIELD(CDS, GLOBAL) _X_FIELD(CDS, SET_PRIMARY) + _X_FIELD(CDS, VIDEOPARAMETERS) + _X_FIELD(CDS, ENABLE_UNSAFE_MODES) + _X_FIELD(CDS, DISABLE_UNSAFE_MODES) _X_FIELD(CDS, RESET) - _X_FIELD(CDS, SETRECT) + _X_FIELD(CDS, RESET_EX) _X_FIELD(CDS, NORESET) *p = 0; diff --git a/include/winuser.h b/include/winuser.h index 51c73d25c2..718f6e1c54 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1501,15 +1501,17 @@ DECL_WINELIB_TYPE_AW(LPHELPWININFO) #define DISP_CHANGE_BADDUALVIEW (-6) /* ChangeDisplaySettings.dwFlags */ -#define CDS_UPDATEREGISTRY 0x00000001 -#define CDS_TEST 0x00000002 -#define CDS_FULLSCREEN 0x00000004 -#define CDS_GLOBAL 0x00000008 -#define CDS_SET_PRIMARY 0x00000010 -#define CDS_VIDEOPARAMETERS 0x00000020 -#define CDS_NORESET 0x10000000 -#define CDS_SETRECT 0x20000000 -#define CDS_RESET 0x40000000 +#define CDS_UPDATEREGISTRY 0x00000001 +#define CDS_TEST 0x00000002 +#define CDS_FULLSCREEN 0x00000004 +#define CDS_GLOBAL 0x00000008 +#define CDS_SET_PRIMARY 0x00000010 +#define CDS_VIDEOPARAMETERS 0x00000020 +#define CDS_ENABLE_UNSAFE_MODES 0x00000100 +#define CDS_DISABLE_UNSAFE_MODES 0x00000200 +#define CDS_NORESET 0x10000000 +#define CDS_RESET_EX 0x20000000 +#define CDS_RESET 0x40000000 typedef struct tagWNDCLASSEXA {

1 0

Zhiyi Zhang : user32: Fix ChangeDisplaySettingsExW() minimum size check.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: b5603287b7d6cc38e2a90840271deaf90c788a6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5603287b7d6cc38e2a90840… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 10 11:09:43 2020 +0800 user32: Fix ChangeDisplaySettingsExW() minimum size check. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 16 ++++++---------- dlls/user32/tests/monitor.c | 4 ++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 0a0a2c70bd..a146f31071 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3285,18 +3285,14 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND { trace_devmode(devmode); - /* This is the minimal dmSize that XP accepts */ - if (devmode->dmSize < FIELD_OFFSET(DEVMODEW, dmFields)) - return DISP_CHANGE_FAILED; + if (devmode->dmSize < FIELD_OFFSET(DEVMODEW, dmICMMethod)) + return DISP_CHANGE_BADMODE; - if (devmode->dmSize >= FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(devmode->dmFields)) - { - if (((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel) || - ((devmode->dmFields & DM_PELSWIDTH) && devmode->dmPelsWidth) || - ((devmode->dmFields & DM_PELSHEIGHT) && devmode->dmPelsHeight) || - ((devmode->dmFields & DM_DISPLAYFREQUENCY) && devmode->dmDisplayFrequency)) + if (((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel) || + ((devmode->dmFields & DM_PELSWIDTH) && devmode->dmPelsWidth) || + ((devmode->dmFields & DM_PELSHEIGHT) && devmode->dmPelsHeight) || + ((devmode->dmFields & DM_DISPLAYFREQUENCY) && devmode->dmDisplayFrequency)) def_mode = FALSE; - } } if (def_mode) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 03fd6f3ec3..e669b2b82e 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -401,11 +401,11 @@ static void test_ChangeDisplaySettingsEx(void) dmW.dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod) - 1; res = ChangeDisplaySettingsW(&dmW, CDS_TEST); - todo_wine ok(res == DISP_CHANGE_BADMODE, "ChangeDisplaySettingsW returned %d, expect DISP_CHANGE_BADMODE\n", res); + ok(res == DISP_CHANGE_BADMODE, "ChangeDisplaySettingsW returned %d, expect DISP_CHANGE_BADMODE\n", res); dmW.dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod) - 1; res = ChangeDisplaySettingsExW(NULL, &dmW, NULL, CDS_TEST, NULL); - todo_wine ok(res == DISP_CHANGE_BADMODE, "ChangeDisplaySettingsExW returned %d, expect DISP_CHANGE_BADMODE\n", res); + ok(res == DISP_CHANGE_BADMODE, "ChangeDisplaySettingsExW returned %d, expect DISP_CHANGE_BADMODE\n", res); dmW.dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); res = ChangeDisplaySettingsW(&dmW, CDS_TEST);

1 0

Derek Lesho : msctf: Always provide a context when from GetBase/Top.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 3c09634eceb8e18d2578020fe9399ad35ac49398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c09634eceb8e18d2578020f… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Feb 4 15:47:41 2020 -0600 msctf: Always provide a context when from GetBase/Top. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/documentmgr.c | 20 +++++++++++++++++--- dlls/msctf/tests/inputprocessor.c | 26 ++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 44856db632..37d55557f5 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -44,6 +44,7 @@ typedef struct tagDocumentMgr { /* Aggregation */ ITfCompartmentMgr *CompartmentMgr; + ITfContext* initialContext; ITfContext* contextStack[2]; /* limit of 2 contexts */ ITfThreadMgrEventSink* ThreadMgrSink; @@ -87,6 +88,8 @@ static void DocumentMgr_Destructor(DocumentMgr *This) ITfThreadMgr_Release(tm); } + if (This->initialContext) + ITfContext_Release(This->initialContext); if (This->contextStack[0]) ITfContext_Release(This->contextStack[0]); if (This->contextStack[1]) @@ -222,14 +225,21 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) static HRESULT WINAPI DocumentMgr_GetTop(ITfDocumentMgr *iface, ITfContext **ppic) { DocumentMgr *This = impl_from_ITfDocumentMgr(iface); + ITfContext *tgt; + TRACE("(%p)\n",This); if (!ppic) return E_INVALIDARG; if (This->contextStack[0]) - ITfContext_AddRef(This->contextStack[0]); + tgt = This->contextStack[0]; + else + tgt = This->initialContext; + + if (tgt) + ITfContext_AddRef(tgt); - *ppic = This->contextStack[0]; + *ppic = tgt; return S_OK; } @@ -245,8 +255,10 @@ static HRESULT WINAPI DocumentMgr_GetBase(ITfDocumentMgr *iface, ITfContext **pp if (This->contextStack[1]) tgt = This->contextStack[1]; - else + else if (This->contextStack[0]) tgt = This->contextStack[0]; + else + tgt = This->initialContext; if (tgt) ITfContext_AddRef(tgt); @@ -342,6 +354,7 @@ static const ITfSourceVtbl DocumentMgrSourceVtbl = HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumentMgr **ppOut) { DocumentMgr *This; + DWORD cookie; This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DocumentMgr)); if (This == NULL) @@ -354,6 +367,7 @@ HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumen list_init(&This->TransitoryExtensionSink); CompartmentMgr_Constructor((IUnknown*)&This->ITfDocumentMgr_iface, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); + Context_Constructor(processId,NULL,&This->ITfDocumentMgr_iface, &This->initialContext, &cookie); *ppOut = &This->ITfDocumentMgr_iface; TRACE("returning %p\n", *ppOut); diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 81e692d1d2..f21042a794 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1639,10 +1639,10 @@ static HRESULT TextEditSink_Constructor(ITfTextEditSink **ppOut) static void test_startSession(void) { HRESULT hr; - DWORD cnt; + DWORD cnt, initial_ctx_cnt; DWORD editCookie; ITfDocumentMgr *dmtest; - ITfContext *cxt,*cxt2,*cxt3,*cxtTest; + ITfContext *cxt,*cxt2,*cxt3,*cxtTest,*initial_ctx; ITextStoreACP *ts = NULL; TfClientId cid2 = 0; ITfThreadMgrEx *tmex; @@ -1684,6 +1684,23 @@ static void test_startSession(void) hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&g_dm); ok(SUCCEEDED(hr),"CreateDocumentMgr failed\n"); + test_OnPushContext = SINK_EXPECTED; + test_OnInitDocumentMgr = SINK_EXPECTED; + + /* For some reason, even when the object isn't initialized, this yields a context */ + hr = ITfDocumentMgr_GetBase(g_dm, &initial_ctx); + ok(SUCCEEDED(hr), "GetBase Failed\n"); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); + ok(SUCCEEDED(hr), "GetTop Failed\n"); + ok(cxtTest == initial_ctx, "GetTop != GetBase\n"); + + ok(initial_ctx != NULL, "Expected initial context\n"); + initial_ctx_cnt = check_context_refcount(initial_ctx); + hr = ITfContext_GetDocumentMgr(initial_ctx,&dmtest); + ok(hr == S_OK, "ITfContext_GetDocumentMgr failed with %x\n",hr); + ok(dmtest == g_dm, "Wrong documentmgr\n"); + ITfDocumentMgr_Release(dmtest); + test_EnumDocumentMgr(g_tm,g_dm,NULL); hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&dmtest); @@ -1740,6 +1757,7 @@ static void test_startSession(void) test_OnPushContext = SINK_EXPECTED; test_ACP_AdviseSink = SINK_EXPECTED; test_OnInitDocumentMgr = SINK_EXPECTED; + hr = ITfDocumentMgr_Push(g_dm, cxt); ok(SUCCEEDED(hr),"Push Failed\n"); ok(check_context_refcount(cxt) > cnt, "Ref count did not increase\n"); @@ -1749,6 +1767,9 @@ static void test_startSession(void) test_EnumContexts(g_dm, cxt); + /* the initial context is released with the document manager */ + ok(initial_ctx_cnt == check_context_refcount(initial_ctx), "Context ref count changed after documentmgr initialization\n"); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); ok(cxtTest == cxt, "Wrong context on top\n"); @@ -1859,6 +1880,7 @@ static void test_startSession(void) ITfContext_Release(cxt); ITfContext_Release(cxt2); ITfContext_Release(cxt3); + ITfContext_Release(initial_ctx); ITextStoreACP_Release(ts); }

1 0

Biswapriyo Nath : include: Update winhttp.h.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: f7f67c467cd75a4607d9e021c4a12a854a380ecb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7f67c467cd75a4607d9e021… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Mon Feb 10 10:22:53 2020 +0100 include: Update winhttp.h. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winhttp.h | 230 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 227 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f7f67c467cd75a4607d9…

1 0