[USER32_APITEST] Improve GetMessageTime tests more (#1254)

Compare GetMessageTime and GetTickCount values.
CORE-15565

diff --git a/modules/rostests/apitests/user32/GetMessageTime.c b/modules/rostests/apitests/user32/GetMessageTime.c
index 76a1aff..de41755 100644 (file)
--- a/modules/rostests/apitests/user32/GetMessageTime.c
+++ b/modules/rostests/apitests/user32/GetMessageTime.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS api tests
  * LICENSE:         GPL - See COPYING in the top level directory
 /*
  * PROJECT:         ReactOS api tests
  * LICENSE:         GPL - See COPYING in the top level directory

- * PURPOSE:         Test for GetMessageTime
+ * PURPOSE:         Test for GetMessageTime and GetTickCount

  * PROGRAMMERS:     Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
  */
 #include "precomp.h"
  * PROGRAMMERS:     Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
  */
 #include "precomp.h"


@@ -46,7 +46,9 @@ WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
             if (s_nCount != 0)
             {
                 ok(GetMessageTime() - s_nMsgTime >= TIMER_INTERVAL / 2,
             if (s_nCount != 0)
             {
                 ok(GetMessageTime() - s_nMsgTime >= TIMER_INTERVAL / 2,

-                   "message time is wrong\n");
+                   "GetMessageTime() is wrong, compared to previous one\n");
+                ok(GetTickCount() - (DWORD)GetMessageTime() < TIMER_INTERVAL / 2,
+                   "GetMessageTime() is wrong, compared to GetTickCount()\n");

             }
             s_nMsgTime = GetMessageTime();
             ok(s_nMsgTime != 0, "message time was zero.\n");
             }
             s_nMsgTime = GetMessageTime();
             ok(s_nMsgTime != 0, "message time was zero.\n");


@@ -65,19 +67,28 @@ WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
         case WM_MOUSEMOVE:
             trace("WM_MOUSEMOVE\n");
             ok_int(s_nCount, 5);
         case WM_MOUSEMOVE:
             trace("WM_MOUSEMOVE\n");
             ok_int(s_nCount, 5);

-            ok(GetMessageTime() - s_nMsgTime < TIMER_INTERVAL, "message time is wrong.\n");
+            ok(GetMessageTime() - s_nMsgTime < TIMER_INTERVAL,
+               "GetMessageTime() is wrong, compared to previous one\n");
+            ok(GetTickCount() - (DWORD)GetMessageTime() < TIMER_INTERVAL / 2,
+               "GetMessageTime() is wrong, compared to GetTickCount()\n");

             s_bReach_WM_MOUSEMOVE = TRUE;
             break;
         case WM_LBUTTONDOWN:
             trace("WM_LBUTTONDOWN\n");
             ok_int(s_nCount, 5);
             s_bReach_WM_MOUSEMOVE = TRUE;
             break;
         case WM_LBUTTONDOWN:
             trace("WM_LBUTTONDOWN\n");
             ok_int(s_nCount, 5);

-            ok(GetMessageTime() - s_nMsgTime < TIMER_INTERVAL, "message time is wrong.\n");
+            ok(GetMessageTime() - s_nMsgTime < TIMER_INTERVAL,
+               "GetMessageTime() is wrong, compared to previous one\n");
+            ok(GetTickCount() - (DWORD)GetMessageTime() < TIMER_INTERVAL / 2,
+               "GetMessageTime() is wrong, compared to GetTickCount()\n");

             s_bReach_WM_LBUTTONDOWN = TRUE;
             break;
         case WM_LBUTTONUP:
             trace("WM_LBUTTONUP\n");
             ok_int(s_nCount, 5);
             s_bReach_WM_LBUTTONDOWN = TRUE;
             break;
         case WM_LBUTTONUP:
             trace("WM_LBUTTONUP\n");
             ok_int(s_nCount, 5);

-            ok(GetMessageTime() - s_nMsgTime < TIMER_INTERVAL, "message time is wrong.\n");
+            ok(GetMessageTime() - s_nMsgTime < TIMER_INTERVAL,
+               "GetMessageTime() is wrong, compared to previous one\n");
+            ok(GetTickCount() - (DWORD)GetMessageTime() < TIMER_INTERVAL / 2,
+               "GetMessageTime() is wrong, compared to GetTickCount()\n");

             s_bReach_WM_LBUTTONUP = TRUE;
             break;
         case WM_DESTROY:
             s_bReach_WM_LBUTTONUP = TRUE;
             break;
         case WM_DESTROY: