Changeset 3482 for trunk/src/user32/dc.cpp

Timestamp:

May 2, 2000, 10:50:53 PM (25 years ago)

Author:

sandervl

Message:

RDW_FRAME support for GetDCEx; added wine dialog change; added extra logging

File:

• trunk/src/user32/dc.cpp (modified) (6 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.54 2000-04-07 12:55:15 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.55 2000-05-02 20:50:48 sandervl Exp $ */
 
 /*
@@ -803 +803 @@
 }
 //******************************************************************************
+//******************************************************************************
+int WIN32API ReleaseDC (HWND hwnd, HDC hdc)
+{
+   BOOL isOwnDC = FALSE;
+   int rc;
+
+   if (hwnd)
+   {
+        Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
+        if(wnd == NULL) {
+                dprintf(("ERROR: ReleaseDC %x %x failed", hwnd, hdc));
+                return 0;
+        }
+        //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
+//      isOwnDC = wnd->isOwnDC() && wnd->getOwnDC();
+        isOwnDC = wnd->isOwnDC() && (wnd->getOwnDC() == hdc);
+   }
+   if (isOwnDC)
+      rc = TRUE;
+   else
+      rc = O32_ReleaseDC (0, hdc);
+
+   dprintf(("ReleaseDC %x %x", hwnd, hdc));
+   return (rc);
+}
+//******************************************************************************
 // This implementation of GetDCEx supports
 // DCX_WINDOW
@@ -961 +987 @@
    /* Something went wrong; clean up
     */
+   dprintf(("ERROR: GetDCEx hwnd %x (%x %x) FAILED!", hwnd, hrgn, flags));
+   DebugInt3();
    if (pHps)
    {
@@ -993 +1021 @@
   if (!hwnd) hwnd = GetDesktopWindow();
   return GetDCEx (hwnd, NULL, DCX_USESTYLE_W | DCX_WINDOW_W);
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API ReleaseDC (HWND hwnd, HDC hdc)
-{
-   BOOL isOwnDC = FALSE;
-   int rc;
-
-   if (hwnd)
-   {
-        Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
-        if(wnd == NULL) {
-                dprintf(("ERROR: ReleaseDC %x %x failed", hwnd, hdc));
-                return 0;
-        }
-        //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
-//      isOwnDC = wnd->isOwnDC() && wnd->getOwnDC();
-        isOwnDC = wnd->isOwnDC() && (wnd->getOwnDC() == hdc);
-   }
-   if (isOwnDC)
-      rc = TRUE;
-   else
-      rc = O32_ReleaseDC (0, hdc);
-
-   dprintf(("ReleaseDC %x %x", hwnd, hdc));
-   return (rc);
 }
 //******************************************************************************
@@ -1040 +1042 @@
    else   dprintf(("RedrawWindow %x %x %x %x", hwnd, pRect, hrgn, redraw));
 
-   if (redraw & (RDW_FRAME_W | RDW_NOFRAME_W))
-   {
-        SetLastError(ERROR_NOT_SUPPORTED_W);
-        return FALSE;
-   }
-
    if (hwnd == NULLHANDLE)
    {
@@ -1076 +1072 @@
             return FALSE;
         }
-        hwnd = wnd->getOS2WindowHandle();
+        //TODO: If frame, exclude client window from update
+        if(redraw & RDW_FRAME_W) {
+                hwnd = wnd->getOS2FrameWindowHandle();
+        }
+        else    hwnd = wnd->getOS2WindowHandle();
+
    }