Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 66231: [WIN32K] Implement support for hatch brush masks.
by tkreuzer＠svn.reactos.org 11 Feb '15

11 Feb '15

Author: tkreuzer Date: Wed Feb 11 21:35:48 2015 New Revision: 66231 URL: http://svn.reactos.org/svn/reactos?rev=66231&view=rev Log: [WIN32K] Implement support for hatch brush masks. Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Wed Feb 11 21:35:48 2015 @@ -424,7 +424,37 @@ NTAPI EBRUSHOBJ_psoMask(EBRUSHOBJ *pebo) { - return NULL; + HBITMAP hbmMask; + PSURFACE psurfMask; + PPDEVOBJ ppdev; + + /* Check if we don't have a mask yet */ + if (pebo->psoMask == NULL) + { + /* Check if this is a hatch brush */ + if (pebo->flattrs & BR_IS_HATCH) + { + /* Get the PDEV */ + ppdev = (PPDEVOBJ)pebo->psurfTrg->SurfObj.hdev; + if (!ppdev) + ppdev = gppdevPrimary; + + /* Use the hatch bitmap as the mask */ + hbmMask = (HBITMAP)ppdev->ahsurf[pebo->pbrush->iHatch]; + psurfMask = SURFACE_ShareLockSurface(hbmMask); + if (psurfMask == NULL) + { + ERR("Failed to lock hatch brush for PDEV %p, iHatch %lu\n", + ppdev, pebo->pbrush->iHatch); + return NULL; + } + + NT_ASSERT(psurfMask->SurfObj.iBitmapFormat == BMF_1BPP); + pebo->psoMask = &psurfMask->SurfObj; + } + } + + return pebo->psoMask; } /** Exported DDI functions ****************************************************/

1 0

[tkreuzer] 66230: [WIN32K] Fix handling of mask bitmap in NtGdiMaskBlt
by tkreuzer＠svn.reactos.org 11 Feb '15

11 Feb '15

Author: tkreuzer Date: Wed Feb 11 21:35:09 2015 New Revision: 66230 URL: http://svn.reactos.org/svn/reactos?rev=66230&view=rev Log: [WIN32K] Fix handling of mask bitmap in NtGdiMaskBlt Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Wed Feb 11 21:35:09 2015 @@ -324,51 +324,44 @@ BOOL Status = FALSE; EXLATEOBJ exlo; XLATEOBJ *XlateObj = NULL; - BOOL UsesSource = ROP_USES_SOURCE(dwRop); - BOOL UsesMask; - - FIXUP_ROP(dwRop); - - UsesMask = ROP_USES_MASK(dwRop); + BOOL UsesSource; + + FIXUP_ROP(dwRop); // FIXME: why do we need this??? //DPRINT1("dwRop : 0x%08x\n", dwRop); + UsesSource = ROP_USES_SOURCE(dwRop); if (!hdcDest || (UsesSource && !hdcSrc)) { EngSetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - /* Take care of mask bitmap */ - if(hbmMask) - { + /* Check if we need a mask and have a mask bitmap */ + if (ROP_USES_MASK(dwRop) && (hbmMask != NULL)) + { + /* Reference the mask bitmap */ psurfMask = SURFACE_ShareLockSurface(hbmMask); - if(!psurfMask) + if (psurfMask == NULL) { EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } - } - - if(UsesMask) - { - if(!psurfMask) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if(gajBitsPerFormat[psurfMask->SurfObj.iBitmapFormat] != 1) + + /* Make sure the mask bitmap is 1 BPP */ + if (gajBitsPerFormat[psurfMask->SurfObj.iBitmapFormat] != 1) { EngSetLastError(ERROR_INVALID_PARAMETER); SURFACE_ShareUnlockSurface(psurfMask); return FALSE; } } - else if(psurfMask) - { - WARN("Getting Mask bitmap without needing it?\n"); - SURFACE_ShareUnlockSurface(psurfMask); + else + { + /* We use NULL, if we need a mask, the Eng function will take care of + that and use the brushobject to get a mask */ psurfMask = NULL; } + MaskPoint.x = xMask; MaskPoint.y = yMask;

1 0

[tkreuzer] 66229: [WIN32K] - Handle the case where we have a masked ROP, but no mask surface in EngBitBlt - Alloc ROPs with a mask in EngPaint Fixes ASSERT when GoogleEarth is launched.
by tkreuzer＠svn.reactos.org 11 Feb '15

11 Feb '15

Author: tkreuzer Date: Wed Feb 11 21:34:42 2015 New Revision: 66229 URL: http://svn.reactos.org/svn/reactos?rev=66229&view=rev Log: [WIN32K] - Handle the case where we have a masked ROP, but no mask surface in EngBitBlt - Alloc ROPs with a mask in EngPaint Fixes ASSERT when GoogleEarth is launched. Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c trunk/reactos/win32ss/gdi/eng/bitblt_new.c trunk/reactos/win32ss/gdi/eng/paint.c Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Wed Feb 11 21:34:42 2015 @@ -458,6 +458,19 @@ else { clippingType = pco->iDComplexity; + } + + /* Check if we need a mask but have no mask surface */ + if (UsesMask && (psoMask == NULL)) + { + /* Check if the BRUSHOBJ can provide the mask */ + psoMask = BRUSHOBJ_psoMask(pbo); + if (psoMask == NULL) + { + /* We have no mask, assume the mask is all foreground */ + rop4 &= (rop4 & 0xFF) || ((rop4 & 0xFF) << 8); + UsesMask = FALSE; + } } if (UsesMask) Modified: trunk/reactos/win32ss/gdi/eng/bitblt_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt_new… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt_new.c [iso-8859-1] Wed Feb 11 21:34:42 2015 @@ -210,7 +210,7 @@ if (ROP4_USES_PATTERN(rop4)) { /* Must have a brush */ - ASSERT(pbo); // FIXME: test this! + NT_ASSERT(pbo); // FIXME: test this! /* Copy the solid color */ bltdata.ulSolidColor = pbo->iSolidColor; @@ -253,11 +253,22 @@ /* Check if the ROP uses a mask */ if (ROP4_USES_MASK(rop4)) { - /* Must have a mask surface and point */ - ASSERT(psoMask); - ASSERT(pptlMask); - //__debugbreak(); + + /* Check if we don't have a mask surface */ + if (psoMask == NULL) + { + /* Must have a brush */ + NT_ASSERT(pbo); // FIXME: test this! + + /* Check if the BRUSHOBJ can provide the mask */ + psoMask = BRUSHOBJ_psoMask(pbo); + if (psoMask == NULL) + { + /* We have no mask, assume the mask is all foreground */ + rop4 = (rop4 & 0xFF) || ((rop4 & 0xFF) << 8); + } + } /* Set the mask format info */ bltdata.siMsk.iFormat = psoMask->iBitmapFormat; Modified: trunk/reactos/win32ss/gdi/eng/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/paint.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/paint.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/paint.c [iso-8859-1] Wed Feb 11 21:34:42 2015 @@ -63,9 +63,8 @@ /* Convert the MIX, consisting of 2 ROP2 codes into a ROP4 */ rop4 = MIX_TO_ROP4(mix); - /* Sanity checks */ + /* Sanity check */ NT_ASSERT(!ROP4_USES_SOURCE(rop4)); - NT_ASSERT(!ROP4_USES_MASK(rop4)); /* Forward the call to Eng/DrvBitBlt */ return IntEngBitBlt(pso,

