Changeset 323 for trunk/src/user32/new/pmwindow.cpp

Timestamp:

Jul 17, 1999, 5:23:38 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

File:

• trunk/src/user32/new/pmwindow.cpp (modified) (18 diffs)

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.5 1999-07-17 09:17:58 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.6 1999-07-17 15:23:38 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -35 +35 @@
 {
   hab = WinInitialize(0);
+  dprintf(("Winitialize returned %x", hab));
   hmq = WinCreateMsgQueue(hab, 0);
 
-  if(!hab || !hmq) {
+  if(!hab || !hmq) 
+  {
         UINT error;
 
@@ -44 +46 @@
         if (!hab || error != PMERR_MSG_QUEUE_ALREADY_EXISTS)
         {
-          dprintf(("WinInitialize or WinCreateMsgQueue failed %x %x", hab, hmq));
-          dprintf((" Error = %x",error));
-          return(FALSE);
-        } else
+                dprintf(("WinInitialize or WinCreateMsgQueue failed %x %x", hab, hmq));
+                dprintf((" Error = %x",error));
+                return(FALSE);
+        } 
+        else
         {
-          //CB: get queue handle (todo)
+                if(!hab) {
+                        hab = WinQueryAnchorBlock(HWND_DESKTOP);
+                        dprintf(("WinQueryAnchorBlock returned %x", hab));
+                }
+                if(!hmq) {
+                        hmq = HMQ_CURRENT;
+                }
         }
   }
   SetThreadHAB(hab);
+  dprintf(("InitPM: hmq = %x", hmq));
   SetThreadMessageQueue(hmq);
 
@@ -113 +123 @@
     case WM_CREATE:
         //Processing is done in after WinCreateWindow returns
-        break;
+        dprintf(("OS2: WM_CREATE %x", hwnd));
+        RestoreOS2TIB();
+        return (MRESULT)FALSE;
 
     case WM_QUIT:
+        dprintf(("OS2: WM_QUIT %x", hwnd));
         if(win32wnd->MsgQuit()) {
                 goto RunDefWndProc;
@@ -122 +135 @@
 
     case WM_CLOSE:
+        dprintf(("OS2: WM_CLOSE %x", hwnd));
         if(win32wnd->MsgClose()) {
                 goto RunDefWndProc;
@@ -128 +142 @@
 
     case WM_DESTROY:
+        dprintf(("OS2: WM_DESTROY %x", hwnd));
         if(win32wnd->MsgDestroy()) {
                 goto RunDefWndProc;
@@ -134 +149 @@
 
     case WM_ENABLE:
+        dprintf(("OS2: WM_ENABLE %x", hwnd));
         if(win32wnd->MsgEnable((ULONG)mp1)) {
                 goto RunDefWndProc;
@@ -140 +156 @@
 
     case WM_SHOW:
+        dprintf(("OS2: WM_SHOW %x", hwnd));
         if(win32wnd->MsgShow((ULONG)mp1)) {
                 goto RunDefWndProc;
@@ -152 +169 @@
      ULONG  xScreen, yScreen, yParent, xParent;
 
+        dprintf(("OS2: WM_MOVE %x", hwnd));
         rc = WinQueryWindowRect(hwnd, &rectl);
         if(rc == TRUE) {
@@ -169 +187 @@
                                 break;
                         }
-                        yParent = point.x;
+                        xParent = point.x;
                         yParent = OS2TOWIN32POINT(rectl2.yTop - rectl2.yBottom, point.y);
                 }
@@ -207 +225 @@
     case WM_ADJUSTWINDOWPOS:
     {
-//      if(win32wnd->MsgWindowPosChanging(0, 0)) {
+        dprintf(("OS2: WM_ADJUSTWINDOWPOS %x", hwnd));
+//              if(win32wnd->MsgWindowPosChanging(0, 0)) {
+                goto RunDefWndProc;
+//      }
         break;
     }
@@ -215 +236 @@
      HPS hps;
 
+        dprintf(("OS2: WM_ERASEBACKGROUND %x", hwnd));
         hps = WinGetPS(hwnd);
         if(win32wnd->MsgEraseBackGround((ULONG)hps))
@@ -232 +254 @@
      SWP swp;
 
+        dprintf(("OS2: WM_SIZE %x", hwnd));
         rc = WinQueryWindowPos(hwnd, &swp);
         if(rc == FALSE) {
@@ -251 +274 @@
       HWND hwndActivate = (HWND)mp1;
 
+        dprintf(("OS2: WM_ACTIVATE %x", hwnd));
         if(WinQueryWindowULong(hwndActivate, OFFSET_WIN32PM_MAGIC) != WIN32PM_MAGIC) {
                 //another (non-win32) application's window
@@ -268 +292 @@
       HWND hwndFocus = (HWND)mp1;
 
+        dprintf(("OS2: WM_SETFOCUS %x", hwnd));
         if(WinQueryWindowULong(hwndFocus, OFFSET_WIN32PM_MAGIC) != WIN32PM_MAGIC) {
                 //another (non-win32) application's window
@@ -360 +385 @@
 
     case WM_PAINT:
+        dprintf(("OS2: WM_PAINT %x", hwnd));
         if(win32wnd->MsgPaint(0, 0)) {
                 goto RunDefWndProc;
@@ -393 +419 @@
         break;
     default:
+        dprintf(("OS2: RunDefWndProc msg %x for %x", msg, hwnd));
         RestoreOS2TIB();
         return WinDefWindowProc( hwnd, msg, mp1, mp2 );
@@ -400 +427 @@
 
 RunDefWndProc:
+  dprintf(("OS2: RunDefWndProc msg %x for %x", msg, hwnd));
   RestoreOS2TIB();
   return WinDefWindowProc( hwnd, msg, mp1, mp2 );