[ros-diffs] [tkreuzer] 40240: Rename NtGdiDeleteObject to GreDeleteObject

Author: tkreuzer
Date: Wed Mar 25 23:24:34 2009
New Revision: 40240

URL: http://svn.reactos.org/svn/reactos?rev=40240&view=rev
Log:
Rename NtGdiDeleteObject to GreDeleteObject

Modified:
    trunk/reactos/subsystems/win32/win32k/eng/surface.c
    trunk/reactos/subsystems/win32/win32k/include/gdiobj.h
    trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
    trunk/reactos/subsystems/win32/win32k/ntuser/message.c
    trunk/reactos/subsystems/win32/win32k/ntuser/painting.c
    trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c
    trunk/reactos/subsystems/win32/win32k/ntuser/vis.c
    trunk/reactos/subsystems/win32/win32k/ntuser/windc.c
    trunk/reactos/subsystems/win32/win32k/ntuser/window.c
    trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c
    trunk/reactos/subsystems/win32/win32k/objects/bitblt.c
    trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c
    trunk/reactos/subsystems/win32/win32k/objects/brush.c
    trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c
    trunk/reactos/subsystems/win32/win32k/objects/dclife.c
    trunk/reactos/subsystems/win32/win32k/objects/dcstate.c
    trunk/reactos/subsystems/win32/win32k/objects/dibobj.c
    trunk/reactos/subsystems/win32/win32k/objects/freetype.c
    trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c
    trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c
    trunk/reactos/subsystems/win32/win32k/objects/path.c
    trunk/reactos/subsystems/win32/win32k/objects/region.c

Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Wed Mar 25 23:24:34
2009
@@ -132,7 +132,7 @@
 
         if (psurf->hDIBPalette != NULL)
         {
-            NtGdiDeleteObject(psurf->hDIBPalette);
+            GreDeleteObject(psurf->hDIBPalette);
         }
     }
 

Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Wed Mar 25
23:24:34 2009
@@ -79,7 +79,7 @@
 #define GDIOBJFLAG_IGNOREPID 	(0x1)
 #define GDIOBJFLAG_IGNORELOCK 	(0x2)
 
-BOOL FASTCALL  NtGdiDeleteObject(HGDIOBJ hObject);
+BOOL FASTCALL  GreDeleteObject(HGDIOBJ hObject);
 BOOL FASTCALL  IsObjectDead(HGDIOBJ);
 BOOL FASTCALL  IntGdiSetDCOwnerEx( HDC, DWORD, BOOL);
 

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Wed Mar 25
23:24:34 2009
@@ -470,13 +470,13 @@
    if(bmpMask)
    {
       GDIOBJ_SetOwnership(bmpMask, PsGetCurrentProcess());
-      NtGdiDeleteObject(bmpMask);
+      GreDeleteObject(bmpMask);
       CurIcon->IconInfo.hbmMask = NULL;
    }
    if(bmpColor)
    {
       GDIOBJ_SetOwnership(bmpColor, PsGetCurrentProcess());
-      NtGdiDeleteObject(bmpColor);
+      GreDeleteObject(bmpColor);
       CurIcon->IconInfo.hbmColor = NULL;
    }
 
@@ -1152,11 +1152,11 @@
    /* Delete old bitmaps */
    if (CurIcon->IconInfo.hbmColor != IconInfo.hbmColor)
    {
-      NtGdiDeleteObject(CurIcon->IconInfo.hbmColor);
+      GreDeleteObject(CurIcon->IconInfo.hbmColor);
    }
    if (CurIcon->IconInfo.hbmMask != IconInfo.hbmMask)
    {
-      NtGdiDeleteObject(CurIcon->IconInfo.hbmMask);
+      GreDeleteObject(CurIcon->IconInfo.hbmMask);
    }
 
    /* Copy new IconInfo field */
@@ -1683,7 +1683,7 @@
    {
       if(hOldOffBmp) NtGdiSelectBitmap(hdcOff, hOldOffBmp);
       if(hOldOffBrush) NtGdiSelectBrush(hdcOff, hOldOffBrush);
-      if(hbmOff) NtGdiDeleteObject(hbmOff);
+      if(hbmOff) GreDeleteObject(hbmOff);
       if(hdcOff) NtGdiDeleteObjectApp(hdcOff);
    }
 

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Wed Mar 25
23:24:34 2009
@@ -398,7 +398,7 @@
   /* send a WM_NCPAINT and WM_ERASEBKGND if the non-client area is still invalid */
      HRGN hrgn = NtGdiCreateRectRgn( 0, 0, 0, 0 );
      co_UserGetUpdateRgn( Window, hrgn, TRUE );
-     NtGdiDeleteObject( hrgn );
+     GreDeleteObject( hrgn );
   }
   return retval;
 }

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Wed Mar 25
23:24:34 2009
@@ -182,7 +182,7 @@
       hRgnWindow = IntCalcWindowRgn(Window, TRUE);
       if (hRgnWindow == NULL)
       {
-         NtGdiDeleteObject(hRgnNonClient);
+         GreDeleteObject(hRgnNonClient);
          return (HRGN)1;
       }
 
@@ -190,14 +190,14 @@
                                 hRgnWindow, RGN_DIFF);
       if (RgnType == ERROR)
       {
-         NtGdiDeleteObject(hRgnWindow);
-         NtGdiDeleteObject(hRgnNonClient);
+         GreDeleteObject(hRgnWindow);
+         GreDeleteObject(hRgnNonClient);
          return (HRGN)1;
       }
       else if (RgnType == NULLREGION)
       {
-         NtGdiDeleteObject(hRgnWindow);
-         NtGdiDeleteObject(hRgnNonClient);
+         GreDeleteObject(hRgnWindow);
+         GreDeleteObject(hRgnNonClient);
          return NULL;
       }
 
@@ -212,14 +212,14 @@
                              hRgnWindow, RGN_AND) == NULLREGION)
          {
             GDIOBJ_SetOwnership(Window->UpdateRegion, PsGetCurrentProcess());
-            NtGdiDeleteObject(Window->UpdateRegion);
+            GreDeleteObject(Window->UpdateRegion);
             Window->UpdateRegion = NULL;
             if (!(Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT))
                MsqDecPaintCountQueue(Window->MessageQueue);
          }
       }
 
-      NtGdiDeleteObject(hRgnWindow);
+      GreDeleteObject(hRgnWindow);
 
       return hRgnNonClient;
    }
@@ -355,7 +355,7 @@
 
       hRgnClient = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->ClientRect);
       RgnType = NtGdiCombineRgn(hRgn, hRgn, hRgnClient, RGN_AND);
-      NtGdiDeleteObject(hRgnClient);
+      GreDeleteObject(hRgnClient);
    }
 
    /*
@@ -368,7 +368,7 @@
 
       hRgnWindow = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->WindowRect);
       RgnType = NtGdiCombineRgn(hRgn, hRgn, hRgnWindow, RGN_AND);
-      NtGdiDeleteObject(hRgnWindow);
+      GreDeleteObject(hRgnWindow);
    }
    else
    {
@@ -405,7 +405,7 @@
                           hRgn, RGN_OR) == NULLREGION)
       {
          GDIOBJ_SetOwnership(Window->UpdateRegion, PsGetCurrentProcess());
-         NtGdiDeleteObject(Window->UpdateRegion);
+         GreDeleteObject(Window->UpdateRegion);
          Window->UpdateRegion = NULL;
       }
 
@@ -425,7 +425,7 @@
                              hRgn, RGN_DIFF) == NULLREGION)
          {
             GDIOBJ_SetOwnership(Window->UpdateRegion, PsGetCurrentProcess());
-            NtGdiDeleteObject(Window->UpdateRegion);
+            GreDeleteObject(Window->UpdateRegion);
             Window->UpdateRegion = NULL;
          }
       }
@@ -467,7 +467,7 @@
             HRGN hRgnTemp = NtGdiCreateRectRgn(0, 0, 0, 0);
             NtGdiCombineRgn(hRgnTemp, hRgn, 0, RGN_COPY);
             IntInvalidateWindows(Child, hRgnTemp, Flags);
-            NtGdiDeleteObject(hRgnTemp);
+            GreDeleteObject(hRgnTemp);
          }
 
       }
@@ -564,7 +564,7 @@
          hRgn = NtGdiCreateRectRgn(0, 0, 0, 0);
          if (NtGdiCombineRgn(hRgn, UpdateRgn, NULL, RGN_COPY) == NULLREGION)
          {
-            NtGdiDeleteObject(hRgn);
+            GreDeleteObject(hRgn);
             hRgn = NULL;
          }
          else
@@ -619,7 +619,7 @@
 
    if (hRgn != NULL)
    {
-      NtGdiDeleteObject(hRgn);
+      GreDeleteObject(hRgn);
    }
 
    return TRUE;
@@ -1209,7 +1209,7 @@
       NtGdiOffsetRgn(hrgnTmp, dx, dy);
       Result = NtGdiCombineRgn(hrgnOwn, hrgnOwn, hrgnTmp, RGN_DIFF);
 
-      NtGdiDeleteObject(hrgnTmp);
+      GreDeleteObject(hrgnTmp);
 
       if (prcUpdate)
       {
@@ -1218,7 +1218,7 @@
 
       if (!hrgnUpdate)
       {
-         NtGdiDeleteObject(hrgnOwn);
+         GreDeleteObject(hrgnOwn);
       }
    }
    else
@@ -1412,9 +1412,9 @@
       NtGdiOffsetRgn(hrgnTemp, dx, dy);
       NtGdiCombineRgn(hrgnTemp, hrgnTemp, hrgnClip, RGN_AND);
       co_UserRedrawWindow(Window, NULL, hrgnTemp, RDW_INVALIDATE | RDW_ERASE);
-      NtGdiDeleteObject(hrgnClip);
-   }
-   NtGdiDeleteObject(hrgnTemp);
+      GreDeleteObject(hrgnClip);
+   }
+   GreDeleteObject(hrgnTemp);
 
    if (flags & SW_SCROLLCHILDREN)
    {
@@ -1487,7 +1487,7 @@
 CLEANUP:
    if (hrgnOwn && !hrgnUpdate)
    {
-      NtGdiDeleteObject(hrgnOwn);
+      GreDeleteObject(hrgnOwn);
    }
 
    if (Window)
@@ -1583,7 +1583,7 @@
    if(!hOldFont)
    {
       DPRINT1("%s: SelectFont() failed!\n", __FUNCTION__);
-      NtGdiDeleteObject(hFont);
+      GreDeleteObject(hFont);
       return FALSE;
    }
 
@@ -1600,7 +1600,7 @@
 
    IntGdiSetTextColor(hDc, OldTextColor);
    NtGdiSelectFont(hDc, hOldFont);
-   NtGdiDeleteObject(hFont);
+   GreDeleteObject(hFont);
 
    return TRUE;
 }
@@ -1864,7 +1864,7 @@
 cleanup:
    if (hOldBrush) NtGdiSelectBrush(hMemDc, hOldBrush);
    if (hOldBmp) NtGdiSelectBitmap(hMemDc, hOldBmp);
-   if (hMemBmp) NtGdiDeleteObject(hMemBmp);
+   if (hMemBmp) GreDeleteObject(hMemBmp);
    if (hMemDc) NtGdiDeleteObjectApp(hMemDc);
 
    return Ret;

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Wed Mar 25
23:24:34 2009
@@ -376,7 +376,7 @@
                      if(hOldBitmap != NULL)
                      {
                         /* delete the old wallpaper */
-                        NtGdiDeleteObject(hOldBitmap);
+                        GreDeleteObject(hOldBitmap);
                      }
 
                      /* Set the style */

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] Wed Mar 25 23:24:34
2009
@@ -71,13 +71,13 @@
       CurrentWnd = CurrentWindow->Wnd;
       if (!(CurrentWnd) || !(CurrentWnd->Style & WS_VISIBLE))
       {
-         NtGdiDeleteObject(VisRgn);
+         GreDeleteObject(VisRgn);
          return NULL;
       }
 
       ClipRgn = UnsafeIntCreateRectRgnIndirect(&CurrentWnd->ClientRect);
       NtGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_AND);
-      NtGdiDeleteObject(ClipRgn);
+      GreDeleteObject(ClipRgn);
 
       if ((PreviousWnd->Style & WS_CLIPSIBLINGS) ||
           (PreviousWnd == Wnd && ClipSiblings))
@@ -98,7 +98,7 @@
                   NtGdiOffsetRgn(ClipRgn, CurrentSiblingWnd->WindowRect.left,
CurrentSiblingWnd->WindowRect.top);
                }
                NtGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_DIFF);
-               NtGdiDeleteObject(ClipRgn);
+               GreDeleteObject(ClipRgn);
             }
             CurrentSibling = CurrentSibling->NextSibling;
          }
@@ -127,7 +127,7 @@
                NtGdiOffsetRgn(ClipRgn, CurrentWnd->WindowRect.left,
CurrentWnd->WindowRect.top);
             }
             NtGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_DIFF);
-            NtGdiDeleteObject(ClipRgn);
+            GreDeleteObject(ClipRgn);
          }
          CurrentWindow = CurrentWindow->NextSibling;
       }
@@ -174,7 +174,7 @@
                           RDW_ALLCHILDREN);
       UserDerefObjectCo(Parent);
    }
-   NtGdiDeleteObject(Temp);
+   GreDeleteObject(Temp);
 }
 
 /* EOF */

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Wed Mar 25 23:24:34
2009
@@ -176,7 +176,7 @@
    }
    else if (Dce->hClipRgn != NULL)
    {
-      NtGdiDeleteObject(Dce->hClipRgn);
+      GreDeleteObject(Dce->hClipRgn);
    }
 
    Dce->hClipRgn = NULL;
@@ -290,7 +290,7 @@
       {
          if(hRgnVisible != NULL)
          {
-            NtGdiDeleteObject(hRgnVisible);
+            GreDeleteObject(hRgnVisible);
          }
          hRgnVisible = NtGdiCreateRectRgn(0, 0, 0, 0);
       }
@@ -311,7 +311,7 @@
 
    if (hRgnVisible != NULL)
    {
-      NtGdiDeleteObject(hRgnVisible);
+      GreDeleteObject(hRgnVisible);
    }
 }
 
@@ -519,7 +519,7 @@
    if (!(Flags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN)) && ClipRegion)
    {
       if (!(Flags & DCX_KEEPCLIPRGN))
-         NtGdiDeleteObject(ClipRegion);
+         GreDeleteObject(ClipRegion);
       ClipRegion = NULL;
    }
 
@@ -609,7 +609,7 @@
 
   if (pdce->hClipRgn && ! (pdce->DCXFlags & DCX_KEEPCLIPRGN))
   {
-      NtGdiDeleteObject(pdce->hClipRgn);
+      GreDeleteObject(pdce->hClipRgn);
   }
 
   RemoveEntryList(&pdce->List);

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Mar 25 23:24:34
2009
@@ -505,7 +505,7 @@
 
    if(Window->WindowRegion)
    {
-      NtGdiDeleteObject(Window->WindowRegion);
+      GreDeleteObject(Window->WindowRegion);
    }
 
    ASSERT(Window->Wnd != NULL);
@@ -4478,7 +4478,7 @@
    else
       Ret = ERROR;
 
-   NtGdiDeleteObject(VisRgn);
+   GreDeleteObject(VisRgn);
 
    return Ret;
 }
@@ -4518,7 +4518,7 @@
    else
       Ret = ERROR;
 
-   NtGdiDeleteObject(VisRgn);
+   GreDeleteObject(VisRgn);
 
    return Ret;
 }
@@ -4550,7 +4550,7 @@
    if(Window->WindowRegion)
    {
       /* Delete no longer needed region handle */
-      NtGdiDeleteObject(Window->WindowRegion);
+      GreDeleteObject(Window->WindowRegion);
    }
    Window->WindowRegion = hRgn;
 

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Wed Mar 25 23:24:34
2009
@@ -947,7 +947,7 @@
                REGION_GetRgnBox(VisRgn, &TempRect) == NULLREGION)
          {
             REGION_UnlockRgn(VisRgn);
-            NtGdiDeleteObject(VisBefore);
+            GreDeleteObject(VisBefore);
             VisBefore = NULL;
          }
          else if(VisRgn)
