April 2021 - Wine-Devel - list.winehq.org

[tools] testbot/LogUtils: Detect WineTest.exe errors.
by Francois Gouget April 7, 2021

April 7, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e6e89f556..5d2dc33a5 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -106,8 +106,10 @@ sub GetLogLineCategory($) $Line =~ /^Task: / or # Typical perl errors _IsPerlError($Line) or - # The testbot.log errors - $Line =~ /:error: /) + # The TestLauncher / testbot.log errors + $Line =~ /:error: / or + # WineTest.exe errors + $Line =~ /^Error: /) { return "error"; } -- 2.20.1

1 0

[tools] testbot/WineRunTask: Increase the leeway to catch TestLauncher timeouts!
by Francois Gouget April 7, 2021

April 7, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunTask.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 714679660..148884328 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -444,9 +444,9 @@ if ($Step->Type eq "single") } $Script .= "$TestLauncher -t $Timeout $FileName "; - # Add 1 second to the timeout so the client-side Wait() does not time out - # right before $TestLauncher does. - $Timeout += 1; + # Add some margin so $TA->Wait() does not time out right before + # TestLauncher does. + $Timeout += 5; $Keepalive = 20; my $CmdLineArg = $Task->CmdLineArg; if ($CmdLineArg) -- 2.20.1

1 0

[PATCH v2 resend 4/4] gdi32: Get rid of redundant ntmCellHeight member.
by Akihiro Sagawa April 7, 2021

April 7, 2021

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/font.c | 6 ++++-- dlls/gdi32/freetype.c | 1 - dlls/gdi32/gdi_private.h | 1 - 3 files changed, 4 insertions(+), 4 deletions(-)

2 1

[PATCH v2 resend 3/4] gdi32: Fix text metrics used in EnumFonts families.
by Akihiro Sagawa April 7, 2021

April 7, 2021

In v2, use the default font height for non-scalable faces. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50818 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/font.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/font.c | 19 +++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-)

2 1

[PATCH v2 resend 2/4] gdi32: Move otmEMSquare initialization to freetype_load_font.
by Akihiro Sagawa April 7, 2021

April 7, 2021

In preparation for the next commit. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH v2 resend 1/4] gdi32/tests: Remove unreliable height tests.
by Akihiro Sagawa April 7, 2021

April 7, 2021

New in v2 to fix Alexandre's test failures. I decide to remove these tests because we'll add more reliable ones in the later patch. In detail, Latin Modern Math causes test failures at these points. The 212 height is too high. However, this is correct as manual test shows it is the same value in native. Moreover, the upper bound is a heuristic value. So, there might be a font face that is over 212 height. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 2 -- 1 file changed, 2 deletions(-)

2 1

[PATCH 1/9] mfplay: Implement GetVideoWindow().
by Nikolay Sivov April 7, 2021

April 7, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 18 ++++++++++++------ dlls/mfplay/tests/mfplay.c | 8 +++++++- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 246704c2799..479aca40890 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -69,6 +69,7 @@ struct media_player IMFSourceResolver *resolver; MFP_CREATION_OPTIONS options; HWND event_window; + HWND output_window; }; struct generic_event @@ -862,11 +863,15 @@ static HRESULT WINAPI media_player_GetAspectRatioMode(IMFPMediaPlayer *iface, return E_NOTIMPL; } -static HRESULT WINAPI media_player_GetVideoWindow(IMFPMediaPlayer *iface, HWND *hwnd) +static HRESULT WINAPI media_player_GetVideoWindow(IMFPMediaPlayer *iface, HWND *window) { - FIXME("%p, %p.\n", iface, hwnd); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, window); + + *window = player->output_window; + + return S_OK; } static HRESULT WINAPI media_player_UpdateVideo(IMFPMediaPlayer *iface) @@ -1166,12 +1171,12 @@ static const IMFAsyncCallbackVtbl media_player_events_callback_vtbl = }; HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, - IMFPMediaPlayerCallback *callback, HWND hwnd, IMFPMediaPlayer **player) + IMFPMediaPlayerCallback *callback, HWND window, IMFPMediaPlayer **player) { struct media_player *object; HRESULT hr; - TRACE("%s, %d, %#x, %p, %p, %p.\n", debugstr_w(url), start_playback, options, callback, hwnd, player); + TRACE("%s, %d, %#x, %p, %p, %p.\n", debugstr_w(url), start_playback, options, callback, window, player); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -1184,9 +1189,10 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C object->events_callback.lpVtbl = &media_player_events_callback_vtbl; object->refcount = 1; object->callback = callback; - object->options = options; if (object->callback) IMFPMediaPlayerCallback_AddRef(object->callback); + object->options = options; + object->output_window = window; if (FAILED(hr = CreatePropertyStore(&object->propstore))) goto failed; if (FAILED(hr = MFCreateSourceResolver(&object->resolver))) diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 64347265c40..6d82f630075 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -83,6 +83,7 @@ static void test_create_player(void) IPropertyStore *propstore; IMFPMediaPlayer *player; IUnknown *unk, *unk2; + HWND window; HRESULT hr; hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); @@ -108,8 +109,13 @@ static void test_create_player(void) IMFPMediaPlayer_Release(player); - hr = MFPCreateMediaPlayer(NULL, FALSE, 0, &callback, NULL, &player); + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, &callback, (HWND)0x1, &player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetVideoWindow(player, &window); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(window == (HWND)0x1, "Unexpected window.\n"); + IMFPMediaPlayer_Release(player); } -- 2.30.2

