Changeset 2400 for trunk/src/user32/new/oslibmsgtranslate.cpp

Timestamp:

Jan 11, 2000, 12:29:16 AM (26 years ago)

Author:

sandervl

Message:

get/peekmessage fixes, timer fix, (user/new) replaced wm_hittest code; added wm_ncactivate, changed system menu

File:

• trunk/src/user32/new/oslibmsgtranslate.cpp (modified) (10 diffs)

trunk/src/user32/new/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.9 2000-01-09 14:14:23 cbratschi Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.10 2000-01-10 23:29:12 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -133 +133 @@
   POSTMSG_PACKET  *packet;
   THDB            *thdb = (THDB *)pThdb;
+  ULONG            hittest;
   int i;
 
@@ -138 +139 @@
   win32wnd = Win32BaseWindow::GetWindowFromOS2Handle(os2Msg->hwnd);
   if (!win32wnd) win32wnd = Win32BaseWindow::GetWindowFromOS2FrameHandle(os2Msg->hwnd);
+
   //PostThreadMessage posts WIN32APP_POSTMSG msg without window handle
-  if(win32wnd == 0 && (os2Msg->msg != WM_CREATE && os2Msg->msg != WM_QUIT && os2Msg->msg != WIN32APP_POSTMSG))
+  //Realplayer starts a timer with hwnd 0 & proc 0; check this here
+  if(win32wnd == 0 && (os2Msg->msg != WM_CREATE && os2Msg->msg != WM_QUIT && os2Msg->msg != WM_TIMER && os2Msg->msg != WIN32APP_POSTMSG))
   {
         goto dummymessage; //not a win32 client window
@@ -167 +170 @@
       case WM_BUTTON3DBLCLK:
         //WM_NC*BUTTON* is posted when the cursor is in a non-client area of the window
+
+        hittest = win32wnd->MsgHitTest(winMsg->pt.x, winMsg->pt.y);
+
         if (IsNCMouseMsg(win32wnd)) {
             winMsg->message = WINWM_NCLBUTTONDOWN + (os2Msg->msg - WM_BUTTON1DOWN);
-            winMsg->wParam  = win32wnd->lastHitTestVal;
+            winMsg->wParam  = hittest;
             winMsg->lParam  = MAKELONG(winMsg->pt.x, winMsg->pt.y); //screen coordinates
         }
@@ -199 +205 @@
       {
         //WM_NCMOUSEMOVE is posted when the cursor moves into a non-client area of the window
-        if(IsNCMouseMsg(win32wnd))
+        hittest = win32wnd->MsgHitTest(winMsg->pt.x, winMsg->pt.y);
+
+        if (IsNCMouseMsg(win32wnd)) 
         {
           winMsg->message = WINWM_NCMOUSEMOVE;
-          winMsg->wParam  = (WPARAM)win32wnd->lastHitTestVal;
+          winMsg->wParam  = (WPARAM)hittest;
           winMsg->lParam  = MAKELONG(winMsg->pt.x,winMsg->pt.y);
-        } else
+        } 
+        else
         {
           winMsg->message = WINWM_MOUSEMOVE;
@@ -220 +229 @@
       }
 
-      case WM_HITTEST:
+      case WM_ACTIVATE:
       {
-        winMsg->message  = WINWM_NCHITTEST;
-        winMsg->wParam  = 0;
-        winMsg->lParam  = MAKELONG(winMsg->pt.x,winMsg->pt.y);
-        return TRUE;
+        winMsg->message = WINWM_NCACTIVATE;
+        winMsg->wParam  = SHORT1FROMMP(os2Msg->mp1);
+        return TRUE;
       }
+
     }
     //do normal translation for all other messages
@@ -346 +355 @@
     case WM_BUTTON3DBLCLK:
         //WM_NC*BUTTON* is posted when the cursor is in a non-client area of the window
+        hittest = win32wnd->MsgHitTest(winMsg->pt.x, winMsg->pt.y);
+
         if(IsNCMouseMsg(win32wnd)) {
             winMsg->message = WINWM_NCLBUTTONDOWN + (os2Msg->msg - WM_BUTTON1DOWN);
-            winMsg->wParam  = win32wnd->lastHitTestVal;
+            winMsg->wParam  = hittest;
             winMsg->lParam  = MAKELONG(winMsg->pt.x, winMsg->pt.y); //screen coordinates
         }
@@ -378 +389 @@
     {
         //WM_NCMOUSEMOVE is posted when the cursor moves into a non-client area of the window
+        hittest = win32wnd->MsgHitTest(winMsg->pt.x, winMsg->pt.y);
+
         if(IsNCMouseMsg(win32wnd))
         {
           winMsg->message = WINWM_NCMOUSEMOVE;
-          winMsg->wParam  = (WPARAM)win32wnd->lastHitTestVal;
+          winMsg->wParam  = (WPARAM)hittest;
           winMsg->lParam  = MAKELONG(winMsg->pt.x,winMsg->pt.y);
         } else
@@ -578 +591 @@
 
         if(wndParams->fsStatus & WPM_TEXT) {
-            win32wnd->MsgSetText(wndParams->pszText, wndParams->cchText);
+            winMsg->message = WINWM_SETTEXT;
+            winMsg->lParam  = (LPARAM)wndParams->pszText;
             break;
         }
@@ -612 +626 @@
         }
         else    winMsg->message = WINWM_PAINT;
-        break;
-    }
-
-    case WM_HITTEST:
-    {
-        winMsg->message  = WINWM_NCHITTEST;
-        winMsg->wParam  = 0;
-        winMsg->lParam  = MAKELONG(winMsg->pt.x,winMsg->pt.y);
         break;
     }