Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 05:45:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K]

Browse source 
Make all GDI object cleanup functions return VOID instead of BOOL.
CORE-6870 #resolve

svn path=/trunk/; revision=63408
This commit is contained in:
Timo Kreuzer 2014-05-22 11:45:53 +00:00
parent c52bfa77a8
commit 02851fb0e2
16 changed files with 93 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reactos/win32ss/gdi/eng/driverobj.c
View file

@ -19,8 +19,9 @@
/*! /*!
* \brief DRIVEROBJ cleanup function * \brief DRIVEROBJ cleanup function
*/ */
BOOL NTAPI VOID
DRIVEROBJ_Cleanup(PVOID pObject) NTAPI
DRIVEROBJ_vCleanup(PVOID pObject)
{ {
PEDRIVEROBJ pedo = pObject; PEDRIVEROBJ pedo = pObject;
FREEOBJPROC pFreeProc; FREEOBJPROC pFreeProc;
@ -28,10 +29,8 @@ DRIVEROBJ_Cleanup(PVOID pObject)
pFreeProc = pedo->drvobj.pFreeProc; pFreeProc = pedo->drvobj.pFreeProc;
if (pFreeProc) if (pFreeProc)
{ {
return pFreeProc(pedo->drvobj.pvObj); NT_VERIFY(pFreeProc(pedo->drvobj.pvObj));
} }
return TRUE;
} }
/** Public interface **********************************************************/ /** Public interface **********************************************************/

2
reactos/win32ss/gdi/eng/driverobj.h
View file

@ -11,7 +11,7 @@ typedef struct _EDRIVEROBJ
typedef DRIVEROBJ *PDRIVEROBJ; typedef DRIVEROBJ *PDRIVEROBJ;
/* Cleanup function */ /* Cleanup function */
BOOL NTAPI DRIVEROBJ_Cleanup(PVOID pObject); VOID NTAPI DRIVEROBJ_vCleanup(PVOID pObject);
#define DRIVEROBJ_AllocObjectWithHandle() ((PEDRIVEROBJ)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_DRIVEROBJ, sizeof(EDRIVEROBJ))) #define DRIVEROBJ_AllocObjectWithHandle() ((PEDRIVEROBJ)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_DRIVEROBJ, sizeof(EDRIVEROBJ)))

6
reactos/win32ss/gdi/eng/surface.c
View file

@ -62,9 +62,9 @@ BitmapFormat(ULONG cBits, ULONG iCompression)
} }
} }
BOOL VOID
NTAPI NTAPI
SURFACE_Cleanup(PVOID ObjectBody) SURFACE_vCleanup(PVOID ObjectBody)
{ {
PSURFACE psurf = (PSURFACE)ObjectBody; PSURFACE psurf = (PSURFACE)ObjectBody;
PVOID pvBits = psurf->SurfObj.pvBits; PVOID pvBits = psurf->SurfObj.pvBits;
@ -108,8 +108,6 @@ SURFACE_Cleanup(PVOID ObjectBody)
{ {
PALETTE_ShareUnlockPalette(psurf->ppal); PALETTE_ShareUnlockPalette(psurf->ppal);
} }
return TRUE;
} }

4
reactos/win32ss/gdi/eng/surface.h
View file

@ -111,9 +111,9 @@ ULONG
FASTCALL FASTCALL
BitmapFormat(ULONG cBits, ULONG iCompression); BitmapFormat(ULONG cBits, ULONG iCompression);
BOOL VOID
NTAPI NTAPI
SURFACE_Cleanup(PVOID ObjectBody); SURFACE_vCleanup(PVOID ObjectBody);
PSURFACE PSURFACE
NTAPI NTAPI

6
reactos/win32ss/gdi/ntgdi/brush.c
View file

@ -114,9 +114,9 @@ BRUSH_vFreeBrushAttr(PBRUSH pbr)
pbr->pBrushAttr = &pbr->BrushAttr; pbr->pBrushAttr = &pbr->BrushAttr;
} }
BOOL VOID
NTAPI NTAPI
BRUSH_Cleanup(PVOID ObjectBody) BRUSH_vCleanup(PVOID ObjectBody)
{ {
PBRUSH pbrush = (PBRUSH)ObjectBody; PBRUSH pbrush = (PBRUSH)ObjectBody;
if (pbrush->hbmPattern) if (pbrush->hbmPattern)
@ -136,8 +136,6 @@ BRUSH_Cleanup(PVOID ObjectBody)
{ {
ExFreePool(pbrush->pStyle); ExFreePool(pbrush->pStyle);
} }
return TRUE;
} }
INT INT

2
reactos/win32ss/gdi/ntgdi/brush.h
View file

@ -94,7 +94,7 @@ typedef struct _EBRUSHOBJ
#define BRUSH_ShareUnlockBrush(pBrush) GDIOBJ_vDereferenceObject((POBJ)pBrush) #define BRUSH_ShareUnlockBrush(pBrush) GDIOBJ_vDereferenceObject((POBJ)pBrush)
INT FASTCALL BRUSH_GetObject (PBRUSH GdiObject, INT Count, LPLOGBRUSH Buffer); INT FASTCALL BRUSH_GetObject (PBRUSH GdiObject, INT Count, LPLOGBRUSH Buffer);
BOOL NTAPI BRUSH_Cleanup(PVOID ObjectBody); VOID NTAPI BRUSH_vCleanup(PVOID ObjectBody);
extern HSURF gahsurfHatch[HS_DDI_MAX]; extern HSURF gahsurfHatch[HS_DDI_MAX];

2
reactos/win32ss/gdi/ntgdi/dc.h
View file

@ -194,7 +194,7 @@ INIT_FUNCTION NTSTATUS NTAPI InitDcImpl(VOID);
PPDEVOBJ FASTCALL IntEnumHDev(VOID); PPDEVOBJ FASTCALL IntEnumHDev(VOID);
PDC NTAPI DC_AllocDcWithHandle(VOID); PDC NTAPI DC_AllocDcWithHandle(VOID);
BOOL NTAPI DC_bAllocDcAttr(PDC pdc); BOOL NTAPI DC_bAllocDcAttr(PDC pdc);
BOOL NTAPI DC_Cleanup(PVOID ObjectBody); VOID NTAPI DC_vCleanup(PVOID ObjectBody);
BOOL FASTCALL IntGdiDeleteDC(HDC, BOOL); BOOL FASTCALL IntGdiDeleteDC(HDC, BOOL);
BOOL FASTCALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest); BOOL FASTCALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest);

6
reactos/win32ss/gdi/ntgdi/dclife.c
View file

@ -344,9 +344,9 @@ DC_vInitDc(
} }
} }
BOOL VOID
NTAPI NTAPI
DC_Cleanup(PVOID ObjectBody) DC_vCleanup(PVOID ObjectBody)
{ {
PDC pdc = (PDC)ObjectBody; PDC pdc = (PDC)ObjectBody;
@ -391,8 +391,6 @@ DC_Cleanup(PVOID ObjectBody)
SURFACE_ShareUnlockSurface(pdc->dclevel.pSurface); SURFACE_ShareUnlockSurface(pdc->dclevel.pSurface);
PDEVOBJ_vRelease(pdc->ppdev) ; PDEVOBJ_vRelease(pdc->ppdev) ;
return TRUE;
} }
VOID VOID

31
reactos/win32ss/gdi/ntgdi/gdiobj.c
View file

@ -87,29 +87,29 @@ ULONG gulFirstFree;
ULONG gulFirstUnused; ULONG gulFirstUnused;
static PPAGED_LOOKASIDE_LIST gpaLookasideList; static PPAGED_LOOKASIDE_LIST gpaLookasideList;
static BOOL NTAPI GDIOBJ_Cleanup(PVOID ObjectBody); static VOID NTAPI GDIOBJ_vCleanup(PVOID ObjectBody);
static const static const
GDICLEANUPPROC GDICLEANUPPROC
apfnCleanup[] = apfnCleanup[] =
{ {
NULL, /* 00 GDIObjType_DEF_TYPE */ NULL, /* 00 GDIObjType_DEF_TYPE */
DC_Cleanup, /* 01 GDIObjType_DC_TYPE */ DC_vCleanup, /* 01 GDIObjType_DC_TYPE */
NULL, /* 02 GDIObjType_UNUSED1_TYPE */ NULL, /* 02 GDIObjType_UNUSED1_TYPE */
NULL, /* 03 GDIObjType_UNUSED2_TYPE */ NULL, /* 03 GDIObjType_UNUSED2_TYPE */
REGION_Cleanup, /* 04 GDIObjType_RGN_TYPE */ REGION_vCleanup, /* 04 GDIObjType_RGN_TYPE */
SURFACE_Cleanup, /* 05 GDIObjType_SURF_TYPE */ SURFACE_vCleanup, /* 05 GDIObjType_SURF_TYPE */
GDIOBJ_Cleanup, /* 06 GDIObjType_CLIENTOBJ_TYPE */ GDIOBJ_vCleanup, /* 06 GDIObjType_CLIENTOBJ_TYPE */
GDIOBJ_Cleanup, /* 07 GDIObjType_PATH_TYPE */ GDIOBJ_vCleanup, /* 07 GDIObjType_PATH_TYPE */
PALETTE_Cleanup, /* 08 GDIObjType_PAL_TYPE */ PALETTE_vCleanup, /* 08 GDIObjType_PAL_TYPE */
GDIOBJ_Cleanup, /* 09 GDIObjType_ICMLCS_TYPE */ GDIOBJ_vCleanup, /* 09 GDIObjType_ICMLCS_TYPE */
GDIOBJ_Cleanup, /* 0a GDIObjType_LFONT_TYPE */ GDIOBJ_vCleanup, /* 0a GDIObjType_LFONT_TYPE */
NULL, /* 0b GDIObjType_RFONT_TYPE, unused */ NULL, /* 0b GDIObjType_RFONT_TYPE, unused */
NULL, /* 0c GDIObjType_PFE_TYPE, unused */ NULL, /* 0c GDIObjType_PFE_TYPE, unused */
NULL, /* 0d GDIObjType_PFT_TYPE, unused */ NULL, /* 0d GDIObjType_PFT_TYPE, unused */
GDIOBJ_Cleanup, /* 0e GDIObjType_ICMCXF_TYPE */ GDIOBJ_vCleanup, /* 0e GDIObjType_ICMCXF_TYPE */
NULL, /* 0f GDIObjType_SPRITE_TYPE, unused */ NULL, /* 0f GDIObjType_SPRITE_TYPE, unused */
BRUSH_Cleanup, /* 10 GDIObjType_BRUSH_TYPE, BRUSH, PEN, EXTPEN */ BRUSH_vCleanup, /* 10 GDIObjType_BRUSH_TYPE, BRUSH, PEN, EXTPEN */
NULL, /* 11 GDIObjType_UMPD_TYPE, unused */ NULL, /* 11 GDIObjType_UMPD_TYPE, unused */
NULL, /* 12 GDIObjType_UNUSED4_TYPE */ NULL, /* 12 GDIObjType_UNUSED4_TYPE */
NULL, /* 13 GDIObjType_SPACE_TYPE, unused */ NULL, /* 13 GDIObjType_SPACE_TYPE, unused */
@ -121,7 +121,7 @@ apfnCleanup[] =
NULL, /* 19 GDIObjType_TTFD_TYPE, unused */ NULL, /* 19 GDIObjType_TTFD_TYPE, unused */
NULL, /* 1a GDIObjType_RC_TYPE, unused */ NULL, /* 1a GDIObjType_RC_TYPE, unused */
NULL, /* 1b GDIObjType_TEMP_TYPE, unused */ NULL, /* 1b GDIObjType_TEMP_TYPE, unused */
DRIVEROBJ_Cleanup,/* 1c GDIObjType_DRVOBJ_TYPE */ DRIVEROBJ_vCleanup,/* 1c GDIObjType_DRVOBJ_TYPE */
NULL, /* 1d GDIObjType_DCIOBJ_TYPE, unused */ NULL, /* 1d GDIObjType_DCIOBJ_TYPE, unused */
NULL, /* 1e GDIObjType_SPOOL_TYPE, unused */ NULL, /* 1e GDIObjType_SPOOL_TYPE, unused */
NULL, /* 1f reserved entry */ NULL, /* 1f reserved entry */
@ -130,10 +130,11 @@ apfnCleanup[] =
/* INTERNAL FUNCTIONS ********************************************************/ /* INTERNAL FUNCTIONS ********************************************************/
static static
BOOL NTAPI VOID
GDIOBJ_Cleanup(PVOID ObjectBody) NTAPI
GDIOBJ_vCleanup(PVOID ObjectBody)
{ {
return TRUE; /* Nothing to do */
} }
static static

2
reactos/win32ss/gdi/ntgdi/gdiobj.h
View file

@ -28,7 +28,7 @@ extern PGDI_HANDLE_TABLE GdiHandleTable;
typedef PVOID PGDIOBJ; typedef PVOID PGDIOBJ;
typedef BOOL (NTAPI *GDICLEANUPPROC)(PVOID ObjectBody); typedef VOID (NTAPI *GDICLEANUPPROC)(PVOID ObjectBody);
/* Every GDI Object must have this standard type of header. /* Every GDI Object must have this standard type of header.
* It's for thread locking. */ * It's for thread locking. */

6
reactos/win32ss/gdi/ntgdi/palette.c
View file

@ -230,17 +230,15 @@ PALETTE_AllocPalWithHandle(
return ppal; return ppal;
} }
BOOL VOID
NTAPI NTAPI
PALETTE_Cleanup(PVOID ObjectBody) PALETTE_vCleanup(PVOID ObjectBody)
{ {
PPALETTE pPal = (PPALETTE)ObjectBody; PPALETTE pPal = (PPALETTE)ObjectBody;
if (pPal->IndexedColors && pPal->IndexedColors != pPal->apalColors) if (pPal->IndexedColors && pPal->IndexedColors != pPal->apalColors)
{ {
ExFreePoolWithTag(pPal->IndexedColors, TAG_PALETTE); ExFreePoolWithTag(pPal->IndexedColors, TAG_PALETTE);
} }
return TRUE;
} }
INT INT

4
reactos/win32ss/gdi/ntgdi/palette.h
View file

@ -117,9 +117,9 @@ PALETTE_vGetBitMasks(
PPALETTE ppal, PPALETTE ppal,
PULONG pulColors); PULONG pulColors);
BOOL VOID
NTAPI NTAPI
PALETTE_Cleanup(PVOID ObjectBody); PALETTE_vCleanup(PVOID ObjectBody);
FORCEINLINE FORCEINLINE
ULONG ULONG

