- Wine-Devel - list.winehq.org

[PATCH v2] gdi32/tests: Trace the invalid height in test_max_height().
by Francois Gouget April 27, 2022

April 27, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Fixed the compilation warning. --- 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..76d787c1440 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=%ld", 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); -- 2.30.2

3 2

[PATCH] po: Fix trailing full stop inconsistencies in the Turkish translation.
by Francois Gouget April 27, 2022

April 27, 2022

The translation's trailing full stop use should match the English version. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- I did not notice anything to indicate that Turkish should behave differently in this regard. --- po/tr.po | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)

1 0

[PATCH] po: Fix trailing full stop inconsistencies in the Czech translation.
by Francois Gouget April 27, 2022

April 27, 2022

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- po/cs.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH] po: Fix a trailing full stop inconsistency in the Asturian translation.
by Francois Gouget April 27, 2022

April 27, 2022

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- po/ast.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] po: Fix the indentation of a usage message in the Brazilian translation.
by Francois Gouget April 27, 2022

April 27, 2022

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- po/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH v2 1/5] mf/tests: Simplify handling of broken Win7 results.
by Rémi Bernon April 27, 2022

April 27, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: No changes. dlls/mf/tests/mf.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 31a84e47bc1..b2dd807dd33 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6631,6 +6631,7 @@ static void test_h264_decoder(void) IMFMediaType *media_type; IMFTransform *transform; DWORD status, length; + BOOL is_win7 = FALSE; ULONG i, ret, flags; HANDLE output_file; IMFSample *sample; @@ -6741,10 +6742,9 @@ static void test_h264_decoder(void) winetest_push_context("out %lu", i); ok(hr == S_OK, "GetOutputAvailableType returned %#lx\n", hr); check_media_type(media_type, default_outputs[i], -1); - if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL))) - check_media_type(media_type, default_outputs_win7[i], -1); - else - check_media_type(media_type, default_outputs_extra[i], -1); + hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL); + is_win7 = broken(FAILED(hr)); + check_media_type(media_type, is_win7 ? default_outputs_win7[i] : default_outputs_extra[i], -1); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret); winetest_pop_context(); @@ -6772,11 +6772,9 @@ static void test_h264_decoder(void) init_media_type(media_type, output_type_desc, i + 1); } hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - if (broken(hr == MF_E_INVALIDMEDIATYPE)) - { - init_media_type(media_type, output_type_desc_win7, ARRAY_SIZE(output_type_desc_win7) - 1); - hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - } + ok(hr == (is_win7 ? MF_E_INVALIDMEDIATYPE : S_OK), "SetOutputType returned %#lx.\n", hr); + init_media_type(media_type, is_win7 ? output_type_desc_win7 : output_type_desc, -1); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret == 1, "Release returned %lu\n", ret); -- 2.35.1

2 9

[PATCH] po: Fix a typo in the Asturian translation.
by Francois Gouget April 27, 2022

April 27, 2022

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- All the other instances of 'invalid' translate to 'nun ye válidu' (or válida). So there does not seem to be any reason to add an 's' to 'válidu'. Thus I think the 's' is just an extra character that should not be there. --- po/ast.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] kernel32/tests: Fix the spelling of a comment.
by Francois Gouget April 27, 2022

April 27, 2022

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index e3c75fbfe0a..88781aa376c 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -338,7 +338,7 @@ static void test_HeapCreate(void) ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); - /* theshold between failure and success varies, and w7pro64 has a much larger overhead. */ + /* threshold between failure and success varies, and w7pro64 has a much larger overhead. */ ptr = HeapAlloc( heap, 0, alloc_size - (0x400 + 0x100 * sizeof(void *)) ); ok( !!ptr, "HeapAlloc failed, error %lu\n", GetLastError() ); -- 2.30.2

1 0

[PATCH] user32/tests: Trace monitor information with 'monitor info'.
by Francois Gouget April 27, 2022

April 27, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Just running user32:monitor does not provide useful information about how many monitors are present, their resolution, etc. I can manually check this information by starting a VM, connecting to it with virt-viewer and using the GUI. But multi-monitor setups are a bit finicky so I'm never really sure if they really get the same configuration when they run tests. This issue is exacerbated by the fact that Libvirt's screenshotting functionality is particularly buggy for Windows guests and seems to only capture the primary monitor. So I'm hoping to use this patch to get more accurate monitor + resolution information (at least until client-side screenshotting). I can also keep it locally if it is deemed not suitable for Wine. --- dlls/user32/tests/monitor.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 02bc6651dd3..94cb7e60382 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2530,9 +2530,38 @@ static void test_display_dc(void) } } +BOOL CALLBACK MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, + LPRECT lprcMonitor, LPARAM dwData) +{ + MONITORINFOEXW info; + static int index; + + info.cbSize = sizeof(info); + if (GetMonitorInfoW(hMonitor, (MONITORINFO*)&info)) + { + printf("Monitor %d %7s [%02lx] %s %s\n", index, + (info.dwFlags & MONITORINFOF_PRIMARY) ? "primary" : "", + info.dwFlags, wine_dbgstr_rect(&info.rcMonitor), + wine_dbgstr_w(info.szDevice)); + } + index++; + return TRUE; +} + START_TEST(monitor) { + char** myARGV; + int myARGC = winetest_get_mainargs(&myARGV); + init_function_pointers(); + + if (myARGC >= 3 && strcmp(myARGV[2], "info") == 0) + { + printf("Monitor information:\n"); + EnumDisplayMonitors(NULL, NULL, MonitorEnumProc, 0); + return; + } + test_enumdisplaydevices(); test_ChangeDisplaySettingsEx(); test_DisplayConfigSetDeviceInfo(); -- 2.30.2

1 0

[PATCH] oleaut32/tests: The EUR abbreviation is not recognized as a currency.
by Francois Gouget April 27, 2022

April 27, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 4fc0e4e0221..cdbb836b041 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2151,6 +2151,12 @@ static void test_VarParseNumFromStrFr(void) EXPECT2(1,2); EXPECTRGB(2,FAILDIG); + /* The three-letter Euro abbreviation is not allowed */ + WCONVERT(L"12EUR", NUMPRS_CURRENCY); + EXPECT(2,NUMPRS_CURRENCY,0,2,0,0); + EXPECT2(1,2); + EXPECTRGB(2,FAILDIG); + /* With flag and decimal flag, consumes decimal point and following digits */ WCONVERT(L"12,1\x20ac", NUMPRS_CURRENCY|NUMPRS_DECIMAL|NUMPRS_USE_ALL); EXPECT(3,NUMPRS_CURRENCY|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_DECIMAL,5,0,-1); -- 2.30.2

1 0