[ros-diffs] [akhaldi] 70854: [DINPUT_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

Author: akhaldi
Date: Tue Mar  1 19:29:57 2016
New Revision: 70854

URL: http://svn.reactos.org/svn/reactos?rev=70854&view=rev
Log:
[DINPUT_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

Modified:
    trunk/rostests/winetests/dinput/keyboard.c
    trunk/rostests/winetests/dinput/mouse.c

Modified: trunk/rostests/winetests/dinput/keyboard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/keyboard…
==============================================================================
--- trunk/rostests/winetests/dinput/keyboard.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/dinput/keyboard.c	[iso-8859-1] Tue Mar  1 19:29:57 2016
@@ -125,6 +125,12 @@
     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,
@@ -152,6 +158,11 @@
     {
         hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, NULL, 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++)
     {

Modified: trunk/rostests/winetests/dinput/mouse.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/mouse.c?…
==============================================================================
--- trunk/rostests/winetests/dinput/mouse.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/dinput/mouse.c	[iso-8859-1] Tue Mar  1 19:29:57 2016
@@ -132,7 +132,7 @@
 
     /* 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());