[PATCH 0/3] MR484: Misc tweaks for the tests

[Francois Gouget (＠fgouget)]

Signed-off-by: Francois Gouget

[PATCH 1/3] ws2_32/tests: Add comments to help identify the hint test indices.

[Francois Gouget]

From: Francois Gouget

Signed-off-by: Francois Gouget 
---
 dlls/ws2_32/tests/protocol.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c
index 0b14543606a..fac3cf57077 100644
--- a/dlls/ws2_32/tests/protocol.c
+++ b/dlls/ws2_32/tests/protocol.c
@@ -1572,7 +1572,7 @@ static const struct addr_hint_tests
 }
 hinttests[] =
 {
-    {AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, 0},
+    {AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, 0}, /* 0 */
     {AF_UNSPEC, SOCK_STREAM, IPPROTO_UDP, 0},
     {AF_UNSPEC, SOCK_STREAM, IPPROTO_IPV6,0},
     {AF_UNSPEC, SOCK_DGRAM,  IPPROTO_TCP, 0},
@@ -1582,7 +1582,7 @@ hinttests[] =
     {AF_INET,   SOCK_STREAM, IPPROTO_UDP, 0},
     {AF_INET,   SOCK_STREAM, IPPROTO_IPV6,0},
     {AF_INET,   SOCK_DGRAM,  IPPROTO_TCP, 0},
-    {AF_INET,   SOCK_DGRAM,  IPPROTO_UDP, 0},
+    {AF_INET,   SOCK_DGRAM,  IPPROTO_UDP, 0}, /* 10 */
     {AF_INET,   SOCK_DGRAM,  IPPROTO_IPV6,0},
     {AF_UNSPEC, 0,           IPPROTO_TCP, 0},
     {AF_UNSPEC, 0,           IPPROTO_UDP, 0},
@@ -1592,7 +1592,7 @@ hinttests[] =
     {AF_INET,   0,           IPPROTO_TCP, 0},
     {AF_INET,   0,           IPPROTO_UDP, 0},
     {AF_INET,   0,           IPPROTO_IPV6,0},
-    {AF_INET,   SOCK_STREAM, 0,           0},
+    {AF_INET,   SOCK_STREAM, 0,           0}, /* 20 */
     {AF_INET,   SOCK_DGRAM,  0,           0},
     {AF_UNSPEC, 999,         IPPROTO_TCP, WSAESOCKTNOSUPPORT},
     {AF_UNSPEC, 999,         IPPROTO_UDP, WSAESOCKTNOSUPPORT},
@@ -1602,7 +1602,7 @@ hinttests[] =
     {AF_INET,   999,         IPPROTO_IPV6,WSAESOCKTNOSUPPORT},
     {AF_UNSPEC, SOCK_STREAM, 999,         0},
     {AF_UNSPEC, SOCK_STREAM, 999,         0},
-    {AF_INET,   SOCK_DGRAM,  999,         0},
+    {AF_INET,   SOCK_DGRAM,  999,         0}, /* 30 */
     {AF_INET,   SOCK_DGRAM,  999,         0},
 };

[PATCH 2/3] include: Add some SPI_ constants.

[Francois Gouget]

From: Francois Gouget

They pop up in some failure messages.

Signed-off-by: Francois Gouget 
---
 include/winuser.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/winuser.h b/include/winuser.h
index d2262b6d70a..b17f30debd3 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -2502,6 +2502,10 @@ typedef struct tagDROPSTRUCT
 #define SPI_SETPENVISUALIZATION        0x201F
 #define SPI_GETPENARBITRATIONTYPE      0x2020
 #define SPI_SETPENARBITRATIONTYPE      0x2021
+#define SPI_GETCARETTIMEOUT            0x2022
+#define SPI_SETCARETTIMEOUT            0x2023
+#define SPI_GETHANDEDNESS              0x2024
+#define SPI_SETHANDEDNESS              0x2025

#define FE_FONTSMOOTHINGSTANDARD       0x0001
 #define FE_FONTSMOOTHINGCLEARTYPE      0x0002

[PATCH 3/3] dinput/tests: Add a trailing linefeed to some ok() calls.

[Francois Gouget]

From: Francois Gouget

Signed-off-by: Francois Gouget 
---
 dlls/dinput/tests/joystick8.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c
index e73330815a0..90d7182a1fa 100644
--- a/dlls/dinput/tests/joystick8.c
+++ b/dlls/dinput/tests/joystick8.c
@@ -1682,8 +1682,8 @@ static void test_simple_joystick( DWORD version )

hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state );
     ok( hr == DI_OK, "GetDeviceState returned: %#lx\n", hr );
-    ok( state.lX == expect_state_abs[1].lX || broken( state.lX == 16853 ) /* w8 */, "got lX %ld", state.lX );
-    ok( state.lY == expect_state_abs[1].lY || broken( state.lY == 16853 ) /* w8 */, "got lY %ld", state.lY );
+    ok( state.lX == expect_state_abs[1].lX || broken( state.lX == 16853 ) /* w8 */, "got lX %ld\n", state.lX );
+    ok( state.lY == expect_state_abs[1].lY || broken( state.lY == 16853 ) /* w8 */, "got lY %ld\n", state.lY );
     check_member( state, expect_state_abs[1], "%ld", lZ );
     check_member( state, expect_state_abs[1], "%ld", lRx );
     check_member( state, expect_state_abs[1], "%ld", rgdwPOV[0] );

[PATCH 0/3] MR484: Misc tweaks for the tests - approved

[Rémi Bernon (＠rbernon)]

This merge request was approved by R��mi Bernon.