@@ -1097,7 +1097,7 @@
             REGION_GetRgnBox(VisRgn, &TempRect) == NULLREGION)
       {
          REGION_UnlockRgn(VisRgn);
-         NtGdiDeleteObject(VisAfter);
+         GreDeleteObject(VisAfter);
          VisAfter = NULL;
       }
       else if(VisRgn)
@@ -1160,7 +1160,7 @@
          {
             /* Nothing to copy, clean up */
             REGION_UnlockRgn(VisRgn);
-            NtGdiDeleteObject(CopyRgn);
+            GreDeleteObject(CopyRgn);
             CopyRgn = NULL;
          }
          else if (OldWindowRect.left != NewWindowRect.left ||
@@ -1222,7 +1222,7 @@
             IntInvalidateWindows(Window, DirtyRgn,
                RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN);
          }
-         NtGdiDeleteObject(DirtyRgn);
+         GreDeleteObject(DirtyRgn);
          */
 
             PWINDOW_OBJECT Parent = Window->Parent;
@@ -1244,12 +1244,12 @@
                 RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN);
             }
          }
-         NtGdiDeleteObject(DirtyRgn);
+         GreDeleteObject(DirtyRgn);
       }
 
       if (CopyRgn != NULL)
       {
-         NtGdiDeleteObject(CopyRgn);
+         GreDeleteObject(CopyRgn);
       }
 
       /* Expose what was covered before but not covered anymore */
@@ -1268,13 +1268,13 @@
          {
             co_VIS_WindowLayoutChanged(Window, ExposedRgn);
          }
-         NtGdiDeleteObject(ExposedRgn);
-         NtGdiDeleteObject(VisBefore);
+         GreDeleteObject(ExposedRgn);
+         GreDeleteObject(VisBefore);
       }
 
       if (VisAfter != NULL)
       {
-         NtGdiDeleteObject(VisAfter);
+         GreDeleteObject(VisAfter);
       }
 
       if (!(WinPos.flags & SWP_NOACTIVATE))

Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Wed Mar 25
23:24:34 2009
@@ -703,8 +703,8 @@
     NtGdiSelectBitmap(hDC2, hOldBitmap3);
 
     /* 6. delete all temp objects */
-    NtGdiDeleteObject(hBitmap2);
-    NtGdiDeleteObject(hBitmap3);
+    GreDeleteObject(hBitmap2);
+    GreDeleteObject(hBitmap3);
 
     NtGdiDeleteObjectApp(hDC1);
     NtGdiDeleteObjectApp(hDC2);

Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Wed Mar 25
23:24:34 2009
@@ -76,7 +76,7 @@
     psurfBmp = SURFACE_LockSurface(hBitmap);
     if (psurfBmp == NULL)
     {
-        NtGdiDeleteObject(hBitmap);
+        GreDeleteObject(hBitmap);
         return NULL;
     }
 
@@ -428,7 +428,7 @@
                         SURFACE_UnlockSurface(psurf);
                     }
                 }
-                NtGdiDeleteObject(hBmpTmp);
+                GreDeleteObject(hBmpTmp);
             }
             NtGdiDeleteObjectApp(hDCTmp);
         }
@@ -667,13 +667,13 @@
     OldBrush = NtGdiSelectBrush(hDC, hbrush);
     if (OldBrush == NULL)
     {
-        NtGdiDeleteObject(hbrush);
+        GreDeleteObject(hbrush);
         return(FALSE);
     }
 
     NtGdiPatBlt(hDC, X, Y, 1, 1, PATCOPY);
     NtGdiSelectBrush(hDC, OldBrush);
-    NtGdiDeleteObject(hbrush);
+    GreDeleteObject(hbrush);
 
     return TRUE;
 }
@@ -801,7 +801,7 @@
             {
                 GDIOBJ_UnlockObjByPtr((POBJ)resBitmap);
                 GDIOBJ_UnlockObjByPtr((POBJ)Bitmap);
-                NtGdiDeleteObject(res);
+                GreDeleteObject(res);
                 return 0;
             }
             IntGetBitmapBits(Bitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf);
@@ -812,7 +812,7 @@
         }
         else
         {
-            NtGdiDeleteObject(res);
+            GreDeleteObject(res);
             res = NULL;
         }
     }
@@ -1025,7 +1025,7 @@
     if (hVisRgn)
     {
         GdiSelectVisRgn(hDC, hVisRgn);
-        NtGdiDeleteObject(hVisRgn);
+        GreDeleteObject(hVisRgn);
     }
 
     return hOrgBmp;

Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Wed Mar 25 23:24:34
2009
@@ -43,7 +43,7 @@
   {
     ASSERT(pbrush->hbmPattern);
     GDIOBJ_SetOwnership(pbrush->hbmPattern, PsGetCurrentProcess());
-    NtGdiDeleteObject(pbrush->hbmPattern);
+    GreDeleteObject(pbrush->hbmPattern);
   }
 
   /* Free the kmode styles array of EXTPENS */
@@ -346,7 +346,7 @@
    pbrush = BRUSH_AllocBrushWithHandle();
    if (pbrush == NULL)
    {
-      NtGdiDeleteObject(hPattern);
+      GreDeleteObject(hPattern);
       SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
       return NULL;
    }
@@ -387,7 +387,7 @@
    pbrush = BRUSH_AllocBrushWithHandle();
    if (pbrush == NULL)
    {
-      NtGdiDeleteObject(hPattern);
+      GreDeleteObject(hPattern);
       SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
       return NULL;
    }
@@ -422,7 +422,7 @@
    pbrush = BRUSH_AllocBrushWithHandle();
    if (pbrush == NULL)
    {
-      NtGdiDeleteObject(hPattern);
+      GreDeleteObject(hPattern);
       SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
       return NULL;
    }

Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Wed Mar 25
23:24:34 2009
@@ -108,7 +108,7 @@
     {
       if (dc->rosdc.hClipRgn != NULL)
       {
-        NtGdiDeleteObject(dc->rosdc.hClipRgn);
+        GreDeleteObject(dc->rosdc.hClipRgn);
         dc->rosdc.hClipRgn = NULL;
         retval = NULLREGION;
       }
@@ -265,7 +265,7 @@
       {
          Result = NtGdiCombineRgn(dc->rosdc.hClipRgn, dc->rosdc.hClipRgn, NewRgn,
RGN_DIFF);
       }
-      NtGdiDeleteObject(NewRgn);
+      GreDeleteObject(NewRgn);
    }
    if (Result != ERROR)
       CLIPPING_UpdateGCRegion(dc);
@@ -315,7 +315,7 @@
    else
    {
       Result = NtGdiCombineRgn(dc->rosdc.hClipRgn, dc->rosdc.hClipRgn, NewRgn,
RGN_AND);
-      NtGdiDeleteObject(NewRgn);
+      GreDeleteObject(NewRgn);
    }
    if (Result != ERROR)
       CLIPPING_UpdateGCRegion(dc);

Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Wed Mar 25
23:24:34 2009
@@ -319,7 +319,7 @@
     if (hVisRgn)
     {
         GdiSelectVisRgn(hdc, hVisRgn);
-        NtGdiDeleteObject(hVisRgn);
+        GreDeleteObject(hVisRgn);
     }
 
     IntGdiSetTextAlign(hdc, TA_TOP);
@@ -482,11 +482,11 @@
     }
     if (DCToDelete->rosdc.hClipRgn)
     {
-        NtGdiDeleteObject(DCToDelete->rosdc.hClipRgn);
+        GreDeleteObject(DCToDelete->rosdc.hClipRgn);
     }
     if (DCToDelete->rosdc.hVisRgn)
     {
-        NtGdiDeleteObject(DCToDelete->rosdc.hVisRgn);
+        GreDeleteObject(DCToDelete->rosdc.hVisRgn);
     }
     if (NULL != DCToDelete->rosdc.CombinedClip)
     {
@@ -494,7 +494,7 @@
     }
     if (DCToDelete->rosdc.hGCClipRgn)
     {
-        NtGdiDeleteObject(DCToDelete->rosdc.hGCClipRgn);
+        GreDeleteObject(DCToDelete->rosdc.hGCClipRgn);
     }
     PATH_Delete(DCToDelete->dclevel.hPath);
 
