Changeset 9463 for trunk/src

Timestamp:

Dec 4, 2002, 4:23:41 PM (23 years ago)

Author:

sandervl

Message:

extra logging + support for postponed ddraw resize

Location:

trunk/src/user32

Files:

• oslibwin.cpp (modified) (3 diffs)
• pmwindow.cpp (modified) (12 diffs)
• win32wbase.cpp (modified) (2 diffs)
• win32wbase.h (modified) (2 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.129 2002-10-15 09:18:10 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.130 2002-12-04 15:23:38 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -682 +682 @@
     pwpos->hwndInsertAfter  = hWinAfter;
     pwpos->hwnd             = hWindow;
+
+    dprintf2(("OSLibMapSWPtoWINDOWPOS %x (%d,%d)(%d,%d) -> %x (%d,%d)(%d,%d) parent height %d", pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy, flags, x, y, cx, cy, parentHeight));
 }
 //******************************************************************************
@@ -762 +764 @@
    pswp->ulReserved1      = 0;
    pswp->ulReserved2      = 0;
+
+   dprintf2(("OSLibMapWINDOWPOStoSWP %x (%d,%d)(%d,%d) -> %x (%d,%d)(%d,%d) parent height %d", pwpos->flags, pwpos->x, pwpos->y, pwpos->cx, pwpos->cy, flags, x, y, cx, cy, parentHeight));
 }
 //******************************************************************************

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.190 2002-11-27 13:56:26 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.191 2002-12-04 15:23:39 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -21 +21 @@
 
 #include <os2wrap.h>
+#include <odinwrap.h>
 #include <stdlib.h>
 #include <string.h>
@@ -491 +492 @@
     SetWin32TIB();
 
+#ifdef DEBUG
+    dbg_ThreadPushCall("Win32WindowProc");
+#endif
+
     // BEGIN NOTE-------------->>>>>> If this is changed, also change Win32FrameWindowProc!! <<<<<<<<<<<-------------------- BEGIN
     teb = GetThreadTEB();
@@ -557 +562 @@
         RELEASE_WNDOBJ(win32wnd);
         RestoreOS2TIB();
+
+#ifdef DEBUG
+        dbg_ThreadPopCall();
+#endif
         return rc;
     }
@@ -670 +679 @@
         win32wnd->callVisibleRgnNotifyProc(FALSE);
         goto RunDefWndProc;
+
+    case WIN32APP_DDRAWFULLSCREEN:
+        //Changing the size of the win32 window in SetCooperativeLevel can
+        //fail if this happens during WM_ADJUSTWINDOWPOS
+        //NOTE: This is not a good solution, but a proper fix is more difficult
+        //      with the current window mess
+        dprintf(("WIN32APP_DDRAWFULLSCREEN %x (%d,%d)", win32wnd->getWindowHandle(), mp1, mp2));
+        SetWindowPos(win32wnd->getWindowHandle(), HWND_TOP_W, 0, 0, (DWORD)mp1, (DWORD)mp2, 0);
+        ShowWindow(win32wnd->getWindowHandle(), SW_SHOW_W);
+        break;
 
     case WIN32APP_SETFOCUSMSG:
@@ -1033 +1052 @@
     if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
+
+#ifdef DEBUG
+    dbg_ThreadPopCall();
+#endif
     return (MRESULT)rc;
 
@@ -1039 +1062 @@
     if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
+
+#ifdef DEBUG
+    dbg_ThreadPopCall();
+#endif
     return WinDefWindowProc( hwnd, msg, mp1, mp2 );
 } /* End of Win32WindowProc */
@@ -1051 +1078 @@
  MRESULT          rc = 0;
  MSG              winMsg, *pWinMsg;
+
+#ifdef DEBUG
+    dbg_ThreadPushCall("Win32FrameWindowProc");
+#endif
 
     //Restore our FS selector
@@ -1406 +1437 @@
         }
         dprintf(("WM_ADJUSTWINDOWPOS ret %x flags %x", ret, WinQueryWindowUShort(hwnd, QWS_FLAGS)));
+//testestset
+        if(ret == 0x0f) {
+            dprintf(("PMFRAME:WM_ADJUSTWINDOWPOS, app changed windowpos struct"));
+            dprintf(("%x (%s) (%d,%d), (%d,%d)", pswp->fl, DbgGetStringSWPFlags(pswp->fl), pswp->x, pswp->y, pswp->cx, pswp->cy));
+        }
+//testestset
         rc = (MRESULT)ret;
         break;
@@ -1954 +1991 @@
     if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
+
+#ifdef DEBUG
+    dbg_ThreadPopCall();
+#endif
     return (MRESULT)rc;
 
@@ -1960 +2001 @@
     if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
+
+#ifdef DEBUG
+    dbg_ThreadPopCall();
+#endif
     return pfnFrameWndProc(hwnd, msg, mp1, mp2);
 
@@ -1968 +2013 @@
     //calling WinDefWindowProc here breaks Opera hotlist window (WM_ADJUSTWINDOWPOS)
 //    return pfnFrameWndProc(hwnd, msg, mp1, mp2);
+
+#ifdef DEBUG
+    dbg_ThreadPopCall();
+#endif
     return WinDefWindowProc( hwnd, msg, mp1, mp2 );
 }

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.343 2002-11-20 12:59:06 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.344 2002-12-04 15:23:40 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2499 +2499 @@
      //we will update the restore position at the end of this method
         if(!(wpos.flags & SWP_NOSIZE)) {
+            //TODO: updating the window rectangle doesn't look right
             wpos.flags |= SWP_NOSIZE;
             rectWindow.right  = rectWindow.left + wpos.cx;
             rectWindow.bottom = rectWindow.top + wpos.cy;
+            dprintf(("WARNING: Don't allow size change for minimized window; only save new restore position"));
+            dprintf(("new window rectangle (%d,%d)(%d,%d)", rectWindow.left, rectWindow.top, rectWindow.right, rectWindow.bottom));
         }
     }

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.146 2002-11-20 12:59:06 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.147 2002-12-04 15:23:41 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -62 +62 @@
     LPSTR               string;   /* Property string (or atom) */
 } PROPERTY;
-
-//PostThreadMessage is done through Open32; which means the message id will be translated
-//(0xc00 added)
-#define OPEN32_MSGDIFF            0xC00
-#define WIN32APP_POSTMSG          (0x1000+OPEN32_MSGDIFF)
-
-//PM doesn't allow SetFocus during WM_SETFOCUS message processing; must delay
-//this by posting a message
-//NOTE Must be smaller than WIN32APP_POSTMSG!
-#define WIN32APP_SETFOCUSMSG      (WIN32APP_POSTMSG-1)
-#define WIN32APP_POSTPONEDESTROY  (WIN32APP_POSTMSG-2)
-
-#define WIN32MSG_MAGICA           0x12345678
-#define WIN32MSG_MAGICW           0x12345679
-
-typedef struct
-{
-        ULONG           wParam;
-        ULONG           lParam;
-} POSTMSG_PACKET;
 
 #define HAS_DLGFRAME(style,exStyle) \