Changeset 10060 for trunk/src

Timestamp:

May 2, 2003, 5:33:17 PM (22 years ago)

Author:

sandervl

Message:

Keep track of all open DCs and query the visible region during WM_VRNENABLED to work around a PM bug

Location:

trunk/src/user32

Files:

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

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.118 2003-03-22 20:27:10 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.119 2003-05-02 15:33:15 sandervl Exp $ */
 
 /*
@@ -885 +885 @@
             dprintf2(("ReleaseDC: CS_OWNDC, not released"));
         }
+        if(!isOwnDC && !wnd->isDesktopWindow()) {
+            //remove from list of open DCs for this window
+            wnd->removeOpenDC(hdc);
+        }
         RELEASE_WNDOBJ(wnd);
     }
@@ -1103 +1107 @@
 
     dprintf (("User32: GetDCEx hwnd %x (%x %x) -> hdc %x", hwnd, hrgn, flags, pHps->hps));
+
+    //add to list of open DCs for this window
+    if(wnd->isDesktopWindow() == FALSE) {//not relevant for the desktop window
+         wnd->addOpenDC((HDC)pHps->hps);
+    }
+
     RELEASE_WNDOBJ(wnd);
 

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.212 2003-04-28 08:41:07 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.213 2003-05-02 15:33:15 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -655 +655 @@
 
         win32wnd->callVisibleRgnNotifyProc(TRUE);
+
+        //Workaround for PM/GPI bug when moving/sizing a window with open DCs
+        //
+        //Windows applictions often get a DC and keep it open for the duration
+        //of the application. When the DC's window is moved (full window dragging on)
+        //PM/GPI doesn't seem to update the DC properly/in time.
+        //This can result is visible distortions on the screen.
+        //Debugging showed that querying the visible region of a DC will cure
+        //this problem (GPI probably recalculates the visible region).
+        int  nrdcs = 0;
+        HDC  hdcWindow[MAX_OPENDCS];
+
+        if(win32wnd->queryOpenDCs(hdcWindow, MAX_OPENDCS, &nrdcs)) 
+        {
+            RECTL rcl = {0,0,1,1};
+            HRGN hrgnRect;
+
+            for(int i=0;i<nrdcs;i++) {
+                dprintf(("Recalc visible region of DC %x for window %x", hdcWindow[i], win32wnd->getWindowHandle()));
+                hrgnRect = GreCreateRectRegion(hdcWindow[i], &rcl, 1);
+                GreCopyClipRegion(hdcWindow[i], hrgnRect, 0, COPYCRGN_VISRGN);
+                GreDestroyRegion(hdcWindow[i], hrgnRect);
+            }
+        }
+
+        //Workaround END
+
         if(!win32wnd->isComingToTop() && ((win32wnd->getExStyle() & WS_EX_TOPMOST_W) == WS_EX_TOPMOST_W))
         {

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.369 2003-04-28 08:41:08 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.370 2003-05-02 15:33:16 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -199 +199 @@
 
   pfnOldPMWndProc     = NULL;
+
+  memset(hdcWindow, 0, sizeof(hdcWindow));
+  nrOpenDCs           = 0;
 }
 //******************************************************************************
@@ -4078 +4081 @@
         lpVisRgnNotifyProc(getWindowHandle(), fDrawingAllowed, dwVisRgnNotifyParam);
     }
+}
+//******************************************************************************
+// Win32BaseWindow::queryOpenDCs
+//
+// Return the DCs that are currently open for this window
+//
+// Parameters:
+//    HDC *phdcWindow   - pointer to HDC array    (IN)
+//    int  chdcWindow   - size of HDC array       (IN)
+//    int *pnrdcs       - number of HDCs returned (OUT)
+// 
+// Returns:
+//    TRUE              - Success
+//    FALSE             - Failure
+//
+//******************************************************************************
+BOOL Win32BaseWindow::queryOpenDCs(HDC *phdcWindow, int  chdcWindow, int *pnrdcs)
+{
+    if(nrOpenDCs == 0) return FALSE;
+
+    if(chdcWindow < nrOpenDCs) {
+        DebugInt3();
+        return FALSE;
+    }
+
+    int j = 0;
+    for(int i=0;i<MAX_OPENDCS && j<nrOpenDCs;i++) {
+        if(hdcWindow[i] != 0) {
+            phdcWindow[j] = hdcWindow[i];
+            j++;
+        }
+    }
+    *pnrdcs = nrOpenDCs;
+    return TRUE;
+}
+//******************************************************************************
+// Win32BaseWindow::addOpenDC
+//
+// Add DC to list of open DCS
+//
+// Parameters:
+//    HDC hdc            - HDC to be added to our list of open DCs
+// 
+// Returns:
+//
+//******************************************************************************
+void Win32BaseWindow::addOpenDC(HDC hdc)
+{
+    for(int i=0;i<MAX_OPENDCS;i++) {
+        if(hdcWindow[i] == 0) {
+            hdcWindow[i] = hdc;
+            break;
+        }
+    }
+    if(i == MAX_OPENDCS) {
+        DebugInt3(); //no room!
+        return;
+    }
+
+    nrOpenDCs++;
+}
+//******************************************************************************
+// Win32BaseWindow::removeOpenDC
+//
+// Remove DC from list of open DCS
+//
+// Parameters:
+//    HDC hdc            - HDC to be removed from our list of open DCs
+// 
+// Returns:
+//
+//******************************************************************************
+void Win32BaseWindow::removeOpenDC(HDC hdc)
+{
+    if(nrOpenDCs == 0) {
+        DebugInt3();
+        return;
+    }
+    for(int i=0;i<MAX_OPENDCS;i++) {
+        if(hdcWindow[i] == hdc) {
+            hdcWindow[i] = 0;
+            break;
+        }
+    }
+    if(i == MAX_OPENDCS) {
+        DebugInt3(); //not found
+        return;
+    }
+    nrOpenDCs--;
 }
 //******************************************************************************

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.152 2003-03-29 16:38:01 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.153 2003-05-02 15:33:17 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -35 +35 @@
 #define WIN32PM_MAGIC             0x12345678
 #define CheckMagicDword(a)        (a==WIN32PM_MAGIC)
+
+#define MAX_OPENDCS               8
 
 #define TYPE_ASCII                0
@@ -288 +290 @@
          BOOL   setVisibleRgnNotifyProc(VISRGN_NOTIFY_PROC lpNotifyProc, DWORD dwUserData);
          void   callVisibleRgnNotifyProc(BOOL fDrawingAllowed);
+         BOOL   isLocked()                            { return fWindowLocked; };
+
+         BOOL   queryOpenDCs(HDC *phdcWindow, int chdcWindow, int *pnrdcs);
+         void   addOpenDC(HDC hdc);
+         void   removeOpenDC(HDC hdc);
 
          int    GetWindowTextLength(BOOL fUnicode);
@@ -423 +430 @@
         DWORD   dwThreadId;             //id of thread that created this window
         DWORD   dwProcessId;            //id of process that created this window
+
+        //array of open window DCs
+        HDC     hdcWindow[MAX_OPENDCS];
+        int     nrOpenDCs;
 
    Win32BaseWindow *owner;