dinput: Fix EnumObjects callback return value handling.

This solves an issue in ZUSI 3 settings for DirectInput devices. Delphi defines the True value of the "C-compatible" LongBool type as -1, which wine interpreted to mean DIENUM_STOP because it is != DIENUM_CONTINUE. Change that logic so only an explicit DIENUM_STOP (= 0) return value stops the enumeration of objects.

dinput: Fix EnumObjects callback return value handling.
dcb84a45 · Florian Will · Alexandre Julliard · c04319e5 · dcb84a45 · dcb84a45
Commit dcb84a45 authored Apr 02, 2023 by Florian Will Committed by Alexandre Julliard Apr 03, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

device.c dlls/dinput/device.c +3 -1

device8.c dlls/dinput/tests/device8.c +1 -1

No files found.
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -730,7 +730,9 @@ static BOOL enum_objects_callback( struct dinput_device *impl, UINT index, struc
    struct enum_objects_params *params = data;
    if (instance->wUsagePage == HID_USAGE_PAGE_PID && !(instance->dwType & DIDFT_NODATA))
        return DIENUM_CONTINUE;
-    return params->callback( instance, params->context );
+
+    /* Applications may return non-zero values instead of DIENUM_CONTINUE. */
+    return params->callback( instance, params->context ) ? DIENUM_CONTINUE : DIENUM_STOP;
 }

 static HRESULT WINAPI dinput_device_EnumObjects( IDirectInputDevice8W *iface, LPDIENUMDEVICEOBJECTSCALLBACKW callback,

--- a/dlls/dinput/tests/device8.c
+++ b/dlls/dinput/tests/device8.c
@@ -1346,7 +1346,7 @@ static void test_sys_mouse( DWORD version )
    res = 0;
    hr = IDirectInputDevice8_EnumObjects( device, check_object_count_bad_retval, &res, DIDFT_AXIS );
    ok( hr == DI_OK, "EnumObjects returned %#lx\n", hr );
-    todo_wine ok( res == 3, "got %lu expected 3\n", res );
+    ok( res == 3, "got %lu expected 3\n", res );

    objinst.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW);
    res = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC );