Changeset 1307 for trunk/src/user32/oslibmsg.cpp

Timestamp:

Oct 15, 1999, 12:03:16 PM (26 years ago)

Author:

sandervl

Message:

GetWindow + EB's message bugfixes

File:

• trunk/src/user32/oslibmsg.cpp (modified) (5 diffs)

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.3 1999-09-26 22:24:28 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.4 1999-10-15 10:03:14 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -26 +26 @@
 #include <wprocess.h>
 
+typedef BOOL (EXPENTRY FNTRANS)(MSG *, QMSG *);
+typedef FNTRANS *PFNTRANS;
+
+typedef struct
+{
+   ULONG   msgOS2;
+   ULONG   msgWin32;
+// PFNTRANS toOS2;
+// PFNTRANS toWIN32;
+} MSGTRANSTAB, *PMSGTRANSTAB;
+
+#define MAX_MSGTRANSTAB 12
+MSGTRANSTAB MsgTransTab[MAX_MSGTRANSTAB] = {
+   0x0000, 0x0000,  // WM_NULL,            WM_NULL
+   0x0070, 0x0200,  // WM_MOUSEMOVE,       WM_MOUSEMOVE
+   0x0071, 0x0201,  // WM_BUTTON1DOWN,     WM_LBUTTONDOWN
+   0x0072, 0x0202,  // WM_BUTTON1UP,       WM_LBUTTONUP
+   0x0073, 0x0203,  // WM_BUTTON1DBLCLK,   WM_LBUTTONDBLCLK
+   0x0074, 0x0204,  // WM_BUTTON2DOWN,     WM_RBUTTONDOWN
+   0x0075, 0x0205,  // WM_BUTTON2UP,       WM_RBUTTONUP
+   0x0076, 0x0206,  // WM_BUTTON2DBLCLK,   WM_RBUTTONDBLCLK
+   0x0077, 0x0207,  // WM_BUTTON3DOWN,     WM_MBUTTONDOWN
+   0x0078, 0x0208,  // WM_BUTTON3UP,       WM_MBUTTONUP
+   0x0079, 0x0209,  // WM_BUTTON3DBLCLK,   WM_MBUTTONDBLCLK
+   0x020a, 0x020a,  // WM_???,             WM_???
+};
+
 QMSG *MsgThreadPtr = 0;
 
@@ -44 +71 @@
 void WinToOS2MsgTranslate(MSG *winMsg, QMSG *os2Msg, BOOL isUnicode)
 {
+  int i;
+
   memcpy(os2Msg, winMsg, sizeof(MSG));
+  os2Msg->hwnd = Win32Window::Win32ToOS2Handle(winMsg->hwnd);
   os2Msg->reserved = 0;
+  for(i=0;i<MAX_MSGTRANSTAB;i++)
+  {
+    if(MsgTransTab[i].msgWin32 == winMsg->message)
+    {
+      os2Msg->msg = MsgTransTab[i].msgOS2;
+      break;
+    }
+  }
 }
 //******************************************************************************
@@ -51 +89 @@
 void OS2ToWinMsgTranslate(QMSG *os2Msg, MSG *winMsg, BOOL isUnicode)
 {
+  int i;
+
   memcpy(winMsg, os2Msg, sizeof(MSG));
   winMsg->hwnd = Win32Window::OS2ToWin32Handle(os2Msg->hwnd);
+  for(i=0;i<MAX_MSGTRANSTAB;i++)
+  {
+    if(MsgTransTab[i].msgOS2 == os2Msg->msg)
+    {
+      winMsg->message = MsgTransTab[i].msgWin32;
+      break;
+    }
+  }
 }
 //******************************************************************************
@@ -68 +116 @@
         thdb->fMsgTranslated = TRUE;
   }
-  
+
+  for(int i=0;i<MAX_MSGTRANSTAB;i++)
+  {
+    if(MsgTransTab[i].msgWin32 == msg)
+    {
+      return MsgTransTab[i].msgOS2;
+    }
+  }
+
   return 0;
 }