diff --git a/reactos/dll/win32/user32/windows/message.c b/reactos/dll/win32/user32/windows/message.c
index 7bff66d5d26..4e5e3430ced 100644
--- a/reactos/dll/win32/user32/windows/message.c
+++ b/reactos/dll/win32/user32/windows/message.c
@@ -2369,7 +2369,7 @@ SendMessageTimeoutA(
                               UcMsg.wParam,
                               UcMsg.lParam,
                              (ULONG_PTR)&dsm,
-                              FNID_SENDMESSAGETIMEOUT,
+                              FNID_SENDMESSAGEWTOOPTION,
                               TRUE);
 
   MsgiAnsiToUnicodeReply(&UcMsg, &AnsiMsg, &Result);
@@ -2436,7 +2436,7 @@ SendMessageTimeoutW(
                               wParam,
                               lParam,
                              (ULONG_PTR)&dsm,
-                              FNID_SENDMESSAGETIMEOUT,
+                              FNID_SENDMESSAGEWTOOPTION,
                               FALSE);
 
   if (lpdwResult) *lpdwResult = dsm.Result;
diff --git a/reactos/include/reactos/win32k/ntuser.h b/reactos/include/reactos/win32k/ntuser.h
index e2535ad2a42..98cc064238d 100644
--- a/reactos/include/reactos/win32k/ntuser.h
+++ b/reactos/include/reactos/win32k/ntuser.h
@@ -696,7 +696,7 @@ typedef LONG_PTR (NTAPI *PFN_FNID)(PWND, UINT, WPARAM, LPARAM, ULONG_PTR);
 #define FNID_SENDMESSAGEFF          0x02B2
 // Kernel has option to use TimeOut or normal msg send, based on type of msg.
 #define FNID_SENDMESSAGEWTOOPTION   0x02B3
-#define FNID_SENDMESSAGETIMEOUT     0x02B4
+#define FNID_SENDMESSAGECALLPROC    0x02B4
 #define FNID_BROADCASTSYSTEMMESSAGE 0x02B5
 #define FNID_TOOLTIPS               0x02B6 
 #define FNID_SENDNOTIFYMESSAGE      0x02B7
@@ -894,7 +894,7 @@ PPROCESSINFO GetW32ProcessInfo(VOID);
 typedef struct _WNDMSG
 {
   DWORD maxMsgs;
-  DWORD abMsgs;
+  PINT abMsgs;
 } WNDMSG, *PWNDMSG;
 
 typedef struct _SHAREDINFO
diff --git a/reactos/subsystems/win32/win32k/ntuser/message.c b/reactos/subsystems/win32/win32k/ntuser/message.c
index 1b58d8ea135..ff138fbd61b 100644
--- a/reactos/subsystems/win32/win32k/ntuser/message.c
+++ b/reactos/subsystems/win32/win32k/ntuser/message.c
@@ -2418,7 +2418,8 @@ NtUserMessageCall( HWND hWnd,
             }
             break;
         }
-    case FNID_SENDMESSAGETIMEOUT:
+    case FNID_SENDMESSAGEFF:
+    case FNID_SENDMESSAGEWTOOPTION:
         {
             DOSENDMESSAGE dsm, *pdsm = (PDOSENDMESSAGE)ResultInfo;
             if (ResultInfo)