Commit 3fad9cac authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard

dinput/tests: Mark some tests as flaky to work around fvwm bug.

parent 048b0421
...@@ -395,11 +395,13 @@ void test_overlapped_format( DWORD version ) ...@@ -395,11 +395,13 @@ void test_overlapped_format( DWORD version )
/* press D */ /* press D */
keybd_event( 0, DIK_D, KEYEVENTF_SCANCODE, 0 ); keybd_event( 0, DIK_D, KEYEVENTF_SCANCODE, 0 );
res = WaitForSingleObject( event, 5000 ); res = WaitForSingleObject( event, 5000 );
flaky_wine_if( GetForegroundWindow() != hwnd && version == 0x800 ) /* FIXME: fvwm sometimes steals input focus */
ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#lx\n", res ); ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#lx\n", res );
count = 10; count = 10;
hr = IDirectInputDevice_GetDeviceData( keyboard, data_size, NULL, &count, 0 ); hr = IDirectInputDevice_GetDeviceData( keyboard, data_size, NULL, &count, 0 );
ok( hr == DI_OK, "GetDeviceData returned %#lx\n", hr ); ok( hr == DI_OK, "GetDeviceData returned %#lx\n", hr );
flaky_wine_if( GetForegroundWindow() != hwnd && version == 0x800 ) /* FIXME: fvwm sometimes steals input focus */
ok( count == 1, "got count %lu\n", count ); ok( count == 1, "got count %lu\n", count );
memset( &state, 0xFF, sizeof(state) ); memset( &state, 0xFF, sizeof(state) );
...@@ -415,11 +417,13 @@ void test_overlapped_format( DWORD version ) ...@@ -415,11 +417,13 @@ void test_overlapped_format( DWORD version )
/* release D */ /* release D */
keybd_event( 0, DIK_D, KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP, 0 ); keybd_event( 0, DIK_D, KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP, 0 );
res = WaitForSingleObject( event, 5000 ); res = WaitForSingleObject( event, 5000 );
flaky_wine_if( GetForegroundWindow() != hwnd && version == 0x800 ) /* FIXME: fvwm sometimes steals input focus */
ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#lx\n", res ); ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#lx\n", res );
count = 10; count = 10;
hr = IDirectInputDevice_GetDeviceData( keyboard, data_size, NULL, &count, 0 ); hr = IDirectInputDevice_GetDeviceData( keyboard, data_size, NULL, &count, 0 );
ok( hr == DI_OK, "GetDeviceData returned %#lx\n", hr ); ok( hr == DI_OK, "GetDeviceData returned %#lx\n", hr );
flaky_wine_if( GetForegroundWindow() != hwnd && version == 0x800 ) /* FIXME: fvwm sometimes steals input focus */
ok( count == 1, "got count %lu\n", count ); ok( count == 1, "got count %lu\n", count );
...@@ -682,14 +686,19 @@ static void test_mouse_keyboard(void) ...@@ -682,14 +686,19 @@ static void test_mouse_keyboard(void)
IDirectInputDevice8_SetCooperativeLevel(di_keyboard, hwnd, DISCL_FOREGROUND|DISCL_EXCLUSIVE); IDirectInputDevice8_SetCooperativeLevel(di_keyboard, hwnd, DISCL_FOREGROUND|DISCL_EXCLUSIVE);
hr = IDirectInputDevice8_Acquire(di_keyboard); hr = IDirectInputDevice8_Acquire(di_keyboard);
flaky_wine_if( GetForegroundWindow() != hwnd ) /* FIXME: fvwm sometimes steals input focus */
ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %#lx\n", hr); ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %#lx\n", hr);
hr = IDirectInputDevice8_Acquire(di_mouse); hr = IDirectInputDevice8_Acquire(di_mouse);
flaky_wine_if( GetForegroundWindow() != hwnd ) /* FIXME: fvwm sometimes steals input focus */
ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %#lx\n", hr); ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %#lx\n", hr);
raw_devices_count = ARRAY_SIZE(raw_devices); raw_devices_count = ARRAY_SIZE(raw_devices);
memset(raw_devices, 0, sizeof(raw_devices)); memset(raw_devices, 0, sizeof(raw_devices));
hr = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); hr = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE));
flaky_wine_if( GetForegroundWindow() != hwnd ) /* FIXME: fvwm sometimes steals input focus */
ok(hr == 3, "GetRegisteredRawInputDevices returned %ld, raw_devices_count: %d\n", hr, raw_devices_count); ok(hr == 3, "GetRegisteredRawInputDevices returned %ld, raw_devices_count: %d\n", hr, raw_devices_count);
flaky_wine_if( GetForegroundWindow() != hwnd ) /* FIXME: fvwm sometimes steals input focus */
ok(raw_devices[0].dwFlags == (RIDEV_CAPTUREMOUSE|RIDEV_NOLEGACY), "Unexpected raw device flags: %#lx\n", raw_devices[0].dwFlags); ok(raw_devices[0].dwFlags == (RIDEV_CAPTUREMOUSE|RIDEV_NOLEGACY), "Unexpected raw device flags: %#lx\n", raw_devices[0].dwFlags);
flaky_wine_if( GetForegroundWindow() != hwnd ) /* FIXME: fvwm sometimes steals input focus */
ok(raw_devices[2].dwFlags == (RIDEV_NOHOTKEYS|RIDEV_NOLEGACY), "Unexpected raw device flags: %#lx\n", raw_devices[1].dwFlags); ok(raw_devices[2].dwFlags == (RIDEV_NOHOTKEYS|RIDEV_NOLEGACY), "Unexpected raw device flags: %#lx\n", raw_devices[1].dwFlags);
hr = IDirectInputDevice8_Unacquire(di_keyboard); hr = IDirectInputDevice8_Unacquire(di_keyboard);
ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %#lx\n", hr); ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %#lx\n", hr);
...@@ -1581,7 +1590,7 @@ cleanup: ...@@ -1581,7 +1590,7 @@ cleanup:
localized = old_localized; localized = old_localized;
} }
static void test_dik_codes( IDirectInputDevice8W *device, HANDLE event, HWND hwnd ) static void test_dik_codes( IDirectInputDevice8W *device, HANDLE event, HWND hwnd, DWORD version )
{ {
static const struct key2dik static const struct key2dik
{ {
...@@ -1685,6 +1694,7 @@ static void test_dik_codes( IDirectInputDevice8W *device, HANDLE event, HWND hwn ...@@ -1685,6 +1694,7 @@ static void test_dik_codes( IDirectInputDevice8W *device, HANDLE event, HWND hwn
keybd_event( vkey, scan, KEYEVENTF_KEYUP, 0 ); keybd_event( vkey, scan, KEYEVENTF_KEYUP, 0 );
res = WaitForSingleObject( event, 5000 ); res = WaitForSingleObject( event, 5000 );
flaky_wine_if( GetForegroundWindow() != hwnd && version == 0x800 ) /* FIXME: fvwm sometimes steals input focus */
ok( !res, "WaitForSingleObject returned %#lx\n", res ); ok( !res, "WaitForSingleObject returned %#lx\n", res );
winetest_pop_context(); winetest_pop_context();
...@@ -2190,7 +2200,7 @@ skip_key_tests: ...@@ -2190,7 +2200,7 @@ skip_key_tests:
ActivateKeyboardLayout( old_hkl, 0 ); ActivateKeyboardLayout( old_hkl, 0 );
UnloadKeyboardLayout( hkl ); UnloadKeyboardLayout( hkl );
test_dik_codes( device, event, hwnd ); test_dik_codes( device, event, hwnd, version );
CloseHandle( event ); CloseHandle( event );
DestroyWindow( hwnd ); DestroyWindow( hwnd );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment