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

Timestamp:

Dec 15, 2001, 7:51:16 PM (24 years ago)

Author:

sandervl

Message:

Added statistics for font, bitmap, pen, brush & region objects.

File:

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

trunk/src/gdi32/objhandle.cpp

@@ -1 @@
-/* $Id: objhandle.cpp,v 1.19 2001-11-13 15:42:06 sandervl Exp $ */
+/* $Id: objhandle.cpp,v 1.20 2001-12-15 18:50:27 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -26 +26 @@
 #include <unicode.h>
 #include "font.h"
+#include <stats.h>
 
 #define DBG_LOCALLOG    DBG_objhandle
@@ -328 +329 @@
 DWORD WIN32API GetObjectType( HGDIOBJ hObj)
 {
-    dprintf2(("GDI32: GetObjectType %x", hObj));
+    DWORD objtype;
+
     //TODO: must use 16 bits gdi object handles
     if(HIWORD(hObj) == 0) {
@@ -334 +336 @@
     }
     if(ObjGetHandleType(hObj) == GDIOBJ_REGION) {
+        dprintf2(("GDI32: GetObjectType %x REGION", hObj));
         SetLastError(ERROR_SUCCESS);
         return OBJ_REGION;
     }
-    return O32_GetObjectType(hObj);
+    objtype = O32_GetObjectType(hObj);
+    dprintf2(("GDI32: GetObjectType %x objtype %d", hObj, objtype));
+    return objtype;
 }
 //******************************************************************************
@@ -344 +349 @@
 BOOL WIN32API DeleteObject(HANDLE hObj)
 {
+    DWORD objtype;
+
     dprintf(("GDI32: DeleteObject %x", hObj));
 
@@ -353 +360 @@
 
     //System objects can't be deleted (TODO: any others?? (fonts?))!!!!)
-    switch (GetObjectType(hObj))
+    objtype = GetObjectType(hObj);
+    switch (objtype)
     {
         case OBJ_PEN:
@@ -385 +393 @@
     }
 
+    STATS_DeleteObject(hObj, objtype);
+
     if(ObjGetHandleType(hObj) == GDIOBJ_REGION)
     {
@@ -398 +408 @@
 //******************************************************************************
 //******************************************************************************
+int WIN32API EnumObjects( HDC hdc, int objType, GOBJENUMPROC objFunc, LPARAM lParam)
+{
+    //calling convention differences
+    dprintf(("!ERROR!: GDI32: EnumObjects STUB"));
+//    return O32_EnumObjects(arg1, arg2, arg3, arg4);
+    return 0;
+}
+//******************************************************************************
+//******************************************************************************
+HANDLE WIN32API GetCurrentObject( HDC hdc, UINT arg2)
+{
+    dprintf(("GDI32: GetCurrentObject %x %x", hdc, arg2));
+    return (HANDLE)O32_GetCurrentObject(hdc, arg2);
+}
+//******************************************************************************
+//******************************************************************************
 BOOL WIN32API SetObjectOwner( HGDIOBJ arg1, int arg2 )
 {
@@ -406 +432 @@
 //******************************************************************************
 //******************************************************************************
+BOOL WIN32API UnrealizeObject( HGDIOBJ hObject)
+{
+    dprintf(("GDI32: UnrealizeObject %x", hObject));
+    return O32_UnrealizeObject(hObject);
+}
+//******************************************************************************
+//******************************************************************************