@@ -635,7 +635,7 @@
     if (hVisRgn)
     {
         GdiSelectVisRgn(hdcNew, hVisRgn);
-        NtGdiDeleteObject(hVisRgn);
+        GreDeleteObject(hVisRgn);
     }
     if (Layout) NtGdiSetLayout(hdcNew, -1, Layout);
 
@@ -654,7 +654,7 @@
     if (GDI_HANDLE_IS_STOCKOBJ(DCHandle)) return TRUE;
 
     if (GDI_HANDLE_GET_TYPE(DCHandle) != GDI_OBJECT_TYPE_DC)
-        return NtGdiDeleteObject((HGDIOBJ) DCHandle);
+        return GreDeleteObject((HGDIOBJ) DCHandle);
 
     if (IsObjectDead((HGDIOBJ)DCHandle)) return TRUE;
 
@@ -689,7 +689,7 @@
         case GDIObjType_PAL_TYPE:
         case GDIObjType_LFONT_TYPE:
         case GDIObjType_BRUSH_TYPE:
-          return NtGdiDeleteObject((HGDIOBJ) DCHandle);
+          return GreDeleteObject((HGDIOBJ) DCHandle);
 
         default:
           return FALSE; 

Modified: trunk/reactos/subsystems/win32/win32k/objects/dcstate.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] Wed Mar 25
23:24:34 2009
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
- * PURPOSE:           Functions for creation and destruction of DCs
+ * PURPOSE:           Functions for saving and restoring dc states
  * FILE:              subsystem/win32/win32k/objects/dcstate.c
  * PROGRAMER:         Timo Kreuzer (timo.kreuzer(a)rectos.org)
  */

Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Mar 25
23:24:34 2009
@@ -1095,7 +1095,7 @@
 
    NtGdiDeleteObjectApp(hdcMem);
 
-   NtGdiDeleteObject(hBitmap);
+   GreDeleteObject(hBitmap);
 
    return SrcHeight;
 }
@@ -1476,7 +1476,7 @@
             ExFreePoolWithTag(lpRGB, TAG_COLORMAP);
         }
         SetLastWin32Error(ERROR_INVALID_HANDLE);
-        NtGdiDeleteObject(bmp);
+        GreDeleteObject(bmp);
         return NULL;
     }
 

Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Wed Mar 25
23:24:34 2009
@@ -3641,10 +3641,10 @@
     if (hbrushBackGnd != NULL)
     {
         BRUSH_UnlockBrush(pbrushBackGnd);
-        NtGdiDeleteObject(hbrushBackGnd);
+        GreDeleteObject(hbrushBackGnd);
     }
     BRUSH_UnlockBrush(pbrushText);
-    NtGdiDeleteObject(hbrushText);
+    GreDeleteObject(hbrushText);
 good:
     DC_UnlockDc( dc );
 
@@ -3662,12 +3662,12 @@
     if (hbrushBackGnd != NULL)
     {
         BRUSH_UnlockBrush(pbrushBackGnd);
-        NtGdiDeleteObject(hbrushBackGnd);
+        GreDeleteObject(hbrushBackGnd);
     }
     if (hbrushText != NULL)
     {
         BRUSH_UnlockBrush(pbrushText);
-        NtGdiDeleteObject(hbrushText);
+        GreDeleteObject(hbrushText);
     }
     DC_UnlockDc(dc);
 

Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] Wed Mar 25
23:24:34 2009
@@ -102,7 +102,7 @@
      case GdiBCDelRgn:
      {
         PGDIBSOBJECT pgO = (PGDIBSOBJECT) pHdr;
-        NtGdiDeleteObject( pgO->hgdiobj );
+        GreDeleteObject( pgO->hgdiobj );
         break;
      }
      default:

Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Wed Mar 25
23:24:34 2009
@@ -661,7 +661,7 @@
 */
 BOOL
 FASTCALL
-NtGdiDeleteObject(HGDIOBJ hObject)
+GreDeleteObject(HGDIOBJ hObject)
 {
     DPRINT("NtGdiDeleteObject handle 0x%08x\n", hObject);
     if (!IsObjectDead(hObject))

Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Wed Mar 25 23:24:34
2009
@@ -149,7 +149,7 @@
 
     /* Paint the region */
     IntGdiPaintRgn( dc, hrgn );
-    NtGdiDeleteObject( hrgn );
+    GreDeleteObject( hrgn );
     /* Restore the old mapping mode */
 //    IntGdiSetMapMode( dc, mapMode );
 //    pdcattr->szlViewportExt = ptViewportExt;
@@ -2670,7 +2670,7 @@
  else if( PATH_PathToRegion( pPath, pdcattr->jFillMode, &hrgnPath ) )
  {
    success = GdiExtSelectClipRgn( dc, hrgnPath, Mode ) != ERROR;
-   NtGdiDeleteObject( hrgnPath );
+   GreDeleteObject( hrgnPath );
 
    /* Empty the path */
    if( success )

Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Wed Mar 25
23:24:34 2009
@@ -1740,7 +1740,7 @@
     if (!trb)
     {
         REGION_UnlockRgn(tra);
-        NtGdiDeleteObject(htra);
+        GreDeleteObject(htra);
         return;
     }
     htrb = trb->BaseObject.hHmgr;
@@ -1751,8 +1751,8 @@
     REGION_UnlockRgn(tra);
     REGION_UnlockRgn(trb);
 
-    NtGdiDeleteObject(htra);
-    NtGdiDeleteObject(htrb);
+    GreDeleteObject(htra);
+    GreDeleteObject(htrb);
     return;
 }
 
@@ -2577,7 +2577,7 @@
     {
         SetLastWin32Error(ERROR_INVALID_PARAMETER);
         REGION_UnlockRgn(Region);
-        NtGdiDeleteObject(hRgn);
+        GreDeleteObject(hRgn);
         return NULL;
     }
 
@@ -2639,13 +2639,13 @@
     }
     if (!REGION_CreateFrameRgn(FrameRgn, hRgn, Width, Height))
     {
-        NtGdiDeleteObject(FrameRgn);
+        GreDeleteObject(FrameRgn);
         return FALSE;
     }
 
     Ret = NtGdiFillRgn(hDC, FrameRgn, hBrush);
 
-    NtGdiDeleteObject(FrameRgn);
+    GreDeleteObject(FrameRgn);
     return Ret;
 }
 
@@ -2918,7 +2918,7 @@
     if (!REGION_LPTODP(dc, tmpVisRgn, hRgn) || 
          NtGdiOffsetRgn(tmpVisRgn, dc->ptlDCOrig.x, dc->ptlDCOrig.y) == ERROR)
     {
-        NtGdiDeleteObject(tmpVisRgn);
+        GreDeleteObject(tmpVisRgn);
         return FALSE;
     }
 
@@ -2927,7 +2927,7 @@
     visrgn = REGION_LockRgn(tmpVisRgn);
     if (visrgn == NULL)
     {
-        NtGdiDeleteObject(tmpVisRgn);
+        GreDeleteObject(tmpVisRgn);
         return FALSE;
     }
 
@@ -2953,7 +2953,7 @@
     SURFACE_UnlockSurface(psurf);
     BRUSH_UnlockBrush(pbrush);
     REGION_UnlockRgn(visrgn);
-    NtGdiDeleteObject(tmpVisRgn);
+    GreDeleteObject(tmpVisRgn);
 
     // Fill the region
     return TRUE;
@@ -3708,7 +3708,7 @@
         total += Count[poly];
     if (! (pETEs = ExAllocatePoolWithTag(PagedPool, sizeof(EdgeTableEntry) * total,
TAG_REGION)) )
     {
-        NtGdiDeleteObject(hrgn);
+        GreDeleteObject(hrgn);
         return 0;
     }
     pts = FirstPtBlock.pts;
@@ -3812,7 +3812,7 @@
                         {
                             DPRINT1("Can't alloc tPB\n");
                             ExFreePoolWithTag(pETEs, TAG_REGION);
-                            NtGdiDeleteObject(hrgn);
+                            GreDeleteObject(hrgn);
                             return 0;
                         }
                         curPtBlock->next = tmpPtBlock;