September 2022 - Wine-commits

Alexandre Julliard : tests: Do not report flaky tests as failures by default.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: c19f88646a594f2ca424b29a6b0dea3a30c8ac8a URL: https://gitlab.winehq.org/wine/wine/-/commit/c19f88646a594f2ca424b29a6b0dea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 10:43:46 2022 +0200 tests: Do not report flaky tests as failures by default. --- include/wine/test.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index e502c967d9b..94d92e19c57 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -44,8 +44,8 @@ extern int winetest_time; /* running in interactive mode? */ extern int winetest_interactive; -/* always count flaky tests as successful (BOOL) */ -extern int winetest_allow_flaky; +/* report failed flaky tests as failures (BOOL) */ +extern int winetest_report_flaky; /* report successful tests (BOOL) */ extern int winetest_report_success; @@ -207,8 +207,8 @@ int winetest_interactive = 0; /* current platform */ const char *winetest_platform = "windows"; -/* always count flaky tests as successful (BOOL) */ -int winetest_allow_flaky; +/* report failed flaky tests as failures (BOOL) */ +int winetest_report_flaky = 0; /* report successful tests (BOOL) */ int winetest_report_success = 0; @@ -731,7 +731,7 @@ static int run_test( const char *name ) winetest_print_unlock(); } status = failures + todo_failures; - if (!winetest_allow_flaky) status += flaky_failures; + if (winetest_report_flaky) status += flaky_failures; if (status > 255) status = 255; return status; } @@ -807,7 +807,7 @@ int main( int argc, char **argv ) } if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); - if (GetEnvironmentVariableA( "WINETEST_ALLOW_FLAKY", p, sizeof(p) )) winetest_allow_flaky = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_REPORT_FLAKY", p, sizeof(p) )) winetest_report_flaky = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) winetest_report_success = atoi(p); if (GetEnvironmentVariableA( "WINETEST_TIME", p, sizeof(p) )) winetest_time = atoi(p); winetest_last_time = winetest_start_time = GetTickCount();

1 0

Alexandre Julliard : user32/tests: Flush window events to fix some race conditions.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: 1c31bdcad70ee89b2d0edd85b9ea827d3dc0995b URL: https://gitlab.winehq.org/wine/wine/-/commit/1c31bdcad70ee89b2d0edd85b9ea82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 18:42:10 2022 +0200 user32/tests: Flush window events to fix some race conditions. --- dlls/user32/tests/win.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5f2e11ce367..b86a9b05e61 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8143,9 +8143,11 @@ static void test_EnableWindow(void) DWORD tid; MSG msg; - hwnd = CreateWindowExA(0, "MainWindowClass", NULL, WS_OVERLAPPEDWINDOW, - 0, 0, 100, 100, 0, 0, 0, NULL); + hwnd = CreateWindowExA(0, "MainWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), + 0, 0, 0, NULL); assert(hwnd); + flush_events( TRUE ); ok(IsWindowEnabled(hwnd), "window should be enabled\n"); SetFocus(hwnd); SetCapture(hwnd); @@ -8658,6 +8660,7 @@ static void run_NCRedrawLoop(UINT flags) UINT loopcount = 0; + flush_events( TRUE ); hwnd = CreateWindowA("TestNCRedrawClass", "MainWindow", WS_OVERLAPPEDWINDOW, 0, 0, 200, 100, NULL, NULL, 0, &flags);

1 0

