From: Aida Jonikienė <aidas957(a)gmail.com> This fixes a segfault when launching NFS Underground. Fixes: f434ea12b83 ("dinput: Implement DIPROP_SCANCODE.") --- dlls/dinput/keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 8ec9dd47150..7d063308d69 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -211,7 +211,7 @@ HRESULT keyboard_create_device( struct dinput *dinput, const GUID *guid, IDirect if (FAILED(hr = dinput_device_init_device_format( &impl->base.IDirectInputDevice8W_iface ))) goto failed; - for (i = 0, index = 0; i < 512; ++i) + for (i = 0, index = 0; i < impl->base.device_format.dwNumObjs; ++i) { if (!GetKeyNameTextW( i << 16, instance.tszName, ARRAY_SIZE(instance.tszName) )) continue; if (!(dik = map_dik_code( i, 0, subtype, impl->base.dinput->dwVersion ))) continue; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6249