October 2020 - Wine-commits

Derek Lesho : winegstreamer: Implement IMFMediaSource::CreatePresentationDescriptor.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: e2893c34524ae45f69f7bc183fa409a4049b9533 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2893c34524ae45f69f7bc18… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Oct 27 11:12:05 2020 -0500 winegstreamer: Implement IMFMediaSource::CreatePresentationDescriptor. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 1 - dlls/mfplat/tests/mfplat.c | 10 +++++----- dlls/mfreadwrite/tests/mfplat.c | 15 ++++++++++----- dlls/winegstreamer/media_source.c | 28 ++++++++++++++++++++++++++-- 4 files changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8c49a483f74..d304a62f08a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1452,7 +1452,6 @@ todo_wine return; hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd); -todo_wine ok(hr == S_OK, "Failed to create descriptor, hr %#x.\n", hr); if (FAILED(hr)) return; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 906454851a8..8c6cbf74661 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -574,10 +574,7 @@ static void test_source_resolver(void) ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); -todo_wine ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); - if (FAILED(hr)) - goto skip_source_tests; ok(descriptor != NULL, "got %p\n", descriptor); hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(descriptor, 0, &selected, &sd); @@ -597,6 +594,7 @@ todo_wine ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid); ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); +todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); IMFMediaType_Release(media_type); @@ -605,7 +603,10 @@ todo_wine var.vt = VT_EMPTY; hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); +todo_wine ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + if (FAILED(hr)) + goto skip_source_tests; get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var); ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MENewStream event.\n", var.vt); @@ -668,11 +669,10 @@ todo_wine get_event((IMFMediaEventGenerator *)mediasource, MEEndOfPresentation, NULL); +skip_source_tests: IMFMediaTypeHandler_Release(handler); IMFPresentationDescriptor_Release(descriptor); -skip_source_tests: - hr = IMFMediaSource_Shutdown(mediasource); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 84581f9be9a..cfe68cb6736 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -627,14 +627,13 @@ static void test_source_reader(void) stream = get_resource_stream("test.wav"); hr = MFCreateSourceReaderFromByteStream(stream, NULL, &reader); -todo_wine - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); - if (FAILED(hr)) { + skip("MFCreateSourceReaderFromByteStream() failed, is G-Streamer missing?\n"); IMFByteStream_Release(stream); return; } + ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); /* Access underlying media source object. */ hr = IMFSourceReader_GetServiceForStream(reader, MF_SOURCE_READER_MEDIASOURCE, &GUID_NULL, &IID_IMFMediaSource, @@ -723,7 +722,10 @@ todo_wine hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); +todo_wine ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + if (hr != S_OK) + goto skip_read_sample; ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); IMFSample_Release(sample); @@ -784,6 +786,8 @@ todo_wine ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); ok(!sample, "Unexpected sample object.\n"); +skip_read_sample: + /* Flush. */ hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); @@ -814,10 +818,11 @@ todo_wine IMFSourceReaderCallback_Release(&callback->IMFSourceReaderCallback_iface); hr = MFCreateSourceReaderFromByteStream(stream, attributes, &reader); +todo_wine ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); IMFAttributes_Release(attributes); - - IMFSourceReader_Release(reader); + if (hr == S_OK) + IMFSourceReader_Release(reader); IMFByteStream_Release(stream); } diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index d6c7837e544..9b2c2174318 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -67,6 +67,7 @@ struct media_source IMFByteStream *byte_stream; struct media_stream **streams; ULONG stream_count; + IMFPresentationDescriptor *pres_desc; GstBus *bus; GstElement *container; GstElement *decodebin; @@ -673,12 +674,12 @@ static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource * { struct media_source *source = impl_from_IMFMediaSource(iface); - FIXME("(%p)->(%p): stub\n", source, descriptor); + TRACE("(%p)->(%p)\n", source, descriptor); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + return IMFPresentationDescriptor_Clone(source->pres_desc, descriptor); } static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor, @@ -741,6 +742,8 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) if (source->their_sink) gst_object_unref(GST_OBJECT(source->their_sink)); + if (source->pres_desc) + IMFPresentationDescriptor_Release(source->pres_desc); if (source->event_queue) IMFMediaEventQueue_Shutdown(source->event_queue); if (source->byte_stream) @@ -841,6 +844,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ GST_STATIC_PAD_TEMPLATE("mf_src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); struct media_source *object = heap_alloc_zero(sizeof(*object)); + IMFStreamDescriptor **descriptors = NULL; unsigned int i; HRESULT hr; int ret; @@ -928,6 +932,25 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ gst_sample_unref(preroll); } + /* init presentation descriptor */ + + descriptors = heap_alloc(object->stream_count * sizeof(IMFStreamDescriptor*)); + for (i = 0; i < object->stream_count; i++) + { + IMFMediaStream_GetStreamDescriptor(&object->streams[i]->IMFMediaStream_iface, &descriptors[i]); + } + + if (FAILED(hr = MFCreatePresentationDescriptor(object->stream_count, descriptors, &object->pres_desc))) + goto fail; + + for (i = 0; i < object->stream_count; i++) + { + IMFPresentationDescriptor_SelectStream(object->pres_desc, i); + IMFStreamDescriptor_Release(descriptors[i]); + } + heap_free(descriptors); + descriptors = NULL; + object->state = SOURCE_STOPPED; *out_media_source = object; @@ -936,6 +959,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ fail: WARN("Failed to construct MFMediaSource, hr %#x.\n", hr); + heap_free(descriptors); IMFMediaSource_Release(&object->IMFMediaSource_iface); return hr; }

1 0

Alistair Leslie-Hughes : include: Add more DBGUID_* defines.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: da9f165acb9ba92dfd2a5c7c203c7ae9980320b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da9f165acb9ba92dfd2a5c7c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 28 20:46:20 2020 +1100 include: Add more DBGUID_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbs.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index 63617c88c00..19f92b3c05f 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -500,6 +500,8 @@ cpp_quote(" EXTERN_C const GUID name DECLSPEC_HIDDEN") cpp_quote("#endif") cpp_quote("DEFINE_DBGUID(DB_NULLGUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);") +cpp_quote("DEFINE_DBGUID(DBGUID_SQL, 0xc8b522d7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);")

1 0

Nikolay Sivov : include: Remove confusing comment.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 03395fdf71b606b589b917eab5d4766842188b91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03395fdf71b606b589b917ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 28 22:58:01 2020 +0300 include: Remove confusing comment. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mlang.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mlang.idl b/include/mlang.idl index 5867648b04f..7c4398feafd 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -708,7 +708,7 @@ interface IMultiLanguage2 : IUnknown [in] LANGID LangId, [out] IEnumScript **ppEnumScript); - HRESULT ValidateCodePageEx( /* undocumented on MSDN */ + HRESULT ValidateCodePageEx( [in] UINT uiCodePage, [in] HWND hwnd, [in] DWORD dwfIODControl);

1 0

Huw Davies : riched20: Pass para ptrs to the various para selection functions.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: da5082912816a346a89cc84de42f77426135f451 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da5082912816a346a89cc84d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:49 2020 +0000 riched20: Pass para ptrs to the various para selection functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 14 +++---- dlls/riched20/editor.h | 8 ++-- dlls/riched20/editstr.h | 2 +- dlls/riched20/paint.c | 48 +++++++++++++---------- dlls/riched20/para.c | 100 ++++++++++++++++++++++++------------------------ dlls/riched20/reader.c | 2 +- 7 files changed, 90 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da5082912816a346a89c…

1 0

Huw Davies : riched20: Use a helper function to find the first row.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: b3b3624079da3efe24beb90ef88435042c79df9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3b3624079da3efe24beb90e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:50 2020 +0000 riched20: Use a helper function to find the first row. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index d3bbbc9d672..d15c47b72aa 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -846,7 +846,7 @@ static void draw_table_borders( ME_Context *c, ME_Paragraph *para ) rowY = c->pt.y + para->pt.y; if (para->fmt.dwMask & PFM_SPACEBEFORE) rowY += ME_twips2pointsY(c, para->fmt.dySpaceBefore); - nHeight = ME_FindItemFwd( para_get_di( para ), diStartRow )->member.row.nHeight; + nHeight = para_first_row( para )->nHeight; rowBottom = rowY + nHeight; /* Draw horizontal lines */

1 0

Alexandre Julliard : gdi32: Add a helper to load a font without using a face.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: 0bf2c11d43cbd36ed258c868491422083f3c7f64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bf2c11d43cbd36ed258c868… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 14:10:41 2020 +0100 gdi32: Add a helper to load a font without using a face. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 259 ++++++++++++++++++++++++-------------------------- 1 file changed, 122 insertions(+), 137 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0bf2c11d43cbd36ed258…

1 0

Alexandre Julliard : gdi32: Allocate the backend font data in the load_font() helper.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: 5772b064ac0194f784640f79701e384a1ffbeb3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5772b064ac0194f784640f79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 14:25:32 2020 +0100 gdi32: Allocate the backend font data in the load_font() helper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 5 ----- dlls/gdi32/freetype.c | 20 ++++++-------------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4e1c69d886e..02cd618f956 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -487,11 +487,6 @@ struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_ HeapFree( GetProcessHeap(), 0, font ); return NULL; } - if (font_funcs && !font_funcs->alloc_font( font )) - { - free_gdi_font( font ); - return NULL; - } return font; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b4764d1e8c9..d941fb18bf6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3666,18 +3666,6 @@ static UINT get_nearest_charset(const WCHAR *family_name, Face *face, UINT *cp) return DEFAULT_CHARSET; } -/************************************************************* - * freetype_alloc_font - */ -static BOOL CDECL freetype_alloc_font( struct gdi_font *font ) -{ - GdiFont *ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)); - list_init(&ret->child_fonts); - ret->gdi_font = font; - font->private = ret; - return TRUE; -} - /************************************************************* * freetype_destroy_font */ @@ -4325,12 +4313,17 @@ static DWORD get_ttc_offset( FT_Face ft_face, UINT face_index ) static BOOL load_font( struct gdi_font *gdi_font ) { - GdiFont *font = get_font_ptr( gdi_font ); + GdiFont *font; INT width = 0, height; FT_Face ft_face; void *data_ptr; SIZE_T data_size; + if (!(font = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*font) ))) return FALSE; + gdi_font->private = font; + font->gdi_font = gdi_font; + list_init( &font->child_fonts ); + if (gdi_font->file[0]) { char *filename = wine_get_unix_file_name( gdi_font->file ); @@ -7294,7 +7287,6 @@ static const struct font_backend_funcs font_funcs = freetype_add_font, freetype_add_mem_font, freetype_remove_font, - freetype_alloc_font, freetype_get_font_data, freetype_get_glyph_index, freetype_get_default_glyph, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index aa6e6ddcaa9..32d50935308 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -376,7 +376,6 @@ struct font_backend_funcs INT (CDECL *add_mem_font)( void *ptr, SIZE_T size, DWORD flags ); BOOL (CDECL *remove_font)( const WCHAR *file, DWORD flags ); - BOOL (CDECL *alloc_font)( struct gdi_font *font ); DWORD (CDECL *get_font_data)( struct gdi_font *gdi_font, DWORD table, DWORD offset, void *buf, DWORD count ); BOOL (CDECL *get_glyph_index)( struct gdi_font *gdi_font, UINT *glyph );

1 0

Alexandre Julliard : gdi32: Move the CreateScalableFontResource() implementation out of freetype.c.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: ed9114c1181c1af67264433f6910039a31882052 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed9114c1181c1af67264433f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 14:25:47 2020 +0100 gdi32: Move the CreateScalableFontResource() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 249 +++++++++++++++++++++++++++++++++++++- dlls/gdi32/freetype.c | 309 ++--------------------------------------------- dlls/gdi32/gdi_private.h | 3 +- 3 files changed, 257 insertions(+), 304 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed9114c1181c1af67264…

1 0

Zhiyi Zhang : user32/tests: Test changing to a valid depth but zero width and height display mode.
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: 2756cabbe43afcc1b10c2156765a5a5c12e8f721 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2756cabbe43afcc1b10c2156… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 27 14:59:34 2020 +0800 user32/tests: Test changing to a valid depth but zero width and height display mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 119 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 0ce27455a66..d7d9086672d 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -323,6 +323,7 @@ static void test_ChangeDisplaySettingsEx(void) { static const DWORD registry_fields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; + static const DWORD depths[] = {8, 16, 32}; DPI_AWARENESS_CONTEXT context = NULL; UINT primary, device, test, mode; UINT device_size, device_count; @@ -600,9 +601,127 @@ static void test_ChangeDisplaySettingsEx(void) ok(count == old_count, "Expect monitor count %d, got %d\n", old_count, count); } + /* Test changing to a mode with depth set but with zero width and height */ + /* This test is only ran for non-primary adapters for now as it may detach the adapters on Wine */ + for (device = 1; device < device_count; ++device) + { + for (test = 0; test < ARRAY_SIZE(depths); ++test) + { + /* Find the native resolution */ + memset(&dm, 0, sizeof(dm)); + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm2, 0); ++mode) + { + if (dm2.dmBitsPerPel == depths[test] + && dm2.dmPelsWidth > dm.dmPelsWidth && dm2.dmPelsHeight > dm.dmPelsHeight) + dm = dm2; + } + if (dm.dmBitsPerPel != depths[test]) + { + skip("Depth %u is unsupported for %s.\n", depths[test], devices[device].name); + continue; + } + + /* Find the second resolution */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm2, 0); ++mode) + { + if (dm2.dmBitsPerPel == depths[test] + && dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + if (dm2.dmBitsPerPel != depths[test] + || dm2.dmPelsWidth == dm.dmPelsWidth || dm2.dmPelsHeight == dm.dmPelsHeight) + { + skip("Failed to find the second mode for %s.\n", devices[device].name); + continue; + } + + /* Find the third resolution */ + memset(&dm3, 0, sizeof(dm3)); + dm3.dmSize = sizeof(dm3); + for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm3, 0); ++mode) + { + if (dm3.dmBitsPerPel == depths[test] + && dm3.dmPelsWidth != dm.dmPelsWidth && dm3.dmPelsHeight != dm.dmPelsHeight + && dm3.dmPelsWidth != dm2.dmPelsWidth && dm3.dmPelsHeight != dm2.dmPelsHeight) + break; + } + if (dm3.dmBitsPerPel != depths[test] + || dm3.dmPelsWidth == dm.dmPelsWidth || dm3.dmPelsHeight == dm.dmPelsHeight + || dm3.dmPelsWidth == dm2.dmPelsWidth || dm3.dmPelsHeight == dm2.dmPelsHeight) + { + skip("Failed to find the third mode for %s.\n", devices[device].name); + continue; + } + + /* Change the current mode to the third mode first */ + res = ChangeDisplaySettingsExA(devices[device].name, &dm3, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL + || broken(res == DISP_CHANGE_FAILED), /* Win8 TestBots */ + "ChangeDisplaySettingsExA %s returned unexpected %d.\n", devices[device].name, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("Failed to change display mode for %s.\n", devices[device].name); + continue; + } + flush_events(); + expect_dm(dm3, devices[device].name, test); + + /* Change the registry mode to the second mode */ + res = ChangeDisplaySettingsExA(devices[device].name, &dm2, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL + || broken(res == DISP_CHANGE_BADFLAGS), /* Win10 32bit */ + "ChangeDisplaySettingsExA %s returned unexpected %d.\n", devices[device].name, res); + + /* Change to a mode with depth set but with zero width and height */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; + dm.dmBitsPerPel = depths[test]; + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + devices[device].name, res); + flush_events(); + + dd.cb = sizeof(dd); + res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); + ok(res, "EnumDisplayDevicesA %s failed, error %#x.\n", devices[device].name, GetLastError()); + todo_wine ok(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, "Expect %s attached.\n", + devices[device].name); + if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "Device %s EnumDisplaySettingsA failed, error %#x.\n", devices[device].name, GetLastError()); + todo_wine_if(depths[test] != 32) + ok(dm.dmBitsPerPel == depths[test], "Device %s expect dmBitsPerPel %u, got %u.\n", + devices[device].name, depths[test], dm.dmBitsPerPel); + /* 2008 resets to the resolution in the registry. Newer versions of Windows doesn't + * change the current resolution */ + ok(dm.dmPelsWidth == dm3.dmPelsWidth || broken(dm.dmPelsWidth == dm2.dmPelsWidth), + "Device %s expect dmPelsWidth %u, got %u.\n", + devices[device].name, dm3.dmPelsWidth, dm.dmPelsWidth); + ok(dm.dmPelsHeight == dm3.dmPelsHeight || broken(dm.dmPelsHeight == dm2.dmPelsHeight), + "Device %s expect dmPelsHeight %u, got %u.\n", + devices[device].name, dm3.dmPelsHeight, dm.dmPelsHeight); + } + } + /* Detach all non-primary adapters to avoid position conflicts */ for (device = 1; device < device_count; ++device) { + dd.cb = sizeof(dd); + res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); + ok(res, "EnumDisplayDevicesA %s failed, error %#x.\n", devices[device].name, GetLastError()); + /* Already detached by previous tests */ + if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + old_count = GetSystemMetrics(SM_CMONITORS); memset(&dm, 0, sizeof(dm));

1 0

Zhiyi Zhang : user32: Use current width or height if a mode specifies zero width or height for ChangeDisplaySettingsExW().
by Alexandre Julliard 27 Oct '20

27 Oct '20

Module: wine Branch: master Commit: e6b2da317350547f6d6cb6b8f52831428cf84cc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6b2da317350547f6d6cb6b8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 27 15:00:47 2020 +0800 user32: Use current width or height if a mode specifies zero width or height for ChangeDisplaySettingsExW(). 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 | 16 +++------------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index d4640e0068e..1381f387e03 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3182,6 +3182,22 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND return DISP_CHANGE_BADMODE; } + if (!is_detached_mode(devmode) && (!devmode->dmPelsWidth || !devmode->dmPelsHeight)) + { + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + if (!EnumDisplaySettingsExW(devname, ENUM_CURRENT_SETTINGS, &dm, 0)) + { + ERR("Current mode not found!\n"); + return DISP_CHANGE_BADMODE; + } + + if (!devmode->dmPelsWidth) + devmode->dmPelsWidth = dm.dmPelsWidth; + if (!devmode->dmPelsHeight) + devmode->dmPelsHeight = dm.dmPelsHeight; + } + ret = USER_Driver->pChangeDisplaySettingsEx(devname, devmode, hwnd, flags, lparam); if (ret != DISP_CHANGE_SUCCESSFUL) ERR("Changing %s display settings returned %d.\n", wine_dbgstr_w(devname), ret); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index d7d9086672d..009fc0d626e 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -602,8 +602,7 @@ static void test_ChangeDisplaySettingsEx(void) } /* Test changing to a mode with depth set but with zero width and height */ - /* This test is only ran for non-primary adapters for now as it may detach the adapters on Wine */ - for (device = 1; device < device_count; ++device) + for (device = 0; device < device_count; ++device) { for (test = 0; test < ARRAY_SIZE(depths); ++test) { @@ -689,10 +688,8 @@ static void test_ChangeDisplaySettingsEx(void) dd.cb = sizeof(dd); res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); ok(res, "EnumDisplayDevicesA %s failed, error %#x.\n", devices[device].name, GetLastError()); - todo_wine ok(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, "Expect %s attached.\n", - devices[device].name); - if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) - continue; + ok(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, "Expect %s attached.\n", + devices[device].name); memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); @@ -715,13 +712,6 @@ static void test_ChangeDisplaySettingsEx(void) /* Detach all non-primary adapters to avoid position conflicts */ for (device = 1; device < device_count; ++device) { - dd.cb = sizeof(dd); - res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); - ok(res, "EnumDisplayDevicesA %s failed, error %#x.\n", devices[device].name, GetLastError()); - /* Already detached by previous tests */ - if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) - continue; - old_count = GetSystemMetrics(SM_CMONITORS); memset(&dm, 0, sizeof(dm));

1 0