wine-commits March 2023

wine-commits@winehq.org

1 participants
910 discussions

Stefan Dösinger : ddraw/tests: Show that SYSMEM | 3DDEVICE surfaces don't consume vidmem.
by Alexandre Julliard 28 Mar '23

28 Mar '23

Module: wine Branch: master Commit: 2212e663f9d6255e15d981441d548cb986d8199c URL: https://gitlab.winehq.org/wine/wine/-/commit/2212e663f9d6255e15d981441d548c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 22 15:05:59 2023 +0300 ddraw/tests: Show that SYSMEM | 3DDEVICE surfaces don't consume vidmem. --- dlls/ddraw/tests/ddraw1.c | 6 ++++++ dlls/ddraw/tests/ddraw2.c | 6 ++++++ dlls/ddraw/tests/ddraw4.c | 6 ++++++ dlls/ddraw/tests/ddraw7.c | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 3e5bf3dee1a..d52824dbc43 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -6145,6 +6145,12 @@ static void test_create_surface_pitch(void) {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE | DDSCAPS_ALLOCONLOAD, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DDERR_INVALIDPARAMS, 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, + 0, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, + 0, 0, DD_OK, + DDSD_PITCH, 0x100, 0x100}, }; DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 6c07c9531f4..c24975daa92 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -7271,6 +7271,12 @@ static void test_create_surface_pitch(void) {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE | DDSCAPS_ALLOCONLOAD, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DDERR_INVALIDPARAMS, 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, + 0, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, + 0, 0, DD_OK, + DDSD_PITCH, 0x100, 0x100}, }; DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 943fbd36002..8bd3f3eac53 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9173,6 +9173,12 @@ static void test_create_surface_pitch(void) {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE | DDSCAPS_ALLOCONLOAD, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DD_OK, DDSD_PITCH, 0x100, 0 }, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, + 0, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, + 0, 0, DD_OK, + DDSD_PITCH, 0x100, 0x100}, }; DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 06e7f1cefac..d276e1f2543 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9013,6 +9013,12 @@ static void test_create_surface_pitch(void) {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE | DDSCAPS_ALLOCONLOAD, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DD_OK, DDSD_PITCH, 0x100, 0 }, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, + 0, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, + 0, 0, DD_OK, + DDSD_PITCH, 0x100, 0x100}, }; DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE;

1 0

Stefan Dösinger : ddraw/tests: Native 64 bit ddraw has a video memory leak.
by Alexandre Julliard 28 Mar '23

28 Mar '23

Module: wine Branch: master Commit: 23cfa8a2106a97ab591066ed0ebc89a4370ecb5e URL: https://gitlab.winehq.org/wine/wine/-/commit/23cfa8a2106a97ab591066ed0ebc89… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 25 17:37:50 2023 +0300 ddraw/tests: Native 64 bit ddraw has a video memory leak. --- dlls/ddraw/tests/ddraw7.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d875afcfa16..06e7f1cefac 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9034,12 +9034,18 @@ static void test_create_surface_pitch(void) hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &primary, NULL); ok(SUCCEEDED(hr), "Failed to create a primary surface, hr %#lx.\n", hr); - hr = IDirectDraw7_GetAvailableVidMem(ddraw, &vidmem_caps, &vidmem_total, &vidmem_free); - ok(SUCCEEDED(hr) || hr == DDERR_NODIRECTDRAWHW, - "Failed to get available video memory, hr %#lx.\n", hr); - for (i = 0; i < ARRAY_SIZE(test_data); ++i) { + /* 64 bit ddraw can leak video memory when trying to create a DDSCAPS_TEXTURE surface. + * Surface creation fails, but video memory is consumed anyway. Update the free vidmem + * every iteration. + * + * This E_NOINTERFACE texture creation failure does not happen in earlier versions of + * the API, so we get to release the surface and avoid the vidmem leak. */ + hr = IDirectDraw7_GetAvailableVidMem(ddraw, &vidmem_caps, &vidmem_total, &vidmem_free); + ok(SUCCEEDED(hr) || hr == DDERR_NODIRECTDRAWHW, + "Failed to get available video memory, hr %#lx.\n", hr); + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | test_data[i].flags_in;

1 0

Stefan Dösinger : wined3d: Make video memory accounting a per-resource flag.
by Alexandre Julliard 28 Mar '23

28 Mar '23

Module: wine Branch: master Commit: 723cd0a4ae76ec45320290893c7af7f90b668556 URL: https://gitlab.winehq.org/wine/wine/-/commit/723cd0a4ae76ec45320290893c7af7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 22 17:45:57 2023 +0300 wined3d: Make video memory accounting a per-resource flag. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54701 --- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/directx.c | 8 ++++---- dlls/d3d9/buffer.c | 6 ++++++ dlls/d3d9/device.c | 3 +++ dlls/d3d9/directx.c | 4 +--- dlls/d3d9/texture.c | 9 +++++++++ dlls/ddraw/ddraw_private.h | 7 +++---- dlls/ddraw/surface.c | 4 ++-- dlls/ddraw/vertexbuffer.c | 2 +- dlls/wined3d/resource.c | 33 ++++++++++++++------------------- dlls/wined3d/texture.c | 5 ++--- dlls/wined3d/utils.c | 1 + include/wine/wined3d.h | 2 +- 13 files changed, 48 insertions(+), 38 deletions(-)

1 0

Rémi Bernon : dinput: Rewrite IDirectInput8_EnumDevicesBySemantics.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: d62e2268d77c237e8430e158bb337958d88486ba URL: https://gitlab.winehq.org/wine/wine/-/commit/d62e2268d77c237e8430e158bb3379… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 27 10:07:56 2023 +0200 dinput: Rewrite IDirectInput8_EnumDevicesBySemantics. Simplifying and fixing it. --- dlls/dinput/device.c | 6 +- dlls/dinput/device_private.h | 2 + dlls/dinput/dinput.c | 198 ++++++++++++++++++------------------------ dlls/dinput/tests/joystick8.c | 2 +- 4 files changed, 90 insertions(+), 118 deletions(-)

1 0

