Ros-diffs March 2012

ros-diffs@reactos.org

22 participants
351 discussions

[tkreuzer] 56224: [WIN32K] - Fix right-to-left support the new EngBitBlt code - Remove an ASSERT that we don't support - Fix clipping in IntEngBitBlt by bailing out when the target rect got empty -...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 24 21:07:46 2012 New Revision: 56224 URL: http://svn.reactos.org/svn/reactos?rev=56224&view=rev Log: [WIN32K] - Fix right-to-left support the new EngBitBlt code - Remove an ASSERT that we don't support - Fix clipping in IntEngBitBlt by bailing out when the target rect got empty - Delete obsolete file You can use the code now, but there is a bug in the clipping code somewhere, sometimes causing the taskbar to be overwritten Removed: trunk/reactos/subsystems/win32/win32k/diblib/engbitblt.c Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c Removed: trunk/reactos/subsystems/win32/win32k/diblib/engbitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/engbitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/engbitblt.c (removed) @@ -1,282 +1,0 @@ - -#include "DibLib.h" - -#define ROP4_FGND(Rop4) ((Rop4) & 0x00FF) -#define ROP4_BKGND(Rop4) (((Rop4) & 0xFF00) >> 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))) - - -typedef struct -{ - ULONG c; - RECTL arcl[5]; -} RECT_ENUM; - -static -VOID -AdjustOffsetAndSize( - _Out_ PPOINTL pptOffset, - _Out_ PSIZEL psizTrg, - _In_ PPOINTL pptlSrc, - _In_ PSIZEL psizSrc) -{ - ULONG x, y, cxMax, cyMax; - - x = pptlSrc->x + pptOffset->x; - if (x < 0) pptOffset->x -= x, x = 0; - - cxMax = psizSrc->cx - x; - if (psizTrg->cx > cxMax) psizTrg->cx= cxMax; - - y = pptlSrc->y + pptOffset->y; - if (y < 0) pptOffset->y -= y, y = 0; - - cyMax = psizSrc->cy - y; - if (psizTrg->cy > cyMax) psizTrg->cy = cyMax; -} - -BOOL -APIENTRY -EngBitBlt( - _Inout_ SURFOBJ *psoTrg, - _In_opt_ SURFOBJ *psoSrc, - _In_opt_ SURFOBJ *psoMask, - _In_opt_ CLIPOBJ *pco, - _In_opt_ XLATEOBJ *pxlo, - _In_ RECTL *prclTrg, - _When_(psoSrc, _In_) POINTL *pptlSrc, - _When_(psoMask, _In_) POINTL *pptlMask, - _In_opt_ BRUSHOBJ *pbo, - _When_(pbo, _In_) POINTL *pptlBrush, - _In_ ROP4 rop4) -{ - BLTDATA bltdata; - ULONG i, iDComplexity, iDirection, rop3Fg, iFunctionIndex; - RECTL rcTrg; - POINTL ptOffset, ptSrc, ptMask; - SIZEL sizTrg; - PFN_DIBFUNCTION pfnBitBlt; - BOOL bEnumMore; - RECT_ENUM rcenum; - - /* Clip the target rect to the extents of the target surface */ - rcTrg.left = min(prclTrg->left, 0); - rcTrg.top = min(prclTrg->top, 0); - rcTrg.right = min(prclTrg->right, psoTrg->sizlBitmap.cx); - rcTrg.bottom = min(prclTrg->bottom, psoTrg->sizlBitmap.cy); - - /* Check if there is a clipping region */ - iDComplexity = pco ? pco->iDComplexity : DC_TRIVIAL; - if (iDComplexity != DC_TRIVIAL) - { - /* Clip the target rect to the bounds of the clipping region */ - RECTL_bIntersectRect(&rcTrg, prclTrg, &pco->rclBounds); - } - - /* Calculate initial offset and size */ - ptOffset.x = rcTrg.left - prclTrg->left; - ptOffset.y = rcTrg.top - prclTrg->top; - sizTrg.cx = rcTrg.right - rcTrg.left; - sizTrg.cy = rcTrg.bottom - rcTrg.top; - - /* Check if the ROP uses a source */ - if (ROP4_USES_SOURCE(rop4)) - { - /* Must have a source surface and point */ - if (!psoSrc || !pptlSrc) return FALSE; - - /* Get the source point */ - ptSrc = *pptlSrc; - - /* Clip against the extents of the source surface */ - AdjustOffsetAndSize(&ptOffset, &sizTrg, &ptSrc, &psoSrc->sizlBitmap); - - /* Check if source and target are equal */ - if (psoSrc == psoTrg) - { - /* Use 0 to mark source as equal to target */ - bltdata.siSrc.iFormat = 0; - - } - else - { - bltdata.siSrc.iFormat = psoSrc->iBitmapFormat; - } - bltdata.siSrc.pjBase = psoSrc->pvScan0; - bltdata.siSrc.lDelta = psoSrc->lDelta; - } - else - { - ptSrc.x = 0; - ptSrc.y = 0; - } - - /* Check if the ROP uses a mask */ - if (ROP4_USES_MASK(rop4)) - { - /* Must have a mask surface and point */ - if (!psoMask || !pptlMask) return FALSE; - - /* Get the mask point */ - ptMask = *pptlMask; - - /* Clip against the extents of the mask surface */ - AdjustOffsetAndSize(&ptOffset, &sizTrg, &ptMask, &psoMask->sizlBitmap); - - bltdata.siMsk.iFormat = psoMask->iBitmapFormat; - bltdata.siMsk.pjBase = psoMask->pvScan0; - bltdata.siMsk.lDelta = psoMask->lDelta; - } - else - { - ptMask.x = 0; - ptMask.y = 0; - } - - /* Adjust the points */ - ptSrc.x += ptOffset.x; - ptSrc.y += ptOffset.y; - ptMask.x += ptOffset.x; - ptMask.y += ptOffset.y; - - /* Recalculate the target rect */ - rcTrg.left = prclTrg->left + ptOffset.x; - rcTrg.top = prclTrg->top + ptOffset.y; - rcTrg.right = rcTrg.left + sizTrg.cx; - rcTrg.bottom = rcTrg.top + sizTrg.cy; - - bltdata.ulWidth = prclTrg->right - prclTrg->left; - bltdata.ulHeight = prclTrg->bottom - prclTrg->top; - bltdata.pxlo = pxlo; - bltdata.rop4 = rop4; - - bltdata.siDst.iFormat = psoTrg->iBitmapFormat; - bltdata.siDst.pjBase = psoTrg->pvScan0; - bltdata.siDst.lDelta = psoTrg->lDelta; - bltdata.siDst.ptOrig.x = prclTrg->left; - bltdata.siDst.ptOrig.y = prclTrg->top; - - - /* Check of the ROP uses a pattern / brush */ - if (ROP4_USES_PATTERN(rop4)) - { - /* Must have a brush */ - if (!pbo) return FALSE; - - /* Copy the solid color */ - bltdata.ulSolidColor = pbo->iSolidColor; - - /* Check if this is a pattern brush */ - if (pbo->iSolidColor == 0xFFFFFFFF) - { - // FIXME: use EBRUSHOBJ - - bltdata.siPat.iFormat = 0;//psoPat->iBitmapFormat; - bltdata.siPat.pjBase = 0;//psoPat->pvScan0; - bltdata.siPat.lDelta = 0;//psoPat->lDelta; - bltdata.siPat.ptOrig = *pptlBrush; - - bltdata.ulPatWidth = 0; - bltdata.ulPatHeight = 0; - } - } - - /* Analyze the copying direction */ - if (psoTrg == psoSrc) - { - if (rcTrg.top < ptSrc.y) - iDirection = rcTrg.left < ptSrc.x ? CD_RIGHTDOWN : CD_LEFTDOWN; - else - iDirection = rcTrg.left < ptSrc.x ? CD_RIGHTUP : CD_LEFTUP; - } - else - iDirection = CD_ANY; - - /* Check if this is a masking ROP */ - if (ROP4_USES_MASK(rop4)) - { - bltdata.apfnDoRop[0] = gapfnRop[ROP4_BKGND(rop4)]; - bltdata.apfnDoRop[1] = gapfnRop[ROP4_FGND(rop4)]; - } - - /* Get the foreground ROP index */ - rop3Fg = ROP4_FGND(rop4); - - /* Get the function index */ - iFunctionIndex = aiIndexPerRop[rop3Fg]; - - /* Get the dib function */ - pfnBitBlt = apfnDibFunction[iFunctionIndex]; - - /* Check if we need to enumerate rects */ - if (iDComplexity == DC_COMPLEX) - { - /* Start the enumeration of the clip object */ - CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, iDirection, 0); - do - { - /* Enumerate a set of rectangles */ - bEnumMore = CLIPOBJ_bEnum(pco, sizeof(rcenum), (ULONG*)&rcenum); - - /* Loop all rectangles we got */ - for (i = 0; i < rcenum.c; i++) - { - /* Intersect this rect with the already calculated bounds rect */ - if (!RECTL_bIntersectRect(&rcenum.arcl[i], &rcenum.arcl[i], &rcTrg)) - { - /* This rect is outside the valid bounds, continue */ - continue; - } - - /* Copy the target start point */ - bltdata.siDst.ptOrig.x = rcenum.arcl[i].left; - bltdata.siDst.ptOrig.x = rcenum.arcl[i].top; - - /* Calculate width and height of this rect */ - bltdata.ulWidth = rcenum.arcl[i].right - rcenum.arcl[i].left; - bltdata.ulHeight = rcenum.arcl[i].bottom - rcenum.arcl[i].top; - - /* Calculate the offset of this rect from the original coordinates */ - ptOffset.x = rcenum.arcl[i].left - prclTrg->left; - ptOffset.y = rcenum.arcl[i].top - prclTrg->top; - - /* Calculate current origin for source and mask */ - bltdata.siSrc.ptOrig.x = pptlSrc->x + ptOffset.x; - bltdata.siSrc.ptOrig.y = pptlSrc->y + ptOffset.y; - bltdata.siMsk.ptOrig.x = pptlMask->x + ptOffset.x; - bltdata.siMsk.ptOrig.y = pptlMask->y + ptOffset.y; - - //bltdata.siPat.ptOrig.x = (pptlMask->x + ptOffset.x) % psoMask->sizlBitmap.cx; - //bltdata.siPat.ptOrig.y = (pptlMask->y + ptOffset.y) % psoMask->sizlBitmap.cx; - - } - } - while (bEnumMore); - } - else - { - /* Call the dib function */ - pfnBitBlt(&bltdata); - } - - return TRUE; -} - -ULONG -NTAPI -XLATEOBJ_iXlate(XLATEOBJ *pxlo, ULONG ulColor) -{ - return ulColor; -} - -BOOL -//__fastcall -RECTL_bIntersectRect(RECTL* prclDst, const RECTL* prcl1, const RECTL* prcl2) -{ - return TRUE; -} - Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c [iso-8859-1] Sat Mar 24 21:07:46 2012 @@ -27,8 +27,13 @@ pbltdata->ulWidth = prclClipped->right - prclClipped->left; pbltdata->ulHeight = prclClipped->bottom - prclClipped->top; - /* Calculate the offset to the origin coordinates */ - cx = (prclClipped->left - prclOrg->left); + /* Calculate the x offset to the origin coordinates */ + if (pbltdata->siDst.iFormat == 0) + cx = (prclClipped->right - 1 - prclOrg->left); + else + cx = (prclClipped->left - prclOrg->left); + + /* Calculate the y offset to the origin coordinates */ if (pbltdata->dy < 0) cy = (prclClipped->bottom - 1 - prclOrg->top); else @@ -43,14 +48,11 @@ pbltdata->siDst.pjBase += pbltdata->siDst.ptOrig.y * pbltdata->siDst.lDelta; pbltdata->siDst.pjBase += pbltdata->siDst.ptOrig.x * pbltdata->siDst.jBpp / 8; - if (pptlSrc) { - /* Calculate current origin for the source */ + /* Calculate start point and bitpointer for source */ pbltdata->siSrc.ptOrig.x = pptlSrc->x + cx; pbltdata->siSrc.ptOrig.y = pptlSrc->y + cy; - - /* Calculate start position for source */ pbltdata->siSrc.pjBase = pbltdata->siSrc.pvScan0; pbltdata->siSrc.pjBase += pbltdata->siSrc.ptOrig.y * pbltdata->siSrc.lDelta; pbltdata->siSrc.pjBase += pbltdata->siSrc.ptOrig.x * pbltdata->siSrc.jBpp / 8; @@ -58,10 +60,9 @@ if (pptlMask) { + /* Calculate start point and bitpointer for mask */ pbltdata->siMsk.ptOrig.x = pptlMask->x + cx; pbltdata->siMsk.ptOrig.y = pptlMask->y + cy; - - /* Calculate start position for mask */ pbltdata->siMsk.pjBase = pbltdata->siMsk.pvScan0; pbltdata->siMsk.pjBase += pbltdata->siMsk.ptOrig.y * pbltdata->siMsk.lDelta; pbltdata->siMsk.pjBase += pbltdata->siMsk.ptOrig.x * pbltdata->siMsk.jBpp / 8; @@ -69,10 +70,9 @@ if (pptlPat) { + /* Calculate start point and bitpointer for pattern */ pbltdata->siPat.ptOrig.x = (pptlPat->x + cx) % psizlPat->cx; pbltdata->siPat.ptOrig.y = (pptlPat->x + cy) % psizlPat->cy; - - /* Calculate start position for pattern */ pbltdata->siPat.pjBase = pbltdata->siPat.pvScan0; pbltdata->siPat.pjBase += pbltdata->siPat.ptOrig.y * pbltdata->siPat.lDelta; pbltdata->siPat.pjBase += pbltdata->siPat.ptOrig.x * pbltdata->siPat.jBpp / 8; @@ -158,7 +158,7 @@ /* Use 0 as target format to get special right to left versions */ bltdata.siDst.iFormat = 0; bltdata.siSrc.iFormat = psoSrc->iBitmapFormat; - __debugbreak(); + //__debugbreak(); } else { @@ -241,8 +241,9 @@ ASSERT(psoMask); ASSERT(pptlMask); - __debugbreak(); - + //__debugbreak(); + + /* Set the mask format info */ bltdata.siMsk.iFormat = psoMask->iBitmapFormat; bltdata.siMsk.pvScan0 = psoMask->pvScan0; bltdata.siMsk.lDelta = psoMask->lDelta; @@ -342,7 +343,7 @@ if (x < 0) pptOffset->x -= x, x = 0; cxMax = psizSrc->cx - x; - if (psizTrg->cx > cxMax) psizTrg->cx= cxMax; + if (psizTrg->cx > cxMax) psizTrg->cx = cxMax; y = pptlSrc->y + pptOffset->y; if (y < 0) pptOffset->y -= y, y = 0; @@ -380,7 +381,6 @@ ASSERT(psoTrg->iBitmapFormat >= BMF_1BPP); ASSERT(psoTrg->iBitmapFormat <= BMF_32BPP); ASSERT(prclTrg); - ASSERT(RECTL_bIsWellOrdered(prclTrg)); /* Clip the target rect to the extents of the target surface */ rcClipped.left = max(prclTrg->left, 0); @@ -395,11 +395,15 @@ if (pco->iDComplexity != DC_TRIVIAL) { /* Clip the target rect to the bounds of the clipping region */ - RECTL_bIntersectRect(&rcClipped, &rcClipped, &pco->rclBounds); + if (!RECTL_bIntersectRect(&rcClipped, &rcClipped, &pco->rclBounds)) + { + /* Nothing left */ + return TRUE; + } } /* Don't pass a clip object with a single rectangle */ -// if (pco->iDComplexity == DC_RECT) pco = (CLIPOBJ*)&gxcoTrivial; + if (pco->iDComplexity == DC_RECT) pco = (CLIPOBJ*)&gxcoTrivial; /* Calculate initial offset and size */ ptOffset.x = rcClipped.left - prclTrg->left; @@ -446,6 +450,10 @@ ptMask.x = 0; ptMask.y = 0; } + + /* Check if all has been clipped away */ + if ((sizTrg.cx <= 0) || (sizTrg.cy <= 0)) + return TRUE; /* Adjust the points */ ptSrc.x += ptOffset.x; @@ -628,3 +636,16 @@ /* Forward to the driver */ return pfnCopyBits(psoTrg, psoSrc, pco, pxlo, prclTrg, pptlSrc); } + +BOOL +APIENTRY +IntEngCopyBits( + SURFOBJ *psoTrg, + SURFOBJ *psoSrc, + CLIPOBJ *pco, + XLATEOBJ *pxlo, + RECTL *prclTrg, + POINTL *pptlSrc) +{ + return EngCopyBits(psoTrg, psoSrc, pco, pxlo, prclTrg, pptlSrc); +}

12 years, 9 months

[tkreuzer] 56223: [WIN32K] Fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 24 19:04:09 2012 New Revision: 56223 URL: http://svn.reactos.org/svn/reactos?rev=56223&view=rev Log: [WIN32K] Fix build Modified: trunk/reactos/subsystems/win32/win32k/CMakeLists.txt Modified: trunk/reactos/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/CM… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Sat Mar 24 19:04:09 2012 @@ -43,7 +43,7 @@ eng/engevent.c eng/clip.c eng/debug.c - eng/drvdbg.c + #eng/drvdbg.c eng/device.c eng/driverobj.c eng/error.c

12 years, 9 months

[tkreuzer] 56222: [WIN32K] Allow to build win32k with the new dib library, a switch is in win32k's CMakeLists.txt

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 24 18:52:48 2012 New Revision: 56222 URL: http://svn.reactos.org/svn/reactos?rev=56222&view=rev Log: [WIN32K] Allow to build win32k with the new dib library, a switch is in win32k's CMakeLists.txt Added: trunk/reactos/subsystems/win32/win32k/dib/dib_new.c (with props) Modified: trunk/reactos/subsystems/win32/win32k/CMakeLists.txt trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/CM… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Sat Mar 24 18:52:48 2012 @@ -1,3 +1,5 @@ + +set (USE_DIBLIB FALSE) spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) @@ -33,7 +35,6 @@ dib/dib16bpp.c dib/dib24bpp.c dib/dib32bpp.c - dib/dib.c dib/floodfill.c dib/stretchblt.c eng/alphablend.c @@ -41,8 +42,8 @@ eng/engbrush.c eng/engevent.c eng/clip.c - eng/copybits.c eng/debug.c + eng/drvdbg.c eng/device.c eng/driverobj.c eng/error.c @@ -143,7 +144,7 @@ objects/font.c objects/freetype.c objects/gdibatch.c - objects/gdidbg.c + objects/gdidbg.c objects/gdiobj.c objects/gdipool.c objects/icm.c @@ -164,7 +165,18 @@ stubs/umpdstubs.c win32k.rc) -list(APPEND SOURCE ${GENDIB_FILES}) +if (USE_DIBLIB) + add_definitions( + -D_USE_DIBLIB_) + list(APPEND SOURCE + dib/dib_new.c + eng/bitblt_new.c) +else() + list(APPEND SOURCE + dib/dib.c + eng/copybits.c + ${GENDIB_FILES}) +endif() if(ARCH MATCHES i386) list(APPEND SOURCE @@ -194,6 +206,11 @@ dxguid libcntpr) +if (USE_DIBLIB) + target_link_libraries(win32k + diblib) +endif() + add_importlibs(win32k ntoskrnl hal ftfd) add_pch(win32k pch.h) add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all) @@ -201,3 +218,9 @@ add_library(win32ksys sys-stubs.S) set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h) + +if (USE_DIBLIB) + add_subdirectory(diblib) +endif() + + Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] Sat Mar 24 18:52:48 2012 @@ -313,6 +313,7 @@ return TRUE; } +#ifndef _USE_DIBLIB_ BOOLEAN DIB_1BPP_BitBlt(PBLTINFO BltInfo) { @@ -465,6 +466,7 @@ } return TRUE; } +#endif // !_USE_DIBLIB_ BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, Modified: trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c [iso-8859-1] Sat Mar 24 18:52:48 2012 @@ -55,6 +55,7 @@ } } +#ifndef _USE_DIBLIB_ BOOLEAN DIB_4BPP_BitBltSrcCopy(PBLTINFO BltInfo) { @@ -366,6 +367,7 @@ } return TRUE; } +#endif // !_USE_DIBLIB_ BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, Added: trunk/reactos/subsystems/win32/win32k/dib/dib_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib_new.c (added) +++ trunk/reactos/subsystems/win32/win32k/dib/dib_new.c [iso-8859-1] Sat Mar 24 18:52:48 2012 @@ -1,0 +1,152 @@ +/* + * PROJECT: Win32 subsystem + * LICENSE: See COPYING in the top level directory + * FILE: subsystems/win32/win32k/dib/dib.c + * PURPOSE: ROP handling, function pointer arrays, misc + * PROGRAMMERS: Ge van Geldorp + */ + + +#include <win32k.h> +#include "..\diblib\DibLib_interface.h" + +/* Static data */ + +unsigned char notmask[2] = { 0x0f, 0xf0 }; +unsigned char altnotmask[2] = { 0xf0, 0x0f }; + +ULONG +DIB_DoRop(ULONG Rop, ULONG Dest, ULONG Source, ULONG Pattern) +{ + return gapfnRop[Rop & 0xFF](Dest, Source, Pattern); +} + +DIB_FUNCTIONS DibFunctionsForBitmapFormat[] = +{ + /* 0 */ + { + Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, + 0, 0, Dummy_StretchBlt, Dummy_TransparentBlt, + 0, Dummy_AlphaBlend + }, + /* BMF_1BPP */ + { + DIB_1BPP_PutPixel, DIB_1BPP_GetPixel, DIB_1BPP_HLine, DIB_1BPP_VLine, + 0, 0, DIB_XXBPP_StretchBlt, + DIB_1BPP_TransparentBlt, 0, DIB_XXBPP_AlphaBlend + }, + /* BMF_4BPP */ + { + DIB_4BPP_PutPixel, DIB_4BPP_GetPixel, DIB_4BPP_HLine, DIB_4BPP_VLine, + 0, 0, DIB_XXBPP_StretchBlt, + DIB_4BPP_TransparentBlt, 0, DIB_XXBPP_AlphaBlend + }, + /* BMF_8BPP */ + { + DIB_8BPP_PutPixel, DIB_8BPP_GetPixel, DIB_8BPP_HLine, DIB_8BPP_VLine, + 0, 0, DIB_XXBPP_StretchBlt, + DIB_8BPP_TransparentBlt, 0, DIB_XXBPP_AlphaBlend + }, + /* BMF_16BPP */ + { + DIB_16BPP_PutPixel, DIB_16BPP_GetPixel, DIB_16BPP_HLine, DIB_16BPP_VLine, + 0, 0, DIB_XXBPP_StretchBlt, + DIB_16BPP_TransparentBlt, 0, DIB_XXBPP_AlphaBlend + }, + /* BMF_24BPP */ + { + DIB_24BPP_PutPixel, DIB_24BPP_GetPixel, DIB_24BPP_HLine, DIB_24BPP_VLine, + 0, 0, DIB_XXBPP_StretchBlt, + DIB_24BPP_TransparentBlt, 0, DIB_24BPP_AlphaBlend + }, + /* BMF_32BPP */ + { + DIB_32BPP_PutPixel, DIB_32BPP_GetPixel, DIB_32BPP_HLine, DIB_32BPP_VLine, + 0, 0, DIB_XXBPP_StretchBlt, + DIB_32BPP_TransparentBlt, 0, DIB_32BPP_AlphaBlend + }, + /* BMF_4RLE */ + { + Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, + 0, 0, Dummy_StretchBlt, Dummy_TransparentBlt, + 0, Dummy_AlphaBlend + }, + /* BMF_8RLE */ + { + Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, + 0, 0, Dummy_StretchBlt, Dummy_TransparentBlt, + 0, Dummy_AlphaBlend + }, + /* BMF_JPEG */ + { + Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, + 0, 0, Dummy_StretchBlt, Dummy_TransparentBlt, + 0, Dummy_AlphaBlend + }, + /* BMF_PNG */ + { + Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, + 0, 0, Dummy_StretchBlt, Dummy_TransparentBlt, + 0, Dummy_AlphaBlend + } +}; + + +VOID Dummy_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c) +{ + return; +} + +ULONG Dummy_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y) +{ + return 0; +} + +VOID Dummy_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c) +{ + return; +} + +VOID Dummy_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c) +{ + return; +} + +BOOLEAN Dummy_BitBlt(PBLTINFO BltInfo) +{ + return FALSE; +} + +BOOLEAN Dummy_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, + SURFOBJ *PatternSurface, SURFOBJ *MaskSurf, + RECTL* DestRect, RECTL *SourceRect, + POINTL* MaskOrigin, BRUSHOBJ* Brush, + POINTL* BrushOrign, + XLATEOBJ *ColorTranslation, + ROP4 Rop) +{ + return FALSE; +} + +BOOLEAN Dummy_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, + RECTL* DestRect, RECTL *SourceRect, + XLATEOBJ *ColorTranslation, ULONG iTransColor) +{ + return FALSE; +} + +BOOLEAN Dummy_ColorFill(SURFOBJ* Dest, RECTL* DestRect, ULONG Color) +{ + return FALSE; +} + + +BOOLEAN +Dummy_AlphaBlend(SURFOBJ* Dest, SURFOBJ* Source, RECTL* DestRect, + RECTL* SourceRect, CLIPOBJ* ClipRegion, + XLATEOBJ* ColorTranslation, BLENDOBJ* BlendObj) +{ + return FALSE; +} + +/* EOF */ Propchange: trunk/reactos/subsystems/win32/win32k/dib/dib_new.c ------------------------------------------------------------------------------ svn:eol-style = native

12 years, 9 months

[tfaber] 56221: [RTL/HEAP] - Addendum to r56217. Let's not waste memory.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Mar 24 17:38:21 2012 New Revision: 56221 URL: http://svn.reactos.org/svn/reactos?rev=56221&view=rev Log: [RTL/HEAP] - Addendum to r56217. Let's not waste memory. Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=56221&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sat Mar 24 17:38:21 2012 @@ -510,7 +510,7 @@ } /* There is a whole bunch of new UCR descriptors. Put them into the unused list */ - while ((PCHAR)(UcrDescriptor + 1) < (PCHAR)UcrSegment + UcrSegment->CommittedSize) + while ((PCHAR)(UcrDescriptor + 1) <= (PCHAR)UcrSegment + UcrSegment->CommittedSize) { InsertTailList(&Heap->UCRList, &UcrDescriptor->ListEntry); UcrDescriptor++;

12 years, 9 months

[tkreuzer] 56220: [WIN32K] Modify EBRUSHOBJ_pvGetEngBrush to return a pointer to the SURFOBJ, instead of a handle, this simplifies the code

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 24 17:19:34 2012 New Revision: 56220 URL: http://svn.reactos.org/svn/reactos?rev=56220&view=rev Log: [WIN32K] Modify EBRUSHOBJ_pvGetEngBrush to return a pointer to the SURFOBJ, instead of a handle, this simplifies the code Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/eng/engbrush.c trunk/reactos/subsystems/win32/win32k/eng/mouse.c trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c trunk/reactos/subsystems/win32/win32k/include/brush.h Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sat Mar 24 17:19:34 2012 @@ -39,16 +39,13 @@ BYTE *pjMskLine, *pjMskCurrent; BYTE fjMaskBit0, fjMaskBit; /* Pattern brushes */ - PEBRUSHOBJ pebo = NULL; - SURFOBJ *psoPattern = NULL; - PSURFACE psurfPattern; + SURFOBJ *psoPattern; ULONG PatternWidth = 0, PatternHeight = 0; LONG PatternX0 = 0, PatternX = 0, PatternY = 0; LONG SrcX = 0, SrcY = 0; PFN_DIB_PutPixel fnDest_PutPixel = NULL; PFN_DIB_GetPixel fnPattern_GetPixel = NULL, fnSrc_GetPixel = NULL, fnDest_GetPixel; ULONG Pattern = 0, Source = 0, Dest = 0; - HBITMAP hbmPattern; DWORD fgndRop, bkgndRop; ASSERT(IS_VALID_ROP4(Rop4)); @@ -61,20 +58,16 @@ /* Determine pattern */ if (pbo && pbo->iSolidColor == 0xFFFFFFFF) { - pebo = CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject); - - hbmPattern = EBRUSHOBJ_pvGetEngBrush(pebo); - psurfPattern = SURFACE_ShareLockSurface(hbmPattern); - if (psurfPattern != NULL) - { - psoPattern = &psurfPattern->SurfObj; + psoPattern = BRUSHOBJ_psoPattern(pbo); + if (psoPattern) + { PatternWidth = psoPattern->sizlBitmap.cx; PatternHeight = psoPattern->sizlBitmap.cy; fnPattern_GetPixel = DibFunctionsForBitmapFormat[psoPattern->iBitmapFormat].DIB_GetPixel; } } else - psurfPattern = NULL; + psoPattern = NULL; pjMskLine = (PBYTE)psoMask->pvScan0 + pptlMask->y * psoMask->lDelta + (pptlMask->x >> 3); fjMaskBit0 = 0x80 >> (pptlMask->x & 0x07); @@ -92,7 +85,7 @@ SrcX = pptlSource->x; } - if (psurfPattern) + if (psoPattern) { PatternY = (prclDest->top - pptlBrush->y) % PatternHeight; if (PatternY < 0) @@ -120,7 +113,7 @@ { Rop4 = (*pjMskCurrent & fjMaskBit) ? fgndRop : bkgndRop; - if(psurfPattern) + if(psoPattern) { if(ROP4_USES_PATTERN(Rop4)) Pattern = fnPattern_GetPixel(psoPattern, PatternX, PatternY); @@ -152,7 +145,7 @@ pjMskCurrent += (fjMaskBit >> 7); } pjMskLine += psoMask->lDelta; - if(psurfPattern) + if(psoPattern) { PatternY++; PatternY %= PatternHeight; @@ -165,11 +158,10 @@ } } - if (psurfPattern) - SURFACE_ShareUnlockSurface(psurfPattern); - return TRUE; } + +#ifndef _USE_DIBLIB_ static BOOLEAN APIENTRY BltPatCopy(SURFOBJ* Dest, @@ -204,10 +196,8 @@ ROP4 Rop4) { BLTINFO BltInfo; - PEBRUSHOBJ GdiBrush = NULL; - SURFACE *psurfPattern; + SURFOBJ *psoPattern; BOOLEAN Result; - HBITMAP hbmPattern; BltInfo.DestSurface = OutputObj; BltInfo.SourceSurface = InputObj; @@ -226,12 +216,10 @@ /* Pattern brush */ if (ROP4_USES_PATTERN(Rop4) && pbo && pbo->iSolidColor == 0xFFFFFFFF) { - GdiBrush = CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject); - hbmPattern = EBRUSHOBJ_pvGetEngBrush(GdiBrush); - psurfPattern = SURFACE_ShareLockSurface(hbmPattern); - if (psurfPattern) - { - BltInfo.PatternSurface = &psurfPattern->SurfObj; + psoPattern = BRUSHOBJ_psoPattern(pbo); + if (psoPattern) + { + BltInfo.PatternSurface = psoPattern; } else { @@ -240,16 +228,10 @@ } else { - psurfPattern = NULL; + psoPattern = NULL; } Result = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_BitBlt(&BltInfo); - - /* Pattern brush */ - if (psurfPattern) - { - SURFACE_ShareUnlockSurface(psurfPattern); - } return Result; } @@ -649,6 +631,7 @@ return bResult; } +#endif // !_USE_DIBLIB_ /**** REACTOS FONT RENDERING CODE *********************************************/ Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Sat Mar 24 17:19:34 2012 @@ -97,7 +97,8 @@ /* Check if there's a GDI realisation */ if (pebo->pengbrush) { - EngDeleteSurface(pebo->pengbrush); + /* Unlock the bitmap again */ + SURFACE_ShareUnlockSurface(pebo->pengbrush); pebo->pengbrush = NULL; } @@ -139,6 +140,7 @@ EBRUSHOBJ *pebo; HBITMAP hbmpRealize; SURFOBJ *psoRealize; + PSURFACE psurfRealize; POINTL ptlSrc = {0, 0}; RECTL rclDest; ULONG lWidth; @@ -159,10 +161,13 @@ } /* Lock the bitmap */ - psoRealize = EngLockSurface(hbmpRealize); - if (!psoRealize) - { - EngDeleteSurface(hbmpRealize); + psurfRealize = SURFACE_ShareLockSurface(hbmpRealize); + + /* Already delete the pattern bitmap (will be kept until dereferenced) */ + EngDeleteSurface(hbmpRealize); + + if (!psurfRealize) + { return FALSE; } @@ -170,13 +175,12 @@ rclDest.left = rclDest.top = 0; rclDest.right = psoPattern->sizlBitmap.cx; rclDest.bottom = psoPattern->sizlBitmap.cy; + psoRealize = &psurfRealize->SurfObj; EngCopyBits(psoRealize, psoPattern, NULL, pxlo, &rclDest, &ptlSrc); - /* Unlock the bitmap again */ - EngUnlockSurface(psoRealize); pebo = CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject); - pebo->pengbrush = (PVOID)hbmpRealize; + pebo->pengbrush = (PVOID)psurfRealize; return TRUE; } @@ -211,7 +215,7 @@ psurfMask = NULL; /* Initialize XLATEOBJ for the brush */ - EXLATEOBJ_vInitialize(&exlo, + EXLATEOBJ_vInitialize(&exlo, psurfPattern->ppal, pebo->psurfTrg->ppal, 0, @@ -256,6 +260,17 @@ } return pebo->pengbrush; +} + +SURFOBJ* +NTAPI +EBRUSHOBJ_psoPattern(EBRUSHOBJ *pebo) +{ + PSURFACE psurfPattern; + + psurfPattern = EBRUSHOBJ_pvGetEngBrush(pebo); + + return psurfPattern ? &psurfPattern->SurfObj : NULL; } Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Sat Mar 24 17:19:34 2012 @@ -337,7 +337,7 @@ /* Calculate lDelta for our surfaces. */ lDelta = WIDTH_BYTES_ALIGN32(sizel.cx, - BitsPerFormat(pso->iBitmapFormat)); + BitsPerFormat(pso->iBitmapFormat)); /* Create a bitmap for saving the pixels under the cursor. */ hbmSave = EngCreateBitmap(sizel, Modified: trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] Sat Mar 24 17:19:34 2012 @@ -35,11 +35,8 @@ ROP4 Rop4) { POINTL RealBrushOrigin; - SURFACE* psurfPattern; - PEBRUSHOBJ GdiBrush = NULL; - SURFOBJ* PatternSurface = NULL; + SURFOBJ* psoPattern; BOOL bResult; - HBITMAP hbmPattern; if (BrushOrigin == NULL) { @@ -53,33 +50,19 @@ /* Pattern brush */ if (ROP4_USES_PATTERN(Rop4) && pbo && pbo->iSolidColor == 0xFFFFFFFF) { - GdiBrush = CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject); - hbmPattern = EBRUSHOBJ_pvGetEngBrush(GdiBrush); - psurfPattern = SURFACE_ShareLockSurface(hbmPattern); - if (psurfPattern) - { - PatternSurface = &psurfPattern->SurfObj; - } - else - { - /* FIXME: What to do here? */ - } + psoPattern = BRUSHOBJ_psoPattern(pbo); + + if (!psoPattern) return FALSE; } else { - psurfPattern = NULL; + psoPattern = NULL; } bResult = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_StretchBlt( - psoDest, psoSource, Mask, PatternSurface, + psoDest, psoSource, Mask, psoPattern, OutputRect, InputRect, MaskOrigin, pbo, &RealBrushOrigin, ColorTranslation, Rop4); - - /* Pattern brush */ - if (psurfPattern) - { - SURFACE_ShareUnlockSurface(psurfPattern); - } return bResult; } Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] Sat Mar 24 17:19:34 2012 @@ -122,6 +122,13 @@ NTAPI EBRUSHOBJ_pvGetEngBrush(EBRUSHOBJ *pebo); +SURFOBJ* +NTAPI +EBRUSHOBJ_psoPattern(EBRUSHOBJ *pebo); + +#define BRUSHOBJ_psoPattern(pbo) \ + EBRUSHOBJ_psoPattern(CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject)) + BOOL FASTCALL IntGdiSetBrushOwner(PBRUSH,DWORD); BOOL FASTCALL GreSetBrushOwner(HBRUSH,DWORD);

12 years, 9 months

[tkreuzer] 56219: [WIN32K] - Add support for pattern brushes and bottom-to-top blt in new EngBitblt - implement a new much simpler EngCopyBits - improve clip enumeration code The code now generally...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 24 16:24:46 2012 New Revision: 56219 URL: http://svn.reactos.org/svn/reactos?rev=56219&view=rev Log: [WIN32K] - Add support for pattern brushes and bottom-to-top blt in new EngBitblt - implement a new much simpler EngCopyBits - improve clip enumeration code The code now generally works very well now, only has a few bugs left Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c [iso-8859-1] Sat Mar 24 16:24:46 2012 @@ -23,22 +23,26 @@ { ULONG cx, cy; - /* Copy the target start point */ - pbltdata->siDst.ptOrig.x = prclClipped->left; - pbltdata->siDst.ptOrig.y = prclClipped->top; - /* Calculate width and height of this rect */ pbltdata->ulWidth = prclClipped->right - prclClipped->left; pbltdata->ulHeight = prclClipped->bottom - prclClipped->top; + + /* Calculate the offset to the origin coordinates */ + cx = (prclClipped->left - prclOrg->left); + if (pbltdata->dy < 0) + cy = (prclClipped->bottom - 1 - prclOrg->top); + else + cy = (prclClipped->top - prclOrg->top); + + /* Calculate the target start point */ + pbltdata->siDst.ptOrig.x = prclOrg->left + cx; + pbltdata->siDst.ptOrig.y = prclOrg->top + cy; /* Calculate start position for target */ pbltdata->siDst.pjBase = pbltdata->siDst.pvScan0; pbltdata->siDst.pjBase += pbltdata->siDst.ptOrig.y * pbltdata->siDst.lDelta; pbltdata->siDst.pjBase += pbltdata->siDst.ptOrig.x * pbltdata->siDst.jBpp / 8; - /* Calculate the offset from the original coordinates */ - cx = (prclClipped->left - prclOrg->left); - cy = (prclClipped->top - prclOrg->top); if (pptlSrc) { @@ -97,8 +101,12 @@ BOOL bEnumMore; RECT_ENUM rcenum; PSIZEL psizlPat; - - + SURFOBJ *psoPattern; + +//static int count = 0; +//if (++count >= 1230) __debugbreak(); + + /* Sanity checks */ ASSERT(psoTrg); ASSERT(psoTrg->iBitmapFormat >= BMF_1BPP); ASSERT(psoTrg->iBitmapFormat <= BMF_32BPP); @@ -110,14 +118,13 @@ rcTrg = *prclTrg; + bltdata.dy = 1; bltdata.rop4 = rop4; + bltdata.apfnDoRop[0] = gapfnRop[ROP4_BKGND(rop4)]; + bltdata.apfnDoRop[1] = gapfnRop[ROP4_FGND(rop4)]; if (!pxlo) pxlo = &gexloTrivial.xlo; bltdata.pxlo = pxlo; bltdata.pfnXlate = XLATEOBJ_pfnXlate(pxlo); - - bltdata.siDst.pvScan0 = psoTrg->pvScan0; - bltdata.siDst.lDelta = psoTrg->lDelta; - bltdata.siDst.jBpp = gajBitsPerFormat[psoTrg->iBitmapFormat]; /* Check if the ROP uses a source */ if (ROP4_USES_SOURCE(rop4)) @@ -132,18 +139,18 @@ ASSERT(pptlSrc->x <= psoSrc->sizlBitmap.cx); ASSERT(pptlSrc->y <= psoSrc->sizlBitmap.cy); - bltdata.siSrc.pvScan0 = psoSrc->pvScan0; - bltdata.siSrc.lDelta = psoSrc->lDelta; - bltdata.siSrc.jBpp = gajBitsPerFormat[psoSrc->iBitmapFormat]; - /* Check if source and target are equal */ if (psoSrc == psoTrg) { /* Analyze the copying direction */ - if (rcTrg.top < pptlSrc->y) + if (rcTrg.top > pptlSrc->y) + { + /* Need to copy from bottom to top */ + iDirection = rcTrg.left < pptlSrc->x ? CD_RIGHTUP : CD_LEFTUP; + bltdata.dy = -1; + } + else iDirection = rcTrg.left < pptlSrc->x ? CD_RIGHTDOWN : CD_LEFTDOWN; - else - iDirection = rcTrg.left < pptlSrc->x ? CD_RIGHTUP : CD_LEFTUP; /* Check for special right to left case */ if ((rcTrg.top == pptlSrc->y) && (rcTrg.left > pptlSrc->x)) @@ -151,6 +158,7 @@ /* Use 0 as target format to get special right to left versions */ bltdata.siDst.iFormat = 0; bltdata.siSrc.iFormat = psoSrc->iBitmapFormat; + __debugbreak(); } else { @@ -164,11 +172,23 @@ bltdata.siDst.iFormat = psoTrg->iBitmapFormat; bltdata.siSrc.iFormat = psoSrc->iBitmapFormat; } + + /* Set the source format info */ + bltdata.siSrc.pvScan0 = psoSrc->pvScan0; + bltdata.siSrc.lDelta = psoSrc->lDelta; + bltdata.siSrc.cjAdvanceY = bltdata.dy * psoSrc->lDelta; + bltdata.siSrc.jBpp = gajBitsPerFormat[psoSrc->iBitmapFormat]; } else { bltdata.siDst.iFormat = psoTrg->iBitmapFormat; } + + /* Set the destination format info */ + bltdata.siDst.pvScan0 = psoTrg->pvScan0; + bltdata.siDst.lDelta = psoTrg->lDelta; + bltdata.siDst.cjAdvanceY = bltdata.dy * psoTrg->lDelta; + bltdata.siDst.jBpp = gajBitsPerFormat[psoTrg->iBitmapFormat]; /* Check if the ROP uses a pattern / brush */ if (ROP4_USES_PATTERN(rop4)) @@ -182,17 +202,25 @@ /* Check if this is a pattern brush */ if (pbo->iSolidColor == 0xFFFFFFFF) { - __debugbreak(); - - // FIXME - bltdata.siPat.iFormat = 0;//psoPat->iBitmapFormat; - bltdata.siPat.pvScan0 = 0;//psoPat->pvScan0; - bltdata.siPat.lDelta = 0;//psoPat->lDelta; - - bltdata.ulPatWidth = 0; - bltdata.ulPatHeight = 0; - - psizlPat = 0;// fixme + /* Get the realized pattern bitmap */ + psoPattern = BRUSHOBJ_psoPattern(pbo); + if (!psoPattern) + { + __debugbreak(); + return FALSE; + } + + /* Set the pattern format info */ + bltdata.siPat.iFormat = psoPattern->iBitmapFormat; + bltdata.siPat.pvScan0 = psoPattern->pvScan0; + bltdata.siPat.lDelta = psoPattern->lDelta; + bltdata.siPat.cjAdvanceY = bltdata.dy * psoPattern->lDelta; + bltdata.siPat.jBpp = gajBitsPerFormat[psoPattern->iBitmapFormat]; + + bltdata.ulPatWidth = psoPattern->sizlBitmap.cx; + bltdata.ulPatHeight = psoPattern->sizlBitmap.cy; + + psizlPat = &psoPattern->sizlBitmap; } else { @@ -218,9 +246,8 @@ bltdata.siMsk.iFormat = psoMask->iBitmapFormat; bltdata.siMsk.pvScan0 = psoMask->pvScan0; bltdata.siMsk.lDelta = psoMask->lDelta; - - bltdata.apfnDoRop[0] = gapfnRop[ROP4_BKGND(rop4)]; - bltdata.apfnDoRop[1] = gapfnRop[ROP4_FGND(rop4)]; + bltdata.siMsk.cjAdvanceY = bltdata.dy * psoMask->lDelta; + bltdata.siMsk.jBpp = 1; /* Calculate the masking function index */ iFunctionIndex = ROP4_USES_PATTERN(rop4) ? 1 : 0; @@ -247,56 +274,54 @@ { /* Start the enumeration of the clip object */ CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, iDirection, 0); - do - { - /* Enumerate a set of rectangles */ - bEnumMore = CLIPOBJ_bEnum(pco, sizeof(rcenum), (ULONG*)&rcenum); - - /* Loop all rectangles we got */ - for (i = 0; i < rcenum.c; i++) + bEnumMore = CLIPOBJ_bEnum(pco, sizeof(rcenum), (ULONG*)&rcenum); + } + else if (pco->iDComplexity == DC_RECT) + { + /* Use the clip bounds */ + rcenum.arcl[0] = pco->rclBounds; + rcenum.c = 1; + bEnumMore = FALSE; + } + else + { + /* Use the target rect */ + rcenum.arcl[0] = rcTrg; + rcenum.c = 1; + bEnumMore = FALSE; + } + + /* Enter enumeration loop */ + while (TRUE) + { + /* Loop all rectangles we got */ + for (i = 0; i < rcenum.c; i++) + { + /* Intersect this rect with the target rect */ + if (!RECTL_bIntersectRect(&rcenum.arcl[i], &rcenum.arcl[i], &rcTrg)) { - /* Intersect this rect with the target rect */ - if (!RECTL_bIntersectRect(&rcenum.arcl[i], &rcenum.arcl[i], &rcTrg)) - { - /* This rect is outside the bounds, continue */ - continue; - } - - /* Calculate the coordinates */ - CalculateCoordinates(&bltdata, - &rcenum.arcl[i], - prclTrg, - pptlSrc, - pptlMask, - pptlBrush, - psizlPat); - - /* Call the dib function */ - pfnBitBlt(&bltdata); + /* This rect is outside the bounds, continue */ + continue; } - } - while (bEnumMore); - } - else - { - /* Check if there is something to clip */ - if (pco->iDComplexity == DC_RECT) - { - /* Clip the target rect to the bounds of the clipping region */ - RECTL_bIntersectRect(&rcTrg, &rcTrg, &pco->rclBounds); - } - - /* Calculate the coordinates */ - CalculateCoordinates(&bltdata, - &rcTrg, - prclTrg, - pptlSrc, - pptlMask, - pptlBrush, - psizlPat); - - /* Call the dib function */ - pfnBitBlt(&bltdata); + + /* Calculate coordinates and pointers */ + CalculateCoordinates(&bltdata, + &rcenum.arcl[i], + prclTrg, + pptlSrc, + pptlMask, + pptlBrush, + psizlPat); + + /* Call the dib function */ + pfnBitBlt(&bltdata); + } + + /* Bail out, when there's nothing more to do */ + if(!bEnumMore) break; + + /* Enumerate more rectangles */ + bEnumMore = CLIPOBJ_bEnum(pco, sizeof(rcenum), (ULONG*)&rcenum); } return TRUE; @@ -563,4 +588,43 @@ return bResult; } - +BOOL +APIENTRY +EngCopyBits( + SURFOBJ *psoTrg, + SURFOBJ *psoSrc, + CLIPOBJ *pco, + XLATEOBJ *pxlo, + RECTL *prclTrg, + POINTL *pptlSrc) +{ + PFN_DrvCopyBits pfnCopyBits; + + /* Is the target surface device managed? */ + if (SURFOBJ_flags(psoTrg) & HOOK_COPYBITS) + { + pfnCopyBits = GDIDEVFUNCS(psoTrg).CopyBits; + } + if (SURFOBJ_flags(psoSrc) & HOOK_COPYBITS) + { + pfnCopyBits = GDIDEVFUNCS(psoSrc).CopyBits; + } + else + { + /* Use SRCCOPY for 2 bitmaps */ + return EngBitBlt(psoTrg, + psoSrc, + NULL, + pco, + pxlo, + prclTrg, + pptlSrc, + NULL, + NULL, + NULL, + ROP4_SRCCOPY); + } + + /* Forward to the driver */ + return pfnCopyBits(psoTrg, psoSrc, pco, pxlo, prclTrg, pptlSrc); +}

12 years, 9 months

[tkreuzer] 56218: [DIBLIB] - Implement support for bottom up bitblt - Add solid pattern support in generic BitBlt function - Make sure right-to-left is only used in the appropriate functions - Fix ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 24 16:19:48 2012 New Revision: 56218 URL: http://svn.reactos.org/svn/reactos?rev=56218&view=rev Log: [DIBLIB] - Implement support for bottom up bitblt - Add solid pattern support in generic BitBlt function - Make sure right-to-left is only used in the appropriate functions - Fix 1bpp _NextPixel() macro Modified: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt.c trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCCOPY.c trunk/reactos/subsystems/win32/win32k/diblib/DibLib.h trunk/reactos/subsystems/win32/win32k/diblib/DibLib_AllSrcBPP.h trunk/reactos/subsystems/win32/win32k/diblib/DibLib_BitBlt.h trunk/reactos/subsystems/win32/win32k/diblib/DibLib_interface.h Modified: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/BitBlt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/BitBlt.c [iso-8859-1] Sat Mar 24 16:19:48 2012 @@ -6,9 +6,10 @@ #define __USES_DEST 1 #define __USES_MASK 0 +#define __FUNCTIONNAME BitBlt + #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[0](D,S,P) -#define __FUNCTIONNAME BitBlt #include "DibLib_AllSrcBPP.h" #undef __FUNCTIONNAME @@ -20,7 +21,17 @@ FASTCALL Dib_BitBlt(PBLTDATA pBltData) { - gapfnBitBlt[pBltData->siDst.iFormat][pBltData->siSrc.iFormat](pBltData); + /* Check for solid brush */ + if (pBltData->ulSolidColor != 0xFFFFFFFF) + { + /* Use the solid version of PATCOPY! */ + gapfnBitBlt_Solid[pBltData->siDst.iFormat][pBltData->siSrc.iFormat](pBltData); + } + else + { + /* Use the pattern version */ + gapfnBitBlt[pBltData->siDst.iFormat][pBltData->siSrc.iFormat](pBltData); + } } Modified: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCCOPY.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCCOPY.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCCOPY.c [iso-8859-1] Sat Mar 24 16:19:48 2012 @@ -5,17 +5,20 @@ FASTCALL Dib_BitBlt_SRCCOPY_EqSurf(PBLTDATA pBltData) { - ULONG cLines, cjWidth = pBltData->ulWidth * pBltData->jDstBpp; + ULONG cLines, cjWidth; PBYTE pjDestBase = pBltData->siDst.pjBase; PBYTE pjSrcBase = pBltData->siSrc.pjBase; + + /* Calculate the width in bytes */ + cjWidth = pBltData->ulWidth * pBltData->siDst.jBpp / 8; /* Loop all lines */ cLines = pBltData->ulHeight; while (cLines--) { memcpy(pjDestBase, pjSrcBase, cjWidth); - pjDestBase += pBltData->siDst.lDelta; - pjSrcBase += pBltData->siSrc.lDelta; + pjDestBase += pBltData->siDst.cjAdvanceY; + pjSrcBase += pBltData->siSrc.cjAdvanceY; } } @@ -38,8 +41,8 @@ while (cLines--) { __movsd((PULONG)pjDestBase, (PULONG)pjSrcBase, cRows); - pjDestBase += pBltData->siDst.lDelta; - pjSrcBase += pBltData->siSrc.lDelta; + pjDestBase += pBltData->siDst.cjAdvanceY; + pjSrcBase += pBltData->siSrc.cjAdvanceY; } } #else Modified: trunk/reactos/subsystems/win32/win32k/diblib/DibLib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/DibLib.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/DibLib.h [iso-8859-1] Sat Mar 24 16:19:48 2012 @@ -42,8 +42,8 @@ #define _ReadPixel_1(pjSource, jShift) (((*(pjSource)) >> (jShift)) & 1) #define _WritePixel_1(pjDest, jShift, ulColor) (void)(*(pjDest) = (UCHAR)((*(pjDest) & ~(1<<(jShift))) | ((ulColor)<<(jShift)))) -#define _NextPixel_1(ppj, pjShift) (void)((*(pjShift))--, *(pjShift) &= 7, (*(ppj) += (*(pjShift) >> 5))) -#define _NextPixelR2L_1(ppj, pjShift) (void)((*(ppj) -= (*(pjShift) >> 5)), (*(pjShift))++, *(pjShift) &= 7) +#define _NextPixel_1(ppj, pjShift) (void)(((*(pjShift))--), (*(pjShift) &= 7), (*(ppj) += (*(pjShift) == 7))) +#define _NextPixelR2L_1(ppj, pjShift) (void)(((*(pjShift))++), (*(pjShift) &= 7), (*(ppj) -= (*(pjShift) == 0))) #define _SHIFT_1(x) x #define _CALCSHIFT_1(pShift, x) (void)(*(pShift) = (7 - ((x) & 7))) Modified: trunk/reactos/subsystems/win32/win32k/diblib/DibLib_AllSrcBPP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/DibLib_AllSrcBPP.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/DibLib_AllSrcBPP.h [iso-8859-1] Sat Mar 24 16:19:48 2012 @@ -30,16 +30,17 @@ #undef _DibXlate #define _DibXlate(pBltData, ulColor) (ulColor) #define _SOURCE_BPP _DEST_BPP -#define _NextPixel_ _NextPixelR2L_ #undef __DIB_FUNCTION_NAME #define __DIB_FUNCTION_NAME __DIB_FUNCTION_NAME_SRCDSTEQ #include "diblib_alldstbpp.h" +#define _NextPixel_ _NextPixelR2L_ #undef __DIB_FUNCTION_NAME #define __DIB_FUNCTION_NAME __DIB_FUNCTION_NAME_SRCDSTEQR2L #include "diblib_alldstbpp.h" #undef _SOURCE_BPP +#undef _NextPixel_ PFN_DIBFUNCTION __PASTE(gapfn, __FUNCTIONNAME)[7][7] = Modified: trunk/reactos/subsystems/win32/win32k/diblib/DibLib_BitBlt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/DibLib_BitBlt.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/DibLib_BitBlt.h [iso-8859-1] Sat Mar 24 16:19:48 2012 @@ -77,7 +77,7 @@ #if __USES_MASK /* Read the mask color and go to the next mask pixel */ jMaskBit = _ReadPixel_1(pjMask, jMskShift); - _NextPixel_1(&pjMask, &jMskShift); + _NextPixel(1, &pjMask, &jMskShift); #endif #if __USES_PATTERN /* Read the pattern color and go to the next pattern pixel */ @@ -110,13 +110,13 @@ _NextPixel(_DEST_BPP, &pjDest, &jDstShift); } - pjDestBase += pBltData->siDst.lDelta; + pjDestBase += pBltData->siDst.cjAdvanceY; #if __USES_SOURCE - pjSrcBase += pBltData->siSrc.lDelta; + pjSrcBase += pBltData->siSrc.cjAdvanceY; #endif #if __USES_PATTERN /* Go to the next pattern line */ - pjPatBase += pBltData->siPat.lDelta; + pjPatBase += pBltData->siPat.cjAdvanceY; /* Check if this was the last line in the pattern */ if (--cPatLines == 0) Modified: trunk/reactos/subsystems/win32/win32k/diblib/DibLib_interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/DibLib_interface.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/DibLib_interface.h [iso-8859-1] Sat Mar 24 16:19:48 2012 @@ -7,6 +7,7 @@ PBYTE pvScan0; PBYTE pjBase; LONG lDelta; + LONG cjAdvanceY; POINTL ptOrig; BYTE jBpp; } SURFINFO; @@ -27,7 +28,7 @@ ULONG rop4; PFN_DOROP apfnDoRop[2]; ULONG ulSolidColor; - BYTE jDstBpp; + LONG dy; } BLTDATA, *PBLTDATA; typedef

12 years, 9 months

[tfaber] 56217: [RTL/HEAP] - Do not overflow the uncommitted range descriptor segment. Really fixes notepad. - Free the correct region in failure case - Some comment fixes See issue #6966 for more ...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Mar 24 14:42:48 2012 New Revision: 56217 URL: http://svn.reactos.org/svn/reactos?rev=56217&view=rev Log: [RTL/HEAP] - Do not overflow the uncommitted range descriptor segment. Really fixes notepad. - Free the correct region in failure case - Some comment fixes See issue #6966 for more details. Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=56217&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sat Mar 24 14:42:48 2012 @@ -476,7 +476,7 @@ { /* Release reserved memory */ ZwFreeVirtualMemory(NtCurrentProcess(), - (PVOID *)&UcrDescriptor, + (PVOID *)&UcrSegment, &ReserveSize, MEM_RELEASE); return NULL; @@ -510,7 +510,7 @@ } /* There is a whole bunch of new UCR descriptors. Put them into the unused list */ - while ((PCHAR)UcrDescriptor < ((PCHAR)UcrSegment + UcrSegment->CommittedSize)) + while ((PCHAR)(UcrDescriptor + 1) < (PCHAR)UcrSegment + UcrSegment->CommittedSize) { InsertTailList(&Heap->UCRList, &UcrDescriptor->ListEntry); UcrDescriptor++; @@ -548,7 +548,7 @@ /* Go through the list of UCR descriptors, they are sorted from lowest address to the highest */ Current = Segment->UCRSegmentList.Flink; - while(Current != &Segment->UCRSegmentList) + while (Current != &Segment->UCRSegmentList) { UcrDescriptor = CONTAINING_RECORD(Current, HEAP_UCR_DESCRIPTOR, SegmentEntry); @@ -563,7 +563,7 @@ return; } - /* We found the block after which the new one should go */ + /* We found the block before which the new one should go */ break; } else if (((ULONG_PTR)UcrDescriptor->Address + UcrDescriptor->Size) == Address) @@ -595,7 +595,7 @@ UcrDescriptor->Address = (PVOID)Address; UcrDescriptor->Size = Size; - /* "Current" is the descriptor after which our one should go */ + /* "Current" is the descriptor before which our one should go */ InsertTailList(Current, &UcrDescriptor->SegmentEntry); DPRINT("Added segment UCR with base %p, size 0x%x\n", Address, Size); @@ -620,7 +620,7 @@ /* Go through UCRs in a segment */ Current = Segment->UCRSegmentList.Flink; - while(Current != &Segment->UCRSegmentList) + while (Current != &Segment->UCRSegmentList) { UcrDescriptor = CONTAINING_RECORD(Current, HEAP_UCR_DESCRIPTOR, SegmentEntry); @@ -1694,7 +1694,7 @@ /* Free UCR segments if any were created */ Current = Heap->UCRSegments.Flink; - while(Current != &Heap->UCRSegments) + while (Current != &Heap->UCRSegments) { UcrSegment = CONTAINING_RECORD(Current, HEAP_UCR_SEGMENT, ListEntry);

12 years, 9 months

[tkreuzer] 56216: [WIN32K] - Add a trivial XLATEOBJ as a global variable. - Make sure the XLATEOBJ is not NULL, when calling the diblib code - Remove the IntEngMaskBlt stub, its a very special func...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Mar 23 11:29:44 2012 New Revision: 56216 URL: http://svn.reactos.org/svn/reactos?rev=56216&view=rev Log: [WIN32K] - Add a trivial XLATEOBJ as a global variable. - Make sure the XLATEOBJ is not NULL, when calling the diblib code - Remove the IntEngMaskBlt stub, its a very special function for font rendering, keep the old one - Add more driver debug assertions - Remove obsolete definition Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.h trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c trunk/reactos/subsystems/win32/win32k/eng/drvdbg.c trunk/reactos/subsystems/win32/win32k/eng/xlate.c trunk/reactos/subsystems/win32/win32k/include/xlateobj.h 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] Fri Mar 23 11:29:44 2012 @@ -1,8 +1,4 @@ #pragma once - -#ifdef _M_IX86 -#define memset4(dest, value, count) asm volatile("rep stosl" : : "D"(dest), "a"(value), "c"(count) : "memory"); -#endif #define ROP4_BLACKNESS ((((0x00000042) >> 8) & 0xff00) | (((0x00000042) >> 16) & 0x00ff)) #define ROP4_NOTSRCERASE ((((0x001100A6) >> 8) & 0xff00) | (((0x001100A6) >> 16) & 0x00ff)) Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c [iso-8859-1] Fri Mar 23 11:29:44 2012 @@ -98,7 +98,6 @@ RECT_ENUM rcenum; PSIZEL psizlPat; -__debugbreak(); ASSERT(psoTrg); ASSERT(psoTrg->iBitmapFormat >= BMF_1BPP); @@ -112,6 +111,7 @@ rcTrg = *prclTrg; bltdata.rop4 = rop4; + if (!pxlo) pxlo = &gexloTrivial.xlo; bltdata.pxlo = pxlo; bltdata.pfnXlate = XLATEOBJ_pfnXlate(pxlo); @@ -170,7 +170,7 @@ bltdata.siDst.iFormat = psoTrg->iBitmapFormat; } - /* Check of the ROP uses a pattern / brush */ + /* Check if the ROP uses a pattern / brush */ if (ROP4_USES_PATTERN(rop4)) { /* Must have a brush */ @@ -213,6 +213,8 @@ ASSERT(psoMask); ASSERT(pptlMask); + __debugbreak(); + bltdata.siMsk.iFormat = psoMask->iBitmapFormat; bltdata.siMsk.pvScan0 = psoMask->pvScan0; bltdata.siMsk.lDelta = psoMask->lDelta; @@ -220,17 +222,21 @@ bltdata.apfnDoRop[0] = gapfnRop[ROP4_BKGND(rop4)]; bltdata.apfnDoRop[1] = gapfnRop[ROP4_FGND(rop4)]; - ASSERT(FALSE); - // get masking function! - pfnBitBlt = 0; + /* Calculate the masking function index */ + iFunctionIndex = ROP4_USES_PATTERN(rop4) ? 1 : 0; + iFunctionIndex |= ROP4_USES_SOURCE(rop4) ? 2 : 0; + iFunctionIndex |= ROP4_USES_DEST(rop4) ? 4 : 0; + + /* Get the masking function */ + pfnBitBlt = gapfnMaskFunction[iFunctionIndex]; } else { /* Get the function index from the foreground ROP index*/ - iFunctionIndex = aiIndexPerRop[ROP4_FGND(rop4)]; + iFunctionIndex = gajIndexPerRop[ROP4_FGND(rop4)]; /* Get the dib function */ - pfnBitBlt = apfnDibFunction[iFunctionIndex]; + pfnBitBlt = gapfnDibFunction[iFunctionIndex]; } /* If no clip object is given, use trivial one */ @@ -557,20 +563,4 @@ return bResult; } -BOOL -NTAPI -IntEngMaskBlt( - SURFOBJ *psoDest, - SURFOBJ *psoMask, - CLIPOBJ *pco, - XLATEOBJ *pxloDest, - XLATEOBJ *pxloSource, - RECTL *DestRect, - POINTL *pptlMask, - BRUSHOBJ *pbo, - POINTL *pptlBrushOrigin) -{ - ASSERT(FALSE); - return 0; -} - + Modified: trunk/reactos/subsystems/win32/win32k/eng/drvdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/drvdbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/drvdbg.c [iso-8859-1] Fri Mar 23 11:29:44 2012 @@ -307,6 +307,8 @@ ASSERT(prclTrg->right <= psoTrg->sizlBitmap.cx); ASSERT(prclTrg->bottom <= psoTrg->sizlBitmap.cy); ASSERT(RECTL_bIsWellOrdered(prclTrg)); + ASSERT(pco); + ASSERT(pco->iDComplexity != DC_RECT); if (ROP4_USES_SOURCE(rop4)) { Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Fri Mar 23 11:29:44 2012 @@ -14,13 +14,15 @@ /** Globals *******************************************************************/ -ULONG giUniqueXlate = 0; - -const BYTE gajXlate5to8[32] = +EXLATEOBJ gexloTrivial = {{0, XO_TRIVIAL, 0, 0, 0, 0}, EXLATEOBJ_iXlateTrivial}; + +static ULONG giUniqueXlate = 0; + +static const BYTE gajXlate5to8[32] = { 0, 8, 16, 25, 33, 41, 49, 58, 66, 74, 82, 90, 99,107,115,123, 132,140,148,156,165,173,181,189,197,206,214,222,231,239,247,255}; -const BYTE gajXlate6to8[64] = +static const BYTE gajXlate6to8[64] = { 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 45, 49, 52, 57, 61, 65, 69, 73, 77, 81, 85, 89, 93, 97,101,105,109,113,117,121,125, 130,134,138,142,146,150,154,158,162,166,170,174,178,182,186,190, Modified: trunk/reactos/subsystems/win32/win32k/include/xlateobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/xlateobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/xlateobj.h [iso-8859-1] Fri Mar 23 11:29:44 2012 @@ -38,6 +38,19 @@ }; } EXLATEOBJ, *PEXLATEOBJ; +PFN_XLATE +FORCEINLINE +XLATEOBJ_pfnXlate(XLATEOBJ *pxlo) +{ + return ((PEXLATEOBJ)pxlo)->pfnXlate; +} + +extern EXLATEOBJ gexloTrivial; + +ULONG +FASTCALL +EXLATEOBJ_iXlateTrivial(PEXLATEOBJ pexlo, ULONG iColor); + void DbgCmpXlate(XLATEOBJ *pxlo1, XLATEOBJ *pxlo2);

12 years, 9 months

[tkreuzer] 56215: [DIBLIB] - add table for masking rops - consity some tables - Fix some typos

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Mar 23 11:20:24 2012 New Revision: 56215 URL: http://svn.reactos.org/svn/reactos?rev=56215&view=rev Log: [DIBLIB] - add table for masking rops - consity some tables - Fix some typos Modified: trunk/reactos/subsystems/win32/win32k/diblib/DibLib.c trunk/reactos/subsystems/win32/win32k/diblib/DibLib.h trunk/reactos/subsystems/win32/win32k/diblib/DibLib_interface.h trunk/reactos/subsystems/win32/win32k/diblib/RopFunctions.c trunk/reactos/subsystems/win32/win32k/diblib/RopFunctions.h Modified: trunk/reactos/subsystems/win32/win32k/diblib/DibLib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/DibLib.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/DibLib.c [iso-8859-1] Fri Mar 23 11:20:24 2012 @@ -1,7 +1,29 @@ #include "DibLib.h" -BYTE ajShift4[2] = {4, 0}; +/* + * M D S P Generic function + * ----------------------- + * 0 0 0 0 -> BLACKNESS, WHITENESS + * 0 0 0 1 -> PATCOPY, NOTPATCOPY + * 0 0 1 0 -> SRCCOPY, NOTSRCCOPY + * 0 0 1 1 SrcPatBlt + * 0 1 0 0 -> NOOP, DESTINVERT + * 0 1 0 1 PatPaint + * 0 1 1 0 SrcPaint + * 0 1 1 1 BitBlt + * 1 0 0 0 MaskCopy, -> SRCCOPY / SRCINVERT using Mask als source + * 1 0 0 1 MaskPatBlt + * 1 0 1 0 MaskSrcBlt + * 1 0 1 1 MaskSrcPatBlt + * 1 1 0 0 MaskPaint + * 1 1 0 1 MaskPatPaint + * 1 1 1 0 MaskSrcPaint + * 1 1 1 1 MaskBlt + */ + + +const BYTE ajShift4[2] = {4, 0}; enum { @@ -28,9 +50,8 @@ INDEX_BitBlt, }; - -PFN_DIBFUNCTION -apfnDibFunction[] = +const PFN_DIBFUNCTION +gapfnDibFunction[] = { Dib_BitBlt_NOOP, Dib_BitBlt_DSTINVERT, @@ -55,8 +76,8 @@ Dib_BitBlt, }; -UCHAR -aiIndexPerRop[256] = +const UCHAR +gajIndexPerRop[256] = { INDEX_BitBlt_BLACKNESS, // BLACKNESS INDEX_BitBlt, // DPSoon, @@ -316,3 +337,15 @@ INDEX_BitBlt_WHITENESS //WHITENESS }; +const PFN_DIBFUNCTION +gapfnMaskFunction[8] = +{ + Dib_MaskCopy, + Dib_MaskPatBlt, + Dib_MaskSrcBlt, + Dib_MaskSrcPatBlt, + Dib_MaskPaint, + Dib_MaskPatPaint, + Dib_MaskSrcPaint, + Dib_MaskBlt +}; Modified: trunk/reactos/subsystems/win32/win32k/diblib/DibLib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/DibLib.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/DibLib.h [iso-8859-1] Fri Mar 23 11:20:24 2012 @@ -20,9 +20,9 @@ typedef ULONG -(NTAPI *PFN_XLATE)(XLATEOBJ* pxlo, ULONG ulColor); +(FASTCALL *PFN_XLATE)(XLATEOBJ* pxlo, ULONG ulColor); -extern BYTE ajShift4[2]; +extern const BYTE ajShift4[2]; #include "DibLib_interface.h" @@ -63,15 +63,15 @@ #define _ReadPixel_16(pjSource, x) (*(USHORT*)(pjSource)) #define _WritePixel_16(pjDest, x, ulColor) (void)(*(USHORT*)(pjDest) = (USHORT)(ulColor)) -#define _NextPixel_16(ppj, pjShift) (void)(*(ppj) -= 2) -#define _NextPixelR2L_16(ppj, pjShift) (void)(*(ppj) += 2) +#define _NextPixel_16(ppj, pjShift) (void)(*(ppj) += 2) +#define _NextPixelR2L_16(ppj, pjShift) (void)(*(ppj) -= 2) #define _SHIFT_16(x) #define _CALCSHIFT_16(pShift, x) #define _ReadPixel_24(pjSource, x) ((pjSource)[0] | ((pjSource)[1] << 8) | ((pjSource)[2] << 16)) #define _WritePixel_24(pjDest, x, ulColor) (void)(((pjDest)[0] = ((ulColor)&0xFF)),((pjDest)[1] = (((ulColor)>>8)&0xFF)),((pjDest)[2] = (((ulColor)>>16)&0xFF))) -#define _NextPixel_24(ppj, pjShift) (void)(*(ppj) -= 3) -#define _NextPixelR2L_24(ppj, pjShift) (void)(*(ppj) += 3) +#define _NextPixel_24(ppj, pjShift) (void)(*(ppj) += 3) +#define _NextPixelR2L_24(ppj, pjShift) (void)(*(ppj) -= 3) #define _SHIFT_24(x) #define _CALCSHIFT_24(pShift, x) Modified: trunk/reactos/subsystems/win32/win32k/diblib/DibLib_interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/DibLib_interface.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/DibLib_interface.h [iso-8859-1] Fri Mar 23 11:20:24 2012 @@ -58,7 +58,17 @@ VOID FASTCALL Dib_SrcPaint(PBLTDATA pBltData); VOID FASTCALL Dib_BitBlt(PBLTDATA pBltData); +VOID FASTCALL Dib_MaskCopy(PBLTDATA pBltData); +VOID FASTCALL Dib_MaskPatBlt(PBLTDATA pBltData); +VOID FASTCALL Dib_MaskSrcBlt(PBLTDATA pBltData); +VOID FASTCALL Dib_MaskSrcPatBlt(PBLTDATA pBltData); +VOID FASTCALL Dib_MaskPaint(PBLTDATA pBltData); +VOID FASTCALL Dib_MaskPatPaint(PBLTDATA pBltData); +VOID FASTCALL Dib_MaskSrcPaint(PBLTDATA pBltData); +VOID FASTCALL Dib_MaskBlt(PBLTDATA pBltData); -extern PFN_DIBFUNCTION apfnDibFunction[]; -extern UCHAR aiIndexPerRop[256]; +extern const UCHAR gajIndexPerRop[256]; +extern const PFN_DIBFUNCTION gapfnDibFunction[]; +extern const PFN_DIBFUNCTION gapfnMaskFunction[8]; + Modified: trunk/reactos/subsystems/win32/win32k/diblib/RopFunctions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/RopFunctions.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/RopFunctions.c [iso-8859-1] Fri Mar 23 11:20:24 2012 @@ -1283,7 +1283,7 @@ return ROP_1(D,S,P); } -PFN_DOROP +const PFN_DOROP gapfnRop[256] = { DoRop_0, // BLACKNESS Modified: trunk/reactos/subsystems/win32/win32k/diblib/RopFunctions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/RopFunctions.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/RopFunctions.h [iso-8859-1] Fri Mar 23 11:20:24 2012 @@ -4,7 +4,7 @@ (__fastcall *PFN_DOROP)(ULONG D, ULONG S, ULONG P); -PFN_DOROP gapfnRop[256]; +extern const PFN_DOROP gapfnRop[256]; #define ROP_0(D,S,P) 0 /* BLACKNESS */ #define ROP_DPSoon(D,S,P) (~((D)|((P)|(S))))

12 years, 9 months

← Newer
1
...
5
6
7
8
9
10
11
...
36
Older →

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 March 2012