Signed-off-by: Francois Gouget fgouget@codeweavers.com --- dlls/gdi32/tests/font.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9c616e6a30b..86ab3f3632f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6523,6 +6523,7 @@ static void test_max_height(void)
/* test an invalid value */ for (i = 0; i < ARRAY_SIZE(invalid_height); i++) { + winetest_push_context("height=%d", invalid_height[i]); lf.lfHeight = invalid_height[i]; hfont = CreateFontIndirectA(&lf); hfont_old = SelectObject(hdc, hfont); @@ -6534,6 +6535,7 @@ static void test_max_height(void) ok(tm.tmAveCharWidth == tm1.tmAveCharWidth, "expected 1 ppem value (%ld), got %ld\n", tm1.tmAveCharWidth, tm.tmAveCharWidth); DeleteObject(SelectObject(hdc, hfont_old)); + winetest_pop_context(); }
ReleaseDC(NULL, hdc);
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=113448
Your paranoid android.
=== w1064v1809 (32 bit report) ===
gdi32: font.c:6532: Test failed: height=-65536: GetTextMetrics failed font.c:6533: Test failed: height=-65536: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-65536: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=-123456: GetTextMetrics failed font.c:6533: Test failed: height=-123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-123456: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=123456: GetTextMetrics failed font.c:6533: Test failed: height=123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=123456: expected 1 ppem value (1), got 0
=== w1064 (32 bit report) ===
gdi32: font.c:6532: Test failed: height=-65536: GetTextMetrics failed font.c:6533: Test failed: height=-65536: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-65536: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=-123456: GetTextMetrics failed font.c:6533: Test failed: height=-123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-123456: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=123456: GetTextMetrics failed font.c:6533: Test failed: height=123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=123456: expected 1 ppem value (1), got 0
=== w1064_tsign (32 bit report) ===
gdi32: font.c:6532: Test failed: height=-65536: GetTextMetrics failed font.c:6533: Test failed: height=-65536: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-65536: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=-123456: GetTextMetrics failed font.c:6533: Test failed: height=-123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-123456: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=123456: GetTextMetrics failed font.c:6533: Test failed: height=123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=123456: expected 1 ppem value (1), got 0
=== w10pro64 (32 bit report) ===
gdi32: font.c:6532: Test failed: height=-65536: GetTextMetrics failed font.c:6533: Test failed: height=-65536: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-65536: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=-123456: GetTextMetrics failed font.c:6533: Test failed: height=-123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-123456: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=123456: GetTextMetrics failed font.c:6533: Test failed: height=123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=123456: expected 1 ppem value (1), got 0
=== w1064v1809 (64 bit report) ===
gdi32: font.c:6532: Test failed: height=-65536: GetTextMetrics failed font.c:6533: Test failed: height=-65536: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-65536: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=-123456: GetTextMetrics failed font.c:6533: Test failed: height=-123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-123456: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=123456: GetTextMetrics failed font.c:6533: Test failed: height=123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=123456: expected 1 ppem value (1), got 0
=== w1064 (64 bit report) ===
gdi32: font.c:6532: Test failed: height=-65536: GetTextMetrics failed font.c:6533: Test failed: height=-65536: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-65536: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=-123456: GetTextMetrics failed font.c:6533: Test failed: height=-123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-123456: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=123456: GetTextMetrics failed font.c:6533: Test failed: height=123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=123456: expected 1 ppem value (1), got 0
=== w1064_2qxl (64 bit report) ===
gdi32: font.c:6532: Test failed: height=-65536: GetTextMetrics failed font.c:6533: Test failed: height=-65536: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-65536: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=-123456: GetTextMetrics failed font.c:6533: Test failed: height=-123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-123456: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=123456: GetTextMetrics failed font.c:6533: Test failed: height=123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=123456: expected 1 ppem value (1), got 0
=== w1064_tsign (64 bit report) ===
gdi32: font.c:6532: Test failed: height=-65536: GetTextMetrics failed font.c:6533: Test failed: height=-65536: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-65536: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=-123456: GetTextMetrics failed font.c:6533: Test failed: height=-123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-123456: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=123456: GetTextMetrics failed font.c:6533: Test failed: height=123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=123456: expected 1 ppem value (1), got 0
=== w10pro64 (64 bit report) ===
gdi32: font.c:6532: Test failed: height=-65536: GetTextMetrics failed font.c:6533: Test failed: height=-65536: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-65536: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=-123456: GetTextMetrics failed font.c:6533: Test failed: height=-123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-123456: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=123456: GetTextMetrics failed font.c:6533: Test failed: height=123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=123456: expected 1 ppem value (1), got 0
=== w10pro64_ar (64 bit report) ===
gdi32: font.c:6532: Test failed: height=-65536: GetTextMetrics failed font.c:6533: Test failed: height=-65536: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-65536: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=-123456: GetTextMetrics failed font.c:6533: Test failed: height=-123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-123456: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=123456: GetTextMetrics failed font.c:6533: Test failed: height=123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=123456: expected 1 ppem value (1), got 0
=== w10pro64_he (64 bit report) ===
gdi32: font.c:6532: Test failed: height=-65536: GetTextMetrics failed font.c:6533: Test failed: height=-65536: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-65536: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=-123456: GetTextMetrics failed font.c:6533: Test failed: height=-123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-123456: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=123456: GetTextMetrics failed font.c:6533: Test failed: height=123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=123456: expected 1 ppem value (1), got 0
=== w10pro64_ja (64 bit report) ===
gdi32: font.c:6532: Test failed: height=-65536: GetTextMetrics failed font.c:6533: Test failed: height=-65536: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-65536: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=-123456: GetTextMetrics failed font.c:6533: Test failed: height=-123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-123456: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=123456: GetTextMetrics failed font.c:6533: Test failed: height=123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=123456: expected 1 ppem value (1), got 0
=== w10pro64_zh_CN (64 bit report) ===
gdi32: font.c:6532: Test failed: height=-65536: GetTextMetrics failed font.c:6533: Test failed: height=-65536: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-65536: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=-123456: GetTextMetrics failed font.c:6533: Test failed: height=-123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=-123456: expected 1 ppem value (1), got 0 font.c:6532: Test failed: height=123456: GetTextMetrics failed font.c:6533: Test failed: height=123456: expected 1 ppem value (2), got 0 font.c:6535: Test failed: height=123456: expected 1 ppem value (1), got 0
On Tue, Apr 26, 2022 at 04:57:14PM +0200, Francois Gouget wrote:
Signed-off-by: Francois Gouget fgouget@codeweavers.com
dlls/gdi32/tests/font.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9c616e6a30b..86ab3f3632f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6523,6 +6523,7 @@ static void test_max_height(void)
/* test an invalid value */ for (i = 0; i < ARRAY_SIZE(invalid_height); i++) {
winetest_push_context("height=%d", invalid_height[i]);
This is producing -Wformat warnings:
dlls/gdi32/tests/font.c: In function ‘test_max_height’: dlls/gdi32/tests/font.c:6526:40: warning: format ‘%d’ expects argument of type ‘int’, but argument 2 has type ‘LONG’ {aka ‘long int’} [-Wformat=] 6526 | winetest_push_context("height=%d", invalid_height[i]); | ~^ ~~~~~~~~~~~~~~~~~ | | | | int LONG {aka long int} | %ld
Huw.