Changeset 21524 for trunk/src

Timestamp:

Dec 11, 2010, 12:11:19 AM (15 years ago)

Author:

dmik

Message:

Fixed: GetObjectType() on DC handles would return wrong values.

File:

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

trunk/src/gdi32/objhandle.cpp

@@ -51 +51 @@
 } GdiObject;
 
-typedef struct 
+typedef struct
 {
   GdiObject *headfree;
@@ -73 +73 @@
 
     objTableMutex.enter();
-    if(objHandleTable.objects == NULL) 
+    if(objHandleTable.objects == NULL)
     {
         objHandleTable.objects = (GdiObject *)malloc(MAX_OBJECT_HANDLES*sizeof(GdiObject));
@@ -88 +88 @@
         }
         objHandleTable.tailfree = &objHandleTable.objects[MAX_OBJECT_HANDLES-1];
-        for(int i=MAX_OBJECT_HANDLES-1;i>0;i--) 
+        for(int i=MAX_OBJECT_HANDLES-1;i>0;i--)
         {
             GdiObject *obj = &objHandleTable.objects[i];
@@ -147 +147 @@
 {
     hObject &= OBJHANDLE_MAGIC_MASK;
-    if(hObject < MAX_OBJECT_HANDLES) 
+    if(hObject < MAX_OBJECT_HANDLES)
     {
         objTableMutex.enter();
         GdiObject *obj = &objHandleTable.objects[hObject];
-        if(!(obj->dwFlags & OBJHANDLE_FLAG_NODELETE)) 
+        if(!(obj->dwFlags & OBJHANDLE_FLAG_NODELETE))
         {
             dprintf2(("ObjDeleteHandle %x type %d", MAKE_HANDLE(hObject), obj->dwType));
@@ -160 +160 @@
 
             //add to the tail of the free object list
-            if(objHandleTable.tailfree) 
+            if(objHandleTable.tailfree)
                 objHandleTable.tailfree->next = obj;
 
@@ -189 +189 @@
     objTableMutex.enter();
     hObject &= OBJHANDLE_MAGIC_MASK;
-    if(hObject < MAX_OBJECT_HANDLES && 
-       ((dwType == HNDL_ANY && objHandleTable.objects[hObject].dwType != HNDL_NONE) || 
-       dwType == objHandleTable.objects[hObject].dwType)) 
+    if(hObject < MAX_OBJECT_HANDLES &&
+       ((dwType == HNDL_ANY && objHandleTable.objects[hObject].dwType != HNDL_NONE) ||
+       dwType == objHandleTable.objects[hObject].dwType))
     {
         dwUserData = objHandleTable.objects[hObject].dwUserData;
@@ -206 +206 @@
     objTableMutex.enter();
     hObject &= OBJHANDLE_MAGIC_MASK;
-    if(hObject < MAX_OBJECT_HANDLES && 
-       ((dwType == HNDL_ANY && objHandleTable.objects[hObject].dwType != HNDL_NONE) || 
-       dwType == objHandleTable.objects[hObject].dwType)) 
+    if(hObject < MAX_OBJECT_HANDLES &&
+       ((dwType == HNDL_ANY && objHandleTable.objects[hObject].dwType != HNDL_NONE) ||
+       dwType == objHandleTable.objects[hObject].dwType))
     {
         objHandleTable.objects[hObject].dwUserData = dwUserData;
@@ -224 +224 @@
     objTableMutex.enter();
     hObject &= OBJHANDLE_MAGIC_MASK;
-    if(hObject < MAX_OBJECT_HANDLES && 
-       ((dwType == HNDL_ANY && objHandleTable.objects[hObject].dwType != HNDL_NONE) || 
-       dwType == objHandleTable.objects[hObject].dwType)) 
+    if(hObject < MAX_OBJECT_HANDLES &&
+       ((dwType == HNDL_ANY && objHandleTable.objects[hObject].dwType != HNDL_NONE) ||
+       dwType == objHandleTable.objects[hObject].dwType))
     {
         dwGDI32Data = objHandleTable.objects[hObject].dwGDI32Data;
@@ -241 +241 @@
     objTableMutex.enter();
     hObject &= OBJHANDLE_MAGIC_MASK;
-    if(hObject < MAX_OBJECT_HANDLES && 
-       ((dwType == HNDL_ANY && objHandleTable.objects[hObject].dwType != HNDL_NONE) || 
-       dwType == objHandleTable.objects[hObject].dwType)) 
+    if(hObject < MAX_OBJECT_HANDLES &&
+       ((dwType == HNDL_ANY && objHandleTable.objects[hObject].dwType != HNDL_NONE) ||
+       dwType == objHandleTable.objects[hObject].dwType))
     {
         objHandleTable.objects[hObject].dwGDI32Data = dwGDI32Data;
@@ -259 +259 @@
     objTableMutex.enter();
     hObject &= OBJHANDLE_MAGIC_MASK;
-    if(hObject < MAX_OBJECT_HANDLES && objHandleTable.objects[hObject].dwType != HNDL_NONE) 
+    if(hObject < MAX_OBJECT_HANDLES && objHandleTable.objects[hObject].dwType != HNDL_NONE)
     {
         dwFlags = objHandleTable.objects[hObject].dwFlags;
@@ -291 +291 @@
 DWORD WIN32API ObjQueryHandleType(HANDLE hObject)
 {
+//hack alert
+    if(HIWORD(hObject) == 0x100)
+    {//most likely a DC handle
+        if(OSLibGpiQueryDCData(hObject) != NULL) {
+            return HNDL_DC;
+        }
+    }
+//end hack
+
     DWORD objtype = 0;
 
@@ -343 +352 @@
 {
     int rc;
-   
+
     if(lpBuffer == NULL)
     { //return required size if buffer pointer == NULL
@@ -351 +360 @@
         case OBJ_PEN:
             return sizeof(LOGPEN);
-    
+
         case OBJ_EXTPEN:
             return sizeof(EXTLOGPEN);
-    
+
         case OBJ_BRUSH:
             return sizeof(LOGBRUSH);
-    
+
         case OBJ_PAL:
             return sizeof(USHORT);
-    
+
         case OBJ_FONT:
             return sizeof(LOGFONTA);
-    
+
         case OBJ_BITMAP:
             return sizeof(BITMAP); //also default for dib sections??? (TODO: NEED TO CHECK THIS)
-    
+
         case OBJ_DC:
         case OBJ_METADC:
@@ -438 +447 @@
 static char *gditypenames[] = {
 "NULL",
-"OBJ_PEN", 
-"OBJ_BRUSH", 
-"OBJ_DC", 
-"OBJ_METADC", 
-"OBJ_PAL", 
-"OBJ_FONT", 
-"OBJ_BITMAP", 
-"OBJ_REGION", 
-"OBJ_METAFILE", 
-"OBJ_MEMDC", 
-"OBJ_EXTPEN", 
-"OBJ_ENHMETADC", 
+"OBJ_PEN",
+"OBJ_BRUSH",
+"OBJ_DC",
+"OBJ_METADC",
+"OBJ_PAL",
+"OBJ_FONT",
+"OBJ_BITMAP",
+"OBJ_REGION",
+"OBJ_METAFILE",
+"OBJ_MEMDC",
+"OBJ_EXTPEN",
+"OBJ_ENHMETADC",
 "OBJ_ENHMETAFILE"
 };
@@ -583 +592 @@
 
 //hack alert
-    if(HIWORD(hObj) == 0x100) 
+    if(HIWORD(hObj) == 0x100)
     {//most likely a DC handle
         if(OSLibGpiQueryDCData(hObj) != NULL) {
@@ -596 +605 @@
         dprintf(("!WARNING!: Can't delete system object"));
         return TRUE;
-    }   
+    }
     STATS_DeleteObject(hObj, GetObjectType(hObj));