Author: tkreuzer Date: Sat Mar 2 19:25:48 2013 New Revision: 58403
URL: http://svn.reactos.org/svn/reactos?rev=58403&view=rev Log: [WIN32K] Improve formatting
Modified: trunk/reactos/win32ss/gdi/ntgdi/pen.c
Modified: trunk/reactos/win32ss/gdi/ntgdi/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/pen.c?rev... ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] Sat Mar 2 19:25:48 2013 @@ -17,8 +17,8 @@ FASTCALL PEN_ShareLockPen(HGDIOBJ hobj) { - if (GDI_HANDLE_GET_TYPE(hobj) != GDILoObjType_LO_PEN_TYPE && - GDI_HANDLE_GET_TYPE(hobj) != GDILoObjType_LO_EXTPEN_TYPE) + if ((GDI_HANDLE_GET_TYPE(hobj) != GDILoObjType_LO_PEN_TYPE) && + (GDI_HANDLE_GET_TYPE(hobj) != GDILoObjType_LO_EXTPEN_TYPE)) { return NULL; } @@ -26,121 +26,122 @@ return (PBRUSH)GDIOBJ_ReferenceObjectByHandle(hobj, GDIObjType_BRUSH_TYPE); }
-HPEN APIENTRY +HPEN +APIENTRY IntGdiExtCreatePen( - DWORD dwPenStyle, - DWORD dwWidth, - IN ULONG ulBrushStyle, - IN ULONG ulColor, - IN ULONG_PTR ulClientHatch, - IN ULONG_PTR ulHatch, - DWORD dwStyleCount, - PULONG pStyle, - IN ULONG cjDIB, - IN BOOL bOldStylePen, - IN OPTIONAL HBRUSH hbrush) -{ - HPEN hPen; - PBRUSH pbrushPen; - static const BYTE PatternAlternate[] = {0x55, 0x55, 0x55, 0}; - static const BYTE PatternDash[] = {0xFF, 0xFF, 0xC0, 0}; - static const BYTE PatternDot[] = {0xE3, 0x8E, 0x38, 0}; - static const BYTE PatternDashDot[] = {0xFF, 0x81, 0xC0, 0}; - static const BYTE PatternDashDotDot[] = {0xFF, 0x8E, 0x38, 0}; - - dwWidth = abs(dwWidth); - - if ( (dwPenStyle & PS_STYLE_MASK) == PS_NULL) - { - return StockObjects[NULL_PEN]; - } - - if (bOldStylePen) - { - pbrushPen = PEN_AllocPenWithHandle(); - } - else - { - pbrushPen = PEN_AllocExtPenWithHandle(); - } - - if (!pbrushPen) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - DPRINT("Can't allocate pen\n"); - return 0; - } - hPen = pbrushPen->BaseObject.hHmgr; - - // If nWidth is zero, the pen is a single pixel wide, regardless of the current transformation. - if ((bOldStylePen) && (!dwWidth) && (dwPenStyle & PS_STYLE_MASK) != PS_SOLID) - dwWidth = 1; - - pbrushPen->ptPenWidth.x = dwWidth; - pbrushPen->ptPenWidth.y = 0; - pbrushPen->ulPenStyle = dwPenStyle; - pbrushPen->BrushAttr.lbColor = ulColor; - pbrushPen->ulStyle = ulBrushStyle; - // FIXME: Copy the bitmap first ? - pbrushPen->hbmClient = (HANDLE)ulClientHatch; - pbrushPen->dwStyleCount = dwStyleCount; - pbrushPen->pStyle = pStyle; - - pbrushPen->flAttrs = bOldStylePen? BR_IS_OLDSTYLEPEN : BR_IS_PEN; - - // If dwPenStyle is PS_COSMETIC, the width must be set to 1. - if ( !(bOldStylePen) && ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) && ( dwWidth != 1) ) - goto ExitCleanup; - - switch (dwPenStyle & PS_STYLE_MASK) - { - case PS_NULL: - pbrushPen->flAttrs |= BR_IS_NULL; - break; - - case PS_SOLID: - pbrushPen->flAttrs |= BR_IS_SOLID; - break; - - case PS_ALTERNATE: - pbrushPen->flAttrs |= BR_IS_BITMAP; - pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternAlternate); - break; - - case PS_DOT: - pbrushPen->flAttrs |= BR_IS_BITMAP; - pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDot); - break; - - case PS_DASH: - pbrushPen->flAttrs |= BR_IS_BITMAP; - pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDash); - break; - - case PS_DASHDOT: - pbrushPen->flAttrs |= BR_IS_BITMAP; - pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDot); - break; - - case PS_DASHDOTDOT: - pbrushPen->flAttrs |= BR_IS_BITMAP; - pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDotDot); - break; - - case PS_INSIDEFRAME: - pbrushPen->flAttrs |= (BR_IS_SOLID|BR_IS_INSIDEFRAME); - break; - - case PS_USERSTYLE: - if ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) - { + DWORD dwPenStyle, + DWORD dwWidth, + IN ULONG ulBrushStyle, + IN ULONG ulColor, + IN ULONG_PTR ulClientHatch, + IN ULONG_PTR ulHatch, + DWORD dwStyleCount, + PULONG pStyle, + IN ULONG cjDIB, + IN BOOL bOldStylePen, + IN OPTIONAL HBRUSH hbrush) +{ + HPEN hPen; + PBRUSH pbrushPen; + static const BYTE PatternAlternate[] = {0x55, 0x55, 0x55, 0}; + static const BYTE PatternDash[] = {0xFF, 0xFF, 0xC0, 0}; + static const BYTE PatternDot[] = {0xE3, 0x8E, 0x38, 0}; + static const BYTE PatternDashDot[] = {0xFF, 0x81, 0xC0, 0}; + static const BYTE PatternDashDotDot[] = {0xFF, 0x8E, 0x38, 0}; + + dwWidth = abs(dwWidth); + + if ( (dwPenStyle & PS_STYLE_MASK) == PS_NULL) + { + return StockObjects[NULL_PEN]; + } + + if (bOldStylePen) + { + pbrushPen = PEN_AllocPenWithHandle(); + } + else + { + pbrushPen = PEN_AllocExtPenWithHandle(); + } + + if (!pbrushPen) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + DPRINT("Can't allocate pen\n"); + return 0; + } + hPen = pbrushPen->BaseObject.hHmgr; + + // If nWidth is zero, the pen is a single pixel wide, regardless of the current transformation. + if ((bOldStylePen) && (!dwWidth) && ((dwPenStyle & PS_STYLE_MASK) != PS_SOLID)) + dwWidth = 1; + + pbrushPen->ptPenWidth.x = dwWidth; + pbrushPen->ptPenWidth.y = 0; + pbrushPen->ulPenStyle = dwPenStyle; + pbrushPen->BrushAttr.lbColor = ulColor; + pbrushPen->ulStyle = ulBrushStyle; + // FIXME: Copy the bitmap first ? + pbrushPen->hbmClient = (HANDLE)ulClientHatch; + pbrushPen->dwStyleCount = dwStyleCount; + pbrushPen->pStyle = pStyle; + + pbrushPen->flAttrs = bOldStylePen ? BR_IS_OLDSTYLEPEN : BR_IS_PEN; + + // If dwPenStyle is PS_COSMETIC, the width must be set to 1. + if ( !(bOldStylePen) && ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) && ( dwWidth != 1) ) + goto ExitCleanup; + + switch (dwPenStyle & PS_STYLE_MASK) + { + case PS_NULL: + pbrushPen->flAttrs |= BR_IS_NULL; + break; + + case PS_SOLID: + pbrushPen->flAttrs |= BR_IS_SOLID; + break; + + case PS_ALTERNATE: + pbrushPen->flAttrs |= BR_IS_BITMAP; + pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternAlternate); + break; + + case PS_DOT: + pbrushPen->flAttrs |= BR_IS_BITMAP; + pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDot); + break; + + case PS_DASH: + pbrushPen->flAttrs |= BR_IS_BITMAP; + pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDash); + break; + + case PS_DASHDOT: + pbrushPen->flAttrs |= BR_IS_BITMAP; + pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDot); + break; + + case PS_DASHDOTDOT: + pbrushPen->flAttrs |= BR_IS_BITMAP; + pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDotDot); + break; + + case PS_INSIDEFRAME: + pbrushPen->flAttrs |= (BR_IS_SOLID | BR_IS_INSIDEFRAME); + break; + + case PS_USERSTYLE: + if ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) + { /* FIXME: PS_USERSTYLE workaround */ DPRINT1("PS_COSMETIC | PS_USERSTYLE not handled\n"); pbrushPen->flAttrs |= BR_IS_SOLID; break; - } - else - { + } + else + { UINT i; BOOL has_neg = FALSE, all_zero = TRUE;
@@ -154,220 +155,228 @@ { goto ExitCleanup; } - } - /* FIXME: What style here? */ - pbrushPen->flAttrs |= 0; - break; - - default: - DPRINT1("IntGdiExtCreatePen unknown penstyle %x\n", dwPenStyle); - } - PEN_UnlockPen(pbrushPen); - return hPen; + } + /* FIXME: What style here? */ + pbrushPen->flAttrs |= 0; + break; + + default: + DPRINT1("IntGdiExtCreatePen unknown penstyle %x\n", dwPenStyle); + } + + PEN_UnlockPen(pbrushPen); + return hPen;
ExitCleanup: - EngSetLastError(ERROR_INVALID_PARAMETER); - pbrushPen->pStyle = NULL; - GDIOBJ_vDeleteObject(&pbrushPen->BaseObject); - return NULL; -} - -VOID FASTCALL + EngSetLastError(ERROR_INVALID_PARAMETER); + pbrushPen->pStyle = NULL; + GDIOBJ_vDeleteObject(&pbrushPen->BaseObject); + + return NULL; +} + +VOID +FASTCALL IntGdiSetSolidPenColor(HPEN hPen, COLORREF Color) { - PBRUSH pbrPen; - - pbrPen = PEN_ShareLockPen(hPen); - if (pbrPen) - { - if (pbrPen->flAttrs & BR_IS_SOLID) - { - pbrPen->BrushAttr.lbColor = Color & 0xFFFFFF; - } - PEN_ShareUnlockPen(pbrPen); - } -} - -INT APIENTRY + PBRUSH pbrPen; + + pbrPen = PEN_ShareLockPen(hPen); + if (pbrPen) + { + if (pbrPen->flAttrs & BR_IS_SOLID) + { + pbrPen->BrushAttr.lbColor = Color & 0xFFFFFF; + } + PEN_ShareUnlockPen(pbrPen); + } +} + +INT +APIENTRY PEN_GetObject(PBRUSH pbrushPen, INT cbCount, PLOGPEN pBuffer) { - PLOGPEN pLogPen; - PEXTLOGPEN pExtLogPen; - INT cbRetCount; - - if (pbrushPen->flAttrs & BR_IS_OLDSTYLEPEN) - { - cbRetCount = sizeof(LOGPEN); - if (pBuffer) - { - - if (cbCount < cbRetCount) return 0; - - if ( (pbrushPen->ulPenStyle & PS_STYLE_MASK) == PS_NULL && - cbCount == sizeof(EXTLOGPEN)) - { + PLOGPEN pLogPen; + PEXTLOGPEN pExtLogPen; + INT cbRetCount; + + if (pbrushPen->flAttrs & BR_IS_OLDSTYLEPEN) + { + cbRetCount = sizeof(LOGPEN); + if (pBuffer) + { + if (cbCount < cbRetCount) return 0; + + if (((pbrushPen->ulPenStyle & PS_STYLE_MASK) == PS_NULL) && + (cbCount == sizeof(EXTLOGPEN))) + { + pExtLogPen = (PEXTLOGPEN)pBuffer; + pExtLogPen->elpPenStyle = pbrushPen->ulPenStyle; + pExtLogPen->elpWidth = 0; + pExtLogPen->elpBrushStyle = pbrushPen->ulStyle; + pExtLogPen->elpColor = pbrushPen->BrushAttr.lbColor; + pExtLogPen->elpHatch = 0; + pExtLogPen->elpNumEntries = 0; + cbRetCount = sizeof(EXTLOGPEN); + } + else + { + pLogPen = (PLOGPEN)pBuffer; + pLogPen->lopnWidth = pbrushPen->ptPenWidth; + pLogPen->lopnStyle = pbrushPen->ulPenStyle; + pLogPen->lopnColor = pbrushPen->BrushAttr.lbColor; + } + } + } + else + { + // FIXME: Can we trust in dwStyleCount being <= 16? + cbRetCount = sizeof(EXTLOGPEN) - sizeof(DWORD) + pbrushPen->dwStyleCount * sizeof(DWORD); + if (pBuffer) + { + ULONG i; + + if (cbCount < cbRetCount) return 0; pExtLogPen = (PEXTLOGPEN)pBuffer; pExtLogPen->elpPenStyle = pbrushPen->ulPenStyle; - pExtLogPen->elpWidth = 0; + pExtLogPen->elpWidth = pbrushPen->ptPenWidth.x; pExtLogPen->elpBrushStyle = pbrushPen->ulStyle; pExtLogPen->elpColor = pbrushPen->BrushAttr.lbColor; - pExtLogPen->elpHatch = 0; - pExtLogPen->elpNumEntries = 0; - cbRetCount = sizeof(EXTLOGPEN); - } - else - { - pLogPen = (PLOGPEN)pBuffer; - pLogPen->lopnWidth = pbrushPen->ptPenWidth; - pLogPen->lopnStyle = pbrushPen->ulPenStyle; - pLogPen->lopnColor = pbrushPen->BrushAttr.lbColor; - } - } - } - else - { - // FIXME: Can we trust in dwStyleCount being <= 16? - cbRetCount = sizeof(EXTLOGPEN) - sizeof(DWORD) + pbrushPen->dwStyleCount * sizeof(DWORD); - if (pBuffer) - { - ULONG i; - - if (cbCount < cbRetCount) return 0; - pExtLogPen = (PEXTLOGPEN)pBuffer; - pExtLogPen->elpPenStyle = pbrushPen->ulPenStyle; - pExtLogPen->elpWidth = pbrushPen->ptPenWidth.x; - pExtLogPen->elpBrushStyle = pbrushPen->ulStyle; - pExtLogPen->elpColor = pbrushPen->BrushAttr.lbColor; - pExtLogPen->elpHatch = (ULONG_PTR)pbrushPen->hbmClient; - pExtLogPen->elpNumEntries = pbrushPen->dwStyleCount; - for (i = 0; i < pExtLogPen->elpNumEntries; i++) - { - pExtLogPen->elpStyleEntry[i] = pbrushPen->pStyle[i]; - } - } - } - - return cbRetCount; + pExtLogPen->elpHatch = (ULONG_PTR)pbrushPen->hbmClient; + pExtLogPen->elpNumEntries = pbrushPen->dwStyleCount; + for (i = 0; i < pExtLogPen->elpNumEntries; i++) + { + pExtLogPen->elpStyleEntry[i] = pbrushPen->pStyle[i]; + } + } + } + + return cbRetCount; }
/* PUBLIC FUNCTIONS ***********************************************************/
-HPEN APIENTRY +HPEN +APIENTRY NtGdiCreatePen( - INT PenStyle, - INT Width, - COLORREF Color, - IN HBRUSH hbr) -{ - if ( PenStyle < PS_SOLID || PenStyle > PS_INSIDEFRAME ) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - return IntGdiExtCreatePen(PenStyle, - Width, - BS_SOLID, - Color, - 0, - 0, - 0, - NULL, - 0, - TRUE, - hbr); -} - -HPEN APIENTRY + INT PenStyle, + INT Width, + COLORREF Color, + IN HBRUSH hbr) +{ + if ((PenStyle < PS_SOLID) ||( PenStyle > PS_INSIDEFRAME)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + return IntGdiExtCreatePen(PenStyle, + Width, + BS_SOLID, + Color, + 0, + 0, + 0, + NULL, + 0, + TRUE, + hbr); +} + +HPEN +APIENTRY NtGdiExtCreatePen( - DWORD dwPenStyle, - DWORD ulWidth, - IN ULONG ulBrushStyle, - IN ULONG ulColor, - IN ULONG_PTR ulClientHatch, - IN ULONG_PTR ulHatch, - DWORD dwStyleCount, - PULONG pUnsafeStyle, - IN ULONG cjDIB, - IN BOOL bOldStylePen, - IN OPTIONAL HBRUSH hBrush) -{ - NTSTATUS Status = STATUS_SUCCESS; - DWORD* pSafeStyle = NULL; - HPEN hPen; - - if ((int)dwStyleCount < 0) return 0; - if (dwStyleCount > 16) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (dwStyleCount > 0) - { - pSafeStyle = ExAllocatePoolWithTag(NonPagedPool, dwStyleCount * sizeof(DWORD), GDITAG_PENSTYLE); - if (!pSafeStyle) - { - SetLastNtError(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - _SEH2_TRY - { - ProbeForRead(pUnsafeStyle, dwStyleCount * sizeof(DWORD), 1); - RtlCopyMemory(pSafeStyle, - pUnsafeStyle, - dwStyleCount * sizeof(DWORD)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - ExFreePoolWithTag(pSafeStyle, GDITAG_PENSTYLE); - return 0; - } - } - - if (ulBrushStyle == BS_PATTERN) - { - _SEH2_TRY - { - ProbeForRead((PVOID)ulHatch, cjDIB, 1); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - if (pSafeStyle) ExFreePoolWithTag(pSafeStyle, GDITAG_PENSTYLE); - return 0; - } - } - - hPen = IntGdiExtCreatePen(dwPenStyle, - ulWidth, - ulBrushStyle, - ulColor, - ulClientHatch, - ulHatch, - dwStyleCount, - pSafeStyle, - cjDIB, - bOldStylePen, - hBrush); - - if (!hPen && pSafeStyle) - { - ExFreePoolWithTag(pSafeStyle, GDITAG_PENSTYLE); - } - return hPen; + DWORD dwPenStyle, + DWORD ulWidth, + IN ULONG ulBrushStyle, + IN ULONG ulColor, + IN ULONG_PTR ulClientHatch, + IN ULONG_PTR ulHatch, + DWORD dwStyleCount, + PULONG pUnsafeStyle, + IN ULONG cjDIB, + IN BOOL bOldStylePen, + IN OPTIONAL HBRUSH hBrush) +{ + NTSTATUS Status = STATUS_SUCCESS; + DWORD* pSafeStyle = NULL; + HPEN hPen; + + if ((int)dwStyleCount < 0) return 0; + if (dwStyleCount > 16) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (dwStyleCount > 0) + { + pSafeStyle = ExAllocatePoolWithTag(NonPagedPool, + dwStyleCount * sizeof(DWORD), + GDITAG_PENSTYLE); + if (!pSafeStyle) + { + SetLastNtError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + _SEH2_TRY + { + ProbeForRead(pUnsafeStyle, dwStyleCount * sizeof(DWORD), 1); + RtlCopyMemory(pSafeStyle, + pUnsafeStyle, + dwStyleCount * sizeof(DWORD)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + ExFreePoolWithTag(pSafeStyle, GDITAG_PENSTYLE); + return 0; + } + } + + if (ulBrushStyle == BS_PATTERN) + { + _SEH2_TRY + { + ProbeForRead((PVOID)ulHatch, cjDIB, 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + if (pSafeStyle) ExFreePoolWithTag(pSafeStyle, GDITAG_PENSTYLE); + return 0; + } + } + + hPen = IntGdiExtCreatePen(dwPenStyle, + ulWidth, + ulBrushStyle, + ulColor, + ulClientHatch, + ulHatch, + dwStyleCount, + pSafeStyle, + cjDIB, + bOldStylePen, + hBrush); + + if (!hPen && pSafeStyle) + { + ExFreePoolWithTag(pSafeStyle, GDITAG_PENSTYLE); + } + + return hPen; }
/* EOF */
-
tkreuzer＠svn.reactos.org