- Wine-Commits - list.winehq.org

Rémi Bernon : dinput/tests: Test W.G.I constant effect with negative direction.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 44799ea3f0dbc91de6e846f7f8f8a74fa1e85f33 URL: https://gitlab.winehq.org/wine/wine/-/commit/44799ea3f0dbc91de6e846f7f8f8a7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 2 12:07:54 2023 +0100 dinput/tests: Test W.G.I constant effect with negative direction. --- dlls/dinput/tests/force_feedback.c | 77 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 794a54e8841..aaa240cdf01 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5747,6 +5747,54 @@ static void test_windows_gaming_input(void) .report_buf = {3,0x01,0x04,0x04,0x5a,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0x7f,0x4e,0x01,0x00,0x00}, }, }; + struct hid_expect expect_create_constant_neg[] = + { + /* create new effect */ + { + .code = IOCTL_HID_SET_FEATURE, + .report_id = 2, + .report_len = 3, + .report_buf = {2,0x04,0x00}, + }, + /* block load */ + { + .code = IOCTL_HID_GET_FEATURE, + .report_id = 3, + .report_len = 5, + .report_buf = {3,0x01,0x01,0x00,0x00}, + }, + /* set constant */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 9, + .report_len = 4, + .report_buf = {9,0x01,0x18,0xfc}, + }, + /* set envelope (wine) */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 8, + .report_len = 8, + .report_buf = {8,0x01,0x00,0x00,0x00,0x00,0x00,0x00}, + .todo = TRUE, .wine_only = TRUE, + }, + /* update effect (wine) */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 18, + .report_buf = {3,0x01,0x04,0x04,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x7f,0x99,0x00,0x00,0x00}, + .wine_only = TRUE, .todo = TRUE, + }, + /* update effect */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 18, + .report_buf = {3,0x01,0x04,0x04,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x7f,0x4e,0x01,0x00,0x00}, + .todo = TRUE, + }, + }; struct hid_expect expect_create_ramp[] = { /* create new effect */ @@ -6556,6 +6604,35 @@ static void test_windows_gaming_input(void) IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, NULL, 0 ); + + hr = IForceFeedbackEffect_QueryInterface( effect, &IID_IConstantForceEffect, (void **)&constant_effect ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + direction.X = -direction.X; + direction.Y = -direction.Y; + direction.Z = -direction.Z; + hr = IConstantForceEffect_SetParameters( constant_effect, direction, duration ); + ok( hr == S_OK, "SetParameters returned %#lx\n", hr ); + direction.X = -direction.X; + direction.Y = -direction.Y; + direction.Z = -direction.Z; + IConstantForceEffect_Release( constant_effect ); + + set_hid_expect( file, expect_create_constant_neg, sizeof(expect_create_constant_neg) ); + hr = IForceFeedbackMotor_LoadEffectAsync( motor, effect, &result_async ); + ok( hr == S_OK, "LoadEffectAsync returned %#lx\n", hr ); + await_result( result_async ); + check_result_async( result_async, 1, Completed, S_OK, ForceFeedbackLoadEffectResult_Succeeded ); + IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, expect_unload, sizeof(expect_unload) ); + hr = IForceFeedbackMotor_TryUnloadEffectAsync( motor, effect, &bool_async ); + ok( hr == S_OK, "TryUnloadEffectAsync returned %#lx\n", hr ); + await_bool( bool_async ); + check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); + IAsyncOperation_boolean_Release( bool_async ); + set_hid_expect( file, NULL, 0 ); + IForceFeedbackEffect_Release( effect );

1 0

Ziqing Hui : mfplat/tests: Test MFGetStrideForBitmapInfoHeader for NV11.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: bc467de573830e38ac3a618fe73fa4cfec935a0e URL: https://gitlab.winehq.org/wine/wine/-/commit/bc467de573830e38ac3a618fe73fa4… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Dec 22 10:45:35 2022 +0800 mfplat/tests: Test MFGetStrideForBitmapInfoHeader for NV11. --- dlls/mfplat/tests/mfplat.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 13055d4c5e4..f8bd56698b1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5739,6 +5739,9 @@ static void test_MFGetStrideForBitmapInfoHeader(void) { &MFVideoFormat_IYUV, 2, 2 }, { &MFVideoFormat_IYUV, 3, 3 }, { &MFVideoFormat_IYUV, 320, 320 }, + { &MFVideoFormat_NV11, 1, 1 }, + { &MFVideoFormat_NV11, 2, 2 }, + { &MFVideoFormat_NV11, 3, 3 }, }; unsigned int i; LONG stride; @@ -5756,7 +5759,9 @@ static void test_MFGetStrideForBitmapInfoHeader(void) for (i = 0; i < ARRAY_SIZE(stride_tests); ++i) { hr = pMFGetStrideForBitmapInfoHeader(stride_tests[i].subtype->Data1, stride_tests[i].width, &stride); + todo_wine_if(IsEqualGUID(stride_tests[i].subtype, &MFVideoFormat_NV11)) ok(hr == S_OK, "%u: failed to get stride, hr %#lx.\n", i, hr); + todo_wine_if(IsEqualGUID(stride_tests[i].subtype, &MFVideoFormat_NV11)) ok(stride == stride_tests[i].stride, "%u: format %s, unexpected stride %ld, expected %ld.\n", i, wine_dbgstr_an((char *)&stride_tests[i].subtype->Data1, 4), stride, stride_tests[i].stride); }

1 0

Rémi Bernon : dinput/tests: Test W.G.I ramp effect with negative directions.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 61c251ac1039c066074a66ba77d57b89730e2ef2 URL: https://gitlab.winehq.org/wine/wine/-/commit/61c251ac1039c066074a66ba77d57b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 2 12:07:54 2023 +0100 dinput/tests: Test W.G.I ramp effect with negative directions. --- dlls/dinput/tests/force_feedback.c | 79 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index d6eab3850c5..794a54e8841 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5833,6 +5833,54 @@ static void test_windows_gaming_input(void) .todo = TRUE, }, }; + struct hid_expect expect_create_ramp_neg[] = + { + /* create new effect */ + { + .code = IOCTL_HID_SET_FEATURE, + .report_id = 2, + .report_len = 3, + .report_buf = {2,0x05,0x00}, + }, + /* block load */ + { + .code = IOCTL_HID_GET_FEATURE, + .report_id = 3, + .report_len = 5, + .report_buf = {3,0x01,0x01,0x00,0x00}, + }, + /* set ramp */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 10, + .report_len = 6, + .report_buf = {10,0x01,0x18,0xfc,0x60,0xf0}, + }, + /* set envelope (wine) */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 8, + .report_len = 8, + .report_buf = {8,0x01,0x00,0x00,0x00,0x00,0x00,0x00}, + .todo = TRUE, .wine_only = TRUE, + }, + /* update effect (wine) */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 18, + .report_buf = {3,0x01,0x05,0x04,0x8f,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x99,0x00,0x00,0x00}, + .wine_only = TRUE, .todo = TRUE, + }, + /* update effect */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 18, + .report_buf = {3,0x01,0x05,0x04,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x01,0x00,0x00}, + .todo = TRUE, + }, + }; struct hid_expect expect_effect_start = { .code = IOCTL_HID_WRITE_REPORT, @@ -6589,6 +6637,37 @@ static void test_windows_gaming_input(void) set_hid_expect( file, NULL, 0 ); + hr = IForceFeedbackEffect_QueryInterface( effect, &IID_IRampForceEffect, (void **)&ramp_effect ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + direction.X = -direction.X; + direction.Y = -direction.Y; + end_direction.X = -end_direction.X; + end_direction.Z = -end_direction.Z; + hr = IRampForceEffect_SetParameters( ramp_effect, direction, end_direction, infinite_duration ); + ok( hr == S_OK, "SetParameters returned %#lx\n", hr ); + direction.X = -direction.X; + direction.Y = -direction.Y; + end_direction.X = -end_direction.X; + end_direction.Z = -end_direction.Z; + IRampForceEffect_Release( ramp_effect ); + + set_hid_expect( file, expect_create_ramp_neg, sizeof(expect_create_ramp_neg) ); + hr = IForceFeedbackMotor_LoadEffectAsync( motor, effect, &result_async ); + ok( hr == S_OK, "LoadEffectAsync returned %#lx\n", hr ); + await_result( result_async ); + check_result_async( result_async, 1, Completed, S_OK, ForceFeedbackLoadEffectResult_Succeeded ); + IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, expect_unload, sizeof(expect_unload) ); + hr = IForceFeedbackMotor_TryUnloadEffectAsync( motor, effect, &bool_async ); + ok( hr == S_OK, "TryUnloadEffectAsync returned %#lx\n", hr ); + await_bool( bool_async ); + check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); + IAsyncOperation_boolean_Release( bool_async ); + set_hid_expect( file, NULL, 0 ); + + IForceFeedbackEffect_Release( effect );

1 0

Rémi Bernon : dinput/tests: Reduce tests verbosity.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 19fb59eb97c32e3aae7c9faa643804fe8450a5c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/19fb59eb97c32e3aae7c9faa643804… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 2 12:07:54 2023 +0100 dinput/tests: Reduce tests verbosity. --- dlls/dinput/tests/force_feedback.c | 12 ++++++------ dlls/dinput/tests/hotplug.c | 14 +++++++------- dlls/dinput/tests/joystick8.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 145f6108ab6..d6eab3850c5 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -4588,7 +4588,7 @@ static HRESULT WINAPI controller_handler_QueryInterface( IEventHandler_RawGameCo return S_OK; } - trace( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + if (winetest_debug > 1) trace( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; } @@ -4608,7 +4608,7 @@ static HRESULT WINAPI controller_handler_Invoke( IEventHandler_RawGameController { struct controller_handler *impl = impl_from_IEventHandler_RawGameController( iface ); - trace( "iface %p, sender %p, controller %p\n", iface, sender, controller ); + if (winetest_debug > 1) trace( "iface %p, sender %p, controller %p\n", iface, sender, controller ); ok( sender == NULL, "got sender %p\n", sender ); impl->invoked = TRUE; @@ -4756,7 +4756,7 @@ static HRESULT WINAPI bool_async_handler_QueryInterface( IAsyncOperationComplete return S_OK; } - trace( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + if (winetest_debug > 1) trace( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; } @@ -4776,7 +4776,7 @@ static HRESULT WINAPI bool_async_handler_Invoke( IAsyncOperationCompletedHandler { struct bool_async_handler *impl = impl_from_IAsyncOperationCompletedHandler_boolean( iface ); - trace( "iface %p, async %p, status %u\n", iface, async, status ); + if (winetest_debug > 1) trace( "iface %p, async %p, status %u\n", iface, async, status ); ok( !impl->invoked, "invoked twice\n" ); impl->invoked = TRUE; @@ -4841,7 +4841,7 @@ static HRESULT WINAPI result_async_handler_QueryInterface( IAsyncOperationComple return S_OK; } - trace( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + if (winetest_debug > 1) trace( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; } @@ -4861,7 +4861,7 @@ static HRESULT WINAPI result_async_handler_Invoke( IAsyncOperationCompletedHandl { struct result_async_handler *impl = impl_from_IAsyncOperationCompletedHandler_ForceFeedbackLoadEffectResult( iface ); - trace( "iface %p, async %p, status %u\n", iface, async, status ); + if (winetest_debug > 1) trace( "iface %p, async %p, status %u\n", iface, async, status ); ok( !impl->invoked, "invoked twice\n" ); impl->invoked = TRUE; diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 63cc152fa20..cd21363770e 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -513,7 +513,7 @@ static HRESULT WINAPI controller_handler_QueryInterface( IEventHandler_RawGameCo return S_OK; } - trace( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + if (winetest_debug > 1) trace( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; } @@ -533,7 +533,7 @@ static HRESULT WINAPI controller_handler_Invoke( IEventHandler_RawGameController { struct controller_handler *impl = impl_from_IEventHandler_RawGameController( iface ); - trace( "iface %p, sender %p, controller %p\n", iface, sender, controller ); + if (winetest_debug > 1) trace( "iface %p, sender %p, controller %p\n", iface, sender, controller ); ok( sender == NULL, "got sender %p\n", sender ); impl->invoked = TRUE; @@ -720,7 +720,7 @@ static HRESULT WINAPI input_sink_OnInputResumed( IGameControllerInputSink *iface { struct custom_controller *impl = impl_from_IGameControllerInputSink( iface ); - trace( "iface %p, timestamp %I64u\n", iface, timestamp ); + if (winetest_debug > 1) trace( "iface %p, timestamp %I64u\n", iface, timestamp ); ok( !controller_added.invoked, "controller added handler invoked\n" ); ok( !impl->on_input_resumed_called, "OnInputResumed already called\n" ); @@ -733,7 +733,7 @@ static HRESULT WINAPI input_sink_OnInputSuspended( IGameControllerInputSink *ifa { struct custom_controller *impl = impl_from_IGameControllerInputSink( iface ); - trace( "iface %p, timestamp %I64u\n", iface, timestamp ); + if (winetest_debug > 1) trace( "iface %p, timestamp %I64u\n", iface, timestamp ); ok( !controller_removed.invoked, "controller removed handler invoked\n" ); ok( !impl->on_input_suspended_called, "OnInputSuspended already called\n" ); @@ -851,7 +851,7 @@ static HRESULT WINAPI custom_factory_CreateGameController( ICustomGameController { struct custom_factory *impl = impl_from_ICustomGameControllerFactory( iface ); - trace( "iface %p, provider %p, value %p\n", iface, provider, value ); + if (winetest_debug > 1) trace( "iface %p, provider %p, value %p\n", iface, provider, value ); ok( !controller_added.invoked, "controller added handler invoked\n" ); ok( !impl->create_controller_called, "unexpected call\n" ); @@ -875,7 +875,7 @@ static HRESULT WINAPI custom_factory_OnGameControllerAdded( ICustomGameControlle { struct custom_factory *impl = impl_from_ICustomGameControllerFactory( iface ); - trace( "iface %p, value %p\n", iface, value ); + if (winetest_debug > 1) trace( "iface %p, value %p\n", iface, value ); ok( controller_added.invoked, "controller added handler not invoked\n" ); ok( impl->create_controller_called, "CreateGameController not called\n" ); @@ -894,7 +894,7 @@ static HRESULT WINAPI custom_factory_OnGameControllerRemoved( ICustomGameControl { struct custom_factory *impl = impl_from_ICustomGameControllerFactory( iface ); - trace( "iface %p, value %p\n", iface, value ); + if (winetest_debug > 1) trace( "iface %p, value %p\n", iface, value ); ok( controller_removed.invoked, "controller removed handler invoked\n" ); ok( custom_controller.on_input_suspended_called, "OnInputSuspended not called\n" ); diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 5232c7da0fd..2d00d2e541c 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -3770,7 +3770,7 @@ static HRESULT WINAPI controller_handler_QueryInterface( IEventHandler_RawGameCo return S_OK; } - trace( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + if (winetest_debug > 1) trace( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; } @@ -3790,7 +3790,7 @@ static HRESULT WINAPI controller_handler_Invoke( IEventHandler_RawGameController { struct controller_handler *impl = impl_from_IEventHandler_RawGameController( iface ); - trace( "iface %p, sender %p, controller %p\n", iface, sender, controller ); + if (winetest_debug > 1) trace( "iface %p, sender %p, controller %p\n", iface, sender, controller ); ok( sender == NULL, "got sender %p\n", sender ); impl->invoked = TRUE;

1 0

André Zwing : advapi32/tests: Don't test function directly when reporting GetLastError().
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: e2b0cbb797527cc614d730e4ef0cab6be6c88c56 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2b0cbb797527cc614d730e4ef0cab… Author: André Zwing <nerv(a)dawncrow.de> Date: Thu Dec 29 16:47:04 2022 +0100 advapi32/tests: Don't test function directly when reporting GetLastError(). --- dlls/advapi32/tests/registry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index b4f0398b358..480e96ef6ee 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1672,7 +1672,8 @@ static void test_reg_load_app_key(void) RegCloseKey(appkey); wait_file_available(hivefilepath); - ok(DeleteFileA(hivefilepath), "couldn't delete hive file %ld\n", GetLastError()); + ret = DeleteFileA(hivefilepath); + ok(ret, "couldn't delete hive file %ld\n", GetLastError()); } /* tests that show that RegConnectRegistry and

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 5dab8075cfd99d85b1e8567c5b228b0445bc9dc7 URL: https://gitlab.winehq.org/wine/wine/-/commit/5dab8075cfd99d85b1e8567c5b228b… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed Dec 28 23:19:18 2022 +0100 po: Update Dutch translation. Avoid using the pronouns "u", "uw", "je" and "jouw". Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 558 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 274 insertions(+), 284 deletions(-)

1 0

André Zwing : kernel32/tests: Don't test function directly when reporting GetLastError().
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: e39c09f5c1d30c51281ae609d7a0c41a22dfa4ff URL: https://gitlab.winehq.org/wine/wine/-/commit/e39c09f5c1d30c51281ae609d7a0c4… Author: André Zwing <nerv(a)dawncrow.de> Date: Thu Dec 29 16:49:44 2022 +0100 kernel32/tests: Don't test function directly when reporting GetLastError(). --- dlls/kernel32/tests/virtual.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 644c060c66f..c54fb16ba15 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -4224,6 +4224,7 @@ static void test_PrefetchVirtualMemory(void) char stackmem[] = "Test stack mem"; static char testmem[] = "Test memory range data"; unsigned int page_size = si.dwPageSize; + BOOL ret; if (!pPrefetchVirtualMemory) { @@ -4236,28 +4237,28 @@ static void test_PrefetchVirtualMemory(void) entries[0].VirtualAddress = ULongToPtr(PtrToUlong(testmem) & -(ULONG_PTR)page_size); entries[0].NumberOfBytes = page_size; - ok( pPrefetchVirtualMemory( GetCurrentProcess(), 1, entries, 0 ) || - broken( is_wow64 && GetLastError() == ERROR_INVALID_PARAMETER ) /* win10 1507 */, + ret = pPrefetchVirtualMemory( GetCurrentProcess(), 1, entries, 0 ); + ok( ret || broken( is_wow64 && GetLastError() == ERROR_INVALID_PARAMETER ) /* win10 1507 */, "PrefetchVirtualMemory unexpected status on 1 page-aligned entry: %ld\n", GetLastError() ); entries[0].VirtualAddress = testmem; entries[0].NumberOfBytes = sizeof(testmem); - ok( pPrefetchVirtualMemory( GetCurrentProcess(), 1, entries, 0 ) || - broken( is_wow64 && GetLastError() == ERROR_INVALID_PARAMETER ) /* win10 1507 */, + ret = pPrefetchVirtualMemory( GetCurrentProcess(), 1, entries, 0 ); + ok( ret || broken( is_wow64 && GetLastError() == ERROR_INVALID_PARAMETER ) /* win10 1507 */, "PrefetchVirtualMemory unexpected status on 1 entry: %ld\n", GetLastError() ); entries[0].VirtualAddress = NULL; entries[0].NumberOfBytes = page_size; - ok( pPrefetchVirtualMemory( GetCurrentProcess(), 1, entries, 0 ) || - broken( is_wow64 && GetLastError() == ERROR_INVALID_PARAMETER ) /* win10 1507 */, + ret = pPrefetchVirtualMemory( GetCurrentProcess(), 1, entries, 0 ); + ok( ret ||broken( is_wow64 && GetLastError() == ERROR_INVALID_PARAMETER ) /* win10 1507 */, "PrefetchVirtualMemory unexpected status on 1 unmapped entry: %ld\n", GetLastError() ); entries[0].VirtualAddress = ULongToPtr(PtrToUlong(testmem) & -(ULONG_PTR)page_size); entries[0].NumberOfBytes = page_size; entries[1].VirtualAddress = ULongToPtr(PtrToUlong(stackmem) & -(ULONG_PTR)page_size); entries[1].NumberOfBytes = page_size; - ok( pPrefetchVirtualMemory( GetCurrentProcess(), 2, entries, 0 ) || - broken( is_wow64 && GetLastError() == ERROR_INVALID_PARAMETER ) /* win10 1507 */, + ret = pPrefetchVirtualMemory( GetCurrentProcess(), 2, entries, 0 ); + ok( ret ||broken( is_wow64 && GetLastError() == ERROR_INVALID_PARAMETER ) /* win10 1507 */, "PrefetchVirtualMemory unexpected status on 2 page-aligned entries: %ld\n", GetLastError() ); }

1 0

André Zwing : setupapi/tests: Don't test function directly when reporting GetLastError().
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 4b09ed1486b4c880c7ed1cbbfd3d9b1335f4d4ab URL: https://gitlab.winehq.org/wine/wine/-/commit/4b09ed1486b4c880c7ed1cbbfd3d9b… Author: André Zwing <nerv(a)dawncrow.de> Date: Thu Dec 29 17:00:08 2022 +0100 setupapi/tests: Don't test function directly when reporting GetLastError(). --- dlls/setupapi/tests/install.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index f53740a8824..2bbcbec88dc 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -2291,8 +2291,10 @@ static void test_rename(void) ok(delete_file("a/six.txt"), "File should exist.\n"); SetupCloseFileQueue(queue); - ok(delete_file("a/"), "Failed to delete directory, error %lu.\n", GetLastError()); - ok(delete_file("b/"), "Failed to delete directory, error %lu.\n", GetLastError()); + ret = delete_file("a/"); + ok(ret, "Failed to delete directory, error %lu.\n", GetLastError()); + ret = delete_file("b/"); + ok(ret, "Failed to delete directory, error %lu.\n", GetLastError()); } static WCHAR service_name[] = L"Wine Test Service";

1 0

Eric Pouech : comctl32/tests: Fix failing test on Windows in Arabic UTF-8.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: e439373f599bea527797dda8b34b31c2131bad32 URL: https://gitlab.winehq.org/wine/wine/-/commit/e439373f599bea527797dda8b34b31… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 22 16:48:41 2022 +0100 comctl32/tests: Fix failing test on Windows in Arabic UTF-8. Already fixed in user32/tests/edit.c by 614b7d7430e0ba60692a46e97f03b8b9600f0651 Apply same fix for equivalent test on comctl32/tests/edit.c Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52932 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/comctl32/tests/edit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 91d16e044a0..97831e8e679 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1219,7 +1219,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2; + mid = lo + (hi - lo + 1) / 2; for (i = lo; i < mid; i++) { @@ -1241,7 +1241,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2; + mid = lo + (hi - lo + 1) / 2; for (i = lo; i < mid; i++) { @@ -1263,7 +1263,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2; + mid = lo + (hi - lo + 1) / 2; for (i = lo; i < mid; i++) { @@ -1285,7 +1285,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2 + 1; + mid = lo + (hi - lo + 1) / 2; for (i = lo; i < mid; i++) { @@ -1307,7 +1307,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2 + 1; + mid = lo + (hi - lo + 1) / 2; for (i = lo; i < mid; i++) { @@ -1329,7 +1329,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2 + 1; + mid = lo + (hi - lo + 1) / 2; for (i = lo; i < mid; i++) {

1 0

Eric Pouech : comctl32/test: Adapt the edit tests for height to Win10+.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 0d8b477b1fbf650c74227004703b0190689288da URL: https://gitlab.winehq.org/wine/wine/-/commit/0d8b477b1fbf650c74227004703b01… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 23 09:47:21 2022 +0100 comctl32/test: Adapt the edit tests for height to Win10+. Starting with Win10, height of multiline edit controls no longer seems to be hardwired to a multiple of the font height (when larger than font height). - Adapt the tests accordingly (detecting how to compute the expected height of a control). - Extend the ranges of the tested heights. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52152 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/comctl32/tests/edit.c | 214 ++++++++++++++++++++++++++------------------- 1 file changed, 126 insertions(+), 88 deletions(-)

1 0