5
reactos/win32ss/gdi/ntgdi/region.c
View file

@ -2275,8 +2275,8 @@ IntSysCreateRectRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRect)
return hrgn; return hrgn;
} }
BOOL NTAPI VOID NTAPI
REGION_Cleanup(PVOID ObjectBody) REGION_vCleanup(PVOID ObjectBody)
{ {
PROSRGNDATA pRgn = (PROSRGNDATA)ObjectBody; PROSRGNDATA pRgn = (PROSRGNDATA)ObjectBody;
PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); PPROCESSINFO ppi = PsGetCurrentProcessWin32Process();
@ -2288,7 +2288,6 @@ REGION_Cleanup(PVOID ObjectBody)
if (pRgn->Buffer && pRgn->Buffer != &pRgn->rdh.rcBound) if (pRgn->Buffer && pRgn->Buffer != &pRgn->rdh.rcBound)
ExFreePoolWithTag(pRgn->Buffer, TAG_REGION); ExFreePoolWithTag(pRgn->Buffer, TAG_REGION);
return TRUE;
} }
VOID FASTCALL VOID FASTCALL

2
reactos/win32ss/gdi/ntgdi/region.h
View file

@ -29,7 +29,7 @@ INT FASTCALL REGION_GetRgnBox(PROSRGNDATA Rgn, RECTL *pRect);
BOOL FASTCALL REGION_RectInRegion(PROSRGNDATA Rgn, const RECTL *rc); BOOL FASTCALL REGION_RectInRegion(PROSRGNDATA Rgn, const RECTL *rc);
BOOL FASTCALL REGION_CropAndOffsetRegion(PROSRGNDATA rgnDst, PROSRGNDATA rgnSrc, const RECTL *rect, const POINT *off); BOOL FASTCALL REGION_CropAndOffsetRegion(PROSRGNDATA rgnDst, PROSRGNDATA rgnSrc, const RECTL *rect, const POINT *off);
VOID FASTCALL REGION_SetRectRgn(PROSRGNDATA pRgn, INT LeftRect, INT TopRect, INT RightRect, INT BottomRect); VOID FASTCALL REGION_SetRectRgn(PROSRGNDATA pRgn, INT LeftRect, INT TopRect, INT RightRect, INT BottomRect);
BOOL NTAPI REGION_Cleanup(PVOID ObjectBody); VOID NTAPI REGION_vCleanup(PVOID ObjectBody);
extern PROSRGNDATA prgnDefault; extern PROSRGNDATA prgnDefault;
extern HRGN hrgnDefault; extern HRGN hrgnDefault;

12
reactos/win32ss/user/user32/windows/mdi.c
View file

@ -1830,7 +1830,7 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll )
return; return;
} }
ERR("CalcChildScroll 1\n"); TRACE("CalcChildScroll 1\n");
if ((list = WIN_ListChildren( hwnd ))) if ((list = WIN_ListChildren( hwnd )))
{ {
int i; int i;
@ -1851,14 +1851,14 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll )
OffsetRect(&rect, -WindowInfo.rcClient.left, OffsetRect(&rect, -WindowInfo.rcClient.left,
-WindowInfo.rcClient.top); -WindowInfo.rcClient.top);
//WIN_GetRectangles( list[i], COORDS_PARENT, &rect, NULL ); //WIN_GetRectangles( list[i], COORDS_PARENT, &rect, NULL );
ERR("CalcChildScroll L\n"); TRACE("CalcChildScroll L\n");
UnionRect( &childRect, &rect, &childRect ); UnionRect( &childRect, &rect, &childRect );
} }
} }
HeapFree( GetProcessHeap(), 0, list ); HeapFree( GetProcessHeap(), 0, list );
} }
UnionRect( &childRect, &clientRect, &childRect ); UnionRect( &childRect, &clientRect, &childRect );
ERR("CalcChildScroll 3\n"); TRACE("CalcChildScroll 3\n");
/* set common info values */ /* set common info values */
info.cbSize = sizeof(info); info.cbSize = sizeof(info);
info.fMask = SIF_POS | SIF_RANGE | SIF_PAGE; info.fMask = SIF_POS | SIF_RANGE | SIF_PAGE;
@ -1883,12 +1883,12 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll )
SetScrollInfo(hwnd, SB_HORZ, &info, TRUE); SetScrollInfo(hwnd, SB_HORZ, &info, TRUE);
if (scroll == SB_HORZ) if (scroll == SB_HORZ)
{ {
ERR("CalcChildScroll H\n"); TRACE("CalcChildScroll H\n");
break; break;
} }
else else
{ {
ERR("CalcChildScroll B\n"); TRACE("CalcChildScroll B\n");
} }
/* fall through */ /* fall through */
case SB_VERT: case SB_VERT:
@ -1898,7 +1898,7 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll )
info.nPage = 1 + clientRect.bottom - clientRect.top; info.nPage = 1 + clientRect.bottom - clientRect.top;
//info.nMax = childRect.bottom - clientRect.bottom; //info.nMax = childRect.bottom - clientRect.bottom;
//info.nPos = clientRect.top - childRect.top; //info.nPos = clientRect.top - childRect.top;
ERR("CalcChildScroll V\n"); TRACE("CalcChildScroll V\n");
if (ci->initialStyle & WS_VSCROLL) if (ci->initialStyle & WS_VSCROLL)
SetScrollInfo(hwnd, SB_VERT, &info, TRUE); SetScrollInfo(hwnd, SB_VERT, &info, TRUE);
break; break;

4
reactos/win32ss/user/user32/windows/message.c
View file

@ -2935,7 +2935,7 @@ User32CallWindowProcFromKernel(PVOID Arguments, ULONG ArgumentLength)
case WM_SIZING: case WM_SIZING:
{ {
PRECT prect = (PRECT) KMMsg.lParam; PRECT prect = (PRECT) KMMsg.lParam;
ERR("WM_SIZING 1 t %d l %d r %d b %d\n",prect->top,prect->left,prect->right,prect->bottom); TRACE("WM_SIZING 1 t %d l %d r %d b %d\n",prect->top,prect->left,prect->right,prect->bottom);
break; break;
} }
default: default:
@ -2983,7 +2983,7 @@ User32CallWindowProcFromKernel(PVOID Arguments, ULONG ArgumentLength)
case WM_SIZING: case WM_SIZING:
{ {
PRECT prect = (PRECT) KMMsg.lParam; PRECT prect = (PRECT) KMMsg.lParam;
ERR("WM_SIZING 2 t %d l %d r %d b %d\n",prect->top,prect->left,prect->right,prect->bottom); TRACE("WM_SIZING 2 t %d l %d r %d b %d\n",prect->top,prect->left,prect->right,prect->bottom);
break; break;
} }
default: default: