Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[gschneider] 42324: FloodFill: - Remove unneeded casts when setting the initial flood start, add debug print for flood region location (silenced) - Improve memory guards, free memory on error

by gschneider＠svn.reactos.org

Author: gschneider Date: Sat Aug 1 19:58:28 2009 New Revision: 42324 URL: http://svn.reactos.org/svn/reactos?rev=42324&view=rev Log: FloodFill: - Remove unneeded casts when setting the initial flood start, add debug print for flood region location (silenced) - Improve memory guards, free memory on error Modified: trunk/reactos/subsystems/win32/win32k/dib/floodfill.c Modified: trunk/reactos/subsystems/win32/win32k/dib/floodfill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/floodfill.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/floodfill.c [iso-8859-1] Sat Aug 1 19:58:28 2009 @@ -43,7 +43,8 @@ { return FALSE; } - info->floodStart = (FLOODITEM*)((PBYTE)info->floodData + (width * height * sizeof(FLOODITEM))); + info->floodStart = info->floodData + (width * height); + DPRINT("Allocated flood stack from %p to %p\n", info->floodData, info->floodStart); return TRUE; } static __inline VOID finalizeFlood(FLOODINFO *info) @@ -118,15 +119,16 @@ removeItemFlood(&flood); DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_PutPixel(DstSurf, x, y, BrushColor); + if (flood.floodStart - 4 < flood.floodData) + { + DPRINT1("Can't finish flooding!\n"); + finalizeFlood(&flood); + return FALSE; + } addItemFlood(&flood, x, y + 1, DstSurf, DstRect, ConvColor, FALSE); addItemFlood(&flood, x, y - 1, DstSurf, DstRect, ConvColor, FALSE); addItemFlood(&flood, x + 1, y, DstSurf, DstRect, ConvColor, FALSE); addItemFlood(&flood, x - 1, y, DstSurf, DstRect, ConvColor, FALSE); - if (flood.floodStart <= flood.floodData) - { - DPRINT1("Couldn't finish flooding!\n"); - return FALSE; - } } finalizeFlood(&flood); } @@ -150,15 +152,16 @@ removeItemFlood(&flood); DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_PutPixel(DstSurf, x, y, BrushColor); + if (flood.floodStart - 4 < flood.floodData) + { + DPRINT1("Can't finish flooding!\n"); + finalizeFlood(&flood); + return FALSE; + } addItemFlood(&flood, x, y + 1, DstSurf, DstRect, ConvColor, TRUE); addItemFlood(&flood, x, y - 1, DstSurf, DstRect, ConvColor, TRUE); addItemFlood(&flood, x + 1, y, DstSurf, DstRect, ConvColor, TRUE); addItemFlood(&flood, x - 1, y, DstSurf, DstRect, ConvColor, TRUE); - if (flood.floodStart <= flood.floodData) - { - DPRINT1("Couldn't finish flooding!\n"); - return FALSE; - } } finalizeFlood(&flood); }

15 years, 4 months

[gschneider] 42323: FloodFill: -Get rid of global variables for flood control -Translate the provided color to the surface, not the other way around (improves speed) -Rename the function to reflect the functionality -Add comments on how to implement support for hatched brushes and non-standard surfaces -Thanks to tkreuzer for feedback

by gschneider＠svn.reactos.org

