January 2023 - Wine-Commits

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

Tim Clem : dinput/tests: Test granularity of the mouse z-axis.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: b452ebb67cb821b6bb0f50e44e03dfede02b0fab URL: https://gitlab.winehq.org/wine/wine/-/commit/b452ebb67cb821b6bb0f50e44e03df… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Dec 23 12:45:12 2022 -0800 dinput/tests: Test granularity of the mouse z-axis. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53627 --- dlls/dinput/tests/device8.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index b98a24df080..6542baa88f0 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1819,6 +1819,12 @@ static void test_sys_mouse( DWORD version ) ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_SATURATION returned %#lx\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_CALIBRATIONMODE, &prop_dword.diph ); ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_CALIBRATIONMODE returned %#lx\n", hr ); + prop_dword.diph.dwObj = DIMOFS_Z; + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_GRANULARITY, &prop_dword.diph ); + ok( hr == DI_OK, "GetProperty DIPROP_GRANULARITY returned %#lx\n", hr ); + todo_wine + ok( prop_dword.dwData == WHEEL_DELTA, "got %ld expected %ld\n", prop_dword.dwData, (DWORD)WHEEL_DELTA ); prop_range.lMin = 0xdeadbeef; prop_range.lMax = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph );

1 0

Tim Clem : dinput: Add granularity to object_properties.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 055b67ea973eacc447237c19d1752bc3ed84ac24 URL: https://gitlab.winehq.org/wine/wine/-/commit/055b67ea973eacc447237c19d1752b… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Dec 23 13:09:01 2022 -0800 dinput: Add granularity to object_properties. Return WHEEL_DELTA for the granularity of the mouse z-axis. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53627 --- dlls/dinput/device.c | 3 ++- dlls/dinput/device_private.h | 1 + dlls/dinput/joystick_hid.c | 1 + dlls/dinput/mouse.c | 6 ++++++ dlls/dinput/tests/device8.c | 1 - 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d0a5fd0ea1c..590151483c9 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1103,6 +1103,7 @@ static BOOL CALLBACK get_object_property( const DIDEVICEOBJECTINSTANCEW *instanc { .range_min = DIPROPRANGE_NOMIN, .range_max = DIPROPRANGE_NOMAX, + .granularity = 1, }; struct get_object_property_params *params = context; struct dinput_device *impl = impl_from_IDirectInputDevice8W( params->iface ); @@ -1155,7 +1156,7 @@ static BOOL CALLBACK get_object_property( const DIDEVICEOBJECTINSTANCEW *instanc case (DWORD_PTR)DIPROP_GRANULARITY: { DIPROPDWORD *value = (DIPROPDWORD *)params->header; - value->dwData = 1; + value->dwData = properties->granularity; return DIENUM_STOP; } case (DWORD_PTR)DIPROP_KEYNAME: diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 31696f00536..be5d7861fd1 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -67,6 +67,7 @@ struct object_properties LONG deadzone; LONG saturation; DWORD calibration_mode; + DWORD granularity; }; enum device_status diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 311e5903878..41fd0e24963 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1696,6 +1696,7 @@ static BOOL init_object_properties( struct hid_joystick *impl, struct hid_value_ } properties->saturation = 10000; + properties->granularity = 1; return DIENUM_CONTINUE; } diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 1af69f34f5b..ee172547a30 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -99,6 +99,12 @@ static BOOL CALLBACK init_object_properties( const DIDEVICEOBJECTINSTANCEW *inst properties->range_min = DIPROPRANGE_NOMIN; properties->range_max = DIPROPRANGE_NOMAX; + /* The z-axis (wheel) has a different granularity */ + if (instance->dwOfs == DIMOFS_Z) + properties->granularity = WHEEL_DELTA; + else + properties->granularity = 1; + return DIENUM_CONTINUE; } diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index 6542baa88f0..86f0360c0f1 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1823,7 +1823,6 @@ static void test_sys_mouse( DWORD version ) prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_GRANULARITY, &prop_dword.diph ); ok( hr == DI_OK, "GetProperty DIPROP_GRANULARITY returned %#lx\n", hr ); - todo_wine ok( prop_dword.dwData == WHEEL_DELTA, "got %ld expected %ld\n", prop_dword.dwData, (DWORD)WHEEL_DELTA ); prop_range.lMin = 0xdeadbeef; prop_range.lMax = 0xdeadbeef;

1 0

Tim Clem : dinput: Create object_properties for each mouse axis.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 1e6258d26be1e05584e76008cbfa057681cd85a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e6258d26be1e05584e76008cbfa05… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Dec 23 12:32:55 2022 -0800 dinput: Create object_properties for each mouse axis. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53627 --- dlls/dinput/device.c | 3 ++- dlls/dinput/mouse.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index b85d97d1b95..d0a5fd0ea1c 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1063,7 +1063,8 @@ static HRESULT check_property( struct dinput_device *impl, const GUID *guid, con case (DWORD_PTR)DIPROP_DEADZONE: case (DWORD_PTR)DIPROP_SATURATION: case (DWORD_PTR)DIPROP_CALIBRATIONMODE: - if (!impl->object_properties) return DIERR_UNSUPPORTED; + /* not supported on the mouse or keyboard */ + if (!(impl->caps.dwDevType & DIDEVTYPE_HID)) return DIERR_UNSUPPORTED; break; case (DWORD_PTR)DIPROP_FFLOAD: diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 1572e73bac2..1af69f34f5b 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -91,6 +91,17 @@ HRESULT mouse_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, return DI_OK; } +static BOOL CALLBACK init_object_properties( const DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + struct mouse *impl = (struct mouse *)data; + struct object_properties *properties = impl->base.object_properties + instance->dwOfs / sizeof(LONG); + + properties->range_min = DIPROPRANGE_NOMIN; + properties->range_max = DIPROPRANGE_NOMAX; + + return DIENUM_CONTINUE; +} + HRESULT mouse_create_device( struct dinput *dinput, const GUID *guid, IDirectInputDevice8W **out ) { struct mouse *impl; @@ -112,6 +123,15 @@ HRESULT mouse_create_device( struct dinput *dinput, const GUID *guid, IDirectInp impl->base.caps.dwHardwareRevision = 100; impl->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; + /* One object_properties per axis */ + impl->base.object_properties = calloc( 3, sizeof(struct object_properties) ); + if (!impl->base.object_properties) + { + IDirectInputDevice_Release( &impl->base.IDirectInputDevice8W_iface ); + return E_OUTOFMEMORY; + } + IDirectInputDevice8_EnumObjects( &impl->base.IDirectInputDevice8W_iface, init_object_properties, impl, DIDFT_RELAXIS ); + get_app_key(&hkey, &appkey); if (!get_config_key( hkey, appkey, L"MouseWarpOverride", buffer, sizeof(buffer) )) {

1 0

Jinoh Kang : regedit: Use the default WM_PAINT implementation for REGEDIT window.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 8242b651722c41564f165967a96978f2db36f4c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/8242b651722c41564f165967a96978… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Dec 22 01:45:31 2022 +0900 regedit: Use the default WM_PAINT implementation for REGEDIT window. --- programs/regedit/childwnd.c | 14 -------------- programs/regedit/main.c | 1 + 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index c243a76c807..3f1797d31a0 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -79,17 +79,6 @@ static void ResizeWnd(int cx, int cy) EndDeferWindowPos(hdwp); } -static void OnPaint(HWND hWnd) -{ - PAINTSTRUCT ps; - RECT rt; - - GetClientRect(hWnd, &rt); - BeginPaint(hWnd, &ps); - FillRect(ps.hdc, &rt, GetSysColorBrush(COLOR_BTNFACE)); - EndPaint(hWnd, &ps); -} - static LPWSTR CombinePaths(LPCWSTR pPaths[], int nPaths) { int i, len, pos; LPWSTR combined; @@ -455,9 +444,6 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa goto def; } break; - case WM_PAINT: - OnPaint(hWnd); - return 0; case WM_SETCURSOR: if (LOWORD(lParam) == HTCLIENT) { POINT pt; diff --git a/programs/regedit/main.c b/programs/regedit/main.c index b1035629726..4cc00d730a7 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -75,6 +75,7 @@ static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) wndclass.lpfnWndProc = ChildWndProc; wndclass.cbWndExtra = sizeof(HANDLE); wndclass.lpszClassName = szChildClass; + wndclass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); RegisterClassExW(&wndclass); hMenuFrame = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDR_REGEDIT_MENU));

1 0

Jinoh Kang : regedit: Clip siblings when drawing list and tree views.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 36ca172e85bf518faab581cc9b849fc79cfe6819 URL: https://gitlab.winehq.org/wine/wine/-/commit/36ca172e85bf518faab581cc9b849f… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Dec 22 01:50:38 2022 +0900 regedit: Clip siblings when drawing list and tree views. --- programs/regedit/listview.c | 3 ++- programs/regedit/treeview.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 159efc0218f..c7a301929c2 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -361,7 +361,8 @@ HWND CreateListView(HWND hwndParent, UINT id) /* Get the dimensions of the parent window's client area, and create the list view control. */ GetClientRect(hwndParent, &rcClient); hwndLV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_LISTVIEWW, L"List View", - WS_VISIBLE | WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS, + WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS | + LVS_REPORT | LVS_EDITLABELS, 0, 0, rcClient.right, rcClient.bottom, hwndParent, ULongToHandle(id), hInst, NULL); if (!hwndLV) return NULL; diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index cd80449999a..e0cac006090 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -696,7 +696,8 @@ HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id) /* Get the dimensions of the parent window's client area, and create the tree view control. */ GetClientRect(hwndParent, &rcClient); hwndTV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, L"Tree View", - WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | + WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS | + TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS, 0, 0, rcClient.right, rcClient.bottom, hwndParent, ULongToHandle(id), hInst, NULL);

1 0

Zebediah Figura : wined3d: Ignore DISCARD and NOOVERWRITE on buffers which are not GPU-accessible.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 734190a78c132c384ff2593a45884dfc40baae44 URL: https://gitlab.winehq.org/wine/wine/-/commit/734190a78c132c384ff2593a45884d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 19 15:41:39 2022 -0600 wined3d: Ignore DISCARD and NOOVERWRITE on buffers which are not GPU-accessible. This fixes a regression introduced by ebbcc10b0593948657b8e684c3a9be8ace1a5d25. Prior to that commit, buffers which were not CPU-accessible would not have the WINED3D_BUFFER_USE_BO flag set, and accordingly buffer_resource_sub_resource_map() would simply return the SYSMEM location, ignoring the DISCARD and NOOVERWRITE flags. However, the "accelerated" path in wined3d_cs_map_upload_bo() only checks for the DISCARD flag, assuming that it is only set for dynamic GPU-accessible buffers, and would subsequently try to allocate non-mappable memory and then map it. This commit avoids the accelerated path for such buffers, once again matching our old behaviour. According to [1], this also matches Windows: DISCARD on SYSTEMMEM buffers is ignored on both AMD and NVidia, and NOOVERWRITE is ignored on NVidia (but not AMD). [1] https://www.winehq.org/mailman3/hyperkitty/list/wine-devel(a)winehq.org/mes… Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53863 --- dlls/wined3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c0646148c4a..b294af3c5fa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5167,9 +5167,9 @@ static unsigned int sanitise_map_flags(const struct wined3d_resource *resource, } else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) { - if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + if (!(resource->access & WINED3D_RESOURCE_ACCESS_GPU) || !(resource->usage & WINED3DUSAGE_DYNAMIC)) { - WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); + WARN("DISCARD or NOOVERWRITE map not on dynamic GPU-accessible buffer, ignoring.\n"); return flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE); } if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE))

1 0

Zebediah Figura : wined3d: Load and invalidate every mipmap level when mapping the top mipmap level.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: d9c369c7476c8681fc78cd0a38fb97e80036edaa URL: https://gitlab.winehq.org/wine/wine/-/commit/d9c369c7476c8681fc78cd0a38fb97… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 17:47:54 2022 -0600 wined3d: Load and invalidate every mipmap level when mapping the top mipmap level. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53743 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/texture.c | 31 ++++++++++++++++++++++++++++--- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index c8822b4c0ca..5c2b71fc8c5 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -12187,7 +12187,7 @@ static void test_mipmap_upload(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); draw_textured_quad(&context, texture); - check_rt_color_todo_if(context.backbuffer, 0x00111111 * (j + 1), j > 0); + check_rt_color(context.backbuffer, 0x00111111 * (j + 1)); winetest_pop_context(); } diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index dfbfc705598..230f7deabb2 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -27983,7 +27983,7 @@ static void test_mipmap_upload(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); draw_textured_quad(&context, texture); - check_rt_color_todo_if(context.backbuffer, 0x00111111 * (j + 1), j > 0); + check_rt_color(context.backbuffer, 0x00111111 * (j + 1)); winetest_pop_context(); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index bb19ac6183d..8d416494eb8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3697,7 +3697,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour struct wined3d_bo_address data; unsigned int texture_level; BYTE *base_memory; - BOOL ret; + BOOL ret = TRUE; TRACE("resource %p, sub_resource_idx %u, map_ptr %p, box %s, flags %#x.\n", resource, sub_resource_idx, map_ptr, debug_box(box), flags); @@ -3732,7 +3732,20 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour { if (resource->usage & WINED3DUSAGE_DYNAMIC) WARN_(d3d_perf)("Mapping a dynamic texture without WINED3D_MAP_DISCARD.\n"); - ret = wined3d_texture_load_location(texture, sub_resource_idx, context, resource->map_binding); + if (!texture_level) + { + unsigned int i; + + for (i = 0; i < texture->level_count; ++i) + { + if (!(ret = wined3d_texture_load_location(texture, sub_resource_idx + i, context, resource->map_binding))) + break; + } + } + else + { + ret = wined3d_texture_load_location(texture, sub_resource_idx, context, resource->map_binding); + } } if (!ret) @@ -3748,7 +3761,19 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour wined3d_texture_dirty_region_add(texture, sub_resource_idx / texture->level_count, box); if (flags & WINED3D_MAP_WRITE) - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~resource->map_binding); + { + if (!texture_level) + { + unsigned int i; + + for (i = 0; i < texture->level_count; ++i) + wined3d_texture_invalidate_location(texture, sub_resource_idx + i, ~resource->map_binding); + } + else + { + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~resource->map_binding); + } + } wined3d_texture_get_bo_address(texture, sub_resource_idx, &data, resource->map_binding); base_memory = wined3d_context_map_bo_address(context, &data, sub_resource->size, flags);

1 0

Zebediah Figura : d3d9/tests: Test uploading the whole mipmap chain in one map.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 2954d3e4a23025657740fb178ddbe110890c0cc8 URL: https://gitlab.winehq.org/wine/wine/-/commit/2954d3e4a23025657740fb178ddbe1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 17:43:39 2022 -0600 d3d9/tests: Test uploading the whole mipmap chain in one map. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 8857c483302..dfbfc705598 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -287,6 +287,7 @@ static D3DCOLOR check_expected_rt_color(unsigned int line, IDirect3DSurface9 *rt #define check_rt_color(a, b) check_rt_color_(__LINE__, a, b, false) #define check_rt_color_todo(a, b) check_rt_color_(__LINE__, a, b, true) +#define check_rt_color_todo_if(a, b, c) check_rt_color_(__LINE__, a, b, c) static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color, bool todo) { unsigned int color = check_expected_rt_color(line, rt, expected_color); @@ -27922,6 +27923,78 @@ static void test_managed_generate_mipmap(void) release_test_context(&context); } +/* Some applications lock a mipmapped texture at level 0, write every level at + * once, and expect it to be uploaded. */ +static void test_mipmap_upload(void) +{ + unsigned int i, j, width, level_count; + struct d3d9_test_context context; + IDirect3DTexture9 *texture; + D3DLOCKED_RECT locked_rect; + IDirect3DDevice9 *device; + unsigned int *mem; + HRESULT hr; + + static const D3DPOOL pools[] = + { + D3DPOOL_MANAGED, + D3DPOOL_SYSTEMMEM, + }; + + if (!init_test_context(&context)) + return; + device = context.device; + + for (i = 0; i < ARRAY_SIZE(pools); ++i) + { + winetest_push_context("pool %#x", pools[i]); + + hr = IDirect3DDevice9_CreateTexture(device, 32, 32, 0, 0, + D3DFMT_A8R8G8B8, pools[i], &texture, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + level_count = IDirect3DBaseTexture9_GetLevelCount(texture); + + hr = IDirect3DTexture9_LockRect(texture, 0, &locked_rect, NULL, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + mem = locked_rect.pBits; + + for (j = 0; j < level_count; ++j) + { + width = 32 >> j; + memset(mem, 0x11 * (j + 1), width * width * 4); + mem += width * width; + } + + hr = IDirect3DTexture9_UnlockRect(texture, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + for (j = 0; j < level_count; ++j) + { + winetest_push_context("level %u", j); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, j); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + draw_textured_quad(&context, texture); + check_rt_color_todo_if(context.backbuffer, 0x00111111 * (j + 1), j > 0); + + winetest_pop_context(); + } + + IDirect3DTexture9_Release(texture); + + winetest_pop_context(); + } + release_test_context(&context); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -28075,4 +28148,5 @@ START_TEST(visual) test_filling_convention(); test_managed_reset(); test_managed_generate_mipmap(); + test_mipmap_upload(); }

1 0

Zebediah Figura : d3d8/tests: Test uploading the whole mipmap chain in one map.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 798b23d9711e767da00157cc89c87e3011084ad5 URL: https://gitlab.winehq.org/wine/wine/-/commit/798b23d9711e767da00157cc89c87e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 17:43:48 2022 -0600 d3d8/tests: Test uploading the whole mipmap chain in one map. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index ea2d96378f7..c8822b4c0ca 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -250,6 +250,7 @@ static void check_rect(struct surface_readback *rb, RECT r, const char *message) #define check_rt_color(a, b) check_rt_color_(__LINE__, a, b, false) #define check_rt_color_todo(a, b) check_rt_color_(__LINE__, a, b, true) +#define check_rt_color_todo_if(a, b, c) check_rt_color_(__LINE__, a, b, c) static void check_rt_color_(unsigned int line, IDirect3DSurface8 *rt, D3DCOLOR expected_color, bool todo) { unsigned int color = 0xdeadbeef; @@ -12126,6 +12127,78 @@ static void test_managed_reset(void) release_test_context(&context); } +/* Some applications lock a mipmapped texture at level 0, write every level at + * once, and expect it to be uploaded. */ +static void test_mipmap_upload(void) +{ + unsigned int i, j, width, level_count; + struct d3d8_test_context context; + IDirect3DTexture8 *texture; + D3DLOCKED_RECT locked_rect; + IDirect3DDevice8 *device; + unsigned int *mem; + HRESULT hr; + + static const D3DPOOL pools[] = + { + D3DPOOL_MANAGED, + D3DPOOL_SYSTEMMEM, + }; + + if (!init_test_context(&context)) + return; + device = context.device; + + for (i = 0; i < ARRAY_SIZE(pools); ++i) + { + winetest_push_context("pool %#x", pools[i]); + + hr = IDirect3DDevice8_CreateTexture(device, 32, 32, 0, 0, + D3DFMT_A8R8G8B8, pools[i], &texture); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + level_count = IDirect3DBaseTexture8_GetLevelCount(texture); + + hr = IDirect3DTexture8_LockRect(texture, 0, &locked_rect, NULL, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + mem = locked_rect.pBits; + + for (j = 0; j < level_count; ++j) + { + width = 32 >> j; + memset(mem, 0x11 * (j + 1), width * width * 4); + mem += width * width; + } + + hr = IDirect3DTexture8_UnlockRect(texture, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + for (j = 0; j < level_count; ++j) + { + winetest_push_context("level %u", j); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MIPFILTER, D3DTEXF_POINT); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAXMIPLEVEL, j); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + draw_textured_quad(&context, texture); + check_rt_color_todo_if(context.backbuffer, 0x00111111 * (j + 1), j > 0); + + winetest_pop_context(); + } + + IDirect3DTexture8_Release(texture); + + winetest_pop_context(); + } + release_test_context(&context); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -12208,4 +12281,5 @@ START_TEST(visual) test_dynamic_map_synchronization(); test_filling_convention(); test_managed_reset(); + test_mipmap_upload(); }

1 0

Zebediah Figura : d3d11/tests: Do not test deferred contexts in test_dynamic_map_synchronization().
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: e7c46ac6b567af4a563c4d3af93dd6a4feb1d724 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7c46ac6b567af4a563c4d3af93dd6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 16:15:39 2022 -0600 d3d11/tests: Do not test deferred contexts in test_dynamic_map_synchronization(). DISCARD maps on deferred contexts do not seem to offer the same synchronization guarantees as do DISCARD maps on the immediate context, at least not with respect to subsequent NOOVERWRITE maps on the immediate context. This is not particularly surprising, seeing as it is probably far more usual to only map a resource on one kind of context or the other. The test currently fails on Windows 11 on NVidia drivers, but it also fails on Mesa, for what I think are the same reasons. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52563 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54023 --- dlls/d3d11/tests/d3d11.c | 38 +++++++------------------------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 336f4b0ab7d..1f6b211f693 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -34355,11 +34355,10 @@ static void test_dynamic_map_synchronization(void) { static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; - ID3D11DeviceContext *immediate, *deferred; struct d3d11_test_context test_context; D3D11_BUFFER_DESC buffer_desc = {0}; D3D11_MAPPED_SUBRESOURCE map_desc; - ID3D11CommandList *list; + ID3D11DeviceContext *immediate; ID3D11Device *device; unsigned int x, y; HRESULT hr; @@ -34369,9 +34368,6 @@ static void test_dynamic_map_synchronization(void) device = test_context.device; immediate = test_context.immediate_context; - hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - buffer_desc.ByteWidth = 200 * 4 * sizeof(struct vec3); buffer_desc.Usage = D3D11_USAGE_DYNAMIC; buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; @@ -34383,33 +34379,14 @@ static void test_dynamic_map_synchronization(void) for (y = 0; y < 200; ++y) { - if (y % 2) - { - hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)test_context.vb, - 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - - fill_dynamic_vb_quad(&map_desc, 0, y); - - ID3D11DeviceContext_Unmap(immediate, (ID3D11Resource *)test_context.vb, 0); - draw_color_quad(&test_context, &green); - } - else - { - hr = ID3D11DeviceContext_Map(deferred, (ID3D11Resource *)test_context.vb, - 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - - fill_dynamic_vb_quad(&map_desc, 0, y); + hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)test_context.vb, + 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ID3D11DeviceContext_Unmap(deferred, (ID3D11Resource *)test_context.vb, 0); + fill_dynamic_vb_quad(&map_desc, 0, y); - hr = ID3D11DeviceContext_FinishCommandList(deferred, FALSE, &list); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ID3D11DeviceContext_ExecuteCommandList(immediate, list, TRUE); - ID3D11CommandList_Release(list); - draw_color_quad(&test_context, &green); - } + ID3D11DeviceContext_Unmap(immediate, (ID3D11Resource *)test_context.vb, 0); + draw_color_quad(&test_context, &green); for (x = 1; x < 200; ++x) { @@ -34426,7 +34403,6 @@ static void test_dynamic_map_synchronization(void) check_texture_color(test_context.backbuffer, 0xff00ff00, 0); - ID3D11DeviceContext_Release(deferred); release_test_context(&test_context); }

1 0