[PATCH 0/1] MR2335: riched20/tests: Don't specify DT_WORDBREAK in _check_txgetnaturalsize(). (#54637)
Today, test_TxGetNaturalSize() creates a pop-up window with a fixed size (extent) of 100 x 100. The test function then proceeds to compute the natural size of rich edit control that fits the sample text "TestSomeText" and compare it to the RECT calculated by DrawText.
It appears that this test fails if the text width exceeds the width of the test window's client area. In this case, DrawText() with DT_WORDBREAK breaks the text into the two lines due to text wrapping; however, Rich Edit's ITextServices::TxGetNaturalSize implementation does not seem to perform text wrapping on overflow. This results in extent mismatch.
In conclusion, the test may fail if the rendered width of the sample text "TestSomeText" is larger than what the test expects. This depends on the current font used for DEFAULT_GUI_FONT.
Fix this by omitting the DT_WORDBREAK flag for the DrawText() call in _check_txgetnaturalsize().
From: Jinoh Kang jinoh.kang.kr@gmail.com
Today, test_TxGetNaturalSize() creates a pop-up window with a fixed size (extent) of 100 x 100. The test function then proceeds to compute the natural size of rich edit control that fits the sample text "TestSomeText" and compare it to the RECT calculated by DrawText.
It appears that this test fails if the text width exceeds the width of the test window's client area. In this case, DrawText() with DT_WORDBREAK breaks the text into the two lines due to text wrapping; however, Rich Edit's ITextServices::TxGetNaturalSize implementation does not seem to perform text wrapping on overflow. This results in extent mismatch.
In conclusion, the test may fail if the rendered width of the sample text "TestSomeText" is larger than what the test expects. This depends on the current font used for DEFAULT_GUI_FONT.
Fix this by omitting the DT_WORDBREAK flag for the DrawText() call in _check_txgetnaturalsize().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54637 --- dlls/riched20/tests/txtsrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 16904347919..e18ee91279e 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -753,7 +753,7 @@ static void _check_txgetnaturalsize(HRESULT res, LONG width, LONG height, HDC hd RECT expected_rect = rect; LONG expected_width, expected_height;
- DrawTextW(hdc, string, -1, &expected_rect, DT_LEFT | DT_CALCRECT | DT_NOCLIP | DT_EDITCONTROL | DT_WORDBREAK); + DrawTextW(hdc, string, -1, &expected_rect, DT_LEFT | DT_CALCRECT | DT_NOCLIP | DT_EDITCONTROL); expected_width = expected_rect.right - expected_rect.left; expected_height = expected_rect.bottom - expected_rect.top; ok_(__FILE__,line)(res == S_OK, "ITextServices_TxGetNaturalSize failed: 0x%08lx.\n", res);
This merge request was approved by Huw Davies.
-
Huw Davies (＠huw) -
Jinoh Kang
-
Jinoh Kang (＠iamahuman)