[DINPUT_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

svn path=/trunk/; revision=70854

diff --git a/rostests/winetests/dinput/keyboard.c b/rostests/winetests/dinput/keyboard.c
index 8d62ffc..18e1f07 100644 (file)
--- a/rostests/winetests/dinput/keyboard.c
+++ b/rostests/winetests/dinput/keyboard.c
@@ -125,6 +125,12 @@ static const HRESULT SetCoop_null_window[16] =  {
     E_INVALIDARG, E_HANDLE,     S_OK,         E_INVALIDARG,
     E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG};
 
     E_INVALIDARG, E_HANDLE,     S_OK,         E_INVALIDARG,
     E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG};
 

+static const HRESULT SetCoop_invalid_window[16] =  {
+    E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG,
+    E_INVALIDARG, E_HANDLE,     E_HANDLE,     E_INVALIDARG,
+    E_INVALIDARG, E_HANDLE,     E_HANDLE,     E_INVALIDARG,
+    E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG};
+

 static const HRESULT SetCoop_real_window[16] =  {
     E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG,
     E_INVALIDARG, S_OK,         S_OK,         E_INVALIDARG,
 static const HRESULT SetCoop_real_window[16] =  {
     E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG,
     E_INVALIDARG, S_OK,         S_OK,         E_INVALIDARG,


@@ -154,6 +160,11 @@ static void test_set_coop(IDirectInputA *pDI, HWND hwnd)
         ok(hr == SetCoop_null_window[i], "SetCooperativeLevel(NULL, %d): %08x\n", i, hr);
     }
     for (i=0; i<16; i++)
         ok(hr == SetCoop_null_window[i], "SetCooperativeLevel(NULL, %d): %08x\n", i, hr);
     }
     for (i=0; i<16; i++)

+    {
+        hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, (HWND)0x400000, i);
+        ok(hr == SetCoop_invalid_window[i], "SetCooperativeLevel(invalid, %d): %08x\n", i, hr);
+    }
+    for (i=0; i<16; i++)

     {
         hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, hwnd, i);
         ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %08x\n", i, hr);
     {
         hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, hwnd, i);
         ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %08x\n", i, hr);

diff --git a/rostests/winetests/dinput/mouse.c b/rostests/winetests/dinput/mouse.c
index cf12807..8463c16 100644 (file)
--- a/rostests/winetests/dinput/mouse.c
+++ b/rostests/winetests/dinput/mouse.c
@@ -132,7 +132,7 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd)
 
     /* Foreground coop level requires window to have focus */
     /* Create a temporary window, this should make dinput
 
     /* Foreground coop level requires window to have focus */
     /* Create a temporary window, this should make dinput

-     * loose mouse input */
+     * lose mouse input */

     hwnd2 = CreateWindowA("static", "Temporary", WS_VISIBLE, 10, 210, 200, 200, NULL, NULL, NULL,
                           NULL);
     ok(hwnd2 != NULL, "CreateWindowA failed with %u\n", GetLastError());
     hwnd2 = CreateWindowA("static", "Temporary", WS_VISIBLE, 10, 210, 200, 200, NULL, NULL, NULL,
                           NULL);
     ok(hwnd2 != NULL, "CreateWindowA failed with %u\n", GetLastError());