Changeset 17408

Timestamp:

Sep 27, 2001, 12:42:59 PM (24 years ago)

Author:

phaller

Message:

added message code check to TranslateMessage (like in NT)

File:

• tags/trunk/src/user32/windowmsg.cpp (modified) (4 diffs)

tags/trunk/src/user32/windowmsg.cpp ¶

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.29 2001-09-19 15:39:52 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.30 2001-09-27 10:42:59 phaller Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -15 +15 @@
  *
  */
+
+#include <odin.h>
+#include <odinwrap.h>
+#include <os2sel.h>
+
 #include <os2win.h>
 #include <misc.h>
@@ -29 +34 @@
 #include "dbglocal.h"
 
+ODINDEBUGCHANNEL(USER32-WINDOWMSG)
+
+
 //******************************************************************************
 //******************************************************************************
@@ -52 +60 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API TranslateMessage( const MSG * msg)
-{
-   return OSLibWinTranslateMessage((MSG *)msg);
+BOOL WIN32API TranslateMessage(const MSG *msg)
+{
+  // check the message code
+  if ( (msg->message <  WM_KEYDOWN) ||
+       (msg->message >  WM_SYSKEYUP)||
+       (msg->message == WM_CHAR)    ||
+       (msg->message == WM_DEADCHAR) )
+  {
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return FALSE;
+  }
+  
+  // only WM_KEYDOWN, WM_KEYUP, WM_SYSKEYDOWN, WM_SYSKEYUP
+  // can go into TranslateMessage
+  
+  return OSLibWinTranslateMessage((MSG *)msg);
 }
 //******************************************************************************