Changeset 2016 for trunk/src

Timestamp:

Dec 7, 1999, 9:43:40 PM (26 years ago)

Author:

sandervl

Message:

Owndc changes

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (7 diffs)
• win32wbase.cpp (modified) (2 diffs)
• win32wbase.h (modified) (2 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.26 1999-12-07 18:19:47 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.27 1999-12-07 20:43:39 sandervl Exp $ */
 
 /*
@@ -343 +343 @@
 INT revertDy (Win32BaseWindow *wnd, INT dy)
 {
+   //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
+//   if (wnd->isOwnDC() && wnd->getOwnDC())
    if (wnd->isOwnDC())
    {
@@ -438 +440 @@
    if ((hwnd != HWND_DESKTOP) && wnd->isOwnDC())
    {
-      hPS_ownDC = wnd->getOwnDC();
-      pHps = (pDCData)GpiQueryDCData(hPS_ownDC);
-      if (!pHps)
-      {
-         O32_SetLastError (ERROR_INVALID_PARAMETER);
-         return (HDC)NULLHANDLE;
-      }
+        hPS_ownDC = wnd->getOwnDC();
+        //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
+        if(hPS_ownDC) {
+                pHps = (pDCData)GpiQueryDCData(hPS_ownDC);
+                if (!pHps)
+                {
+                        O32_SetLastError (ERROR_INVALID_PARAMETER);
+                        return (HDC)NULLHANDLE;
+                }
+        }
    }
 
@@ -499 +504 @@
    if (!wnd) goto exit;
 
-   if(wnd->isOwnDC())
+   //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
+   if(wnd->isOwnDC() && wnd->getOwnDC())
+//   if(wnd->isOwnDC())
    {
        pDCData pHps = (pDCData)GpiQueryDCData((HPS)pPaint->hdc);
@@ -535 +542 @@
    if (updateRegionExists)
    {
+      //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
+//      if (wnd->isOwnDC() && wnd->getOwnDC())
       if (wnd->isOwnDC())
       {
@@ -612 +621 @@
    dprintf (("User32: GetDCEx hwnd %x (%x %x) -> wnd %x", hwnd, hrgn, flags, wnd));
 
-   isWindowOwnDC = (((hWindow == HWND_DESKTOP) ? FALSE : wnd->isOwnDC())
+   //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
+//   isWindowOwnDC = (((hWindow == HWND_DESKTOP) ? FALSE : (wnd->isOwnDC() && wnd->getOwnDC()))
+   isWindowOwnDC = (((hWindow == HWND_DESKTOP) ? FALSE : (wnd->isOwnDC()))
                  && !(flags & DCX_CACHE_W));
 
@@ -747 +758 @@
    {
       Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
+      //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
+//      isOwnDC = wnd->isOwnDC() && wnd->getOwnDC();
       isOwnDC = wnd->isOwnDC();
    }

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.106 1999-12-07 12:26:58 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.107 1999-12-07 20:43:39 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -628 +628 @@
   if(windowClass->getStyle() & CS_OWNDC) {
         dprintf(("Class with CS_OWNDC style"));
-        ownDC = GetWindowDC(getWindowHandle());
+//      ownDC = GetWindowDC(getWindowHandle());
   }
   else 

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.50 1999-12-07 12:26:59 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.51 1999-12-07 20:43:40 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -364 +364 @@
          fakeOpen32WinBaseClass fakeWinBase;
 
-//         BOOL   isOwnDC() { return (windowClass && windowClass->getStyle() & CS_OWNDC_W); }
-         BOOL   isOwnDC() { return FALSE; }
+         BOOL   isOwnDC() { return (windowClass && windowClass->getStyle() & CS_OWNDC_W); }
          HDC    getOwnDC() { return ownDC; }
          void   setOwnDC(HDC hdc) { ownDC = hdc; }