Alexandre Julliard : user32/tests: Mark some input tests as flaky.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: 3af6ececec418698d84ef70dcd5068d183e003e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/3af6ececec418698d84ef70dcd5068… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 18:43:28 2022 +0200 user32/tests: Mark some input tests as flaky. --- dlls/user32/tests/input.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 37b1a4aef6d..09e1ca1f961 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2584,6 +2584,7 @@ static void rawinput_test_process(void) raw_devices[0].dwFlags = RIDEV_REMOVE; raw_devices[0].hwndTarget = 0; + flaky_wine ok(rawinput_test_received_legacy, "%d: foreground process expected WM_MOUSEMOVE message\n", i); ok(rawinput_test_received_raw, "%d: foreground process expected WM_INPUT message\n", i); ok(rawinput_test_received_rawfg, "%d: foreground process expected RIM_INPUT message\n", i); @@ -2853,6 +2854,7 @@ static void test_rawinput(const char* argv0) SetEvent(process_done); SetEvent(params.done); + flaky_wine if (!skipped) { todo_wine_if(rawinput_tests[i].todo_legacy) @@ -3432,6 +3434,7 @@ static LRESULT CALLBACK mouse_move_wndproc(HWND hwnd, UINT msg, WPARAM wparam, L POINT pt = {LOWORD(lparam), HIWORD(lparam)}; MapWindowPoints(hwnd, NULL, &pt, 1); + flaky if (pt.x != last_x) ok( pt.x == expect_x, "got unexpected WM_MOUSEMOVE x %ld, expected %ld\n", pt.x, expect_x ); expect_x = pt.x == 200 ? 210 : 200; @@ -3583,6 +3586,7 @@ static void test_Input_mouse(void) SetEvent(thread_data.end_event); WaitForSingleObject(thread, INFINITE); CloseHandle(thread); + flaky_wine ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); ok(!got_button_down, "unexpected WM_RBUTTONDOWN message\n"); ok(!got_button_up, "unexpected WM_RBUTTONUP message\n");

1 0

Alexandre Julliard : mmdevapi/tests: Mark some capture tests as flaky.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: 2742660e08a3496f44ec9d0d4fbfc26b5f51f31e URL: https://gitlab.winehq.org/wine/wine/-/commit/2742660e08a3496f44ec9d0d4fbfc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 19:56:58 2022 +0200 mmdevapi/tests: Mark some capture tests as flaky. --- dlls/mmdevapi/tests/capture.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 9d3d13dcaae..e7865457cbe 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -184,9 +184,11 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) * whereas GetCurrentPadding grows when input is not consumed. */ hr = IAudioCaptureClient_GetNextPacketSize(acc, &next); ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08lx\n", hr); + flaky_wine ok(next < pad, "GetNextPacketSize %u vs. GCP %u\n", next, pad); hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); + flaky_wine ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); ok(next == frames, "GetNextPacketSize %u vs. GetBuffer %u\n", next, frames); @@ -256,6 +258,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) } frames = period; + flaky_wine ok(next == frames, "GetNextPacketSize %u vs. GetDevicePeriod %u\n", next, frames); /* GetBufferSize is not a multiple of the period size! */ @@ -269,6 +272,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr); hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); + flaky_wine ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); trace("Overrun position %d pad %u flags %lx, amount of frames locked: %u\n", @@ -296,6 +300,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr); hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); + flaky_wine ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); trace("Cont'ed position %d pad %u flags %lx, amount of frames locked: %u\n", @@ -317,6 +322,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(hr == S_OK, "Start on a stopped stream returns %08lx\n", hr); hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); + flaky_wine ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); hr = IAudioClient_GetCurrentPadding(ac, &pad); @@ -324,6 +330,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) trace("Restart position %d pad %u flags %lx, amount of frames locked: %u\n", hr==S_OK ? (UINT)pos : -1, pad, flags, frames); + flaky_wine ok(pad > sum, "restarted GCP %u\n", pad); /* GCP is still near buffer size */ if(frames){ @@ -366,6 +373,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr); hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); + flaky_wine ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); trace("Running position %d pad %u flags %lx, amount of frames locked: %u\n", SUCCEEDED(hr) ? (UINT)pos : -1, pad, flags, frames);

1 0

Alexandre Julliard : dinput/tests: Mark a mouse input test as flaky.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: 48f99c41455dd1b7727bcc82e07e24428820465b URL: https://gitlab.winehq.org/wine/wine/-/commit/48f99c41455dd1b7727bcc82e07e24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 19:59:14 2022 +0200 dinput/tests: Mark a mouse input test as flaky. --- dlls/dinput/tests/device8.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index ebe376d1127..e779b56092a 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -2032,12 +2032,16 @@ static void test_sys_mouse( DWORD version ) ok( hr == (version < 0x800 ? DI_OK : DI_BUFFEROVERFLOW), "GetDeviceData returned %#lx\n", hr ); count = 1; hr = IDirectInputDevice8_GetDeviceData( device, sizeof(objdata), &objdata, &count, 0 ); + + flaky_wine_if (hr == DIERR_NOTACQUIRED) ok( hr == DI_OK, "GetDeviceData returned %#lx\n", hr ); ok( count == 1, "got count %lu\n", count ); - hr = IDirectInputDevice8_Unacquire( device ); - ok( hr == DI_OK, "Unacquire returned %#lx\n", hr ); - + if (hr != DIERR_NOTACQUIRED) + { + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_OK, "Unacquire returned %#lx\n", hr ); + } tmp_hwnd = CreateWindowW( L"static", L"static", WS_POPUP | WS_VISIBLE, 50, 250, 200, 200, NULL, NULL, NULL, NULL );

1 0

Kevin Puetz : vbscript: Only set EXCEPINFO strings for cases that map_hres translated.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: db94448d9785ac5b4425981fa3a043f79e64ee34 URL: https://gitlab.winehq.org/wine/wine/-/commit/db94448d9785ac5b4425981fa3a043… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Fri Sep 23 19:38:34 2022 +0000 vbscript: Only set EXCEPINFO strings for cases that map_hres translated. Add test for E_UNEXPECTED. --- dlls/vbscript/interp.c | 11 +++++++---- dlls/vbscript/tests/run.c | 26 ++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 1d7482b5013..fae2c0fccbb 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -2498,10 +2498,13 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd } ctx->ei.scode = hres; - if(!ctx->ei.bstrSource) - ctx->ei.bstrSource = get_vbscript_string(VBS_RUNTIME_ERROR); - if(!ctx->ei.bstrDescription) - ctx->ei.bstrDescription = get_vbscript_error_string(hres); + if(HRESULT_FACILITY(hres) == FACILITY_VBS) + { + if(!ctx->ei.bstrSource) + ctx->ei.bstrSource = get_vbscript_string(VBS_RUNTIME_ERROR); + if(!ctx->ei.bstrDescription) + ctx->ei.bstrDescription = get_vbscript_error_string(hres); + } if(exec.resume_next) { unsigned stack_off; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 8d7c15ba70b..ef26641d01d 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2477,6 +2477,32 @@ static void test_callbacks(void) free_ei(&ei); IActiveScriptError_Release(error1); + + store_script_error = &error1; + SET_EXPECT(OnScriptError); + hres = parse_script_ar("throwException &h8000FFFF&"); + ok(hres == E_UNEXPECTED, "got error: %08lx\n", hres); + CHECK_CALLED(OnScriptError); + + memset(&ei, 0xcc, sizeof(ei)); + hres = IActiveScriptError_GetExceptionInfo(error1, &ei); + ok(hres == S_OK, "GetExceptionInfo returned %08lx\n", hres); + ok(!ei.wCode, "wCode = %x\n", ei.wCode); + ok(!ei.wReserved, "wReserved = %x\n", ei.wReserved); + if(is_english) { + ok(!ei.bstrSource, + "bstrSource = %s\n", wine_dbgstr_w(ei.bstrSource)); + ok(!ei.bstrDescription, + "bstrDescription = %s\n", wine_dbgstr_w(ei.bstrDescription)); + } + ok(!ei.bstrHelpFile, "bstrHelpFile = %s\n", wine_dbgstr_w(ei.bstrHelpFile)); + ok(!ei.dwHelpContext, "dwHelpContext = %lx\n", ei.dwHelpContext); + ok(!ei.pvReserved, "pvReserved = %p\n", ei.pvReserved); + ok(!ei.pfnDeferredFillIn, "pfnDeferredFillIn = %p\n", ei.pfnDeferredFillIn); + ok(ei.scode == E_UNEXPECTED, "scode = %lx\n", ei.scode); + free_ei(&ei); + + IActiveScriptError_Release(error1); } static void test_gc(void)

1 0

Kevin Puetz : vbscript/tests: Test throwException with Description but *not* Source.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: e19b8b635c791482dd5c399f2cb895cfb9932b85 URL: https://gitlab.winehq.org/wine/wine/-/commit/e19b8b635c791482dd5c399f2cb895… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Sat Sep 24 00:37:13 2022 +0000 vbscript/tests: Test throwException with Description but *not* Source. It occurred to me to wonder whether it was really Description, Source, or both that results in skipping the map_vbs_exception logic. It turns out we had it right (it's just description, and it's null-pointer and not empty string that makes the difference). But the fact that it's not obvious still makes it a good testcase --- dlls/vbscript/tests/run.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index ef26641d01d..31ac03ab8d7 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1577,8 +1577,11 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, if(pdp->cArgs >= 2) { v = pdp->rgvarg + pdp->cArgs - 2; - ok(V_VT(v) == VT_BSTR, "v = %s\n", debugstr_variant(v)); - pei->bstrSource = SysAllocString(V_BSTR(v)); + if(!(V_VT(v) == VT_ERROR && V_ERROR(v) == DISP_E_PARAMNOTFOUND)) /* != vtMissing */ + { + ok(V_VT(v) == VT_BSTR, "v = %s\n", debugstr_variant(v)); + pei->bstrSource = SysAllocString(V_BSTR(v)); + } } if(pdp->cArgs >= 3) { @@ -2453,6 +2456,31 @@ static void test_callbacks(void) IActiveScriptError_Release(error1); + store_script_error = &error1; + SET_EXPECT(OnScriptError); + hres = parse_script_ar("throwException &h80004002&, , \"test desc\""); + ok(hres == E_NOINTERFACE, "got error: %08lx\n", hres); + CHECK_CALLED(OnScriptError); + + memset(&ei, 0xcc, sizeof(ei)); + hres = IActiveScriptError_GetExceptionInfo(error1, &ei); + ok(hres == S_OK, "GetExceptionInfo returned %08lx\n", hres); + ok(!ei.wCode, "wCode = %x\n", ei.wCode); + ok(!ei.wReserved, "wReserved = %x\n", ei.wReserved); + if(is_english) { + ok(!ei.bstrSource, "bstrSource = %s\n", wine_dbgstr_w(ei.bstrSource)); + ok(!wcscmp(ei.bstrDescription, L"test desc"), + "bstrDescription = %s\n", wine_dbgstr_w(ei.bstrDescription)); + } + ok(!ei.bstrHelpFile, "bstrHelpFile = %s\n", wine_dbgstr_w(ei.bstrHelpFile)); + ok(!ei.dwHelpContext, "dwHelpContext = %lx\n", ei.dwHelpContext); + ok(!ei.pvReserved, "pvReserved = %p\n", ei.pvReserved); + ok(!ei.pfnDeferredFillIn, "pfnDeferredFillIn = %p\n", ei.pfnDeferredFillIn); + ok(ei.scode == E_NOINTERFACE, "scode = %lx\n", ei.scode); + free_ei(&ei); + + IActiveScriptError_Release(error1); + store_script_error = &error1; SET_EXPECT(OnScriptError); hres = parse_script_ar("throwException &h80004002&, \"test src\", \"test desc\"");

1 0

Kevin Puetz : vbscript: Do HRESULT->VBSERROR mapping for the whole EXCEPINFO at once.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: 0456e3c9428fff82a58d53b2f40eacb80343cf66 URL: https://gitlab.winehq.org/wine/wine/-/commit/0456e3c9428fff82a58d53b2f40eac… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Fri Sep 23 23:43:15 2022 +0000 vbscript: Do HRESULT->VBSERROR mapping for the whole EXCEPINFO at once. --- dlls/vbscript/compile.c | 4 +- dlls/vbscript/global.c | 12 ++--- dlls/vbscript/interp.c | 19 ++----- dlls/vbscript/vbdisp.c | 121 +++++++++++++++++++++++------------------- dlls/vbscript/vbscript.h | 3 +- dlls/vbscript/vbscript_main.c | 8 --- 6 files changed, 77 insertions(+), 90 deletions(-)

1 0

Jacek Caban : winevulkan: Separate 32-bit and 64-bit thunks implementation.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: a5e39c42c8f5da421220391e44e11536a1c3b28f URL: https://gitlab.winehq.org/wine/wine/-/commit/a5e39c42c8f5da421220391e44e115… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 31 22:16:29 2022 +0200 winevulkan: Separate 32-bit and 64-bit thunks implementation. --- dlls/winevulkan/make_vulkan | 53 +- dlls/winevulkan/vulkan_thunks.c | 8618 ++++++++++++++++++++++++++++++++------- 2 files changed, 7158 insertions(+), 1513 deletions(-)

1 0

Jacek Caban : winevulkan: Merge body and body_conversion.
by Alexandre Julliard 26 Sep '22

26 Sep '22

Module: wine Branch: master Commit: 8d1bdb5f20e7f559cc8095d9e593c23004aead0c URL: https://gitlab.winehq.org/wine/wine/-/commit/8d1bdb5f20e7f559cc8095d9e593c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 23 19:30:12 2022 +0200 winevulkan: Merge body and body_conversion. --- dlls/winevulkan/make_vulkan | 60 +- dlls/winevulkan/vulkan_thunks.c | 2294 +++++++++++++++++++++++++++++++++++---- 2 files changed, 2092 insertions(+), 262 deletions(-)

1 0