Changeset 5390 for trunk/src/gdi32/objhandle.cpp

Timestamp:

Mar 27, 2001, 10:47:53 PM (24 years ago)

Author:

sandervl

Message:

DeleteDC check for DIB section + SelectObject fixes

File:

• trunk/src/gdi32/objhandle.cpp (modified) (7 diffs)

trunk/src/gdi32/objhandle.cpp

@@ -1 @@
-/* $Id: objhandle.cpp,v 1.11 2001-01-18 18:13:18 sandervl Exp $ */
+/* $Id: objhandle.cpp,v 1.12 2001-03-27 20:47:53 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -177 +177 @@
   if(DIBSection::getSection() != NULL)
   {
-        DIBSection *dsect = DIBSection::find(hObject);
+        DIBSection *dsect = DIBSection::findObj(hObject);
         if(dsect)
         {
@@ -236 +236 @@
 {
  HGDIOBJ rc;
-
-    dprintf2(("GDI32: SelectObject %x %x", hdc, hObj));
-
-    if(ObjGetHandleType(hObj) == GDIOBJ_REGION) {
+ DWORD   handleType = GetObjectType(hObj);
+
+    dprintf2(("GDI32: SelectObject %x %x type %x", hdc, hObj, handleType));
+
+    if(handleType == GDIOBJ_REGION) {
         //Return complexity here; not previously selected clip region
         return (HGDIOBJ)SelectClipRgn(hdc, hObj);
     }
 
-    if(DIBSection::getSection() != NULL)
+    if(handleType == OBJ_BITMAP && DIBSection::getSection() != NULL)
     {
         DIBSection *dsect;
 
-        dsect = DIBSection::find(hdc);
+        dsect = DIBSection::findHDC(hdc);
         if(dsect)
         {
@@ -254 +255 @@
             dsect->UnSelectDIBObject();
         }
-        dsect = DIBSection::find((DWORD)hObj);
+        dsect = DIBSection::findObj(hObj);
         if(dsect)
         {
@@ -261 +262 @@
     }
     rc = O32_SelectObject(hdc, hObj);
-    if(rc != 0 && DIBSection::getSection != NULL)
-    {
-        DIBSection *dsect = DIBSection::find((DWORD)rc);
+    if(rc != 0 && GetObjectType(rc) == OBJ_BITMAP && DIBSection::getSection != NULL)
+    {
+        DIBSection *dsect = DIBSection::findObj(rc);
         if(dsect)
         {
@@ -270 +271 @@
     }
 #ifdef USING_OPEN32
-    if(O32_GetObjectType(hObj) == OBJ_BITMAP)
+    if(handleType == OBJ_BITMAP)
     {
         //SvL: Open32 messes up the height of the hdc (for windows)
@@ -286 +287 @@
 }
 //******************************************************************************
+//Called from user32 ReleaseDC (for non CS_OWNDC hdcs)
+//******************************************************************************
+VOID WIN32API UnselectGDIObjects(HDC hdc)
+{
+    DIBSection *dsect;
+
+    dsect = DIBSection::findHDC(hdc);
+    if(dsect)
+    {
+        //remove previously selected dibsection
+        dsect->UnSelectDIBObject();
+    }
+}
+//******************************************************************************
 //******************************************************************************
 DWORD WIN32API GetObjectType( HGDIOBJ hObj)