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

Timestamp:

Apr 7, 2002, 4:38:08 PM (23 years ago)

Author:

sandervl

Message:

changed vmutex usage

File:

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

trunk/src/gdi32/objhandle.cpp

@@ -1 @@
-/* $Id: objhandle.cpp,v 1.20 2001-12-15 18:50:27 sandervl Exp $ */
+/* $Id: objhandle.cpp,v 1.21 2002-04-07 14:38:08 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -45 +45 @@
 static VMutex    objTableMutex;
 
+#ifdef DEBUG
+static DWORD GetObjectTypeNoDbg( HGDIOBJ hObj);
+#else
+#define GetObjectTypeNoDbg GetObjectType
+#endif
+
 //******************************************************************************
 //******************************************************************************
 BOOL WIN32API ObjAllocateHandle(HANDLE *hObject, DWORD dwUserData, ObjectType type)
 {
-    objTableMutex.enter(VMUTEX_WAIT_FOREVER);
+    objTableMutex.enter();
     if(lowestFreeIndex == -1) {
         //oops, out of handles
@@ -85 +91 @@
     hObject &= OBJHANDLE_MAGIC_MASK;
     if(hObject < MAX_OBJECT_HANDLES) {
-        objTableMutex.enter(VMUTEX_WAIT_FOREVER);
+        objTableMutex.enter();
         objHandleTable[hObject].dwUserData = 0;
         objHandleTable[hObject].type = GDIOBJ_NONE;
@@ -158 +164 @@
   if(lpBuffer == NULL)
   { //return required size if buffer pointer == NULL
-    int objtype = GetObjectType(hObject);
+    int objtype = GetObjectTypeNoDbg(hObject);
     switch(objtype)
     {
@@ -219 +225 @@
         hObject |= GDIOBJ_PREFIX;
   }
-  objtype = GetObjectType(hObject);
+  objtype = GetObjectTypeNoDbg(hObject);
 
   switch(objtype)
@@ -253 +259 @@
 //******************************************************************************
 //******************************************************************************
+#ifdef DEBUG
+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_ENHMETAFILE"
+};
+
+char *DbgGetGDITypeName(DWORD handleType)
+{
+    if(handleType <= OBJ_ENHMETAFILE) {
+        return gditypenames[handleType];
+    }
+    return "UNKNOWN TYPE";
+}
+#endif
+//******************************************************************************
+//******************************************************************************
 HGDIOBJ WIN32API SelectObject(HDC hdc, HGDIOBJ hObj)
 {
@@ -263 +297 @@
     }
 
-    handleType = GetObjectType(hObj);
-    dprintf2(("GDI32: SelectObject %x %x type %x", hdc, hObj, handleType));
+    handleType = GetObjectTypeNoDbg(hObj);
+    dprintf2(("GDI32: SelectObject %x %x type %s", hdc, hObj, DbgGetGDITypeName(handleType)));
     if(handleType == GDIOBJ_REGION) {
         //Return complexity here; not previously selected clip region
@@ -287 +321 @@
     }
     rc = O32_SelectObject(hdc, hObj);
-    if(rc != 0 && GetObjectType(rc) == OBJ_BITMAP && DIBSection::getSection != NULL)
+    if(rc != 0 && GetObjectTypeNoDbg(rc) == OBJ_BITMAP && DIBSection::getSection != NULL)
     {
         DIBSection *dsect = DIBSection::findObj(rc);
@@ -327 +361 @@
 //******************************************************************************
 //******************************************************************************
-DWORD WIN32API GetObjectType( HGDIOBJ hObj)
+#ifdef DEBUG
+static DWORD GetObjectTypeNoDbg( HGDIOBJ hObj)
 {
     DWORD objtype;
@@ -340 +375 @@
         return OBJ_REGION;
     }
+    return O32_GetObjectType(hObj);
+}
+#endif
+//******************************************************************************
+//******************************************************************************
+DWORD WIN32API GetObjectType( HGDIOBJ hObj)
+{
+    DWORD objtype;
+
+    //TODO: must use 16 bits gdi object handles
+    if(HIWORD(hObj) == 0) {
+        hObj |= GDIOBJ_PREFIX;
+    }
+    if(ObjGetHandleType(hObj) == GDIOBJ_REGION) {
+        dprintf2(("GDI32: GetObjectType %x REGION", hObj));
+        SetLastError(ERROR_SUCCESS);
+        return OBJ_REGION;
+    }
     objtype = O32_GetObjectType(hObj);
     dprintf2(("GDI32: GetObjectType %x objtype %d", hObj, objtype));
@@ -360 +413 @@
 
     //System objects can't be deleted (TODO: any others?? (fonts?))!!!!)
-    objtype = GetObjectType(hObj);
+    objtype = GetObjectTypeNoDbg(hObj);
     switch (objtype)
     {