Changeset 923 for trunk/src

Timestamp:

Sep 13, 1999, 6:13:46 PM (26 years ago)

Author:

dengert

Message:

some more DC related functions

Location:

trunk/src/user32/new

Files:

• dc.cpp (modified) (6 diffs)
• dc.h (added)
• makefile (modified) (3 diffs)
• wingdi.cpp (modified) (6 diffs)

trunk/src/user32/new/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.3 1999-09-12 15:44:20 dengert Exp $ */
+/* $Id: dc.cpp,v 1.4 1999-09-13 16:13:46 dengert Exp $ */
 
 /*
@@ -268 +268 @@
 ULONG   OPEN32API _O32_GetRegionData (HRGN hrgn, ULONG count, PRGNDATA_W pData);
 BOOL    OPEN32API _O32_DeleteObject (LHANDLE hgdiobj);
+int     OPEN32API _O32_ReleaseDC (HWND hwnd, HDC hdc);
+
+#ifndef DEVESC_SETPS
+  #define DEVESC_SETPS  49149L
+#endif
 
 #define FLOAT_TO_FIXED(x) ((FIXED) ((x) * 65536.0))
@@ -649 +654 @@
 }
 
+void releaseOwnDC (HDC hps)
+{
+   pDCData pHps = (pDCData)GpiQueryDCData ((HPS)hps);
+
+   if (pHps) {
+      if (pHps->hrgnHDC)
+         GpiDestroyRegion (pHps->hps, pHps->hrgnHDC);
+
+      GpiSetBitmap (pHps->hps, NULL);
+      _O32_DeleteObject (pHps->nullBitmapHandle);
+      GpiDestroyPS(pHps->hps);
+
+      if (pHps->hdc)
+         DevCloseDC(pHps->hdc);
+
+// how can a memory chunk allocated by GpiAllocateDCData freed by delete?
+//      delete pHps;
+   }
+}
+
 HDC WIN32API BeginPaint (HWND hWnd, PPAINTSTRUCT_W lpps)
 {
@@ -916 +941 @@
       PRECTL pr;
       int i;
+      LONG height = OSLibQueryScreenHeight();
 
       if (!hrgn)
@@ -931 +957 @@
       success = TRUE;
       if (flags & DCX_EXCLUDERGN_W)
-         for (; (i > 0) && success; i--, pr++)
+         for (; (i > 0) && success; i--, pr++) {
+            LONG y = pr->yBottom;
+
+            pr->yBottom = height - pr->yTop;
+            pr->yTop    = height - y;
             success &= GpiExcludeClipRectangle (pHps->hps, pr);
+         }
       else
-         for (; (i > 0) && success; i--, pr++)
+         for (; (i > 0) && success; i--, pr++) {
+            LONG y = pr->yBottom;
+
+            pr->yBottom = height - pr->yTop;
+            pr->yTop    = height - y;
             success &= GpiIntersectClipRectangle (pHps->hps, pr);
+         }
       if (!success)
          goto error;
@@ -978 +1014 @@
 }
 
-
+HDC WIN32API GetWindowDC (HWND hwnd)
+{
+  return GetDCEx (hwnd, NULL, DCX_WINDOW_W);
+}
+
+int WIN32API ReleaseDC (HWND hwnd, HDC hdc)
+{
+   USHORT sel = RestoreOS2FS();
+   BOOL isOwnDC = FALSE;
+   int rc;
+
+   if (hwnd)
+   {
+      Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
+      isOwnDC = wnd->isOwnDC();
+   }
+   if (isOwnDC)
+      rc = TRUE;
+   else
+      rc = _O32_ReleaseDC (0, hdc);
+
+   SetFS(sel);
+   return (rc);
+}
 //******************************************************************************
 //******************************************************************************

trunk/src/user32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.49 1999-09-09 18:08:46 dengert Exp $
+# $Id: makefile,v 1.50 1999-09-13 16:13:46 dengert Exp $
 
 #
@@ -106 +106 @@
 pmwindow.obj:   pmwindow.cpp win32class.h win32wbase.h win32dlg.h pmwindow.h win32wndchild.h $(PDWIN32_INCLUDE)\wprocess.h oslibgdi.h oslibwin.h
 win32class.obj: win32class.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h
-win32wbase.obj:   win32wbase.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h
+win32wbase.obj:   win32wbase.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h
 win32wnd.obj:   win32wnd.cpp win32class.h win32wbase.h win32wnd.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h oslibmenu.h
 win32dlg.obj:   win32dlg.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h oslibmsg.h
@@ -120 +120 @@
 oslibres.obj:   oslibres.cpp oslibwin.h oslibres.h $(PDWIN32_INCLUDE)\winconst.h
 oslibdos.obj:   oslibdos.cpp oslibdos.h
-dc.obj:         dc.cpp win32wbase.h
+dc.obj:         dc.cpp win32wbase.h dc.h
 
 clipboard.obj:  clipboard.cpp

trunk/src/user32/new/wingdi.cpp

@@ -1 @@
-/* $Id: wingdi.cpp,v 1.15 1999-09-12 15:44:20 dengert Exp $ */
+/* $Id: wingdi.cpp,v 1.16 1999-09-13 16:13:46 dengert Exp $ */
 /*
  * Win32 Window graphics apis for OS/2
@@ -33 +33 @@
     return 0;
     }
-// !! there is no HDC to paint on !!!    window->MsgEraseBackGround(hdc);
+// !! there is no HDC to paint on !!!    window->MsgEraseBackGround(hdc);
 #ifdef OPEN32_GDI
     hdc = O32_BeginPaint(window->getOS2WindowHandle(),lps);
@@ -97 +97 @@
     return GetDC(hwnd);
 }
-#endif
 
 //******************************************************************************
@@ -112 +111 @@
 //******************************************************************************
 //******************************************************************************
+
 HDC WIN32API GetWindowDC(HWND hwnd)
 {
@@ -118 +118 @@
    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    if(!window) {
-        dprintf(("GetWindowDC, window %x not found", hwnd));
-        return 0;
+        dprintf(("GetWindowDC, window %x not found", hwnd));
+        return 0;
    }
    dprintf(("GetWindowDC %x", hwnd));
@@ -128 +128 @@
 #endif
 }
+#endif
 //******************************************************************************
 //******************************************************************************