Rémi Bernon : dinput/tests: Avoid window activation race conditions with Wine.
Alexandre Julliard
julliard at winehq.org
Thu Jul 7 17:03:25 CDT 2022
Module: wine
Branch: master
Commit: 2020541b4b42c4534335bdc0520d63ce53d880c5
URL: https://source.winehq.org/git/wine.git/?a=commit;h=2020541b4b42c4534335bdc0520d63ce53d880c5
Author: Rémi Bernon <rbernon at codeweavers.com>
Date: Thu Jul 7 08:47:39 2022 +0200
dinput/tests: Avoid window activation race conditions with Wine.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53240
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
dlls/dinput/tests/device8.c | 40 +++++++++++++++-------------------------
1 file changed, 15 insertions(+), 25 deletions(-)
diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c
index 927bf18949a..ebe376d1127 100644
--- a/dlls/dinput/tests/device8.c
+++ b/dlls/dinput/tests/device8.c
@@ -1893,7 +1893,6 @@ static void test_sys_mouse( DWORD version )
hwnd = CreateWindowW( L"static", L"static", WS_POPUP | WS_VISIBLE,
50, 50, 200, 200, NULL, NULL, NULL, NULL );
ok( !!hwnd, "CreateWindowW failed, error %lu\n", GetLastError() );
- flush_events();
hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_FOREGROUND );
ok( hr == DIERR_INVALIDPARAM, "SetCooperativeLevel returned %#lx\n", hr );
@@ -1926,7 +1925,6 @@ static void test_sys_mouse( DWORD version )
child = CreateWindowW( L"static", L"static", WS_CHILD | WS_VISIBLE,
10, 10, 50, 50, hwnd, NULL, NULL, NULL );
ok( !!child, "CreateWindowW failed, error %lu\n", GetLastError() );
- flush_events();
hr = IDirectInputDevice8_SetCooperativeLevel( device, child, DISCL_FOREGROUND );
ok( hr == DIERR_INVALIDPARAM, "SetCooperativeLevel returned %#lx\n", hr );
@@ -1966,27 +1964,6 @@ static void test_sys_mouse( DWORD version )
hr = IDirectInputDevice8_Acquire( device );
ok( hr == DI_NOEFFECT, "Acquire returned %#lx\n", hr );
-
- tmp_hwnd = CreateWindowW( L"static", L"static", WS_POPUP | WS_VISIBLE,
- 50, 250, 200, 200, NULL, NULL, NULL, NULL );
- ok( !!tmp_hwnd, "CreateWindowW failed, error %lu\n", GetLastError() );
- flush_events();
-
- hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state );
- ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#lx\n", hr );
-
- hr = IDirectInputDevice8_Acquire( device );
- ok( hr == DIERR_OTHERAPPHASPRIO, "Acquire returned %#lx\n", hr );
-
- SetActiveWindow( hwnd );
- flush_events();
-
- hr = IDirectInputDevice8_SetProperty( device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&prop_dword );
- ok( hr == DI_OK, "SetProperty returned %#lx\n", hr );
-
- hr = IDirectInputDevice8_Acquire( device );
- ok( hr == DI_OK, "Acquire returned %#lx\n", hr );
-
mouse_event( MOUSEEVENTF_MOVE, 10, 10, 0, 0 );
res = WaitForSingleObject( event, 100 );
if (res == WAIT_TIMEOUT) /* Acquire is asynchronous */
@@ -2058,8 +2035,23 @@ static void test_sys_mouse( DWORD version )
ok( hr == DI_OK, "GetDeviceData returned %#lx\n", hr );
ok( count == 1, "got count %lu\n", count );
+ hr = IDirectInputDevice8_Unacquire( device );
+ ok( hr == DI_OK, "Unacquire returned %#lx\n", hr );
+
+
+ tmp_hwnd = CreateWindowW( L"static", L"static", WS_POPUP | WS_VISIBLE,
+ 50, 250, 200, 200, NULL, NULL, NULL, NULL );
+ ok( !!tmp_hwnd, "CreateWindowW failed, error %lu\n", GetLastError() );
+
+ hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state );
+ ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#lx\n", hr );
+
+ hr = IDirectInputDevice8_Acquire( device );
+ ok( hr == DIERR_OTHERAPPHASPRIO, "Acquire returned %#lx\n", hr );
+
DestroyWindow( tmp_hwnd );
+
CloseHandle( event );
DestroyWindow( hwnd );
@@ -2554,7 +2546,6 @@ static void test_sys_keyboard( DWORD version )
hwnd = CreateWindowW( L"static", L"static", WS_POPUP | WS_VISIBLE,
50, 50, 200, 200, NULL, NULL, NULL, NULL );
ok( !!hwnd, "CreateWindowW failed, error %lu\n", GetLastError() );
- flush_events();
hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_FOREGROUND );
ok( hr == DIERR_INVALIDPARAM, "SetCooperativeLevel returned %#lx\n", hr );
@@ -2589,7 +2580,6 @@ static void test_sys_keyboard( DWORD version )
child = CreateWindowW( L"static", L"static", WS_CHILD | WS_VISIBLE,
10, 10, 50, 50, hwnd, NULL, NULL, NULL );
ok( !!child, "CreateWindowW failed, error %lu\n", GetLastError() );
- flush_events();
hr = IDirectInputDevice8_SetCooperativeLevel( device, child, DISCL_FOREGROUND );
ok( hr == DIERR_INVALIDPARAM, "SetCooperativeLevel returned %#lx\n", hr );
More information about the wine-cvs
mailing list