[ros-diffs] [jgardou] 47119: some leftover from last sync : GDIDBG macros expect handles, not index

[jgardou at svn.reactos.org]

Author: jgardou
Date: Sat May  8 01:33:11 2010
New Revision: 47119

URL: http://svn.reactos.org/svn/reactos?rev=47119&view=rev
Log:
some leftover from last sync : GDIDBG macros expect handles, not index

Modified:
    branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c
    branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c

Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c
URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c?rev=47119&r1=47118&r2=47119&view=diff
==============================================================================
--- branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original)
+++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Sat May  8 01:33:11 2010
@@ -796,6 +796,7 @@
     if (DCToDelete == NULL)
     {
         SetLastWin32Error(ERROR_INVALID_HANDLE);
+        DPRINT1("Could not lock DC to delete\n");
         return FALSE;
     }
 
@@ -842,6 +843,7 @@
 
     if (!GDIOBJ_OwnedByCurrentProcess(DCHandle))
     {
+        DPRINT1("Not a DC from current process!\n");
         SetLastWin32Error(ERROR_INVALID_HANDLE);
         return FALSE;
     }

Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c
URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c?rev=47119&r1=47118&r2=47119&view=diff
==============================================================================
--- branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original)
+++ branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Sat May  8 01:33:11 2010
@@ -646,7 +646,7 @@
                  */
                 DPRINT1("Object->cExclusiveLock = %d\n", Object->cExclusiveLock);
                 GDIDBG_TRACECALLER();
-                GDIDBG_TRACELOCKER(GDI_HANDLE_GET_INDEX(hObj));
+                GDIDBG_TRACELOCKER(hObj);
                 (void)InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId);
                 /* do not assert here for it will call again from dxg.sys it being call twice */
 
@@ -688,7 +688,7 @@
             }
             DPRINT1("Type = 0x%lx, KernelData = 0x%p, ProcessId = 0x%p\n", Entry->Type, Entry->KernelData, Entry->ProcessId);
             GDIDBG_TRACECALLER();
-            GDIDBG_TRACEALLOCATOR(GDI_HANDLE_GET_INDEX(hObj));
+            GDIDBG_TRACEALLOCATOR(hObj);
         }
     }
 
@@ -989,7 +989,7 @@
     {
         DPRINT1("Tried to lock object (0x%p) of wrong owner! ProcessId = %p, HandleProcessId = %p\n", hObj, ProcessId, HandleProcessId);
         GDIDBG_TRACECALLER();
-        GDIDBG_TRACEALLOCATOR(GDI_HANDLE_GET_INDEX(hObj));
+        GDIDBG_TRACEALLOCATOR(hObj);
         return NULL;
     }
 
@@ -1039,8 +1039,8 @@
                     {
                         GDIDBG_TRACELOOP(hObj, Object->Tid, Thread);
                         GDIDBG_TRACECALLER();
-                        GDIDBG_TRACELOCKER(GDI_HANDLE_GET_INDEX(hObj));
-                        GDIDBG_TRACEALLOCATOR(GDI_HANDLE_GET_INDEX(hObj));
+                        GDIDBG_TRACELOCKER(hObj);
+                        GDIDBG_TRACEALLOCATOR(hObj);
 
                         /* Unlock the handle table entry. */
                         (void)InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId);