August 2020 - Wine-commits - list.winehq.org

Shawn M. Chapla : gdiplus/tests: Add cursory GdipGetClipBoundsI checks to graphics clipping test.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 5e40198862ea0ed8a389d7d3ed5fdec0e97689e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e40198862ea0ed8a389d7d3… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Tue Aug 25 18:13:40 2020 -0400 gdiplus/tests: Add cursory GdipGetClipBoundsI checks to graphics clipping test. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index d1f0d03ddc..38780d4686 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -5071,6 +5071,7 @@ static void test_clipping(void) GpRegion *region, *region100x100; GpMatrix *matrix; GpRectF rect; + GpRect recti; GpPointF ptf[4]; GpUnit unit; HRGN hrgn; @@ -5107,6 +5108,11 @@ static void test_clipping(void) ok(rect.X == 100.0 && rect.Y == 100.0 && rect.Width == 100.0 && rect.Height == 100.0, "expected 100.0,100.0-100.0,100.0, got %.2f,%.2f-%.2f,%.2f\n", rect.X, rect.Y, rect.Width, rect.Height); + status = GdipGetClipBoundsI(graphics, &recti); + expect(Ok, status); + ok(recti.X == 100 && recti.Y == 100 && recti.Width == 100 && recti.Height == 100, + "expected 100,100-100,100, got %i,%i-%i,%i\n", recti.X, recti.Y, recti.Width, recti.Height); + /* Clip region does not account for changes to gdi32 transform */ SetViewportOrgEx(hdc, 10, 10, NULL); @@ -5149,6 +5155,11 @@ static void test_clipping(void) ok(rect.X == 45.0 && rect.Y == 20.0 && rect.Width == 50.0 && rect.Height == 25.0, "expected 45.0,20.0-50.0,25.0, got %.2f,%.2f-%.2f,%.2f\n", rect.X, rect.Y, rect.Width, rect.Height); + status = GdipGetClipBoundsI(graphics, &recti); + expect(Ok, status); + todo_wine ok(recti.X == 45 && recti.Y == 20 && recti.Width == 50 && recti.Height == 25, + "expected 45,20-50,25, got %i,%i-%i,%i\n", recti.X, recti.Y, recti.Width, recti.Height); + status = GdipSetEmpty(region); expect(Ok, status); status = GdipGetClip(graphics, region);

1 0

Shawn M. Chapla : gdiplus: Implement GdipGetClipBoundsI in terms of GdipGetClipBounds.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 52fa4fb74e028f7a3f8c577562b21300cb22a4da URL: https://source.winehq.org/git/wine.git/?a=commit;h=52fa4fb74e028f7a3f8c5775… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Tue Aug 25 18:13:41 2020 -0400 gdiplus: Implement GdipGetClipBoundsI in terms of GdipGetClipBounds. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 16 ++++++++++++---- dlls/gdiplus/tests/graphics.c | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c3542b3d65..5db8973c7b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4770,15 +4770,23 @@ GpStatus WINGDIPAPI GdipGetClipBounds(GpGraphics *graphics, GpRectF *rect) */ GpStatus WINGDIPAPI GdipGetClipBoundsI(GpGraphics *graphics, GpRect *rect) { + GpRectF rectf; + GpStatus stat; + TRACE("(%p, %p)\n", graphics, rect); - if(!graphics) + if (!rect) return InvalidParameter; - if(graphics->busy) - return ObjectBusy; + if ((stat = GdipGetClipBounds(graphics, &rectf)) == Ok) + { + rect->X = gdip_round(rectf.X); + rect->Y = gdip_round(rectf.Y); + rect->Width = gdip_round(rectf.Width); + rect->Height = gdip_round(rectf.Height); + } - return GdipGetRegionBoundsI(graphics->clip, graphics, rect); + return stat; } GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics *graphics, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 38780d4686..1dbb0ae279 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -5157,7 +5157,7 @@ static void test_clipping(void) status = GdipGetClipBoundsI(graphics, &recti); expect(Ok, status); - todo_wine ok(recti.X == 45 && recti.Y == 20 && recti.Width == 50 && recti.Height == 25, + ok(recti.X == 45 && recti.Y == 20 && recti.Width == 50 && recti.Height == 25, "expected 45,20-50,25, got %i,%i-%i,%i\n", recti.X, recti.Y, recti.Width, recti.Height); status = GdipSetEmpty(region);