1 8

[PATCH 1/6] ntoskrnl/tests: Factor out winetest_init() and winetest_cleanup().
by Zebediah Figura April 7, 2021

April 7, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- The idea of this series is twofold: first, to make it possible to use ok() almost everywhere (including in the driver initialization and unload routines), and secondly, to reduce the programming overhead of communicating test results, which is especially useful as we add more and more test drivers. dlls/ntoskrnl.exe/tests/driver.c | 23 +++++------------------ dlls/ntoskrnl.exe/tests/driver_netio.c | 22 +++++----------------- dlls/ntoskrnl.exe/tests/utils.h | 25 +++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 179d2d5e02d..1d78f576ecf 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1782,15 +1782,7 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) test_stack_limits(); test_completion(); - /* print process report */ - if (winetest_debug) - { - kprintf("%04x:ntoskrnl: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - PsGetCurrentProcessId(), successes + failures + todo_successes + todo_failures, - todo_successes, failures + todo_failures, - (failures + todo_failures != 1) ? "failures" : "failure", skipped ); - } - ZwClose(okfile); + winetest_cleanup(); *((LONG *)buffer) = failures; irp->IoStatus.Status = STATUS_SUCCESS; @@ -2116,24 +2108,19 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; void *buffer = irp->AssociatedIrp.SystemBuffer; struct test_input *test_input = (struct test_input *)buffer; - OBJECT_ATTRIBUTES attr = {0}; - UNICODE_STRING pathU; - IO_STATUS_BLOCK io; + NTSTATUS status; if (!buffer) return STATUS_ACCESS_VIOLATION; if (length < sizeof(failures)) return STATUS_BUFFER_TOO_SMALL; - attr.Length = sizeof(attr); - RtlInitUnicodeString(&pathU, L"\\??\\C:\\windows\\winetest_ntoskrnl_okfile"); running_under_wine = test_input->running_under_wine; winetest_debug = test_input->winetest_debug; winetest_report_success = test_input->winetest_report_success; - attr.ObjectName = &pathU; - attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE; /* needed to be accessible from system threads */ - ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); + + if ((status = winetest_init())) + return status; pExEventObjectType = get_proc_address("ExEventObjectType"); ok(!!pExEventObjectType, "ExEventObjectType not found\n"); diff --git a/dlls/ntoskrnl.exe/tests/driver_netio.c b/dlls/ntoskrnl.exe/tests/driver_netio.c index 3d783dbef0d..98392c9c7fd 100644 --- a/dlls/ntoskrnl.exe/tests/driver_netio.c +++ b/dlls/ntoskrnl.exe/tests/driver_netio.c @@ -468,38 +468,26 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; void *buffer = irp->AssociatedIrp.SystemBuffer; struct test_input *test_input = buffer; - OBJECT_ATTRIBUTES attr = {0}; - UNICODE_STRING pathU; - IO_STATUS_BLOCK io; + NTSTATUS status; if (!buffer) return STATUS_ACCESS_VIOLATION; if (length < sizeof(failures)) return STATUS_BUFFER_TOO_SMALL; - attr.Length = sizeof(attr); - RtlInitUnicodeString(&pathU, L"\\??\\C:\\winetest_ntoskrnl_okfile"); running_under_wine = test_input->running_under_wine; winetest_debug = test_input->winetest_debug; winetest_report_success = test_input->winetest_report_success; - attr.ObjectName = &pathU; - attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE; /* needed to be accessible from system threads */ - ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); + + if ((status = winetest_init())) + return status; netio_init(); test_wsk_get_address_info(); test_wsk_listen_socket(); test_wsk_connect_socket(); - if (winetest_debug) - { - kprintf("%04x:ntoskrnl: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - PsGetCurrentProcessId(), successes + failures + todo_successes + todo_failures, - todo_successes, failures + todo_failures, - (failures + todo_failures != 1) ? "failures" : "failure", skipped ); - } - ZwClose(okfile); + winetest_cleanup(); *((LONG *)buffer) = failures; irp->IoStatus.Information = sizeof(failures); diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index be0f58f837c..508346ef9bf 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -49,6 +49,31 @@ static inline void WINAPIV kprintf(const char *format, ...) __ms_va_end(valist); } +static inline NTSTATUS winetest_init(void) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + IO_STATUS_BLOCK io; + + RtlInitUnicodeString(&string, L"\\??\\C:\\windows\\winetest_ntoskrnl_okfile"); + /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); + return ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); +} + +static inline void winetest_cleanup(void) +{ + if (winetest_debug) + { + kprintf("%04x:ntoskrnl: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + PsGetCurrentProcessId(), successes + failures + todo_successes + todo_failures, + todo_successes, failures + todo_failures, + (failures + todo_failures != 1) ? "failures" : "failure", skipped ); + } + ZwClose(okfile); +} + static inline void WINAPIV vok_(const char *file, int line, int condition, const char *msg, __ms_va_list args) { const char *current_file; -- 2.30.2

1 5

[PATCH 3/3] mshtml: Expose IHTMLStyleSheet4 to scripts.
by Jacek Caban April 6, 2021

April 6, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstylesheet.c | 9 +++++++- dlls/mshtml/tests/documentmode.js | 36 +++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.js | 12 +++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-)

2 1

[PATCH 2/3] mshtml: Add IHTMLStyleSheet4::insertRule implementation.
by Jacek Caban April 6, 2021

April 6, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstylesheet.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)

1 0