1 0

[tkreuzer] 66228: [WIN32K] Add minimal infrastructure for handling pattern brush masks.
by tkreuzer＠svn.reactos.org 11 Feb '15

11 Feb '15

Author: tkreuzer Date: Wed Feb 11 21:34:11 2015 New Revision: 66228 URL: http://svn.reactos.org/svn/reactos?rev=66228&view=rev Log: [WIN32K] Add minimal infrastructure for handling pattern brush masks. Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c trunk/reactos/win32ss/gdi/ntgdi/brush.h Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Wed Feb 11 21:34:11 2015 @@ -9,8 +9,7 @@ #include <win32k.h> -#define NDEBUG -#include <debug.h> +DBG_DEFAULT_CHANNEL(GdiFont); static const ULONG gaulHatchBrushes[HS_DDI_MAX][8] = { @@ -128,6 +127,7 @@ ASSERT(pebo->flattrs & BR_IS_SOLID); /* Set the RGB color */ + crColor &= 0xFFFFFF; pebo->crRealize = crColor; pebo->ulRGBColor = crColor; @@ -167,6 +167,12 @@ pebo->BrushObject.pvRbrush = NULL; } + if (pebo->psoMask != NULL) + { + SURFACE_ShareUnlockSurface(pebo->psoMask); + pebo->psoMask = NULL; + } + /* Dereference the palettes */ PALETTE_ShareUnlockPalette(pebo->ppalSurf); PALETTE_ShareUnlockPalette(pebo->ppalDC); @@ -175,7 +181,8 @@ VOID NTAPI -EBRUSHOBJ_vUpdateFromDC(EBRUSHOBJ *pebo, +EBRUSHOBJ_vUpdateFromDC( + EBRUSHOBJ *pebo, PBRUSH pbrush, PDC pdc) { @@ -288,7 +295,8 @@ { BOOL bResult; PFN_DrvRealizeBrush pfnRealizeBrush = NULL; - PSURFACE psurfPattern, psurfMask; + PSURFACE psurfPattern; + SURFOBJ *psoMask; PPDEVOBJ ppdev; EXLATEOBJ exlo; PPALETTE ppalPattern; @@ -300,13 +308,30 @@ ASSERT(pebo->psurfTrg); ppdev = (PPDEVOBJ)pebo->psurfTrg->SurfObj.hdev; - if (!ppdev) ppdev = gppdevPrimary; + if (!ppdev) + ppdev = gppdevPrimary; if (bCallDriver) + { + /* Get the Drv function */ pfnRealizeBrush = ppdev->DriverFunctions.RealizeBrush; - - if (!pfnRealizeBrush) + if (pfnRealizeBrush == NULL) + { + ERR("No DrvRealizeBrush. Cannot realize brush\n"); + return FALSE; + } + + /* Get the mask */ + psoMask = EBRUSHOBJ_psoMask(pebo); + } + else + { + /* Use the Eng function */ pfnRealizeBrush = EngRealizeBrush; + + /* We don't handle the mask bitmap here. We do this only on demand */ + psoMask = NULL; + } /* Check if this is a hatch brush */ if (pbr->flAttrs & BR_IS_HATCH) @@ -325,9 +350,6 @@ psurfPattern = SURFACE_ShareLockSurface(hbmPattern); ASSERT(psurfPattern); ASSERT(psurfPattern->ppal); - - /* FIXME: implement mask */ - psurfMask = NULL; /* DIB brushes with DIB_PAL_COLORS usage need a new palette */ if (pbr->flAttrs & BR_IS_DIBPALCOLORS) @@ -354,17 +376,15 @@ bResult = pfnRealizeBrush(&pebo->BrushObject, &pebo->psurfTrg->SurfObj, &psurfPattern->SurfObj, - psurfMask ? &psurfMask->SurfObj : NULL, + psoMask, &exlo.xlo, iHatch); /* Cleanup the XLATEOBJ */ EXLATEOBJ_vCleanup(&exlo); - /* Unlock surfaces */ + /* Unlock surface */ SURFACE_ShareUnlockSurface(psurfPattern); - if (psurfMask) - SURFACE_ShareUnlockSurface(psurfMask); return bResult; } @@ -400,6 +420,12 @@ return psurfPattern ? &psurfPattern->SurfObj : NULL; } +SURFOBJ* +NTAPI +EBRUSHOBJ_psoMask(EBRUSHOBJ *pebo) +{ + return NULL; +} /** Exported DDI functions ****************************************************/ Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Wed Feb 11 21:34:11 2015 @@ -73,6 +73,8 @@ DWORD ulUnique; // DWORD dwUnknown54; // DWORD dwUnknown58; + + SURFOBJ *psoMask; } EBRUSHOBJ, *PEBRUSHOBJ; /* GDI Brush Attributes */ @@ -158,6 +160,13 @@ #define BRUSHOBJ_psoPattern(pbo) \ EBRUSHOBJ_psoPattern(CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject)) +SURFOBJ* +NTAPI +EBRUSHOBJ_psoMask(EBRUSHOBJ *pebo); + +#define BRUSHOBJ_psoMask(pbo) \ + EBRUSHOBJ_psoMask(CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject)) + FORCEINLINE ULONG EBRUSHOBJ_iSetSolidColor(EBRUSHOBJ *pebo, ULONG iSolidColor)

1 0

[tkreuzer] 66227: [WIN32K] Improve naming of some BRUSH fields and set the correct fields to the correct values (ulStyle was not for the brush style, but the hatch style!)
by tkreuzer＠svn.reactos.org 11 Feb '15

11 Feb '15

Author: tkreuzer Date: Wed Feb 11 21:33:50 2015 New Revision: 66227 URL: http://svn.reactos.org/svn/reactos?rev=66227&view=rev Log: [WIN32K] Improve naming of some BRUSH fields and set the correct fields to the correct values (ulStyle was not for the brush style, but the hatch style!) Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c trunk/reactos/win32ss/gdi/ntgdi/arc.c trunk/reactos/win32ss/gdi/ntgdi/brush.c trunk/reactos/win32ss/gdi/ntgdi/brush.h trunk/reactos/win32ss/gdi/ntgdi/drawing.c trunk/reactos/win32ss/gdi/ntgdi/fillshap.c trunk/reactos/win32ss/gdi/ntgdi/pen.c trunk/reactos/win32ss/gdi/ntgdi/stockobj.c Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Wed Feb 11 21:33:50 2015 @@ -312,8 +312,8 @@ if (pbr->flAttrs & BR_IS_HATCH) { /* Get the hatch brush pattern from the PDEV */ - hbmPattern = (HBITMAP)ppdev->ahsurf[pbr->ulStyle]; - iHatch = pbr->ulStyle; + hbmPattern = (HBITMAP)ppdev->ahsurf[pbr->iHatch]; + iHatch = pbr->iHatch; } else { Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/arc.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] Wed Feb 11 21:33:50 2015 @@ -79,7 +79,7 @@ return FALSE; } - PenOrigWidth = PenWidth = pbrPen->ptPenWidth.x; + PenOrigWidth = PenWidth = pbrPen->lWidth; if (pbrPen->ulPenStyle == PS_NULL) PenWidth = 0; if (pbrPen->ulPenStyle == PS_INSIDEFRAME) @@ -93,7 +93,7 @@ } if (!PenWidth) PenWidth = 1; - pbrPen->ptPenWidth.x = PenWidth; + pbrPen->lWidth = PenWidth; RectBounds.left = Left; RectBounds.right = Right; @@ -181,7 +181,7 @@ if (arctype == GdiTypeChord) PUTLINE(EfCx + CenterX, EfCy + CenterY, SfCx + CenterX, SfCy + CenterY, dc->eboLine); - pbrPen->ptPenWidth.x = PenOrigWidth; + pbrPen->lWidth = PenOrigWidth; PEN_ShareUnlockPen(pbrPen); DPRINT("IntArc Exit.\n"); return ret; Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] Wed Feb 11 21:33:50 2015 @@ -181,7 +181,7 @@ else if (pbrush->flAttrs & BR_IS_HATCH) { plogbrush->lbStyle = BS_HATCHED; - plogbrush->lbHatch = pbrush->ulStyle; + plogbrush->lbHatch = pbrush->iHatch; } else if (pbrush->flAttrs & BR_IS_DIB) { @@ -293,7 +293,7 @@ pbrush->flAttrs |= BR_IS_HATCH; pbrush->BrushAttr.lbColor = Color & 0xFFFFFF; - pbrush->ulStyle = Style; + pbrush->iHatch = Style; GDIOBJ_vUnlockObject(&pbrush->BaseObject); Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Wed Feb 11 21:33:50 2015 @@ -13,31 +13,40 @@ */ typedef struct _BRUSH { - /* Header for all gdi objects in the handle table. - Do not (re)move this. */ - BASEOBJECT BaseObject; + /* Header for all gdi objects in the handle table. + Do not (re)move this. */ + BASEOBJECT BaseObject; - ULONG ulStyle; - HBITMAP hbmPattern; - HBITMAP hbmClient; - ULONG flAttrs; + ULONG iHatch; // This is not the brush style, but the hatch style! + HBITMAP hbmPattern; + HBITMAP hbmClient; + ULONG flAttrs; - ULONG ulBrushUnique; - BRUSH_ATTR *pBrushAttr; // Just like DC_ATTR, pointer to user data - BRUSH_ATTR BrushAttr; // " " DCOBJ, internal if pBrushAttr == Zero - POINT ptOrigin; - ULONG bCacheGrabbed; - COLORREF crBack; - COLORREF crFore; - ULONG ulPalTime; - ULONG ulSurfTime; - PVOID ulRealization; - //ULONG Unknown4C[3]; - POINT ptPenWidth; - ULONG ulPenStyle; - DWORD *pStyle; - ULONG dwStyleCount; - //ULONG Unknown6C; + ULONG ulBrushUnique; + BRUSH_ATTR *pBrushAttr; // Pointer to the currently active brush attribute + BRUSH_ATTR BrushAttr; // Internal brush attribute for global brushes + POINT ptOrigin; + ULONG bCacheGrabbed; + COLORREF crBack; + COLORREF crFore; + ULONG ulPalTime; + ULONG ulSurfTime; + PVOID pvRBrush; + HDEV hdev; + //DWORD unk054; + LONG lWidth; + FLOAT eWidth; + ULONG ulPenStyle; + DWORD *pStyle; + ULONG dwStyleCount; + BYTE jJoin; // 0x06c Join styles for geometric wide lines + BYTE jEndCap; // end cap style for a geometric wide line + //WORD unk06e; // 0x06e + INT iBrushStyle; // 0x070 + //PREGION prgn; // 0x074 + //DWORD unk078; // 0x078 + DWORD unk07c; // 0x07c + LIST_ENTRY ListHead; // 0x080 } BRUSH, *PBRUSH; typedef struct _EBRUSHOBJ @@ -91,8 +100,17 @@ #define BRUSH_ShareLockBrush(hBrush) ((PBRUSH)GDIOBJ_ShareLockObj((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH)) #define BRUSH_ShareUnlockBrush(pBrush) GDIOBJ_vDereferenceObject((POBJ)pBrush) -INT FASTCALL BRUSH_GetObject (PBRUSH GdiObject, INT Count, LPLOGBRUSH Buffer); -VOID NTAPI BRUSH_vCleanup(PVOID ObjectBody); +INT +FASTCALL +BRUSH_GetObject( + PBRUSH GdiObject, + INT Count, + LPLOGBRUSH Buffer); + +VOID +NTAPI +BRUSH_vCleanup( + PVOID ObjectBody); extern HSURF gahsurfHatch[HS_DDI_MAX]; Modified: trunk/reactos/win32ss/gdi/ntgdi/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/drawing.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/drawing.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/drawing.c [iso-8859-1] Wed Feb 11 21:33:50 2015 @@ -139,7 +139,7 @@ int d2xt = b2+b2; int d2yt = a2+a2; - int w = pbrush->ptPenWidth.x; + int w = pbrush->lWidth; /* Inner ellipse: E(X,Y) = B*B*X*X + A*A*Y*Y - A*A*B*B */ @@ -983,7 +983,7 @@ int d2xt = b2+b2; int d2yt = a2+a2; - int w = pbrushPen->ptPenWidth.x; + int w = pbrushPen->lWidth; /* Inner ellipse: E(X,Y) = B*B*X*X + A*A*Y*Y - A*A*B*B */ @@ -1470,7 +1470,7 @@ { Rect r; int rx, ry; /* Radius in x and y directions */ - int w = pbrushPen->ptPenWidth.x; + int w = pbrushPen->lWidth; r = rect( Left, Top, abs(Right-Left), abs(Bottom-Top)); rx = Wellipse/2; Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Wed Feb 11 21:33:50 2015 @@ -252,7 +252,7 @@ return FALSE; } - PenOrigWidth = PenWidth = pbrush->ptPenWidth.x; + PenOrigWidth = PenWidth = pbrush->lWidth; if (pbrush->ulPenStyle == PS_NULL) PenWidth = 0; if (pbrush->ulPenStyle == PS_INSIDEFRAME) @@ -266,7 +266,7 @@ } if (!PenWidth) PenWidth = 1; - pbrush->ptPenWidth.x = PenWidth; + pbrush->lWidth = PenWidth; RectBounds.left = Left; RectBounds.right = Right; @@ -330,7 +330,7 @@ DC_vFinishBlit(dc, NULL); } - pbrush->ptPenWidth.x = PenOrigWidth; + pbrush->lWidth = PenOrigWidth; PEN_ShareUnlockPen(pbrush); DC_UnlockDc(dc); DPRINT("Ellipse Exit.\n"); @@ -760,7 +760,7 @@ return FALSE; } - PenOrigWidth = PenWidth = pbrLine->ptPenWidth.x; + PenOrigWidth = PenWidth = pbrLine->lWidth; if (pbrLine->ulPenStyle == PS_NULL) PenWidth = 0; if (pbrLine->ulPenStyle == PS_INSIDEFRAME) @@ -774,7 +774,7 @@ } if (!PenWidth) PenWidth = 1; - pbrLine->ptPenWidth.x = PenWidth; + pbrLine->lWidth = PenWidth; RectBounds.left = Left; RectBounds.top = Top; @@ -829,7 +829,7 @@ } - pbrLine->ptPenWidth.x = PenOrigWidth; + pbrLine->lWidth = PenOrigWidth; PEN_ShareUnlockPen(pbrLine); return ret; } Modified: trunk/reactos/win32ss/gdi/ntgdi/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/pen.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] Wed Feb 11 21:33:50 2015 @@ -120,11 +120,11 @@ if ((bOldStylePen) && (!dwWidth) && ((dwPenStyle & PS_STYLE_MASK) != PS_SOLID)) dwWidth = 1; - pbrushPen->ptPenWidth.x = dwWidth; - pbrushPen->ptPenWidth.y = 0; + pbrushPen->lWidth = dwWidth; + pbrushPen->eWidth = (FLOAT)pbrushPen->lWidth; pbrushPen->ulPenStyle = dwPenStyle; pbrushPen->BrushAttr.lbColor = ulColor; - pbrushPen->ulStyle = ulBrushStyle; + pbrushPen->iBrushStyle = ulBrushStyle; // FIXME: Copy the bitmap first ? pbrushPen->hbmClient = (HANDLE)ulClientHatch; pbrushPen->dwStyleCount = dwStyleCount; @@ -256,7 +256,7 @@ pExtLogPen = (PEXTLOGPEN)pBuffer; pExtLogPen->elpPenStyle = pbrushPen->ulPenStyle; pExtLogPen->elpWidth = 0; - pExtLogPen->elpBrushStyle = pbrushPen->ulStyle; + pExtLogPen->elpBrushStyle = pbrushPen->iBrushStyle; pExtLogPen->elpColor = pbrushPen->BrushAttr.lbColor; pExtLogPen->elpHatch = 0; pExtLogPen->elpNumEntries = 0; @@ -265,7 +265,8 @@ else { pLogPen = (PLOGPEN)pBuffer; - pLogPen->lopnWidth = pbrushPen->ptPenWidth; + pLogPen->lopnWidth.x = pbrushPen->lWidth; + pLogPen->lopnWidth.y = 0; pLogPen->lopnStyle = pbrushPen->ulPenStyle; pLogPen->lopnColor = pbrushPen->BrushAttr.lbColor; } @@ -282,8 +283,8 @@ if (cbCount < cbRetCount) return 0; pExtLogPen = (PEXTLOGPEN)pBuffer; pExtLogPen->elpPenStyle = pbrushPen->ulPenStyle; - pExtLogPen->elpWidth = pbrushPen->ptPenWidth.x; - pExtLogPen->elpBrushStyle = pbrushPen->ulStyle; + pExtLogPen->elpWidth = pbrushPen->lWidth; + pExtLogPen->elpBrushStyle = pbrushPen->iBrushStyle; pExtLogPen->elpColor = pbrushPen->BrushAttr.lbColor; pExtLogPen->elpHatch = (ULONG_PTR)pbrushPen->hbmClient; pExtLogPen->elpNumEntries = pbrushPen->dwStyleCount; Modified: trunk/reactos/win32ss/gdi/ntgdi/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/stockobj… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/stockobj.c [iso-8859-1] Wed Feb 11 21:33:50 2015 @@ -114,11 +114,12 @@ if ((dwPenStyle & PS_STYLE_MASK) == PS_NULL) dwWidth = 1; - pbrushPen->ptPenWidth.x = abs(dwWidth); - pbrushPen->ptPenWidth.y = 0; + pbrushPen->iHatch = 0; + pbrushPen->lWidth = abs(dwWidth); + pbrushPen->eWidth = (FLOAT)pbrushPen->lWidth; pbrushPen->ulPenStyle = dwPenStyle; pbrushPen->BrushAttr.lbColor = ulColor; - pbrushPen->ulStyle = ulBrushStyle; + pbrushPen->iBrushStyle = ulBrushStyle; pbrushPen->hbmClient = (HANDLE)NULL; pbrushPen->dwStyleCount = 0; pbrushPen->pStyle = 0;

