Changeset 9953 for trunk/src

Timestamp:

Mar 29, 2003, 5:38:01 PM (22 years ago)

Author:

sandervl

Message:

some minor updates

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (4 diffs)
• win32wbase.cpp (modified) (3 diffs)
• win32wbase.h (modified) (3 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.205 2003-03-28 13:56:59 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.206 2003-03-29 16:37:59 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -644 +644 @@
 
     case WM_VRNENABLED:
+    {
         dprintf(("OS2: WM_VRNENABLED %x %x %x", win32wnd->getWindowHandle(), mp1, mp2));
         //Always call handler; even if mp1 is 0. If we don't do this, the
         //DivX 4 player will never be allowed to draw after putting another window
         //on top of it.
+
         win32wnd->callVisibleRgnNotifyProc(TRUE);
         if(!win32wnd->isComingToTop() && ((win32wnd->getExStyle() & WS_EX_TOPMOST_W) == WS_EX_TOPMOST_W))
@@ -669 +671 @@
         }
         goto RunDefWndProc;
+    }
 
     case WM_VRNDISABLED:
+    {
         dprintf(("OS2: WM_VRNDISABLED %x %x %x", win32wnd->getWindowHandle(), mp1, mp2));
         //visible region is about to change or WinLockWindowUpdate called
         //suspend window drawing
+
         win32wnd->callVisibleRgnNotifyProc(FALSE);
         goto RunDefWndProc;
+    }
 
     case WIN32APP_DDRAWFULLSCREEN:
@@ -1466 +1472 @@
             }
         }
+#ifdef DEBUG
         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
+#endif
         rc = (MRESULT)ret;
         break;

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.364 2003-03-27 10:42:41 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.365 2003-03-29 16:38:00 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -120 +120 @@
   fIsDragDropActive= FALSE;
   fDirtyUpdateRegion = FALSE;
+  fWindowLocked    = FALSE;
 
   state            = STATE_INIT;
@@ -4009 +4010 @@
     SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
     return 0;
+}
+//******************************************************************************
+// Win32BaseWindow::setVisibleRgnNotifyProc
+//
+// Sets the visible region change notification handler. Called when
+// the window receives a WM_VRNDISABLED or WM_VRNENABLED message (PM).
+//
+// Parameters:
+//    VISRGN_NOTIFY_PROC lpNotifyProc    - notification handler
+//    DWORD              dwUserData      - caller supplied parameter for handler invocations
+// 
+// Returns:
+//    TRUE              - Success
+//    FALSE             - Failure
+//
+//******************************************************************************
+BOOL Win32BaseWindow::setVisibleRgnNotifyProc(VISRGN_NOTIFY_PROC lpNotifyProc, DWORD dwUserData)
+{
+    lpVisRgnNotifyProc  = lpNotifyProc;
+    dwVisRgnNotifyParam = dwUserData;
+    return TRUE;
+}
+//******************************************************************************
+// Win32BaseWindow::callVisibleRgnNotifyProc
+//
+// Call the visible region change notification handler. Called when
+// the window receives a WM_VRNDISABLED or WM_VRNENABLED message (PM).
+//
+// Parameters:
+//    BOOL   fDrawingAllowed    - drawing is allowed or not
+// 
+// Returns:
+//    TRUE              - Success
+//    FALSE             - Failure
+//
+//******************************************************************************
+void Win32BaseWindow::callVisibleRgnNotifyProc(BOOL fDrawingAllowed) 
+{
+    if(fDrawingAllowed) {
+        fWindowLocked = TRUE;
+    }
+    else {
+        fWindowLocked = FALSE;
+    }
+    if(lpVisRgnNotifyProc) {
+        lpVisRgnNotifyProc(getWindowHandle(), fDrawingAllowed, dwVisRgnNotifyParam);
+    }
 }
 //******************************************************************************

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.151 2003-03-27 10:42:42 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.152 2003-03-29 16:38:01 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -286 +286 @@
          void   SetVisibleRegionChanged(BOOL changed) { fVisibleRegionChanged = changed; };
          BOOL   IsVisibleRegionChanged()              { return fVisibleRegionChanged; };
-         BOOL   setVisibleRgnNotifyProc(VISRGN_NOTIFY_PROC lpNotifyProc, DWORD dwUserData)
-         {
-             lpVisRgnNotifyProc  = lpNotifyProc;
-             dwVisRgnNotifyParam = dwUserData;
-             return TRUE;
-         }
-         void   callVisibleRgnNotifyProc(BOOL fDrawingAllowed) 
-         {
-             if(lpVisRgnNotifyProc) {
-                 lpVisRgnNotifyProc(getWindowHandle(), fDrawingAllowed, dwVisRgnNotifyParam);
-             }
-         }
+         BOOL   setVisibleRgnNotifyProc(VISRGN_NOTIFY_PROC lpNotifyProc, DWORD dwUserData);
+         void   callVisibleRgnNotifyProc(BOOL fDrawingAllowed);
+
          int    GetWindowTextLength(BOOL fUnicode);
          int    GetWindowTextLengthA() { return GetWindowTextLength(FALSE); };
@@ -422 +413 @@
                  fEraseBkgndFlag:1,
                  fIsDragDropActive:1,
-                 fDirtyUpdateRegion:1;
+                 fDirtyUpdateRegion:1,
+                 fWindowLocked:1;
 
         ULONG   state;