Author: gschneider Date: Sat Aug 1 16:39:40 2009 New Revision: 42323 URL: http://svn.reactos.org/svn/reactos?rev=42323&view=rev Log: FloodFill: -Get rid of global variables for flood control -Translate the provided color to the surface, not the other way around (improves speed) -Rename the function to reflect the functionality -Add comments on how to implement support for hatched brushes and non-standard surfaces -Thanks to tkreuzer for feedback Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.h trunk/reactos/subsystems/win32/win32k/dib/floodfill.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] Sat Aug 1 16:39:40 2009 @@ -133,7 +133,7 @@ BOOLEAN DIB_32BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); -BOOLEAN DIB_XXBPP_FloodFill(SURFOBJ*, BRUSHOBJ*, RECTL*, POINTL*, XLATEOBJ*, COLORREF, UINT); +BOOLEAN DIB_XXBPP_FloodFillSolid(SURFOBJ*, BRUSHOBJ*, RECTL*, POINTL*, ULONG, UINT); extern unsigned char notmask[2]; extern unsigned char altnotmask[2]; Modified: trunk/reactos/subsystems/win32/win32k/dib/floodfill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/floodfill.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/floodfill.c [iso-8859-1] Sat Aug 1 16:39:40 2009 @@ -27,76 +27,72 @@ ULONG y; } FLOODITEM; -static ULONG floodLen = 0; -static FLOODITEM *floodStart = NULL, *floodData = NULL; +typedef struct _floodInfo +{ + ULONG floodLen; + FLOODITEM *floodStart; + FLOODITEM *floodData; +} FLOODINFO; -static __inline BOOL initFlood(RECTL *DstRect) +static __inline BOOL initFlood(FLOODINFO *info, RECTL *DstRect) { ULONG width = DstRect->right - DstRect->left; ULONG height = DstRect->bottom - DstRect->top; - floodData = ExAllocatePoolWithTag(NonPagedPool, width * height * sizeof(FLOODITEM), TAG_DIB); - if (floodData == NULL) + info->floodData = ExAllocatePoolWithTag(NonPagedPool, width * height * sizeof(FLOODITEM), TAG_DIB); + if (info->floodData == NULL) { return FALSE; } - floodStart = (FLOODITEM*)((PBYTE)floodData + (width * height * sizeof(FLOODITEM))); + info->floodStart = (FLOODITEM*)((PBYTE)info->floodData + (width * height * sizeof(FLOODITEM))); return TRUE; } -static __inline VOID finalizeFlood() +static __inline VOID finalizeFlood(FLOODINFO *info) { - ExFreePoolWithTag(floodData, TAG_DIB); + ExFreePoolWithTag(info->floodData, TAG_DIB); } -static __inline VOID addItemFlood(ULONG x, +static __inline VOID addItemFlood(FLOODINFO *info, + ULONG x, ULONG y, SURFOBJ *DstSurf, RECTL *DstRect, - XLATEOBJ* ColorTranslation, - COLORREF Color, + ULONG Color, BOOL isSurf) { if (x >= DstRect->left && x <= DstRect->right && y >= DstRect->top && y <= DstRect->bottom) { - if (isSurf == TRUE && XLATEOBJ_iXlate(ColorTranslation, - DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y)) != Color) + if (isSurf == TRUE && + DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y) != Color) { return; } - else if (isSurf == FALSE && XLATEOBJ_iXlate(ColorTranslation, - DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y)) == Color) + else if (isSurf == FALSE && + DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y) == Color) { return; } - floodStart--; - floodStart->x = x; - floodStart->y = y; - floodLen++; + info->floodStart--; + info->floodStart->x = x; + info->floodStart->y = y; + info->floodLen++; } } -static __inline VOID removeItemFlood() +static __inline VOID removeItemFlood(FLOODINFO *info) { - floodStart++; - floodLen--; -} -static __inline BOOL isEmptyFlood() -{ - if (floodLen == 0) - { - return TRUE; - } - return FALSE; + info->floodStart++; + info->floodLen--; } -BOOLEAN DIB_XXBPP_FloodFill(SURFOBJ *DstSurf, - BRUSHOBJ *Brush, - RECTL *DstRect, - POINTL *Origin, - XLATEOBJ *ColorTranslation, - COLORREF Color, - UINT FillType) +BOOLEAN DIB_XXBPP_FloodFillSolid(SURFOBJ *DstSurf, + BRUSHOBJ *Brush, + RECTL *DstRect, + POINTL *Origin, + ULONG ConvColor, + UINT FillType) { ULONG x, y; ULONG BrushColor; + FLOODINFO flood = {0, NULL, NULL}; BrushColor = Brush->iSolidColor; x = Origin->x; @@ -105,59 +101,66 @@ if (FillType == FLOODFILLBORDER) { /* Check if the start pixel has the border color */ - if (XLATEOBJ_iXlate(ColorTranslation, - DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y)) == Color) + if (DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y) == ConvColor) { return FALSE; } - if (initFlood(DstRect) == FALSE) + if (initFlood(&flood, DstRect) == FALSE) { return FALSE; } - addItemFlood(x, y, DstSurf, DstRect, ColorTranslation, Color, FALSE); - while (!isEmptyFlood()) + addItemFlood(&flood, x, y, DstSurf, DstRect, ConvColor, FALSE); + while (flood.floodLen != 0) { - x = floodStart->x; - y = floodStart->y; - removeItemFlood(); + x = flood.floodStart->x; + y = flood.floodStart->y; + removeItemFlood(&flood); DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_PutPixel(DstSurf, x, y, BrushColor); - addItemFlood(x, y + 1, DstSurf, DstRect, ColorTranslation, Color, FALSE); - addItemFlood(x, y - 1, DstSurf, DstRect, ColorTranslation, Color, FALSE); - addItemFlood(x + 1, y, DstSurf, DstRect, ColorTranslation, Color, FALSE); - addItemFlood(x - 1, y, DstSurf, DstRect, ColorTranslation, Color, FALSE); + addItemFlood(&flood, x, y + 1, DstSurf, DstRect, ConvColor, FALSE); + addItemFlood(&flood, x, y - 1, DstSurf, DstRect, ConvColor, FALSE); + addItemFlood(&flood, x + 1, y, DstSurf, DstRect, ConvColor, FALSE); + addItemFlood(&flood, x - 1, y, DstSurf, DstRect, ConvColor, FALSE); + if (flood.floodStart <= flood.floodData) + { + DPRINT1("Couldn't finish flooding!\n"); + return FALSE; + } } - finalizeFlood(); + finalizeFlood(&flood); } else if (FillType == FLOODFILLSURFACE) { /* Check if the start pixel has the surface color */ - if (XLATEOBJ_iXlate(ColorTranslation, - DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y)) != Color) + if (DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y) != ConvColor) { return FALSE; } - if (initFlood(DstRect) == FALSE) + if (initFlood(&flood, DstRect) == FALSE) { return FALSE; } - addItemFlood(x, y, DstSurf, DstRect, ColorTranslation, Color, TRUE); - while (!isEmptyFlood()) + addItemFlood(&flood, x, y, DstSurf, DstRect, ConvColor, TRUE); + while (flood.floodLen != 0) { - x = floodStart->x; - y = floodStart->y; - removeItemFlood(); + x = flood.floodStart->x; + y = flood.floodStart->y; + removeItemFlood(&flood); DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_PutPixel(DstSurf, x, y, BrushColor); - addItemFlood(x, y + 1, DstSurf, DstRect, ColorTranslation, Color, TRUE); - addItemFlood(x, y - 1, DstSurf, DstRect, ColorTranslation, Color, TRUE); - addItemFlood(x + 1, y, DstSurf, DstRect, ColorTranslation, Color, TRUE); - addItemFlood(x - 1, y, DstSurf, DstRect, ColorTranslation, Color, TRUE); - + addItemFlood(&flood, x, y + 1, DstSurf, DstRect, ConvColor, TRUE); + addItemFlood(&flood, x, y - 1, DstSurf, DstRect, ConvColor, TRUE); + addItemFlood(&flood, x + 1, y, DstSurf, DstRect, ConvColor, TRUE); + addItemFlood(&flood, x - 1, y, DstSurf, DstRect, ConvColor, TRUE); + if (flood.floodStart <= flood.floodData) + { + DPRINT1("Couldn't finish flooding!\n"); + return FALSE; + } } - finalizeFlood(); + finalizeFlood(&flood); } else { Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Sat Aug 1 16:39:40 2009 @@ -1070,13 +1070,14 @@ UINT FillType) { PDC dc; - PDC_ATTR pdcattr; - SURFACE *psurf = NULL; - HPALETTE Pal = 0; - XLATEOBJ *XlateObj = NULL; + PDC_ATTR pdcattr; + SURFACE *psurf = NULL; + HPALETTE Pal = 0; + XLATEOBJ *XlateObj = NULL; BOOL Ret = FALSE; RECTL DestRect; POINTL Pt; + ULONG ConvColor; dc = DC_LockDc(hDC); if (!dc) @@ -1118,11 +1119,16 @@ Pal = dc->dclevel.pSurface->hDIBPalette; if (!Pal) Pal = pPrimarySurface->DevInfo.hpalDefault; - XlateObj = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, 0, NULL, Pal); - + XlateObj = (XLATEOBJ*)IntEngCreateXlate(0, PAL_RGB, Pal, NULL); + + /* Only solid fills supported for now + * How to support pattern brushes and non standard surfaces (not offering dib functions): + * Version a (most likely slow): call DrvPatBlt for every pixel + * Version b: create a flood mask and let MaskBlt blit a masked brush */ if (XlateObj != NULL) { - Ret = DIB_XXBPP_FloodFill(&psurf->SurfObj, &dc->eboFill.BrushObject, &DestRect, &Pt, XlateObj, Color, FillType); + ConvColor = XLATEOBJ_iXlate(XlateObj, Color); + Ret = DIB_XXBPP_FloodFillSolid(&psurf->SurfObj, &dc->eboFill.BrushObject, &DestRect, &Pt, ConvColor, FillType); EngDeleteXlate(XlateObj); }

15 years, 4 months

[gschneider] 42322: GetWindowLongPtr returns a LONG_PTR, so be it

by gschneider＠svn.reactos.org

Author: gschneider Date: Sat Aug 1 13:32:48 2009 New Revision: 42322 URL: http://svn.reactos.org/svn/reactos?rev=42322&view=rev Log: GetWindowLongPtr returns a LONG_PTR, so be it Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat Aug 1 13:32:48 2009 @@ -1148,7 +1148,7 @@ else { POINT Pt; - DWORD Style; + LONG_PTR Style; LONG HitCode; Style = GetWindowLongPtrW(hWnd, GWL_STYLE); @@ -1352,7 +1352,7 @@ case WM_SETCURSOR: { - ULONG Style = GetWindowLongPtrW(hWnd, GWL_STYLE); + LONG_PTR Style = GetWindowLongPtrW(hWnd, GWL_STYLE); if (Style & WS_CHILD) {

15 years, 4 months

[gschneider] 42321: - Handle WM_SETREDRAW messages differently in the DefWndProc, ported from current Wine - Fixes mIRC riched component regression, no more riched20 reverts for releases needed See issue #4098 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Sat Aug 1 13:26:40 2009 New Revision: 42321 URL: http://svn.reactos.org/svn/reactos?rev=42321&view=rev Log: - Handle WM_SETREDRAW messages differently in the DefWndProc, ported from current Wine - Fixes mIRC riched component regression, no more riched20 reverts for releases needed See issue #4098 for more details. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat Aug 1 13:26:40 2009 @@ -1245,7 +1245,14 @@ case WM_SETREDRAW: { - DefWndSetRedraw(hWnd, wParam); + LONG_PTR Style = GetWindowLongPtrW(hWnd, GWL_STYLE); + if (wParam) SetWindowLongPtr(hWnd, GWL_STYLE, Style | WS_VISIBLE); + else + { + RedrawWindow(hWnd, NULL, 0, RDW_ALLCHILDREN | RDW_VALIDATE); + Style &= ~WS_VISIBLE; + SetWindowLongPtr(hWnd, GWL_STYLE, Style); + } return (0); }

15 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009