From ea055dde70f370fe9c713acad7b9ee6ad9074ffd Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Wed, 25 Mar 2009 20:24:34 +0000 Subject: [PATCH] Rename NtGdiDeleteObject to GreDeleteObject svn path=/trunk/; revision=40240 --- reactos/subsystems/win32/win32k/eng/surface.c | 2 +- .../subsystems/win32/win32k/include/gdiobj.h | 2 +- .../win32/win32k/ntuser/cursoricon.c | 10 ++--- .../subsystems/win32/win32k/ntuser/message.c | 2 +- .../subsystems/win32/win32k/ntuser/painting.c | 44 +++++++++---------- .../win32/win32k/ntuser/sysparams.c | 2 +- reactos/subsystems/win32/win32k/ntuser/vis.c | 10 ++--- .../subsystems/win32/win32k/ntuser/windc.c | 10 ++--- .../subsystems/win32/win32k/ntuser/window.c | 8 ++-- .../subsystems/win32/win32k/ntuser/winpos.c | 18 ++++---- .../subsystems/win32/win32k/objects/bitblt.c | 4 +- .../subsystems/win32/win32k/objects/bitmaps.c | 14 +++--- .../subsystems/win32/win32k/objects/brush.c | 8 ++-- .../subsystems/win32/win32k/objects/cliprgn.c | 6 +-- .../subsystems/win32/win32k/objects/dclife.c | 14 +++--- .../subsystems/win32/win32k/objects/dcstate.c | 2 +- .../subsystems/win32/win32k/objects/dibobj.c | 4 +- .../win32/win32k/objects/freetype.c | 8 ++-- .../win32/win32k/objects/gdibatch.c | 2 +- .../subsystems/win32/win32k/objects/gdiobj.c | 2 +- .../subsystems/win32/win32k/objects/path.c | 4 +- .../subsystems/win32/win32k/objects/region.c | 22 +++++----- 22 files changed, 99 insertions(+), 99 deletions(-) diff --git a/reactos/subsystems/win32/win32k/eng/surface.c b/reactos/subsystems/win32/win32k/eng/surface.c index 738a229732f..8ee3b0d6b25 100644 --- a/reactos/subsystems/win32/win32k/eng/surface.c +++ b/reactos/subsystems/win32/win32k/eng/surface.c @@ -132,7 +132,7 @@ SURFACE_Cleanup(PVOID ObjectBody) if (psurf->hDIBPalette != NULL) { - NtGdiDeleteObject(psurf->hDIBPalette); + GreDeleteObject(psurf->hDIBPalette); } } diff --git a/reactos/subsystems/win32/win32k/include/gdiobj.h b/reactos/subsystems/win32/win32k/include/gdiobj.h index 8a1de020544..0424da5bca1 100644 --- a/reactos/subsystems/win32/win32k/include/gdiobj.h +++ b/reactos/subsystems/win32/win32k/include/gdiobj.h @@ -79,7 +79,7 @@ PVOID INTERNAL_CALL GDI_MapHandleTable(PSECTION_OBJECT SectionObject, PEPROCES #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); diff --git a/reactos/subsystems/win32/win32k/ntuser/cursoricon.c b/reactos/subsystems/win32/win32k/ntuser/cursoricon.c index d1afdd03f4a..8788ecb42b7 100644 --- a/reactos/subsystems/win32/win32k/ntuser/cursoricon.c +++ b/reactos/subsystems/win32/win32k/ntuser/cursoricon.c @@ -470,13 +470,13 @@ IntDestroyCurIconObject(PWINSTATION_OBJECT WinSta, PCURICON_OBJECT CurIcon, BOOL 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 @@ NtUserSetCursorContents( /* 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 @@ cleanup: { if(hOldOffBmp) NtGdiSelectBitmap(hdcOff, hOldOffBmp); if(hOldOffBrush) NtGdiSelectBrush(hdcOff, hOldOffBrush); - if(hbmOff) NtGdiDeleteObject(hbmOff); + if(hbmOff) GreDeleteObject(hbmOff); if(hdcOff) NtGdiDeleteObjectApp(hdcOff); } diff --git a/reactos/subsystems/win32/win32k/ntuser/message.c b/reactos/subsystems/win32/win32k/ntuser/message.c index c4c02d33511..df26ff00ad9 100644 --- a/reactos/subsystems/win32/win32k/ntuser/message.c +++ b/reactos/subsystems/win32/win32k/ntuser/message.c @@ -398,7 +398,7 @@ IntDispatchMessage(PMSG pMsg) /* 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; } diff --git a/reactos/subsystems/win32/win32k/ntuser/painting.c b/reactos/subsystems/win32/win32k/ntuser/painting.c index dd75c54fda3..e898858b975 100644 --- a/reactos/subsystems/win32/win32k/ntuser/painting.c +++ b/reactos/subsystems/win32/win32k/ntuser/painting.c @@ -182,7 +182,7 @@ IntGetNCUpdateRgn(PWINDOW_OBJECT Window, BOOL Validate) hRgnWindow = IntCalcWindowRgn(Window, TRUE); if (hRgnWindow == NULL) { - NtGdiDeleteObject(hRgnNonClient); + GreDeleteObject(hRgnNonClient); return (HRGN)1; } @@ -190,14 +190,14 @@ IntGetNCUpdateRgn(PWINDOW_OBJECT Window, BOOL Validate) 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 @@ IntGetNCUpdateRgn(PWINDOW_OBJECT Window, BOOL Validate) 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 @@ IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags) hRgnClient = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->ClientRect); RgnType = NtGdiCombineRgn(hRgn, hRgn, hRgnClient, RGN_AND); - NtGdiDeleteObject(hRgnClient); + GreDeleteObject(hRgnClient); } /* @@ -368,7 +368,7 @@ IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags) hRgnWindow = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->WindowRect); RgnType = NtGdiCombineRgn(hRgn, hRgn, hRgnWindow, RGN_AND); - NtGdiDeleteObject(hRgnWindow); + GreDeleteObject(hRgnWindow); } else { @@ -405,7 +405,7 @@ IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags) hRgn, RGN_OR) == NULLREGION) { GDIOBJ_SetOwnership(Window->UpdateRegion, PsGetCurrentProcess()); - NtGdiDeleteObject(Window->UpdateRegion); + GreDeleteObject(Window->UpdateRegion); Window->UpdateRegion = NULL; } @@ -425,7 +425,7 @@ IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags) hRgn, RGN_DIFF) == NULLREGION) { GDIOBJ_SetOwnership(Window->UpdateRegion, PsGetCurrentProcess()); - NtGdiDeleteObject(Window->UpdateRegion); + GreDeleteObject(Window->UpdateRegion); Window->UpdateRegion = NULL; } } @@ -467,7 +467,7 @@ IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags) 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 @@ co_UserRedrawWindow(PWINDOW_OBJECT Window, const RECTL* UpdateRect, HRGN UpdateR 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 @@ co_UserRedrawWindow(PWINDOW_OBJECT Window, const RECTL* UpdateRect, HRGN UpdateR if (hRgn != NULL) { - NtGdiDeleteObject(hRgn); + GreDeleteObject(hRgn); } return TRUE; @@ -1209,7 +1209,7 @@ UserScrollDC(HDC hDC, INT dx, INT dy, const RECTL *prcScroll, NtGdiOffsetRgn(hrgnTmp, dx, dy); Result = NtGdiCombineRgn(hrgnOwn, hrgnOwn, hrgnTmp, RGN_DIFF); - NtGdiDeleteObject(hrgnTmp); + GreDeleteObject(hrgnTmp); if (prcUpdate) { @@ -1218,7 +1218,7 @@ UserScrollDC(HDC hDC, INT dx, INT dy, const RECTL *prcScroll, if (!hrgnUpdate) { - NtGdiDeleteObject(hrgnOwn); + GreDeleteObject(hrgnOwn); } } else @@ -1412,9 +1412,9 @@ NtUserScrollWindowEx(HWND hWnd, INT dx, INT dy, const RECT *prcUnsafeScroll, NtGdiOffsetRgn(hrgnTemp, dx, dy); NtGdiCombineRgn(hrgnTemp, hrgnTemp, hrgnClip, RGN_AND); co_UserRedrawWindow(Window, NULL, hrgnTemp, RDW_INVALIDATE | RDW_ERASE); - NtGdiDeleteObject(hrgnClip); + GreDeleteObject(hrgnClip); } - NtGdiDeleteObject(hrgnTemp); + GreDeleteObject(hrgnTemp); if (flags & SW_SCROLLCHILDREN) { @@ -1487,7 +1487,7 @@ NtUserScrollWindowEx(HWND hWnd, INT dx, INT dy, const RECT *prcUnsafeScroll, CLEANUP: if (hrgnOwn && !hrgnUpdate) { - NtGdiDeleteObject(hrgnOwn); + GreDeleteObject(hrgnOwn); } if (Window) @@ -1583,7 +1583,7 @@ UserDrawCaptionText(HDC hDc, if(!hOldFont) { DPRINT1("%s: SelectFont() failed!\n", __FUNCTION__); - NtGdiDeleteObject(hFont); + GreDeleteObject(hFont); return FALSE; } @@ -1600,7 +1600,7 @@ UserDrawCaptionText(HDC hDc, IntGdiSetTextColor(hDc, OldTextColor); NtGdiSelectFont(hDc, hOldFont); - NtGdiDeleteObject(hFont); + GreDeleteObject(hFont); return TRUE; } @@ -1864,7 +1864,7 @@ BOOL UserDrawCaption( 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; diff --git a/reactos/subsystems/win32/win32k/ntuser/sysparams.c b/reactos/subsystems/win32/win32k/ntuser/sysparams.c index 4f3357bc643..188d0014dc4 100644 --- a/reactos/subsystems/win32/win32k/ntuser/sysparams.c +++ b/reactos/subsystems/win32/win32k/ntuser/sysparams.c @@ -376,7 +376,7 @@ IntSystemParametersInfo( if(hOldBitmap != NULL) { /* delete the old wallpaper */ - NtGdiDeleteObject(hOldBitmap); + GreDeleteObject(hOldBitmap); } /* Set the style */ diff --git a/reactos/subsystems/win32/win32k/ntuser/vis.c b/reactos/subsystems/win32/win32k/ntuser/vis.c index 50a1e2cf9ae..05c3583b7c0 100644 --- a/reactos/subsystems/win32/win32k/ntuser/vis.c +++ b/reactos/subsystems/win32/win32k/ntuser/vis.c @@ -71,13 +71,13 @@ VIS_ComputeVisibleRegion( 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 @@ VIS_ComputeVisibleRegion( 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 @@ VIS_ComputeVisibleRegion( 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 @@ co_VIS_WindowLayoutChanged( RDW_ALLCHILDREN); UserDerefObjectCo(Parent); } - NtGdiDeleteObject(Temp); + GreDeleteObject(Temp); } /* EOF */ diff --git a/reactos/subsystems/win32/win32k/ntuser/windc.c b/reactos/subsystems/win32/win32k/ntuser/windc.c index 475f11c456f..bb5a74be139 100644 --- a/reactos/subsystems/win32/win32k/ntuser/windc.c +++ b/reactos/subsystems/win32/win32k/ntuser/windc.c @@ -176,7 +176,7 @@ DceDeleteClipRgn(DCE* Dce) } else if (Dce->hClipRgn != NULL) { - NtGdiDeleteObject(Dce->hClipRgn); + GreDeleteObject(Dce->hClipRgn); } Dce->hClipRgn = NULL; @@ -290,7 +290,7 @@ noparent: { if(hRgnVisible != NULL) { - NtGdiDeleteObject(hRgnVisible); + GreDeleteObject(hRgnVisible); } hRgnVisible = NtGdiCreateRectRgn(0, 0, 0, 0); } @@ -311,7 +311,7 @@ noparent: if (hRgnVisible != NULL) { - NtGdiDeleteObject(hRgnVisible); + GreDeleteObject(hRgnVisible); } } @@ -519,7 +519,7 @@ UserGetDCEx(PWINDOW_OBJECT Window OPTIONAL, HANDLE ClipRegion, ULONG Flags) if (!(Flags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN)) && ClipRegion) { if (!(Flags & DCX_KEEPCLIPRGN)) - NtGdiDeleteObject(ClipRegion); + GreDeleteObject(ClipRegion); ClipRegion = NULL; } @@ -609,7 +609,7 @@ DceFreeDCE(PDCE pdce, BOOLEAN Force) if (pdce->hClipRgn && ! (pdce->DCXFlags & DCX_KEEPCLIPRGN)) { - NtGdiDeleteObject(pdce->hClipRgn); + GreDeleteObject(pdce->hClipRgn); } RemoveEntryList(&pdce->List); diff --git a/reactos/subsystems/win32/win32k/ntuser/window.c b/reactos/subsystems/win32/win32k/ntuser/window.c index efd2eeba5ad..fd9e9fcf95c 100644 --- a/reactos/subsystems/win32/win32k/ntuser/window.c +++ b/reactos/subsystems/win32/win32k/ntuser/window.c @@ -505,7 +505,7 @@ static LRESULT co_UserFreeWindow(PWINDOW_OBJECT Window, if(Window->WindowRegion) { - NtGdiDeleteObject(Window->WindowRegion); + GreDeleteObject(Window->WindowRegion); } ASSERT(Window->Wnd != NULL); @@ -4478,7 +4478,7 @@ IntGetWindowRgn(PWINDOW_OBJECT Window, HRGN hRgn) else Ret = ERROR; - NtGdiDeleteObject(VisRgn); + GreDeleteObject(VisRgn); return Ret; } @@ -4518,7 +4518,7 @@ IntGetWindowRgnBox(PWINDOW_OBJECT Window, RECTL *Rect) else Ret = ERROR; - NtGdiDeleteObject(VisRgn); + GreDeleteObject(VisRgn); return Ret; } @@ -4550,7 +4550,7 @@ NtUserSetWindowRgn( if(Window->WindowRegion) { /* Delete no longer needed region handle */ - NtGdiDeleteObject(Window->WindowRegion); + GreDeleteObject(Window->WindowRegion); } Window->WindowRegion = hRgn; diff --git a/reactos/subsystems/win32/win32k/ntuser/winpos.c b/reactos/subsystems/win32/win32k/ntuser/winpos.c index c7e1e76dbf8..7f046df35aa 100644 --- a/reactos/subsystems/win32/win32k/ntuser/winpos.c +++ b/reactos/subsystems/win32/win32k/ntuser/winpos.c @@ -947,7 +947,7 @@ co_WinPosSetWindowPos( REGION_GetRgnBox(VisRgn, &TempRect) == NULLREGION) { REGION_UnlockRgn(VisRgn); - NtGdiDeleteObject(VisBefore); + GreDeleteObject(VisBefore); VisBefore = NULL; } else if(VisRgn) @@ -1097,7 +1097,7 @@ co_WinPosSetWindowPos( REGION_GetRgnBox(VisRgn, &TempRect) == NULLREGION) { REGION_UnlockRgn(VisRgn); - NtGdiDeleteObject(VisAfter); + GreDeleteObject(VisAfter); VisAfter = NULL; } else if(VisRgn) @@ -1160,7 +1160,7 @@ co_WinPosSetWindowPos( { /* Nothing to copy, clean up */ REGION_UnlockRgn(VisRgn); - NtGdiDeleteObject(CopyRgn); + GreDeleteObject(CopyRgn); CopyRgn = NULL; } else if (OldWindowRect.left != NewWindowRect.left || @@ -1222,7 +1222,7 @@ co_WinPosSetWindowPos( IntInvalidateWindows(Window, DirtyRgn, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); } - NtGdiDeleteObject(DirtyRgn); + GreDeleteObject(DirtyRgn); */ PWINDOW_OBJECT Parent = Window->Parent; @@ -1244,12 +1244,12 @@ co_WinPosSetWindowPos( 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_WinPosSetWindowPos( { 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)) diff --git a/reactos/subsystems/win32/win32k/objects/bitblt.c b/reactos/subsystems/win32/win32k/objects/bitblt.c index 9ec7f82879a..4a6076f6a4f 100644 --- a/reactos/subsystems/win32/win32k/objects/bitblt.c +++ b/reactos/subsystems/win32/win32k/objects/bitblt.c @@ -703,8 +703,8 @@ NtGdiMaskBlt ( NtGdiSelectBitmap(hDC2, hOldBitmap3); /* 6. delete all temp objects */ - NtGdiDeleteObject(hBitmap2); - NtGdiDeleteObject(hBitmap3); + GreDeleteObject(hBitmap2); + GreDeleteObject(hBitmap3); NtGdiDeleteObjectApp(hDC1); NtGdiDeleteObjectApp(hDC2); diff --git a/reactos/subsystems/win32/win32k/objects/bitmaps.c b/reactos/subsystems/win32/win32k/objects/bitmaps.c index 201532c4282..7164ebfb97a 100644 --- a/reactos/subsystems/win32/win32k/objects/bitmaps.c +++ b/reactos/subsystems/win32/win32k/objects/bitmaps.c @@ -76,7 +76,7 @@ IntGdiCreateBitmap( psurfBmp = SURFACE_LockSurface(hBitmap); if (psurfBmp == NULL) { - NtGdiDeleteObject(hBitmap); + GreDeleteObject(hBitmap); return NULL; } @@ -428,7 +428,7 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos) SURFACE_UnlockSurface(psurf); } } - NtGdiDeleteObject(hBmpTmp); + GreDeleteObject(hBmpTmp); } NtGdiDeleteObjectApp(hDCTmp); } @@ -667,13 +667,13 @@ GdiSetPixelV( 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 @@ BITMAP_CopyBitmap(HBITMAP hBitmap) { 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 @@ BITMAP_CopyBitmap(HBITMAP hBitmap) } else { - NtGdiDeleteObject(res); + GreDeleteObject(res); res = NULL; } } @@ -1025,7 +1025,7 @@ NtGdiSelectBitmap( if (hVisRgn) { GdiSelectVisRgn(hDC, hVisRgn); - NtGdiDeleteObject(hVisRgn); + GreDeleteObject(hVisRgn); } return hOrgBmp; diff --git a/reactos/subsystems/win32/win32k/objects/brush.c b/reactos/subsystems/win32/win32k/objects/brush.c index b2f9bbe78c6..59fc8696595 100644 --- a/reactos/subsystems/win32/win32k/objects/brush.c +++ b/reactos/subsystems/win32/win32k/objects/brush.c @@ -43,7 +43,7 @@ BRUSH_Cleanup(PVOID ObjectBody) { 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 @@ IntGdiCreateDIBBrush( pbrush = BRUSH_AllocBrushWithHandle(); if (pbrush == NULL) { - NtGdiDeleteObject(hPattern); + GreDeleteObject(hPattern); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; } @@ -387,7 +387,7 @@ IntGdiCreateHatchBrush( pbrush = BRUSH_AllocBrushWithHandle(); if (pbrush == NULL) { - NtGdiDeleteObject(hPattern); + GreDeleteObject(hPattern); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; } @@ -422,7 +422,7 @@ IntGdiCreatePatternBrush( pbrush = BRUSH_AllocBrushWithHandle(); if (pbrush == NULL) { - NtGdiDeleteObject(hPattern); + GreDeleteObject(hPattern); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; } diff --git a/reactos/subsystems/win32/win32k/objects/cliprgn.c b/reactos/subsystems/win32/win32k/objects/cliprgn.c index 8b3b4e169b8..608dafb1225 100644 --- a/reactos/subsystems/win32/win32k/objects/cliprgn.c +++ b/reactos/subsystems/win32/win32k/objects/cliprgn.c @@ -108,7 +108,7 @@ int FASTCALL GdiExtSelectClipRgn(PDC dc, { if (dc->rosdc.hClipRgn != NULL) { - NtGdiDeleteObject(dc->rosdc.hClipRgn); + GreDeleteObject(dc->rosdc.hClipRgn); dc->rosdc.hClipRgn = NULL; retval = NULLREGION; } @@ -265,7 +265,7 @@ int APIENTRY NtGdiExcludeClipRect(HDC hDC, { 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 @@ int APIENTRY NtGdiIntersectClipRect(HDC hDC, else { Result = NtGdiCombineRgn(dc->rosdc.hClipRgn, dc->rosdc.hClipRgn, NewRgn, RGN_AND); - NtGdiDeleteObject(NewRgn); + GreDeleteObject(NewRgn); } if (Result != ERROR) CLIPPING_UpdateGCRegion(dc); diff --git a/reactos/subsystems/win32/win32k/objects/dclife.c b/reactos/subsystems/win32/win32k/objects/dclife.c index fe2fdfb0caa..ca25ff6f14f 100644 --- a/reactos/subsystems/win32/win32k/objects/dclife.c +++ b/reactos/subsystems/win32/win32k/objects/dclife.c @@ -319,7 +319,7 @@ IntGdiCreateDC( if (hVisRgn) { GdiSelectVisRgn(hdc, hVisRgn); - NtGdiDeleteObject(hVisRgn); + GreDeleteObject(hVisRgn); } IntGdiSetTextAlign(hdc, TA_TOP); @@ -482,11 +482,11 @@ IntGdiDeleteDC(HDC hDC, BOOL Force) } 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 @@ IntGdiDeleteDC(HDC hDC, BOOL Force) } if (DCToDelete->rosdc.hGCClipRgn) { - NtGdiDeleteObject(DCToDelete->rosdc.hGCClipRgn); + GreDeleteObject(DCToDelete->rosdc.hGCClipRgn); } PATH_Delete(DCToDelete->dclevel.hPath); @@ -635,7 +635,7 @@ NtGdiCreateCompatibleDC(HDC hDC) if (hVisRgn) { GdiSelectVisRgn(hdcNew, hVisRgn); - NtGdiDeleteObject(hVisRgn); + GreDeleteObject(hVisRgn); } if (Layout) NtGdiSetLayout(hdcNew, -1, Layout); @@ -654,7 +654,7 @@ NtGdiDeleteObjectApp(HANDLE DCHandle) 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 @@ NewNtGdiDeleteObjectApp(HANDLE DCHandle) case GDIObjType_PAL_TYPE: case GDIObjType_LFONT_TYPE: case GDIObjType_BRUSH_TYPE: - return NtGdiDeleteObject((HGDIOBJ) DCHandle); + return GreDeleteObject((HGDIOBJ) DCHandle); default: return FALSE; diff --git a/reactos/subsystems/win32/win32k/objects/dcstate.c b/reactos/subsystems/win32/win32k/objects/dcstate.c index 3f10a703ea7..e637c8c7bb5 100644 --- a/reactos/subsystems/win32/win32k/objects/dcstate.c +++ b/reactos/subsystems/win32/win32k/objects/dcstate.c @@ -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@rectos.org) */ diff --git a/reactos/subsystems/win32/win32k/objects/dibobj.c b/reactos/subsystems/win32/win32k/objects/dibobj.c index f5ac6aa6804..232948d7a9a 100644 --- a/reactos/subsystems/win32/win32k/objects/dibobj.c +++ b/reactos/subsystems/win32/win32k/objects/dibobj.c @@ -1095,7 +1095,7 @@ NtGdiStretchDIBitsInternal( NtGdiDeleteObjectApp(hdcMem); - NtGdiDeleteObject(hBitmap); + GreDeleteObject(hBitmap); return SrcHeight; } @@ -1476,7 +1476,7 @@ DIB_CreateDIBSection( ExFreePoolWithTag(lpRGB, TAG_COLORMAP); } SetLastWin32Error(ERROR_INVALID_HANDLE); - NtGdiDeleteObject(bmp); + GreDeleteObject(bmp); return NULL; } diff --git a/reactos/subsystems/win32/win32k/objects/freetype.c b/reactos/subsystems/win32/win32k/objects/freetype.c index 39b53d000ff..8b565d10c91 100644 --- a/reactos/subsystems/win32/win32k/objects/freetype.c +++ b/reactos/subsystems/win32/win32k/objects/freetype.c @@ -3641,10 +3641,10 @@ GreExtTextOutW( 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 @@ fail: if (hbrushBackGnd != NULL) { BRUSH_UnlockBrush(pbrushBackGnd); - NtGdiDeleteObject(hbrushBackGnd); + GreDeleteObject(hbrushBackGnd); } if (hbrushText != NULL) { BRUSH_UnlockBrush(pbrushText); - NtGdiDeleteObject(hbrushText); + GreDeleteObject(hbrushText); } DC_UnlockDc(dc); diff --git a/reactos/subsystems/win32/win32k/objects/gdibatch.c b/reactos/subsystems/win32/win32k/objects/gdibatch.c index 224604d8f9c..15880c55fe0 100644 --- a/reactos/subsystems/win32/win32k/objects/gdibatch.c +++ b/reactos/subsystems/win32/win32k/objects/gdibatch.c @@ -102,7 +102,7 @@ GdiFlushUserBatch(PDC dc, PGDIBATCHHDR pHdr) case GdiBCDelRgn: { PGDIBSOBJECT pgO = (PGDIBSOBJECT) pHdr; - NtGdiDeleteObject( pgO->hgdiobj ); + GreDeleteObject( pgO->hgdiobj ); break; } default: diff --git a/reactos/subsystems/win32/win32k/objects/gdiobj.c b/reactos/subsystems/win32/win32k/objects/gdiobj.c index ff2a02f5757..6f776bde430 100644 --- a/reactos/subsystems/win32/win32k/objects/gdiobj.c +++ b/reactos/subsystems/win32/win32k/objects/gdiobj.c @@ -661,7 +661,7 @@ IsObjectDead(HGDIOBJ hObject) */ BOOL FASTCALL -NtGdiDeleteObject(HGDIOBJ hObject) +GreDeleteObject(HGDIOBJ hObject) { DPRINT("NtGdiDeleteObject handle 0x%08x\n", hObject); if (!IsObjectDead(hObject)) diff --git a/reactos/subsystems/win32/win32k/objects/path.c b/reactos/subsystems/win32/win32k/objects/path.c index bd40b500931..03e64f0bae3 100644 --- a/reactos/subsystems/win32/win32k/objects/path.c +++ b/reactos/subsystems/win32/win32k/objects/path.c @@ -149,7 +149,7 @@ PATH_FillPath( PDC dc, PPATH pPath ) /* 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 @@ NtGdiSelectClipPath(HDC hDC, else if( PATH_PathToRegion( pPath, pdcattr->jFillMode, &hrgnPath ) ) { success = GdiExtSelectClipRgn( dc, hrgnPath, Mode ) != ERROR; - NtGdiDeleteObject( hrgnPath ); + GreDeleteObject( hrgnPath ); /* Empty the path */ if( success ) diff --git a/reactos/subsystems/win32/win32k/objects/region.c b/reactos/subsystems/win32/win32k/objects/region.c index d45a8bf80b8..343592c171a 100644 --- a/reactos/subsystems/win32/win32k/objects/region.c +++ b/reactos/subsystems/win32/win32k/objects/region.c @@ -1740,7 +1740,7 @@ REGION_XorRegion( if (!trb) { REGION_UnlockRgn(tra); - NtGdiDeleteObject(htra); + GreDeleteObject(htra); return; } htrb = trb->BaseObject.hHmgr; @@ -1751,8 +1751,8 @@ REGION_XorRegion( REGION_UnlockRgn(tra); REGION_UnlockRgn(trb); - NtGdiDeleteObject(htra); - NtGdiDeleteObject(htrb); + GreDeleteObject(htra); + GreDeleteObject(htrb); return; } @@ -2577,7 +2577,7 @@ NtGdiExtCreateRegion( { SetLastWin32Error(ERROR_INVALID_PARAMETER); REGION_UnlockRgn(Region); - NtGdiDeleteObject(hRgn); + GreDeleteObject(hRgn); return NULL; } @@ -2639,13 +2639,13 @@ NtGdiFrameRgn( } 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 @@ IntGdiPaintRgn( 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 @@ IntGdiPaintRgn( visrgn = REGION_LockRgn(tmpVisRgn); if (visrgn == NULL) { - NtGdiDeleteObject(tmpVisRgn); + GreDeleteObject(tmpVisRgn); return FALSE; } @@ -2953,7 +2953,7 @@ IntGdiPaintRgn( SURFACE_UnlockSurface(psurf); BRUSH_UnlockBrush(pbrush); REGION_UnlockRgn(visrgn); - NtGdiDeleteObject(tmpVisRgn); + GreDeleteObject(tmpVisRgn); // Fill the region return TRUE; @@ -3708,7 +3708,7 @@ IntCreatePolyPolygonRgn( 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 @@ IntCreatePolyPolygonRgn( { DPRINT1("Can't alloc tPB\n"); ExFreePoolWithTag(pETEs, TAG_REGION); - NtGdiDeleteObject(hrgn); + GreDeleteObject(hrgn); return 0; } curPtBlock->next = tmpPtBlock;