1 0

[tkreuzer] 66226: [WIN32K] - Make sure PENs and BRUSHes are properly initialized. - Fix BRUSHATTR allocation - enable BRUSHATTR deallocation - Remove some obsolete defines
by tkreuzer＠svn.reactos.org 11 Feb '15

11 Feb '15

Author: tkreuzer Date: Wed Feb 11 21:33:24 2015 New Revision: 66226 URL: http://svn.reactos.org/svn/reactos?rev=66226&view=rev Log: [WIN32K] - Make sure PENs and BRUSHes are properly initialized. - Fix BRUSHATTR allocation - enable BRUSHATTR deallocation - Remove some obsolete defines Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.c trunk/reactos/win32ss/gdi/ntgdi/brush.h trunk/reactos/win32ss/gdi/ntgdi/color.h trunk/reactos/win32ss/gdi/ntgdi/pen.c trunk/reactos/win32ss/gdi/ntgdi/pen.h Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] Wed Feb 11 21:33:24 2015 @@ -11,19 +11,80 @@ #define NDEBUG #include <debug.h> -#define GDIOBJATTRFREE 170 - -typedef struct _GDI_OBJ_ATTR_FREELIST -{ - LIST_ENTRY Entry; - DWORD nEntries; - PVOID AttrList[GDIOBJATTRFREE]; -} GDI_OBJ_ATTR_FREELIST, *PGDI_OBJ_ATTR_FREELIST; - -typedef struct _GDI_OBJ_ATTR_ENTRY -{ - RGN_ATTR Attr[GDIOBJATTRFREE]; -} GDI_OBJ_ATTR_ENTRY, *PGDI_OBJ_ATTR_ENTRY; +static +VOID +BRUSH_vInit( + PBRUSH pbr) +{ + /* Start with kmode brush attribute */ + pbr->pBrushAttr = &pbr->BrushAttr; +} + +static +PBRUSH +BRUSH_AllocBrushWithHandle( + VOID) +{ + PBRUSH pbr; + + pbr = (PBRUSH)GDIOBJ_AllocObjWithHandle(GDILoObjType_LO_BRUSH_TYPE, sizeof(BRUSH)); + if (pbr == NULL) + { + return NULL; + } + + BRUSH_vInit(pbr); + return pbr; +} + +static +BOOL +BRUSH_bAllocBrushAttr(PBRUSH pbr) +{ + PPROCESSINFO ppi; + BRUSH_ATTR *pBrushAttr; + NT_ASSERT(pbr->pBrushAttr == &pbr->BrushAttr); + + ppi = PsGetCurrentProcessWin32Process(); + NT_ASSERT(ppi); + + pBrushAttr = GdiPoolAllocate(ppi->pPoolBrushAttr); + if (!pBrushAttr) + { + DPRINT1("Could not allocate brush attr\n"); + return FALSE; + } + + /* Copy the content from the kernel mode dc attr */ + pbr->pBrushAttr = pBrushAttr; + *pbr->pBrushAttr = pbr->BrushAttr; + + /* Set the object attribute in the handle table */ + GDIOBJ_vSetObjectAttr(&pbr->BaseObject, pBrushAttr); + + DPRINT("BRUSH_bAllocBrushAttr: pbr=%p, pbr->pdcattr=%p\n", pbr, pbr->pBrushAttr); + return TRUE; +} + +static +VOID +BRUSH_vFreeBrushAttr(PBRUSH pbr) +{ + PPROCESSINFO ppi; + + if (pbr->pBrushAttr == &pbr->BrushAttr) return; + + /* Reset the object attribute in the handle table */ + GDIOBJ_vSetObjectAttr(&pbr->BaseObject, NULL); + + /* Free memory from the process gdi pool */ + ppi = PsGetCurrentProcessWin32Process(); + ASSERT(ppi); + GdiPoolFree(ppi->pPoolBrushAttr, pbr->pBrushAttr); + + /* Reset to kmode brush attribute */ + pbr->pBrushAttr = &pbr->BrushAttr; +} BOOL FASTCALL @@ -34,16 +95,20 @@ if ((ulOwner == GDI_OBJ_HMGR_PUBLIC) || ulOwner == GDI_OBJ_HMGR_NONE) { + /* Free user mode attribute, if any */ + BRUSH_vFreeBrushAttr(pbr); + // Deny user access to User Data. GDIOBJ_vSetObjectAttr(&pbr->BaseObject, NULL); - // FIXME: deallocate brush attr } if (ulOwner == GDI_OBJ_HMGR_POWNED) { + /* Allocate a user mode attribute */ + BRUSH_bAllocBrushAttr(pbr); + // Allow user access to User Data. GDIOBJ_vSetObjectAttr(&pbr->BaseObject, pbr->pBrushAttr); - // FIXME: Allocate brush attr } GDIOBJ_vSetObjectOwner(&pbr->BaseObject, ulOwner); @@ -62,56 +127,6 @@ Ret = IntGdiSetBrushOwner(pbrush, ulOwner); BRUSH_ShareUnlockBrush(pbrush); return Ret; -} - -BOOL -NTAPI -BRUSH_bAllocBrushAttr(PBRUSH pbr) -{ - PPROCESSINFO ppi; - BRUSH_ATTR *pBrushAttr; - - ppi = PsGetCurrentProcessWin32Process(); - ASSERT(ppi); - - pBrushAttr = GdiPoolAllocate(ppi->pPoolDcAttr); - if (!pBrushAttr) - { - DPRINT1("Could not allocate brush attr\n"); - return FALSE; - } - - /* Copy the content from the kernel mode dc attr */ - pbr->pBrushAttr = pBrushAttr; - *pbr->pBrushAttr = pbr->BrushAttr; - - /* Set the object attribute in the handle table */ - GDIOBJ_vSetObjectAttr(&pbr->BaseObject, pBrushAttr); - - DPRINT("BRUSH_bAllocBrushAttr: pbr=%p, pbr->pdcattr=%p\n", pbr, pbr->pBrushAttr); - return TRUE; -} - - -VOID -NTAPI -BRUSH_vFreeBrushAttr(PBRUSH pbr) -{ -#if 0 - PPROCESSINFO ppi; - - if (pbrush->pBrushAttr == &pbrush->BrushAttr) return; - - /* Reset the object attribute in the handle table */ - GDIOBJ_vSetObjectAttr(&pbr->BaseObject, NULL); - - /* Free memory from the process gdi pool */ - ppi = PsGetCurrentProcessWin32Process(); - ASSERT(ppi); - GdiPoolFree(ppi->pPoolBrushAttr, pbr->pBrushAttr); -#endif - /* Reset to kmode brush attribute */ - pbr->pBrushAttr = &pbr->BrushAttr; } VOID Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Wed Feb 11 21:33:24 2015 @@ -32,12 +32,12 @@ ULONG ulPalTime; ULONG ulSurfTime; PVOID ulRealization; - ULONG Unknown4C[3]; + //ULONG Unknown4C[3]; POINT ptPenWidth; ULONG ulPenStyle; DWORD *pStyle; ULONG dwStyleCount; - ULONG Unknown6C; + //ULONG Unknown6C; } BRUSH, *PBRUSH; typedef struct _EBRUSHOBJ @@ -86,8 +86,6 @@ #define BR_CACHED_ENGINE 0x00040000 #define BR_CACHED_IS_SOLID 0x80000000 -#define BRUSH_AllocBrush() ((PBRUSH) GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) -#define BRUSH_AllocBrushWithHandle() ((PBRUSH) GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_BRUSH, sizeof(BRUSH))) #define BRUSH_FreeBrush(pBrush) GDIOBJ_FreeObj((POBJ)pBrush, GDIObjType_BRUSH_TYPE) #define BRUSH_FreeBrushByHandle(hBrush) GDIOBJ_FreeObjByHandle((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH) #define BRUSH_ShareLockBrush(hBrush) ((PBRUSH)GDIOBJ_ShareLockObj((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH)) Modified: trunk/reactos/win32ss/gdi/ntgdi/color.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/color.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/color.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/color.h [iso-8859-1] Wed Feb 11 21:33:24 2015 @@ -1,8 +1,5 @@ #pragma once -#ifndef CLR_INVALID -#define CLR_INVALID 0xffffffff -#endif #define PC_SYS_USED 0x80 /* Palentry is used (both system and logical) */ #define PC_SYS_RESERVED 0x40 /* System palentry is not to be mapped to */ #define PC_SYS_MAPPED 0x10 /* Logical palentry is a direct alias for system palentry */ Modified: trunk/reactos/win32ss/gdi/ntgdi/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/pen.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] Wed Feb 11 21:33:24 2015 @@ -13,9 +13,52 @@ /* PRIVATE FUNCTIONS **********************************************************/ +static +VOID +PEN_vInit( + PPEN ppen) +{ + /* Start with kmode brush attribute */ + ppen->pBrushAttr = &ppen->BrushAttr; +} + +PBRUSH +NTAPI +PEN_AllocPenWithHandle( + VOID) +{ + PPEN ppen; + + ppen = (PBRUSH)GDIOBJ_AllocObjWithHandle(GDILoObjType_LO_PEN_TYPE, sizeof(PEN)); + if (ppen == NULL) + { + return NULL; + } + + PEN_vInit(ppen); + return ppen; +} + +PBRUSH +NTAPI +PEN_AllocExtPenWithHandle( + VOID) +{ + PPEN ppen; + + ppen = (PBRUSH)GDIOBJ_AllocObjWithHandle(GDILoObjType_LO_EXTPEN_TYPE, sizeof(PEN)); + if (ppen == NULL) + { + return NULL; + } + + PEN_vInit(ppen); + return ppen; +} + PBRUSH FASTCALL -PEN_ShareLockPen(HGDIOBJ hobj) +PEN_ShareLockPen(HPEN hobj) { if ((GDI_HANDLE_GET_TYPE(hobj) != GDILoObjType_LO_PEN_TYPE) && (GDI_HANDLE_GET_TYPE(hobj) != GDILoObjType_LO_EXTPEN_TYPE)) Modified: trunk/reactos/win32ss/gdi/ntgdi/pen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/pen.h?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/pen.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/pen.h [iso-8859-1] Wed Feb 11 21:33:24 2015 @@ -2,24 +2,28 @@ /* Internal interface */ -#define PEN_AllocPen() ((HPEN)GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) -#define PEN_AllocPenWithHandle() ((PBRUSH)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PEN, sizeof(BRUSH))) +typedef BRUSH PEN, *PPEN; -#define PEN_FreePen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDIObjType_BRUSH_TYPE) -#define PEN_FreePenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN) +PPEN +NTAPI +PEN_AllocPenWithHandle( + VOID); -#define PEN_AllocExtPen() ((PBRUSH)GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) -#define PEN_AllocExtPenWithHandle() ((PBRUSH)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_EXTPEN, sizeof(BRUSH))) - -#define PEN_FreeExtPen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDIObjType_BRUSH_TYPE) -#define PEN_FreeExtPenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_EXTPEN) - -//#define PEN_LockExtPen(hBMObj) ((PBRUSH)GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_EXTPEN)) +PPEN +NTAPI +PEN_AllocExtPenWithHandle( + VOID); #define PEN_UnlockPen(pPenObj) GDIOBJ_vUnlockObject((POBJ)pPenObj) +#define PEN_ShareUnlockPen(ppen) GDIOBJ_vDereferenceObject((POBJ)ppen) -#define PEN_ShareUnlockPen(ppen) GDIOBJ_vDereferenceObject((POBJ)ppen) +PPEN +FASTCALL +PEN_ShareLockPen(HPEN hpen); -PBRUSH FASTCALL PEN_ShareLockPen(HGDIOBJ); - -INT APIENTRY PEN_GetObject(PBRUSH pPen, INT Count, PLOGPEN Buffer); +INT +NTAPI +PEN_GetObject( + _In_ PPEN pPen, + _In_ INT Count, + _Out_ PLOGPEN Buffer);