1 0

Biswapriyo Nath : include/d3d10sdklayers.idl: Add D3D10Debug interface.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: e9ec3560d4604f7e7d282b9a5cdbdec4b7880583 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9ec3560d4604f7e7d282b9a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Aug 26 00:11:57 2020 +0530 include/d3d10sdklayers.idl: Add D3D10Debug interface. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d10sdklayers.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/d3d10sdklayers.idl b/include/d3d10sdklayers.idl index c6606d2fd6..b5b0d031ae 100644 --- a/include/d3d10sdklayers.idl +++ b/include/d3d10sdklayers.idl @@ -24,6 +24,10 @@ cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef GetMessage") cpp_quote("#endif") +const UINT D3D10_DEBUG_FEATURE_FLUSH_PER_RENDER_OP = 0x1; +const UINT D3D10_DEBUG_FEATURE_FINISH_PER_RENDER_OP = 0x2; +const UINT D3D10_DEBUG_FEATURE_PRESENT_PER_RENDER_OP = 0x4; + typedef enum D3D10_MESSAGE_CATEGORY { D3D10_MESSAGE_CATEGORY_APPLICATION_DEFINED, @@ -585,6 +589,31 @@ typedef struct D3D10_INFO_QUEUE_FILTER D3D10_INFO_QUEUE_FILTER_DESC DenyList; } D3D10_INFO_QUEUE_FILTER; +[ + local, + object, + uuid(9b7e4e01-342c-4106-a19f-4f2704f689f0), + pointer_default(unique) +] +interface ID3D10Debug : IUnknown +{ + HRESULT SetFeatureMask( + [in] UINT mask + ); + UINT GetFeatureMask(); + HRESULT SetPresentPerRenderOpDelay( + [in] UINT milliseconds + ); + UINT GetPresentPerRenderOpDelay(); + HRESULT SetSwapChain( + [in] IDXGISwapChain *swapchain + ); + HRESULT GetSwapChain( + [out] IDXGISwapChain **swapchain + ); + HRESULT Validate(); +} + [ local, object,

1 0

Biswapriyo Nath : include/d3d10sdklayers.idl: Add D3D10SwitchToRef interface.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 5aca2b07e587602eccaade401cfe5455a11f2ee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aca2b07e587602eccaade40… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Aug 26 00:11:57 2020 +0530 include/d3d10sdklayers.idl: Add D3D10SwitchToRef interface. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d10sdklayers.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/d3d10sdklayers.idl b/include/d3d10sdklayers.idl index b5b0d031ae..317f7c23e0 100644 --- a/include/d3d10sdklayers.idl +++ b/include/d3d10sdklayers.idl @@ -614,6 +614,20 @@ interface ID3D10Debug : IUnknown HRESULT Validate(); } +[ + local, + object, + uuid(9b7e4e02-342c-4106-a19f-4f2704f689f0), + pointer_default(unique) +] +interface ID3D10SwitchToRef : IUnknown +{ + BOOL SetUseRef( + [in] BOOL useref + ); + BOOL GetUseRef(); +} + [ local, object,

1 0

Biswapriyo Nath : include/d3d11sdklayers.idl: Add D3D11SwitchToRef interface.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 85da080aa2690f41c19453034537c40e76351146 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85da080aa2690f41c1945303… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Aug 26 00:11:57 2020 +0530 include/d3d11sdklayers.idl: Add D3D11SwitchToRef interface. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11sdklayers.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/d3d11sdklayers.idl b/include/d3d11sdklayers.idl index e54ac01b03..54236fcdac 100644 --- a/include/d3d11sdklayers.idl +++ b/include/d3d11sdklayers.idl @@ -1239,6 +1239,19 @@ interface ID3D11Debug : IUnknown { HRESULT ValidateContextForDispatch(ID3D11DeviceContext *pContext); } +[ + object, + uuid(1ef337e3-58e7-4f83-a692-db221f5ed47e), + local, + pointer_default(unique) +] +interface ID3D11SwitchToRef : IUnknown { + BOOL SetUseRef( + [in] BOOL useref + ); + BOOL GetUseRef(); +} + [ object, uuid(6543dbb6-1b48-42f5-ab82-e97ec74326f6),

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 666f614f3f09211614024f87a238aa49c79f574a URL: https://source.winehq.org/git/wine.git/?a=commit;h=666f614f3f09211614024f87… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Aug 26 09:41:48 2020 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index df830130b9..eb11306670 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-08-21 11:13+0300\n" +"PO-Revision-Date: 2020-08-26 09:41+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -6803,10 +6803,8 @@ msgid "Connection reset by peer.\n" msgstr "Sujungimas nutrauktas kito serverio.\n" #: winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Nerealizuota" +msgstr "Nerealizuota.\n" #: winerror.mc:3760 msgid "No Signature found in file.\n"

1 0

Zhiyi Zhang : user32/tests: Add more registry display mode tests.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: fd29fe4ea73d87e39bd3d0ddd791c14f536508b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd29fe4ea73d87e39bd3d0dd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 25 15:11:56 2020 +0800 user32/tests: Add more registry display mode tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 102 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 87 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index b151721533..7cd41145ea 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -298,34 +298,38 @@ static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD te ok_(__FILE__, line)((dm.dmFields & expected.dmFields) == expected.dmFields, "Device %s test %d expect dmFields to contain %#x, got %#x\n", device, test, expected.dmFields, dm.dmFields); /* Wine doesn't support changing color depth yet */ - todo_wine_if(expected.dmBitsPerPel != 32 && expected.dmBitsPerPel != 24) - ok_(__FILE__, line)(dm.dmBitsPerPel == expected.dmBitsPerPel, "Device %s test %d expect dmBitsPerPel %d, got %d\n", - device, test, expected.dmBitsPerPel, dm.dmBitsPerPel); - ok_(__FILE__, line)(dm.dmPelsWidth == expected.dmPelsWidth, "Device %s test %d expect dmPelsWidth %d, got %d\n", - device, test, expected.dmPelsWidth, dm.dmPelsWidth); - ok_(__FILE__, line)(dm.dmPelsHeight == expected.dmPelsHeight, "Device %s test %d expect dmPelsHeight %d, got %d\n", - device, test, expected.dmPelsHeight, dm.dmPelsHeight); - ok_(__FILE__, line)(dm.dmPosition.x == expected.dmPosition.x, "Device %s test %d expect dmPosition.x %d, got %d\n", - device, test, expected.dmPosition.x, dm.dmPosition.x); - ok_(__FILE__, line)(dm.dmPosition.y == expected.dmPosition.y, "Device %s test %d expect dmPosition.y %d, got %d\n", - device, test, expected.dmPosition.y, dm.dmPosition.y); - ok_(__FILE__, line)(dm.dmDisplayFrequency == expected.dmDisplayFrequency, - "Device %s test %d expect dmDisplayFrequency %d, got %d\n", device, test, expected.dmDisplayFrequency, + todo_wine_if(expected.dmFields & DM_BITSPERPEL && expected.dmBitsPerPel != 32 && expected.dmBitsPerPel != 24) + ok_(__FILE__, line)(!(expected.dmFields & DM_BITSPERPEL) || dm.dmBitsPerPel == expected.dmBitsPerPel, + "Device %s test %d expect dmBitsPerPel %u, got %u\n", device, test, expected.dmBitsPerPel, dm.dmBitsPerPel); + ok_(__FILE__, line)(!(expected.dmFields & DM_PELSWIDTH) || dm.dmPelsWidth == expected.dmPelsWidth, + "Device %s test %d expect dmPelsWidth %u, got %u\n", device, test, expected.dmPelsWidth, dm.dmPelsWidth); + ok_(__FILE__, line)(!(expected.dmFields & DM_PELSHEIGHT) || dm.dmPelsHeight == expected.dmPelsHeight, + "Device %s test %d expect dmPelsHeight %u, got %u\n", device, test, expected.dmPelsHeight, dm.dmPelsHeight); + ok_(__FILE__, line)(!(expected.dmFields & DM_POSITION) || dm.dmPosition.x == expected.dmPosition.x, + "Device %s test %d expect dmPosition.x %d, got %d\n", device, test, expected.dmPosition.x, dm.dmPosition.x); + ok_(__FILE__, line)(!(expected.dmFields & DM_POSITION) || dm.dmPosition.y == expected.dmPosition.y, + "Device %s test %d expect dmPosition.y %d, got %d\n", device, test, expected.dmPosition.y, dm.dmPosition.y); + ok_(__FILE__, line)(!(expected.dmFields & DM_DISPLAYFREQUENCY) || + dm.dmDisplayFrequency == expected.dmDisplayFrequency, + "Device %s test %d expect dmDisplayFrequency %u, got %u\n", device, test, expected.dmDisplayFrequency, dm.dmDisplayFrequency); - ok_(__FILE__, line)(dm.dmDisplayOrientation == expected.dmDisplayOrientation, + ok_(__FILE__, line)(!(expected.dmFields & DM_DISPLAYORIENTATION) || + dm.dmDisplayOrientation == expected.dmDisplayOrientation, "Device %s test %d expect dmDisplayOrientation %d, got %d\n", device, test, expected.dmDisplayOrientation, dm.dmDisplayOrientation); } static void test_ChangeDisplaySettingsEx(void) { + static const DWORD registry_fields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; DPI_AWARENESS_CONTEXT context = NULL; UINT primary, device, test, mode; UINT device_size, device_count; struct device_info *devices; + DEVMODEA dm, dm2, dm3; INT count, old_count; DISPLAY_DEVICEA dd; - DEVMODEA dm, dm2; POINTL position; DEVMODEW dmW; LONG res; @@ -672,10 +676,26 @@ static void test_ChangeDisplaySettingsEx(void) /* Test changing modes by saving settings to the registry first */ for (device = 0; device < device_count; ++device) { + /* Place adapter to the right */ + if (device == 0) + { + position.x = 0; + position.y = 0; + } + else + { + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[device - 1].name, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "EnumDisplaySettingsA %s failed, error %#x.\n", devices[device - 1].name, GetLastError()); + position.x = dm.dmPosition.x + dm.dmPelsWidth; + } + memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); + dm3 = dm; /* Find a mode that's different from the current mode */ memset(&dm2, 0, sizeof(dm2)); @@ -687,6 +707,8 @@ static void test_ChangeDisplaySettingsEx(void) } ok(dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, "Failed to find a different mode.\n"); + /* Test normal operation */ + dm.dmPosition = position; dm.dmPelsWidth = dm2.dmPelsWidth; dm.dmPelsHeight = dm2.dmPelsHeight; dm.dmDisplayFrequency = dm2.dmDisplayFrequency; @@ -706,6 +728,56 @@ static void test_ChangeDisplaySettingsEx(void) flush_events(); expect_dm(dm, devices[device].name, 0); + + /* Test specifying only position, width and height */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + dm.dmPosition = position; + dm.dmPelsWidth = dm3.dmPelsWidth; + dm.dmPelsHeight = dm3.dmPelsHeight; + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); + res = EnumDisplaySettingsA(devices[device].name, ENUM_REGISTRY_SETTINGS, &dm); + /* Win10 either returns failure here or retrieves outdated display settings until they're applied */ + if (res) + { + ok((dm.dmFields & registry_fields) == registry_fields, "Got unexpected dmFields %#x.\n", dm.dmFields); + ok(dm.dmPosition.x == position.x, "Expected dmPosition.x %d, got %d.\n", position.x, dm.dmPosition.x); + ok(dm.dmPosition.y == position.y, "Expected dmPosition.y %d, got %d.\n", position.y, dm.dmPosition.y); + ok(dm.dmPelsWidth == dm3.dmPelsWidth || broken(dm.dmPelsWidth == dm2.dmPelsWidth), /* Win10 */ + "Expected dmPelsWidth %u, got %u.\n", dm3.dmPelsWidth, dm.dmPelsWidth); + ok(dm.dmPelsHeight == dm3.dmPelsHeight || broken(dm.dmPelsHeight == dm2.dmPelsHeight), /* Win10 */ + "Expected dmPelsHeight %u, got %u.\n", dm3.dmPelsHeight, dm.dmPelsHeight); + todo_wine ok(dm.dmBitsPerPel, "Expected dmBitsPerPel not zero.\n"); + todo_wine ok(dm.dmDisplayFrequency, "Expected dmDisplayFrequency not zero.\n"); + } + else + { + win_skip("EnumDisplaySettingsA %s failed, error %#x.\n", devices[device].name, GetLastError()); + } + + res = ChangeDisplaySettingsExA(devices[device].name, NULL, NULL, 0, NULL); + todo_wine ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + skip("ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); + continue; + } + flush_events(); + + res = EnumDisplaySettingsA(devices[device].name, ENUM_REGISTRY_SETTINGS, &dm); + ok(res, "EnumDisplaySettingsA %s failed, error %#x.\n", devices[device].name, GetLastError()); + ok((dm.dmFields & registry_fields) == registry_fields, "Got unexpected dmFields %#x.\n", dm.dmFields); + ok(dm.dmPosition.x == position.x, "Expected dmPosition.x %d, got %d.\n", position.x, dm.dmPosition.x); + ok(dm.dmPosition.y == position.y, "Expected dmPosition.y %d, got %d.\n", position.y, dm.dmPosition.y); + ok(dm.dmPelsWidth == dm3.dmPelsWidth, "Expected dmPelsWidth %u, got %u.\n", dm3.dmPelsWidth, dm.dmPelsWidth); + ok(dm.dmPelsHeight == dm3.dmPelsHeight, "Expected dmPelsHeight %u, got %u.\n", dm3.dmPelsHeight, + dm.dmPelsHeight); + ok(dm.dmBitsPerPel, "Expected dmBitsPerPel not zero.\n"); + ok(dm.dmDisplayFrequency, "Expected dmDisplayFrequency not zero.\n"); + + expect_dm(dm, devices[device].name, 0); } /* Test dmPosition */

1 0

Zhiyi Zhang : winex11.drv: Store a full display mode in registry.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 1aa7c9af90c340f45e03c6b94525704ad19eb657 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1aa7c9af90c340f45e03c6b9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 25 15:12:09 2020 +0800 winex11.drv: Store a full display mode in registry. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 11 +++-------- dlls/winex11.drv/settings.c | 48 ++++++++++++++++++++++++++++----------------- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 7cd41145ea..9a7efb8e9b 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -749,8 +749,8 @@ static void test_ChangeDisplaySettingsEx(void) "Expected dmPelsWidth %u, got %u.\n", dm3.dmPelsWidth, dm.dmPelsWidth); ok(dm.dmPelsHeight == dm3.dmPelsHeight || broken(dm.dmPelsHeight == dm2.dmPelsHeight), /* Win10 */ "Expected dmPelsHeight %u, got %u.\n", dm3.dmPelsHeight, dm.dmPelsHeight); - todo_wine ok(dm.dmBitsPerPel, "Expected dmBitsPerPel not zero.\n"); - todo_wine ok(dm.dmDisplayFrequency, "Expected dmDisplayFrequency not zero.\n"); + ok(dm.dmBitsPerPel, "Expected dmBitsPerPel not zero.\n"); + ok(dm.dmDisplayFrequency, "Expected dmDisplayFrequency not zero.\n"); } else { @@ -758,12 +758,7 @@ static void test_ChangeDisplaySettingsEx(void) } res = ChangeDisplaySettingsExA(devices[device].name, NULL, NULL, 0, NULL); - todo_wine ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); - if (res != DISP_CHANGE_SUCCESSFUL) - { - skip("ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); - continue; - } + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); flush_events(); res = EnumDisplaySettingsA(devices[device].name, ENUM_REGISTRY_SETTINGS, &dm); diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index c4929e9b58..7827ede656 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -456,12 +456,15 @@ BOOL is_detached_mode(const DEVMODEW *mode) } /* Get the full display mode with all the necessary fields set. - * Return NULL on failure. Caller should free the returned mode. */ -static DEVMODEW *get_full_mode(ULONG_PTR id, const DEVMODEW *dev_mode) + * Return NULL on failure. Caller should call free_full_mode() to free the returned mode. */ +static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode) { DEVMODEW *modes, *full_mode, *found_mode = NULL; UINT mode_count, mode_idx; + if (is_detached_mode(dev_mode)) + return dev_mode; + if (!handler.get_modes(id, 0, &modes, &mode_count)) return NULL; @@ -500,9 +503,18 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, const DEVMODEW *dev_mode) memcpy(full_mode, found_mode, sizeof(*found_mode) + found_mode->dmDriverExtra); handler.free_modes(modes); + + full_mode->dmFields |= DM_POSITION; + full_mode->u1.s2.dmPosition = dev_mode->u1.s2.dmPosition; return full_mode; } +static void free_full_mode(DEVMODEW *mode) +{ + if (!is_detached_mode(mode)) + heap_free(mode); +} + static LONG get_display_settings(struct x11drv_display_setting **new_displays, INT *new_display_count, const WCHAR *dev_name, DEVMODEW *dev_mode) { @@ -781,19 +793,9 @@ static LONG apply_display_settings(struct x11drv_display_setting *displays, INT if ((attached_mode && !do_attach) || (!attached_mode && do_attach)) continue; - if (attached_mode) - { - full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); - if (!full_mode) - return DISP_CHANGE_BADMODE; - - full_mode->dmFields |= DM_POSITION; - full_mode->u1.s2.dmPosition = displays[display_idx].desired_mode.u1.s2.dmPosition; - } - else - { - full_mode = &displays[display_idx].desired_mode; - } + full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); + if (!full_mode) + return DISP_CHANGE_BADMODE; TRACE("handler:%s changing %s to position:(%d,%d) resolution:%ux%u frequency:%uHz " "depth:%ubits orientation:%#x.\n", handler.name, @@ -803,8 +805,7 @@ static LONG apply_display_settings(struct x11drv_display_setting *displays, INT full_mode->u1.s2.dmDisplayOrientation); ret = handler.set_current_mode(displays[display_idx].id, full_mode); - if (attached_mode) - heap_free(full_mode); + free_full_mode(full_mode); if (ret != DISP_CHANGE_SUCCESSFUL) return ret; } @@ -834,6 +835,7 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, { struct x11drv_display_setting *displays; INT display_idx, display_count; + DEVMODEW *full_mode; LONG ret; ret = get_display_settings(&displays, &display_count, devname, devmode); @@ -846,12 +848,22 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, { if (!lstrcmpiW(displays[display_idx].desired_mode.dmDeviceName, devname)) { - if (!write_registry_settings(devname, &displays[display_idx].desired_mode)) + full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); + if (!full_mode) + { + heap_free(displays); + return DISP_CHANGE_BADMODE; + } + + if (!write_registry_settings(devname, full_mode)) { ERR("Failed to write %s display settings to registry.\n", wine_dbgstr_w(devname)); + free_full_mode(full_mode); heap_free(displays); return DISP_CHANGE_NOTUPDATED; } + + free_full_mode(full_mode); break; } }

1 0

Zhiyi Zhang : winex11.drv: Allow setting a 0-bit color depth display mode.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: f04360cfbec574dc37675df141ef8fc14e1302ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=f04360cfbec574dc37675df1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 25 15:16:51 2020 +0800 winex11.drv: Allow setting a 0-bit color depth display mode. Windows 8.1 and older allow setting a display mode with 0-bit color depth. Fix a regression from 981fb4edb371dd2ccf57dd350e76451df50c0a98. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 7827ede656..902f1ec15d 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -473,7 +473,9 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode) { found_mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*modes) + modes[0].dmDriverExtra) * mode_idx); - if (dev_mode->dmFields & DM_BITSPERPEL && found_mode->dmBitsPerPel != dev_mode->dmBitsPerPel) + if (dev_mode->dmFields & DM_BITSPERPEL && + dev_mode->dmBitsPerPel && + found_mode->dmBitsPerPel != dev_mode->dmBitsPerPel) continue; if (dev_mode->dmFields & DM_PELSWIDTH && found_mode->dmPelsWidth != dev_mode->dmPelsWidth) continue;

1 0

Zhiyi Zhang : winex11.drv: Always update _NET_WM_STATE in update_net_wm_states().
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: c5ec1585f6e5211a2b63e3435748210552250534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5ec1585f6e5211a2b63e343… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 25 15:20:39 2020 +0800 winex11.drv: Always update _NET_WM_STATE in update_net_wm_states(). KWin treats a window covering exactly the whole monitor as maximized when handling its first map request and expects applications to update maximized state later. Wine doesn't know about this added maximized state and expect it unchanged, making the window always maximized as far as KWin is concerned. So always send _NET_WM_STATE updates even if Wine doesn't expect changes to hint KWin that a window should not be maximized. Fix test failures when running the tests introduced by 36b720357bcaf0a1e625f488e0c981ce10e8affa with KWin. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f4920b802e..09475d1adb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -996,8 +996,6 @@ void update_net_wm_states( struct x11drv_win_data *data ) for (i = 0; i < NB_NET_WM_STATES; i++) { - if (!((data->net_wm_state ^ new_state) & (1 << i))) continue; /* unchanged */ - TRACE( "setting wm state %u for window %p/%lx to %u prev %u\n", i, data->hwnd, data->whole_window, (new_state & (1 << i)) != 0, (data->net_wm_state & (1 << i)) != 0 );

1 0