Changeset 4574 for trunk/src/gdi32/gdi32.cpp

Timestamp:

Nov 9, 2000, 7:16:57 PM (25 years ago)

Author:

sandervl

Message:

DeleteDC + CreateDIBSection fixes

File:

• trunk/src/gdi32/gdi32.cpp (modified) (4 diffs)

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.59 2000-11-05 18:48:21 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.60 2000-11-09 18:16:57 sandervl Exp $ */
 
 /*
@@ -22 +22 @@
 #include "oslibgpi.h"
 #include "oslibgdi.h"
+#include <dcdata.h>
+#include <win32wnd.h>
 
 #define DBG_LOCALLOG    DBG_gdi32
@@ -85 +87 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(BOOL, DeleteDC, HDC, hdc)
-{
-  return O32_DeleteDC(hdc);
-}
-//******************************************************************************
-//******************************************************************************
 HBRUSH WIN32API CreatePatternBrush(HBITMAP arg1)
 {
@@ -137 +133 @@
     dprintf(("CreateCompatibleDC %X returned %x", hdc, newHdc));
     return newHdc;
+}
+//******************************************************************************
+//******************************************************************************
+ODINFUNCTION1(BOOL, DeleteDC, HDC, hdc)
+{
+  pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
+  if(!pHps)
+  {
+      dprintf(("WARNING: DeleteDC %x; invalid hdc!", hdc));
+      SetLastError(ERROR_INVALID_HANDLE);
+      return 0;
+  }
+  SetLastError(ERROR_SUCCESS);
+  //Must call ReleaseDC for window dcs
+  if(pHps->hdcType == TYPE_1) {
+      return ReleaseDC(OS2ToWin32Handle(pHps->hwnd), hdc);
+  }
+
+  return O32_DeleteDC(hdc);
 }
 //******************************************************************************