1 0

[tkreuzer] 66225: [WIN32K] Fix ROP2 value coming from user mode before using it.
by tkreuzer＠svn.reactos.org 11 Feb '15

11 Feb '15

Author: tkreuzer Date: Wed Feb 11 21:32:54 2015 New Revision: 66225 URL: http://svn.reactos.org/svn/reactos?rev=66225&view=rev Log: [WIN32K] Fix ROP2 value coming from user mode before using it. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/intgdi.h Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Wed Feb 11 21:32:54 2015 @@ -1150,7 +1150,7 @@ &prgnClip->rdh.rcBound ); /* Get the FG rop and create a MIX based on the BK mode */ - rop2Fg = pdc->pdcattr->jROP2; + rop2Fg = FIXUP_ROP2(pdc->pdcattr->jROP2); mix = rop2Fg | (pdc->pdcattr->jBkMode == OPAQUE ? rop2Fg : R2_NOP) << 8; /* Prepare DC for blit */ Modified: trunk/reactos/win32ss/gdi/ntgdi/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/intgdi.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] Wed Feb 11 21:32:54 2015 @@ -4,6 +4,9 @@ #define ROP_USES_MASK(Rop) (((Rop) & 0xFF000000) != (((Rop) & 0xff0000) << 8)) #define FIXUP_ROP(Rop) if(((Rop) & 0xFF000000) == 0) Rop = MAKEROP4((Rop), (Rop)) #define ROP_TO_ROP4(Rop) ((Rop) >> 16) + +/* The range of valid ROP2 values is 1 .. 16 */ +#define FIXUP_ROP2(rop2) ((((rop2) - 1) & 0xF) + 1) /* Brush functions */

1 0

[tkreuzer] 66224: [WIN32K] Simplify ROP4_USES_* macros
by tkreuzer＠svn.reactos.org 11 Feb '15

11 Feb '15

Author: tkreuzer Date: Wed Feb 11 21:32:24 2015 New Revision: 66224 URL: http://svn.reactos.org/svn/reactos?rev=66224&view=rev Log: [WIN32K] Simplify ROP4_USES_* macros Modified: trunk/reactos/win32ss/gdi/eng/inteng.h Modified: trunk/reactos/win32ss/gdi/eng/inteng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/inteng.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/inteng.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/inteng.h [iso-8859-1] Wed Feb 11 21:32:24 2015 @@ -41,10 +41,10 @@ #define ROP4_FROM_INDEX(index) ((index) | ((index) << 8)) -#define ROP4_USES_SOURCE(Rop4) (((((Rop4) & 0xCC00) >> 2) != ((Rop4) & 0x3300)) || ((((Rop4) & 0xCC) >> 2) != ((Rop4) & 0x33))) -#define ROP4_USES_MASK(Rop4) (((Rop4) & 0xFF00) != (((Rop4) & 0xff) << 8)) -#define ROP4_USES_DEST(Rop4) (((((Rop4) & 0xAA) >> 1) != ((Rop4) & 0x55)) || ((((Rop4) & 0xAA00) >> 1) != ((Rop4) & 0x5500))) -#define ROP4_USES_PATTERN(Rop4) (((((Rop4) & 0xF0) >> 4) != ((Rop4) & 0x0F)) || ((((Rop4) & 0xF000) >> 4) != ((Rop4) & 0x0F00))) +#define ROP4_USES_DEST(Rop4) ((((Rop4) & 0xAAAA) >> 1) != ((Rop4) & 0x5555)) +#define ROP4_USES_SOURCE(Rop4) ((((Rop4) & 0xCCCC) >> 2) != ((Rop4) & 0x3333)) +#define ROP4_USES_PATTERN(Rop4) ((((Rop4) & 0xF0F0) >> 4) != ((Rop4) & 0x0F0F)) +#define ROP4_USES_MASK(Rop4) ((((Rop4) & 0xFF00) >> 8) != ((Rop4) & 0x00ff)) #define IS_VALID_ROP4(rop) (((rop) & 0xFFFF0000) == 0)

1 0

[hbelusca] 66223: [WIN32K]: Fix an insecure user buffer reading/writing. Caught by Thomas Faber, thanks! CORE-8322
by hbelusca＠svn.reactos.org 11 Feb '15

11 Feb '15

Author: hbelusca Date: Wed Feb 11 20:12:30 2015 New Revision: 66223 URL: http://svn.reactos.org/svn/reactos?rev=66223&view=rev Log: [WIN32K]: Fix an insecure user buffer reading/writing. Caught by Thomas Faber, thanks! CORE-8322 Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Wed Feb 11 20:12:30 2015 @@ -790,6 +790,8 @@ { case UserThreadInitiateShutdown: { + ULONG CapturedFlags = 0; + ERR("Shutdown initiated\n"); if (ThreadInformationLength != sizeof(ULONG)) @@ -798,7 +800,33 @@ break; } - Status = UserInitiateShutdown(Thread, (PULONG)ThreadInformation); + /* Capture the caller value */ + Status = STATUS_SUCCESS; + _SEH2_TRY + { + ProbeForWrite(ThreadInformation, sizeof(CapturedFlags), sizeof(PVOID)); + CapturedFlags = *(PULONG)ThreadInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (NT_SUCCESS(Status)) + Status = UserInitiateShutdown(Thread, &CapturedFlags); + + /* Return the modified value to the caller */ + _SEH2_TRY + { + *(PULONG)ThreadInformation = CapturedFlags; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + break; } @@ -814,6 +842,7 @@ break; } + /* Capture the caller value */ Status = STATUS_SUCCESS; _SEH2_TRY { @@ -844,6 +873,7 @@ break; } + /* Capture the caller value */ Status = STATUS_SUCCESS; _SEH2_TRY {

1 0

[tfaber] 66222: [SHELL32] - Show a confirmation dialog when emptying the recycle bin. Patch by Robert Naumann, with some modifications by me. CORE-9006 #resolve
by tfaber＠svn.reactos.org 11 Feb '15

11 Feb '15

Author: tfaber Date: Wed Feb 11 11:06:12 2015 New Revision: 66222 URL: http://svn.reactos.org/svn/reactos?rev=66222&view=rev Log: [SHELL32] - Show a confirmation dialog when emptying the recycle bin. Patch by Robert Naumann, with some modifications by me. CORE-9006 #resolve Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Wed Feb 11 11:06:12 2015 @@ -1415,7 +1415,7 @@ DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { TRACE("(%p) object dropped on recycle bin, effect %u\n", this, *pdwEffect); - + /* TODO: pdwEffect should be read and make the drop object be permanently deleted in the move case (shift held) */ FORMATETC fmt; @@ -1430,7 +1430,7 @@ } else { - /* + /* * TODO call SetData on the data object with format CFSTR_TARGETCLSID * set to the Recycle Bin's class identifier CLSID_RecycleBin. */ @@ -1438,7 +1438,7 @@ return S_OK; } -DWORD WINAPI DoDeleteThreadProc(LPVOID lpParameter) +DWORD WINAPI DoDeleteThreadProc(LPVOID lpParameter) { CoInitialize(NULL); CComPtr<IDataObject> pDataObject; @@ -1451,7 +1451,7 @@ return 0; } -HRESULT WINAPI DoDeleteDataObject(IDataObject *pda) +HRESULT WINAPI DoDeleteDataObject(IDataObject *pda) { TRACE("performing delete"); HRESULT hr; @@ -1499,7 +1499,7 @@ { psfFrom = psfDesktop; } - else + else { hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfFrom)); if (FAILED(hr)) @@ -1603,19 +1603,80 @@ HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags) { - WCHAR szPath[MAX_PATH] = {0}; - DWORD dwSize, dwType; + WCHAR szPath[MAX_PATH] = {0}, szBuffer[MAX_PATH]; + DWORD dwSize, dwType, count; LONG ret; + IShellFolder *pDesktop, *pRecycleBin; + PIDLIST_ABSOLUTE pidlRecycleBin; + PITEMID_CHILD pidl; + HRESULT hr = S_OK; + LPENUMIDLIST penumFiles; + STRRET StrRet; TRACE("%p, %s, 0x%08x\n", hwnd, debugstr_w(pszRootPath), dwFlags); if (!(dwFlags & SHERB_NOCONFIRMATION)) { - /* FIXME - * enumerate available files - * show confirmation dialog - */ - FIXME("show confirmation dialog\n"); + hr = SHGetDesktopFolder(&pDesktop); + if (FAILED(hr)) + return hr; + hr = SHGetFolderLocation(NULL, CSIDL_BITBUCKET, NULL, 0, &pidlRecycleBin); + if (FAILED(hr)) + { + pDesktop->Release(); + return hr; + } + hr = pDesktop->BindToObject(pidlRecycleBin, NULL, IID_PPV_ARG(IShellFolder, &pRecycleBin)); + CoTaskMemFree(pidlRecycleBin); + pDesktop->Release(); + if (FAILED(hr)) + return hr; + hr = pRecycleBin->EnumObjects(hwnd, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN, &penumFiles); + if (FAILED(hr)) + { + pRecycleBin->Release(); + return hr; + } + + count = 0; + if (hr != S_FALSE) + { + while (penumFiles->Next(1, &pidl, NULL) == S_OK) + { + count++; + pRecycleBin->GetDisplayNameOf(pidl, SHGDN_NORMAL, &StrRet); + StrRetToBuf(&StrRet, pidl, szBuffer, _countof(szBuffer)); + CoTaskMemFree(pidl); + } + penumFiles->Release(); + } + pRecycleBin->Release(); + + switch (count) + { + case 0: + /* no files, don't need confirmation */ + break; + + case 1: + /* we have only one item inside the bin, so show a message box with its name */ + if (ShellMessageBoxW(shell32_hInstance, hwnd, MAKEINTRESOURCEW(IDS_DELETEITEM_TEXT), MAKEINTRESOURCEW(IDS_EMPTY_BITBUCKET), + MB_ICONEXCLAMATION | MB_YESNO | MB_DEFBUTTON2, szBuffer) == IDNO) + { + return S_OK; + } + break; + + default: + /* we have more than one item, so show a message box with the count of the items */ + StringCbPrintfW(szBuffer, sizeof(szBuffer), L"%u", count); + if (ShellMessageBoxW(shell32_hInstance, hwnd, MAKEINTRESOURCEW(IDS_DELETEMULTIPLE_TEXT), MAKEINTRESOURCEW(IDS_EMPTY_BITBUCKET), + MB_ICONEXCLAMATION | MB_YESNO | MB_DEFBUTTON2, szBuffer) == IDNO) + { + return S_OK; + } + break; + } } if (dwFlags & SHERB_NOPROGRESSUI)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs