[USER32_APITEST]

- Add a test for SendMessageTimeout failure case
- Remove a pointless (and broken) memset (Coverity)
CORE-8699

svn path=/trunk/; revision=64948

diff --git a/rostests/apitests/user32/CMakeLists.txt b/rostests/apitests/user32/CMakeLists.txt
index e65e9b9..cccad1a 100644 (file)
--- a/rostests/apitests/user32/CMakeLists.txt
+++ b/rostests/apitests/user32/CMakeLists.txt
@@ -19,6 +19,7 @@ list(APPEND SOURCE
     RealGetWindowClass.c
     ScrollDC.c
     ScrollWindowEx.c
     RealGetWindowClass.c
     ScrollDC.c
     ScrollWindowEx.c

+    SendMessageTimeout.c

     SetActiveWindow.c
     SetCursorPos.c
     SystemParametersInfo.c
     SetActiveWindow.c
     SetCursorPos.c
     SystemParametersInfo.c

diff --git a/rostests/apitests/user32/SendMessageTimeout.c b/rostests/apitests/user32/SendMessageTimeout.c
new file mode 100644 (file)
index 0000000..7cf82d6
--- /dev/null
+++ b/rostests/apitests/user32/SendMessageTimeout.c
@@ -0,0 +1,40 @@
+/*
+ * PROJECT:         ReactOS API tests
+ * LICENSE:         LGPLv2.1+ - See COPYING.LIB in the top level directory
+ * PURPOSE:         Test for SendMessageTimeout
+ * PROGRAMMERS:     Thomas Faber <thomas.faber@reactos.org>
+ */
+
+#include <apitest.h>
+#include <winuser.h>
+
+static
+void
+TestSendMessageTimeout(HWND hWnd, UINT Msg)
+{
+    LRESULT ret;
+    DWORD_PTR result;
+
+    ret = SendMessageTimeoutW(hWnd, Msg, 0, 0, SMTO_NORMAL, 0, NULL);
+    ok(ret == 0, "ret = %Id\n", ret);
+
+    result = 0x55555555;
+    ret = SendMessageTimeoutW(hWnd, Msg, 0, 0, SMTO_NORMAL, 0, &result);
+    ok(ret == 0, "ret = %Id\n", ret);
+    ok(result == 0, "result = %Iu\n", result);
+
+    ret = SendMessageTimeoutA(hWnd, Msg, 0, 0, SMTO_NORMAL, 0, NULL);
+    ok(ret == 0, "ret = %Id\n", ret);
+
+    result = 0x55555555;
+    ret = SendMessageTimeoutA(hWnd, Msg, 0, 0, SMTO_NORMAL, 0, &result);
+    ok(ret == 0, "ret = %Id\n", ret);
+    ok(result == 0, "result = %Iu\n", result);
+}
+
+START_TEST(SendMessageTimeout)
+{
+    TestSendMessageTimeout(NULL, WM_USER);
+    TestSendMessageTimeout(NULL, WM_PAINT);
+    TestSendMessageTimeout(NULL, WM_GETICON);
+}

diff --git a/rostests/apitests/user32/SetCursorPos.c b/rostests/apitests/user32/SetCursorPos.c
index 8e429fa..b93deb1 100644 (file)
--- a/rostests/apitests/user32/SetCursorPos.c
+++ b/rostests/apitests/user32/SetCursorPos.c
@@ -95,8 +95,6 @@ void Test_SetCursorPos()
     MSG msg;
     int i;
 
     MSG msg;
     int i;
 

-    memset(results, sizeof(results), 0);
-

     hMouseHookLL = SetWindowsHookEx(WH_MOUSE_LL, MouseLLHookProc, GetModuleHandleA( NULL ), 0);
     hMouseHook = SetWindowsHookExW(WH_MOUSE, MouseHookProc, GetModuleHandleW( NULL ), GetCurrentThreadId());
     ok(hMouseHook!=NULL,"failed to set hook\n");
     hMouseHookLL = SetWindowsHookEx(WH_MOUSE_LL, MouseLLHookProc, GetModuleHandleA( NULL ), 0);
     hMouseHook = SetWindowsHookExW(WH_MOUSE, MouseHookProc, GetModuleHandleW( NULL ), GetCurrentThreadId());
     ok(hMouseHook!=NULL,"failed to set hook\n");

diff --git a/rostests/apitests/user32/testlist.c b/rostests/apitests/user32/testlist.c
index bc2ccb2..fcf5ccf 100644 (file)
--- a/rostests/apitests/user32/testlist.c
+++ b/rostests/apitests/user32/testlist.c
@@ -21,6 +21,7 @@ extern void func_LookupIconIdFromDirectoryEx(void);
 extern void func_RealGetWindowClass(void);
 extern void func_ScrollDC(void);
 extern void func_ScrollWindowEx(void);
 extern void func_RealGetWindowClass(void);
 extern void func_ScrollDC(void);
 extern void func_ScrollWindowEx(void);

+extern void func_SendMessageTimeout(void);

 extern void func_SetActiveWindow(void);
 extern void func_SetCursorPos(void);
 extern void func_SystemParametersInfo(void);
 extern void func_SetActiveWindow(void);
 extern void func_SetCursorPos(void);
 extern void func_SystemParametersInfo(void);


@@ -48,6 +49,7 @@ const struct test winetest_testlist[] =
     { "RealGetWindowClass", func_RealGetWindowClass },
     { "ScrollDC", func_ScrollDC },
     { "ScrollWindowEx", func_ScrollWindowEx },
     { "RealGetWindowClass", func_RealGetWindowClass },
     { "ScrollDC", func_ScrollDC },
     { "ScrollWindowEx", func_ScrollWindowEx },

+    { "SendMessageTimeout", func_SendMessageTimeout },

     { "SetActiveWindow", func_SetActiveWindow },
     { "SetCursorPos", func_SetCursorPos },
     { "SystemParametersInfo", func_SystemParametersInfo },
     { "SetActiveWindow", func_SetActiveWindow },
     { "SetCursorPos", func_SetCursorPos },
     { "SystemParametersInfo", func_SystemParametersInfo },