Index: win32ss/gdi/ntgdi/gdiobj.c
===================================================================
--- win32ss/gdi/ntgdi/gdiobj.c	(revision 64034)
+++ win32ss/gdi/ntgdi/gdiobj.c	(working copy)
@@ -386,14 +386,14 @@
         /* Check if the slot is deleted */
         if ((cOldRefs & REF_MASK_VALID) == 0)
         {
-            DPRINT("GDIOBJ: Slot is not valid: 0x%lx, hobh=%p\n", cOldRefs, hobj);
+            DPRINT1("GDIOBJ: Slot is not valid: 0x%lx, hobh=%p\n", cOldRefs, hobj);
             return NULL;
         }
 
         /* Check if the unique value matches */
         if (pentry->FullUnique != (USHORT)((ULONG_PTR)hobj >> 16))
         {
-            DPRINT("GDIOBJ: Wrong unique value. Handle: 0x%4x, entry: 0x%4x\n",
+            DPRINT1("GDIOBJ: Wrong unique value. Handle: 0x%4x, entry: 0x%4x\n",
                    (USHORT)((ULONG_PTR)hobj >> 16), pentry->FullUnique);
             return NULL;
         }
@@ -403,7 +403,7 @@
             pentry->ObjectOwner.ulObj != GDI_OBJ_HMGR_PUBLIC &&
             pentry->ObjectOwner.ulObj != PtrToUlong(PsGetCurrentProcessId()))
         {
-            DPRINT("GDIOBJ: Cannot reference foreign handle %p, pentry=%p:%lx.\n",
+            DPRINT1("GDIOBJ: Cannot reference foreign handle %p, pentry=%p:%lx.\n",
                     hobj, pentry, pentry->ObjectOwner.ulObj);
             return NULL;
         }
@@ -705,7 +705,8 @@
     ASSERT_EXCLUSIVE_OBJECT_TYPE(objt);
     if ((((ULONG_PTR)hobj >> 16) & 0x1f) != objt)
     {
-        DPRINT("Wrong object type: hobj=0x%p, objt=0x%x\n", hobj, objt);
+        DPRINT1("Object type: hobj=0x%p, objt=0x%x ", hobj, objt);
+        ASSERTMSG("Wrong object type!", FALSE);
         return NULL;
     }
 
@@ -713,7 +714,8 @@
     pentry = ENTRY_ReferenceEntryByHandle(hobj, 0);
     if (!pentry)
     {
-        DPRINT("GDIOBJ: Requested handle 0x%p is not valid.\n", hobj);
+        DPRINT1("Handle 0x%p",hobj);
+        ASSERTMSG("GDIOBJ: Requested handle is not valid !!\n",FALSE);
         return NULL;
     }