Rémi Bernon : dinput: Implement DIDBAM_PRESERVE BuildActionMap flag.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: cb987646a4df19e9b9cbc2c5a5a5b411d3835ec1 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb987646a4df19e9b9cbc2c5a5a5b4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 27 09:48:35 2023 +0200 dinput: Implement DIDBAM_PRESERVE BuildActionMap flag. --- dlls/dinput/device.c | 4 ++++ dlls/dinput/tests/joystick8.c | 14 ++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a152d552f5d..b4b39f0595e 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1847,6 +1847,8 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, for (action = format->rgoAction; action < action_end; action++) { if (!action->dwSemantic) return DIERR_INVALIDPARAM; + if (flags == DIDBAM_PRESERVE && !IsEqualCLSID( &action->guidInstance, &GUID_NULL ) && + !IsEqualCLSID( &action->guidInstance, &impl->guid )) continue; if (action->dwFlags & DIA_APPMAPPED) action->dwHow = DIAH_APPREQUESTED; else action->dwHow = 0; } @@ -1864,6 +1866,8 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, for (action = format->rgoAction; action < action_end; action++) { if (action->dwHow == DIAH_APPREQUESTED || action->dwHow == DIAH_USERCONFIG) continue; + if (flags == DIDBAM_PRESERVE && !IsEqualCLSID( &action->guidInstance, &GUID_NULL ) && + !IsEqualCLSID( &action->guidInstance, &impl->guid )) continue; if (action->dwFlags & DIA_APPNOMAP) continue; action->guidInstance = GUID_NULL; action->dwHow = 0; diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index ccd07da28ec..f8ab7bfc789 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -209,8 +209,8 @@ static BOOL CALLBACK check_no_created_effect_objects( IDirectInputEffect *effect return DIENUM_CONTINUE; } -#define check_diactionw( a, b ) check_diactionw_( __LINE__, a, b, FALSE ) -static void check_diactionw_( int line, const DIACTIONW *actual, const DIACTIONW *expected, BOOL todo ) +#define check_diactionw( a, b ) check_diactionw_( __LINE__, a, b ) +static void check_diactionw_( int line, const DIACTIONW *actual, const DIACTIONW *expected ) { check_member_( __FILE__, line, *actual, *expected, "%#Ix", uAppData ); check_member_( __FILE__, line, *actual, *expected, "%#lx", dwSemantic ); @@ -219,15 +219,13 @@ static void check_diactionw_( int line, const DIACTIONW *actual, const DIACTIONW check_member_wstr_( __FILE__, line, *actual, *expected, lptszActionName ); else check_member_( __FILE__, line, *actual, *expected, "%p", lptszActionName ); - todo_wine_if( todo ) check_member_guid_( __FILE__, line, *actual, *expected, guidInstance ); check_member_( __FILE__, line, *actual, *expected, "%#lx", dwObjID ); - todo_wine_if( todo ) check_member_( __FILE__, line, *actual, *expected, "%#lx", dwHow ); } -#define check_diactionformatw( a, b ) check_diactionformatw_( __LINE__, a, b, FALSE ) -static void check_diactionformatw_( int line, const DIACTIONFORMATW *actual, const DIACTIONFORMATW *expected, BOOL todo ) +#define check_diactionformatw( a, b ) check_diactionformatw_( __LINE__, a, b ) +static void check_diactionformatw_( int line, const DIACTIONFORMATW *actual, const DIACTIONFORMATW *expected ) { DWORD i; check_member_( __FILE__, line, *actual, *expected, "%#lx", dwSize ); @@ -237,7 +235,7 @@ static void check_diactionformatw_( int line, const DIACTIONFORMATW *actual, con for (i = 0; i < min( actual->dwNumActions, expected->dwNumActions ); ++i) { winetest_push_context( "action[%lu]", i ); - check_diactionw_( line, actual->rgoAction + i, expected->rgoAction + i, todo && i >= 2 ); + check_diactionw_( line, actual->rgoAction + i, expected->rgoAction + i ); winetest_pop_context(); if (expected->dwActionSize != sizeof(DIACTIONW)) break; if (actual->dwActionSize != sizeof(DIACTIONW)) break; @@ -1377,7 +1375,7 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e ok( hr == DI_OK, "BuildActionMap returned %#lx\n", hr ); hr = IDirectInputDevice8_BuildActionMap( device, &action_format, L"username", DIDBAM_PRESERVE ); ok( hr == DI_OK, "BuildActionMap returned %#lx\n", hr ); - check_diactionformatw_( __LINE__, &action_format, &expect_action_format_4, TRUE ); + check_diactionformatw( &action_format, &expect_action_format_4 ); IDirectInputDevice8_Release( keyboard ); IDirectInputDevice8_Release( mouse );

1 0

Rémi Bernon : dinput: Check device type in BuildActionMap for specific semantics.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 782ad8f70c60b35c19a4469f322818f3d879933e URL: https://gitlab.winehq.org/wine/wine/-/commit/782ad8f70c60b35c19a4469f322818… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 24 11:05:36 2023 +0100 dinput: Check device type in BuildActionMap for specific semantics. --- dlls/dinput/device.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8b5d5a566bf..a152d552f5d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1785,7 +1785,8 @@ static HRESULT WINAPI dinput_device_WriteEffectToFile( IDirectInputDevice8W *ifa return DI_OK; } -static BOOL object_matches_semantic( const DIOBJECTDATAFORMAT *object, DWORD semantic, BOOL exact ) +static BOOL object_matches_semantic( const DIDEVICEINSTANCEW *instance, const DIOBJECTDATAFORMAT *object, + DWORD semantic, BOOL exact ) { DWORD value = semantic & 0xff, axis = (semantic >> 15) & 3, type; @@ -1799,7 +1800,15 @@ static BOOL object_matches_semantic( const DIOBJECTDATAFORMAT *object, DWORD sem } if (!(DIDFT_GETTYPE( object->dwType ) & type)) return FALSE; - if ((semantic & 0xf0000000) == 0x80000000) return object->dwOfs == value; + if ((semantic & 0xf0000000) == 0x80000000) + { + switch (semantic & 0x0f000000) + { + case 0x01000000: return (instance->dwDevType & 0xf) == DIDEVTYPE_KEYBOARD && object->dwOfs == value; + case 0x02000000: return (instance->dwDevType & 0xf) == DIDEVTYPE_MOUSE && object->dwOfs == value; + default: return FALSE; + } + } if (axis && (axis - 1) != DIDFT_GETINSTANCE( object->dwType )) return FALSE; return !exact || !value || value == DIDFT_GETINSTANCE( object->dwType ) + 1; } @@ -1872,7 +1881,7 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, for (object = impl->device_format.rgodf; object < object_end; object++) { if (mapped[object - impl->device_format.rgodf]) continue; - if (!object_matches_semantic( object, action->dwSemantic, TRUE )) continue; + if (!object_matches_semantic( &impl->instance, object, action->dwSemantic, TRUE )) continue; if ((action->dwFlags & DIA_FORCEFEEDBACK) && !(object->dwType & DIDFT_FFACTUATOR)) continue; action->dwObjID = object->dwType; action->guidInstance = impl->guid; @@ -1891,7 +1900,7 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, for (object = impl->device_format.rgodf; object < object_end; object++) { if (mapped[object - impl->device_format.rgodf]) continue; - if (!object_matches_semantic( object, action->dwSemantic, FALSE )) continue; + if (!object_matches_semantic( &impl->instance, object, action->dwSemantic, FALSE )) continue; if ((action->dwFlags & DIA_FORCEFEEDBACK) && !(object->dwType & DIDFT_FFACTUATOR)) continue; action->dwObjID = object->dwType; action->guidInstance = impl->guid;

1 0

Rémi Bernon : dinput: Load action map from registry before resetting guid.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 18b5f7956f5b45540f5ee7e3ae29cf0948ae5ac2 URL: https://gitlab.winehq.org/wine/wine/-/commit/18b5f7956f5b45540f5ee7e3ae29cf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 27 09:40:50 2023 +0200 dinput: Load action map from registry before resetting guid. --- dlls/dinput/device.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index b9f38330800..8b5d5a566bf 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1812,7 +1812,6 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, DIACTIONW *action, *action_end; DWORD i, username_len = MAX_PATH; WCHAR username_buf[MAX_PATH]; - BOOL load_success = FALSE; BOOL *mapped; TRACE( "iface %p, format %p, username %s, flags %#lx\n", iface, format, @@ -1840,12 +1839,7 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, { if (!action->dwSemantic) return DIERR_INVALIDPARAM; if (action->dwFlags & DIA_APPMAPPED) action->dwHow = DIAH_APPREQUESTED; - else if (action->dwFlags & DIA_APPNOMAP) continue; - else - { - action->dwHow = 0; - action->guidInstance = GUID_NULL; - } + else action->dwHow = 0; } /* Unless asked the contrary by these flags, try to load a previous mapping */ @@ -1854,10 +1848,18 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, /* Retrieve logged user name if necessary */ if (username == NULL) GetUserNameW( username_buf, &username_len ); else lstrcpynW( username_buf, username, MAX_PATH ); - load_success = load_mapping_settings( impl, format, username_buf ); + load_mapping_settings( impl, format, username_buf ); + } + + action_end = format->rgoAction + format->dwNumActions; + for (action = format->rgoAction; action < action_end; action++) + { + if (action->dwHow == DIAH_APPREQUESTED || action->dwHow == DIAH_USERCONFIG) continue; + if (action->dwFlags & DIA_APPNOMAP) continue; + action->guidInstance = GUID_NULL; + action->dwHow = 0; } - if (load_success) return DI_OK; if (!(mapped = calloc( impl->device_format.dwNumObjs, sizeof(*mapped) ))) return DIERR_OUTOFMEMORY; action_end = format->rgoAction + format->dwNumActions;

1 0

Rémi Bernon : dinput: Trace formats in (Build|Set)ActionMap and EnumDevicesBySemantics.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 2da8f5d2acda0ea56051e8ab9cc7f96f6dd8a537 URL: https://gitlab.winehq.org/wine/wine/-/commit/2da8f5d2acda0ea56051e8ab9cc7f9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 27 10:04:19 2023 +0200 dinput: Trace formats in (Build|Set)ActionMap and EnumDevicesBySemantics. --- dlls/dinput/device.c | 24 ++++++++++++++++++++++-- dlls/dinput/dinput.c | 12 ++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 41baa630989..b9f38330800 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1815,7 +1815,7 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, BOOL load_success = FALSE; BOOL *mapped; - FIXME( "iface %p, format %p, username %s, flags %#lx stub!\n", iface, format, + TRACE( "iface %p, format %p, username %s, flags %#lx\n", iface, format, debugstr_w(username), flags ); if (!format) return DIERR_INVALIDPARAM; @@ -1825,6 +1825,16 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, if (format->dwNumActions * 4 != format->dwDataSize) return DIERR_INVALIDPARAM; + TRACE( "format guid %s, genre %#lx, name %s\n", debugstr_guid(&format->guidActionMap), + format->dwGenre, debugstr_w(format->tszActionMap) ); + for (i = 0; i < format->dwNumActions; i++) + { + DIACTIONW *action = format->rgoAction + i; + TRACE( " %lu: app_data %#Ix, semantic %#lx, flags %#lx, instance %s, obj_id %#lx, how %#lx, name %s\n", + i, action->uAppData, action->dwSemantic, action->dwFlags, debugstr_guid(&action->guidInstance), + action->dwObjID, action->dwHow, debugstr_w(action->lptszActionName) ); + } + action_end = format->rgoAction + format->dwNumActions; for (action = format->rgoAction; action < action_end; action++) { @@ -1968,12 +1978,22 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D int i, index; HRESULT hr; - FIXME( "iface %p, format %p, username %s, flags %#lx stub!\n", iface, format, + TRACE( "iface %p, format %p, username %s, flags %#lx\n", iface, format, debugstr_w(username), flags ); if (!format) return DIERR_INVALIDPARAM; if (flags != DIDSAM_DEFAULT && flags != DIDSAM_FORCESAVE && flags != DIDSAM_NOUSER) return DIERR_INVALIDPARAM; + TRACE( "format guid %s, genre %#lx, name %s\n", debugstr_guid(&format->guidActionMap), + format->dwGenre, debugstr_w(format->tszActionMap) ); + for (i = 0; i < format->dwNumActions; i++) + { + DIACTIONW *action = format->rgoAction + i; + TRACE( " %u: app_data %#Ix, semantic %#lx, flags %#lx, instance %s, obj_id %#lx, how %#lx, name %s\n", + i, action->uAppData, action->dwSemantic, action->dwFlags, debugstr_guid(&action->guidInstance), + action->dwObjID, action->dwHow, debugstr_w(action->lptszActionName) ); + } + if (!(data_format.rgodf = malloc( sizeof(DIOBJECTDATAFORMAT) * format->dwNumActions ))) return DIERR_OUTOFMEMORY; data_format.dwDataSize = format->dwDataSize; diff --git a/dlls/dinput/dinput.c b/dlls/dinput/dinput.c index 998573ad20d..cac47de74a4 100644 --- a/dlls/dinput/dinput.c +++ b/dlls/dinput/dinput.c @@ -519,6 +519,18 @@ static HRESULT WINAPI dinput8_EnumDevicesBySemantics( IDirectInput8W *iface, con FIXME( "iface %p, username %s, action_format %p, callback %p, context %p, flags %#lx stub!\n", iface, debugstr_w(username), action_format, callback, context, flags ); + if (!action_format) return DIERR_INVALIDPARAM; + + TRACE( "format guid %s, genre %#lx, name %s\n", debugstr_guid(&action_format->guidActionMap), + action_format->dwGenre, debugstr_w(action_format->tszActionMap) ); + for (i = 0; i < action_format->dwNumActions; i++) + { + DIACTIONW *action = action_format->rgoAction + i; + TRACE( " %u: app_data %#Ix, semantic %#lx, flags %#lx, instance %s, obj_id %#lx, how %#lx, name %s\n", + i, action->uAppData, action->dwSemantic, action->dwFlags, debugstr_guid(&action->guidInstance), + action->dwObjID, action->dwHow, debugstr_w(action->lptszActionName) ); + } + didevi.dwSize = sizeof(didevi); hr = IDirectInput8_EnumDevices( &impl->IDirectInput8W_iface, DI8DEVCLASS_GAMECTRL,

1 0

Rémi Bernon : dinput/tests: Add more IDirectInput8_EnumDevicesBySemantics tests.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 8e63f68fb383b31b7c3f014b9717ff2f02c10688 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e63f68fb383b31b7c3f014b9717ff… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 27 09:13:45 2023 +0200 dinput/tests: Add more IDirectInput8_EnumDevicesBySemantics tests. --- dlls/dinput/tests/joystick8.c | 92 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 581e4624ef5..ccd07da28ec 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -408,6 +408,76 @@ static void check_dinput_devices( DWORD version, DIDEVICEINSTANCEW *devinst ) } } +static BOOL CALLBACK enum_devices_by_semantic( const DIDEVICEINSTANCEW *instance, IDirectInputDevice8W *device, + DWORD flags, DWORD remaining, void *context ) +{ + const DIDEVICEINSTANCEW expect_joystick = + { + .dwSize = sizeof(DIDEVICEINSTANCEW), + .guidInstance = expect_guid_product, + .guidProduct = expect_guid_product, + .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK, + .tszInstanceName = L"Wine Test", + .tszProductName = L"Wine Test", + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_JOYSTICK, + }; + const DIDEVICEINSTANCEW expect_keyboard = + { + .dwSize = sizeof(DIDEVICEINSTANCEW), + .guidInstance = GUID_SysKeyboard, + .guidProduct = GUID_SysKeyboard, + .dwDevType = (DI8DEVTYPEKEYBOARD_PCENH << 8) | DI8DEVTYPE_KEYBOARD, + .tszInstanceName = L"Keyboard", + .tszProductName = L"Keyboard", + }; + const DIDEVICEINSTANCEW expect_mouse = + { + .dwSize = sizeof(DIDEVICEINSTANCEW), + .guidInstance = GUID_SysMouse, + .guidProduct = GUID_SysMouse, + .dwDevType = (DI8DEVTYPEMOUSE_UNKNOWN << 8) | DI8DEVTYPE_MOUSE, + .tszInstanceName = L"Mouse", + .tszProductName = L"Mouse", + }; + const DIDEVICEINSTANCEW *expect_instance = NULL; + + ok( remaining <= 2, "got remaining %lu\n", remaining ); + + if (remaining == 2) + { + expect_instance = &expect_joystick; + todo_wine ok( flags == (context ? 3 : 0), "got flags %#lx\n", flags ); + } + else if (remaining == 1) + { + expect_instance = &expect_keyboard; + ok( flags == 1, "got flags %#lx\n", flags ); + } + else if (remaining == 0) + { + expect_instance = &expect_mouse; + ok( flags == 1, "got flags %#lx\n", flags ); + } + + check_member( *instance, *expect_instance, "%#lx", dwSize ); + if (expect_instance != &expect_joystick) check_member_guid( *instance, *expect_instance, guidInstance ); + check_member_guid( *instance, *expect_instance, guidProduct ); + todo_wine_if( expect_instance == &expect_mouse ) + check_member( *instance, *expect_instance, "%#lx", dwDevType ); + if (!localized) + { + check_member_wstr( *instance, *expect_instance, tszInstanceName ); + todo_wine_if( expect_instance != &expect_joystick ) + check_member_wstr( *instance, *expect_instance, tszProductName ); + } + check_member_guid( *instance, *expect_instance, guidFFDriver ); + check_member( *instance, *expect_instance, "%#x", wUsagePage ); + check_member( *instance, *expect_instance, "%#x", wUsage ); + + return DIENUM_CONTINUE; +} + static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE event ) { const DIACTIONW expect_actions[] = @@ -1277,7 +1347,7 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e ok( !wcscmp( prop_username.wsz, L"" ), "got username %s\n", debugstr_w(prop_username.wsz) ); - /* test BuildActionMap with multiple devices */ + /* test BuildActionMap with multiple devices and EnumDevicesBySemantics */ hr = DirectInput8Create( instance, 0x800, &IID_IDirectInput8W, (void **)&dinput, NULL ); ok( hr == DI_OK, "DirectInput8Create returned %#lx\n", hr ); @@ -1312,6 +1382,26 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e IDirectInputDevice8_Release( keyboard ); IDirectInputDevice8_Release( mouse ); + action_format = action_format_2; + action_format.rgoAction = actions; + memcpy( actions, default_actions, sizeof(default_actions) ); + hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_devices_by_semantic, (void *)0xdeadbeef, 0 ); + ok( hr == DI_OK, "EnumDevicesBySemantics returned %#lx\n", hr ); + + action_format = action_format_3; + action_format.rgoAction = actions; + memcpy( actions, default_actions + 7, sizeof(expect_actions_4) ); + hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_devices_by_semantic, (void *)0xdeadbeef, 0 ); + ok( hr == DI_OK, "EnumDevicesBySemantics returned %#lx\n", hr ); + + action_format = action_format_3; + action_format.rgoAction = actions; + memcpy( actions, default_actions + 9, 2 * sizeof(DIACTIONW) ); + action_format.dwNumActions = 2; + action_format.dwDataSize = 8; + hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_devices_by_semantic, NULL, 0 ); + ok( hr == DI_OK, "EnumDevicesBySemantics returned %#lx\n", hr ); + IDirectInput8_Release( dinput ); }

1 0

Rémi Bernon : dinput/tests: Test BuildActionMap cases with multiple devices.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 83881f579f573123e172a2d40f203c15fa92079f URL: https://gitlab.winehq.org/wine/wine/-/commit/83881f579f573123e172a2d40f203c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 24 11:32:58 2023 +0100 dinput/tests: Test BuildActionMap cases with multiple devices. --- dlls/dinput/tests/joystick8.c | 210 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 200 insertions(+), 10 deletions(-)

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2023