Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 56221: [RTL/HEAP] - Addendum to r56217. Let's not waste memory.
by tfaber＠svn.reactos.org 24 Mar '12

24 Mar '12

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++;

1 0

[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 24 Mar '12

24 Mar '12

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);

1 0

[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 24 Mar '12

24 Mar '12

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); +}

1 0

[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 24 Mar '12

24 Mar '12

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

1 0

[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 24 Mar '12

24 Mar '12

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);

1 0

[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 23 Mar '12

23 Mar '12

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);

1 0

[tkreuzer] 56215: [DIBLIB] - add table for masking rops - consity some tables - Fix some typos
by tkreuzer＠svn.reactos.org 23 Mar '12

23 Mar '12

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))))

1 0

[ekohl] 56214: [DEVMGMT] Implement the "Show hidden devices" feature.
by ekohl＠svn.reactos.org 22 Mar '12

22 Mar '12

Author: ekohl Date: Thu Mar 22 22:38:06 2012 New Revision: 56214 URL: http://svn.reactos.org/svn/reactos?rev=56214&view=rev Log: [DEVMGMT] Implement the "Show hidden devices" feature. Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/en-US.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/id-ID.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c trunk/reactos/base/applications/mscutils/devmgmt/precomp.h trunk/reactos/base/applications/mscutils/devmgmt/resource.h Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -136,11 +136,13 @@ static INT EnumDeviceClasses(INT ClassIndex, + BOOL ShowHidden, LPTSTR DevClassName, LPTSTR DevClassDesc, BOOL *DevPresent, INT *ClassImage, - BOOL *IsUnknown) + BOOL *IsUnknown, + BOOL *IsHidden) { GUID ClassGuid; HKEY KeyClass; @@ -150,6 +152,7 @@ *DevPresent = FALSE; *DevClassName = _T('\0'); + *IsHidden = FALSE; Ret = CM_Enumerate_Classes(ClassIndex, &ClassGuid, @@ -172,6 +175,11 @@ /* This case is special because these devices don't show up with normal class enumeration */ *IsUnknown = IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_UNKNOWN); + + if (ShowHidden == FALSE && + (IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_LEGACYDRIVER) || + IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_VOLUME))) + *IsHidden = TRUE; if (SetupDiClassNameFromGuid(&ClassGuid, ClassName, @@ -327,7 +335,8 @@ VOID ListDevicesByType(HWND hTreeView, - HTREEITEM hRoot) + HTREEITEM hRoot, + BOOL bShowHidden) { HTREEITEM hDevItem; TCHAR DevName[MAX_DEV_LEN]; @@ -338,17 +347,20 @@ INT index = 0; INT DevImage; BOOL IsUnknown = FALSE; + BOOL IsHidden = FALSE; do { ClassRet = EnumDeviceClasses(index, + bShowHidden, DevName, DevDesc, &DevExist, &DevImage, - &IsUnknown); - - if ((ClassRet != -1) && (DevExist)) + &IsUnknown, + &IsHidden); + + if ((ClassRet != -1) && (DevExist) && !IsHidden) { TCHAR DeviceName[MAX_DEV_LEN]; INT DevIndex = 0; @@ -442,7 +454,8 @@ static HTREEITEM AddDeviceToTree(HWND hTreeView, HTREEITEM hRoot, - DEVINST dnDevInst) + DEVINST dnDevInst, + BOOL bShowHidden) { TCHAR DevName[MAX_DEV_LEN]; TCHAR FriendlyName[MAX_DEV_LEN]; @@ -452,6 +465,28 @@ LPTSTR DeviceID; INT ClassImage = 24; CONFIGRET cr; + + ulLength = MAX_GUID_STRING_LEN * sizeof(TCHAR); + cr = CM_Get_DevNode_Registry_Property(dnDevInst, + CM_DRP_CLASSGUID, + NULL, + ClassGuidString, + &ulLength, + 0); + if (cr == CR_SUCCESS) + { + pSetupGuidFromString(ClassGuidString, &ClassGuid); + + if (bShowHidden == FALSE && + (IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_LEGACYDRIVER) || + IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_VOLUME))) + return NULL; + } + else + { + /* It's a device with no driver */ + ClassGuid = GUID_DEVCLASS_UNKNOWN; + } cr = CM_Get_Device_ID(dnDevInst, DevName, @@ -480,23 +515,6 @@ return NULL; } - ulLength = MAX_GUID_STRING_LEN * sizeof(TCHAR); - cr = CM_Get_DevNode_Registry_Property(dnDevInst, - CM_DRP_CLASSGUID, - NULL, - ClassGuidString, - &ulLength, - 0); - if (cr == CR_SUCCESS) - { - pSetupGuidFromString(ClassGuidString, &ClassGuid); - } - else - { - /* It's a device with no driver */ - ClassGuid = GUID_DEVCLASS_UNKNOWN; - } - if (!SetupDiGetClassImageIndex(&ImageListData, &ClassGuid, &ClassImage)) @@ -532,7 +550,8 @@ static VOID EnumChildDevices(HWND hTreeView, HTREEITEM hRoot, - DEVINST dnParentDevInst) + DEVINST dnParentDevInst, + BOOL bShowHidden) { HTREEITEM hDevItem; DEVINST dnDevInst; @@ -546,13 +565,15 @@ hDevItem = AddDeviceToTree(hTreeView, hRoot, - dnDevInst); - if (hDevItem == NULL) - return; - - EnumChildDevices(hTreeView, - hDevItem, - dnDevInst); + dnDevInst, + bShowHidden); + if (hDevItem != NULL) + { + EnumChildDevices(hTreeView, + hDevItem, + dnDevInst, + bShowHidden); + } while (cr == CR_SUCCESS) { @@ -564,13 +585,15 @@ hDevItem = AddDeviceToTree(hTreeView, hRoot, - dnDevInst); - if (hDevItem == NULL) - break; - - EnumChildDevices(hTreeView, - hDevItem, - dnDevInst); + dnDevInst, + bShowHidden); + if (hDevItem != NULL) + { + EnumChildDevices(hTreeView, + hDevItem, + dnDevInst, + bShowHidden); + } } (void)TreeView_SortChildren(hTreeView, @@ -581,7 +604,8 @@ VOID ListDevicesByConnection(HWND hTreeView, - HTREEITEM hRoot) + HTREEITEM hRoot, + BOOL bShowHidden) { DEVINST devInst; CONFIGRET cr; @@ -592,7 +616,8 @@ if (cr == CR_SUCCESS) EnumChildDevices(hTreeView, hRoot, - devInst); + devInst, + bShowHidden); (void)TreeView_Expand(hTreeView, hRoot, Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ ÑÐ²ÑÑÐ·Ð²Ð°Ð½ÐµÑÐ¾", IDC_DEVBYCONN MENUITEM "Ð¡ÑÐµÐ´ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ Ð²Ð¸Ð´Ð°", IDC_RESBYTYPE, GRAYED MENUITEM "Ð¡ÑÐµÐ´ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ ÑÐ²ÑÑÐ·Ð²Ð°Ð½ÐµÑÐ¾", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "ÐÐ¾Ð¼Ð¾Ñ" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "ZaÅÃzenÃ podle pÅipojenÃ", IDC_DEVBYCONN MENUITEM "ProstÅedky podle typu", IDC_RESBYTYPE, GRAYED MENUITEM "ProstÅedky podle pÅipojenÃ", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "NÃ¡povÄda" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +ï»¿LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDR_MAINMENU MENU BEGIN @@ -20,6 +20,8 @@ MENUITEM "GerÃ¤te nach Verbindung", IDC_DEVBYCONN MENUITEM "Resourcen nach Typ", IDC_RESBYTYPE, GRAYED MENUITEM "Resourcen nach Verbindung", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Ausgeblendete GerÃ¤te anzeigen", IDC_SHOWHIDDEN END POPUP "&?" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "Î£ÏÏÎºÎµÏÎÏ Î±Î½Î¬ ÏÏÎ½Î´ÎµÏÎ·", IDC_DEVBYCONN MENUITEM "Î Î·Î³ÎÏ Î±Î½Î¬ ÏÏÏÎ¿", IDC_RESBYTYPE, GRAYED MENUITEM "Î Î·Î³ÎÏ Î±Î½Î¬ ÏÏÎ½Î´ÎµÏÎ·", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "ÎÎ¿Î®Î¸ÎµÎ¹Î±" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/en-US.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "Devices by connection", IDC_DEVBYCONN MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "Help" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -25,6 +25,8 @@ MENUITEM "Dispositivos por conexiÃ³n", IDC_DEVBYCONN MENUITEM "Recursos por tipo", IDC_RESBYTYPE, GRAYED MENUITEM "Recursos por conexiÃ³n", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "Ayuda" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "PÃ©riphÃ©riques par connexion", IDC_DEVBYCONN MENUITEM "Ressources par type", IDC_RESBYTYPE, GRAYED MENUITEM "Ressources par connexion", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "Aide" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/id-ID.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "Device dengan koneksi", IDC_DEVBYCONN MENUITEM "Resource dengan tipe", IDC_RESBYTYPE, GRAYED MENUITEM "Resource dengan koneksi", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "Bantuan" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "Dispositivi per connessione", IDC_DEVBYCONN MENUITEM "Risorse per tipo", IDC_RESBYTYPE, GRAYED MENUITEM "Risorse per connessione", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "Aiuto" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "ããã¤ã¹ (æ¥ç¶å¥)", IDC_DEVBYCONN MENUITEM "ãªã½ ã¼ã¹ (ç¨®é¡å¥)", IDC_RESBYTYPE, GRAYED MENUITEM "ãªã½ ã¼ã¹ (æ¥ç¶å¥)", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "ãã«ã" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -24,6 +24,8 @@ MENUITEM "Devices by connection", IDC_DEVBYCONN MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "ëìë§" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "Enheter etter tilkobling", IDC_DEVBYCONN MENUITEM "Ressurser etter type", IDC_RESBYTYPE, GRAYED MENUITEM "Ressurser etter tilkobling", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "Hjelp" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -27,6 +27,8 @@ MENUITEM "Ur&zÄdzenia wedÅug poÅÄczenia", IDC_DEVBYCONN MENUITEM "Zaso&by wedÅug typu", IDC_RESBYTYPE, GRAYED MENUITEM "Za&soby wedÅug poÅÄczenia", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "Pomo&c" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -21,6 +21,8 @@ MENUITEM "Dispozitive dupÄ &conexiune", IDC_DEVBYCONN MENUITEM "Resurse dupÄ t&ip", IDC_RESBYTYPE, GRAYED MENUITEM "Resurse dupÄ c&onexiune", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "&?" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -22,6 +22,8 @@ MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¿Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDC_DEVBYCONN MENUITEM "Ð ÐµÑÑÑÑÑ Ð¿Ð¾ ÑÐ¸Ð¿Ñ", IDC_RESBYTYPE, GRAYED MENUITEM "Ð ÐµÑÑÑÑÑ Ð¿Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -25,6 +25,8 @@ MENUITEM "Zariadenia podÄ¾a pripojenia", IDC_DEVBYCONN MENUITEM "Prostriedky podÄ¾a typu", IDC_RESBYTYPE, GRAYED MENUITEM "Prostriedky podÄ¾a pripojenia", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "PomocnÃk" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -27,6 +27,8 @@ MENUITEM "Enheter efter koppling", IDC_DEVBYCONN MENUITEM "Resurcer efter typ", IDC_RESBYTYPE, GRAYED MENUITEM "Resurcer efter koppling", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "HjÃ¤lp" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -28,6 +28,8 @@ MENUITEM "à¸à¸¸à¸à¸à¸£à¸à¹à¹à¸à¹à¸à¸à¸²à¸¡à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸", IDC_DEVBYCONN MENUITEM "à¹à¸«à¸¥à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸¡à¸à¸£à¸°à¹à¸ à¸", IDC_RESBYTYPE, GRAYED MENUITEM "à¹à¸«à¸¥à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸¡à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "à¸à¹à¸§à¸¢à¹à¸«à¸¥à¸·à¸" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -28,6 +28,8 @@ MENUITEM "ÐÑÐ¸ÑÑÑÐ¾Ñ Ð·Ð° Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½ÑÐ¼", IDC_DEVBYCONN MENUITEM "Ð ÐµÑÑÑÑÐ¸ Ð·Ð° ÑÐ¸Ð¿Ð¾Ð¼", IDC_RESBYTYPE, GRAYED MENUITEM "Ð ÐµÑÑÑÑÐ¸ Ð·Ð° Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½ÑÐ¼", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "ÐÐ¾Ð²ÑÐ´ÐºÐ°" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -24,6 +24,8 @@ MENUITEM "è®¾å¤ï¼æè¿æ¥", IDC_DEVBYCONN MENUITEM "èµæºï¼æç±»å", IDC_RESBYTYPE, GRAYED MENUITEM "èµæºï¼æè¿æ¥", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "å¸®å©" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -217,11 +217,11 @@ switch (Info->Display) { case DevicesByType: - ListDevicesByType(Info->hTreeView, hRoot); + ListDevicesByType(Info->hTreeView, hRoot, Info->bShowHidden); break; case DevicesByConnection: - ListDevicesByConnection(Info->hTreeView, hRoot); + ListDevicesByConnection(Info->hTreeView, hRoot, Info->bShowHidden); break; default: @@ -238,6 +238,9 @@ UpdateViewMenu(PMAIN_WND_INFO Info) { UINT id = IDC_DEVBYTYPE; + HMENU hMenu; + + hMenu = GetMenu(Info->hMainWnd); switch (Info->Display) { @@ -255,11 +258,15 @@ break; } - CheckMenuRadioItem(GetMenu(Info->hMainWnd), + CheckMenuRadioItem(hMenu, IDC_DEVBYTYPE, IDC_RESBYCONN, id, MF_BYCOMMAND); + + CheckMenuItem(hMenu, + IDC_SHOWHIDDEN, + MF_BYCOMMAND | (Info->bShowHidden) ? MF_CHECKED : MF_UNCHECKED); } @@ -598,6 +605,14 @@ OnRefresh(Info); } break; + + case IDC_SHOWHIDDEN: + { + Info->bShowHidden = !Info->bShowHidden; + UpdateViewMenu(Info); + OnRefresh(Info); + } + break; } } @@ -794,6 +809,7 @@ { Info->nCmdShow = nCmdShow; Info->Display = DevicesByType; + Info->bShowHidden = TRUE; hMainWnd = CreateWindowEx(WS_EX_WINDOWEDGE, szMainWndClass, Modified: trunk/reactos/base/applications/mscutils/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -40,6 +40,7 @@ int nCmdShow; DISPLAY_TYPE Display; + BOOL bShowHidden; /* status flags */ UINT InMenuLoop : 1; @@ -71,8 +72,8 @@ VOID FreeDeviceStrings(HWND hTreeView); VOID OpenPropSheet(HWND hTreeView, HTREEITEM hItem); HTREEITEM InitTreeView(HWND hTreeView); -VOID ListDevicesByType(HWND hTreeView, HTREEITEM hRoot); -VOID ListDevicesByConnection(HWND hTreeView, HTREEITEM hRoot); +VOID ListDevicesByType(HWND hTreeView, HTREEITEM hRoot, BOOL bShowHidden); +VOID ListDevicesByConnection(HWND hTreeView, HTREEITEM hRoot, BOOL bShowHidden); /* misc.c */ Modified: trunk/reactos/base/applications/mscutils/devmgmt/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/resource.h [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -23,6 +23,7 @@ #define IDC_DEVBYCONN 105 #define IDC_RESBYTYPE 106 #define IDC_RESBYCONN 107 +#define IDC_SHOWHIDDEN 108 /* tooltips */ #define IDS_TOOLTIP_PROP 6000

1 0

[tkreuzer] 56213: [WIN32K] - Initial implementations of IntEngBitBlt, EngBitBlt, NtGdiBitBlt
by tkreuzer＠svn.reactos.org 22 Mar '12

22 Mar '12

Author: tkreuzer Date: Thu Mar 22 20:43:31 2012 New Revision: 56213 URL: http://svn.reactos.org/svn/reactos?rev=56213&view=rev Log: [WIN32K] - Initial implementations of IntEngBitBlt, EngBitBlt, NtGdiBitBlt Added: trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c (with props) Added: 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 (added) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c [iso-8859-1] Thu Mar 22 20:43:31 2012 @@ -1,0 +1,576 @@ + +#include <win32k.h> +#include "../diblib/DibLib_interface.h" +DBG_DEFAULT_CHANNEL(GdiFont); + +#define SURFOBJ_flags(pso) (CONTAINING_RECORD(pso, SURFACE, SurfObj)->flags) + +#define XCLIPOBJ CLIPGDI + +XCLIPOBJ gxcoTrivial; + + +static +void +CalculateCoordinates( + PBLTDATA pbltdata, + PRECTL prclClipped, + PRECTL prclOrg, + PPOINTL pptlSrc, + PPOINTL pptlMask, + PPOINTL pptlPat, + PSIZEL psizlPat) +{ + 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 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) + { + /* Calculate current origin for the 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; + } + + if (pptlMask) + { + 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; + } + + if (pptlPat) + { + 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; + } +} + +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, iFunctionIndex, iDirection = CD_ANY; + RECTL rcTrg; + PFN_DIBFUNCTION pfnBitBlt; + BOOL bEnumMore; + RECT_ENUM rcenum; + PSIZEL psizlPat; + +__debugbreak(); + + ASSERT(psoTrg); + ASSERT(psoTrg->iBitmapFormat >= BMF_1BPP); + ASSERT(psoTrg->iBitmapFormat <= BMF_32BPP); + ASSERT(prclTrg); + ASSERT(prclTrg->left >= 0); + ASSERT(prclTrg->top >= 0); + ASSERT(prclTrg->right <= psoTrg->sizlBitmap.cx); + ASSERT(prclTrg->bottom <= psoTrg->sizlBitmap.cy); + + rcTrg = *prclTrg; + + bltdata.rop4 = rop4; + 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)) + { + /* Sanity checks */ + ASSERT(psoSrc); + ASSERT(psoSrc->iBitmapFormat >= BMF_1BPP); + ASSERT(psoSrc->iBitmapFormat <= BMF_32BPP); + ASSERT(pptlSrc); + ASSERT(pptlSrc->x >= 0); + ASSERT(pptlSrc->y >= 0); + 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) + 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)) + { + /* Use 0 as target format to get special right to left versions */ + bltdata.siDst.iFormat = 0; + bltdata.siSrc.iFormat = psoSrc->iBitmapFormat; + } + else + { + /* Use 0 as source format to get special equal surface versions */ + bltdata.siDst.iFormat = psoTrg->iBitmapFormat; + bltdata.siSrc.iFormat = 0; + } + } + else + { + bltdata.siDst.iFormat = psoTrg->iBitmapFormat; + bltdata.siSrc.iFormat = psoSrc->iBitmapFormat; + } + } + else + { + bltdata.siDst.iFormat = psoTrg->iBitmapFormat; + } + + /* Check of the ROP uses a pattern / brush */ + if (ROP4_USES_PATTERN(rop4)) + { + /* Must have a brush */ + ASSERT(pbo); // FIXME: test this! + + /* Copy the solid color */ + bltdata.ulSolidColor = pbo->iSolidColor; + + /* 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 + } + else + { + pptlBrush = NULL; + psizlPat = NULL; + } + } + else + { + pptlBrush = NULL; + psizlPat = NULL; + } + + /* Check if the ROP uses a mask */ + if (ROP4_USES_MASK(rop4)) + { + /* Must have a mask surface and point */ + ASSERT(psoMask); + ASSERT(pptlMask); + + 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)]; + + ASSERT(FALSE); + // get masking function! + pfnBitBlt = 0; + } + else + { + /* Get the function index from the foreground ROP index*/ + iFunctionIndex = aiIndexPerRop[ROP4_FGND(rop4)]; + + /* Get the dib function */ + pfnBitBlt = apfnDibFunction[iFunctionIndex]; + } + + /* If no clip object is given, use trivial one */ + if (!pco) pco = (CLIPOBJ*)&gxcoTrivial; + + /* Check if we need to enumerate rects */ + if (pco->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 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); + } + } + 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); + } + + return TRUE; +} + + +static +VOID +AdjustOffsetAndSize( + _Out_ PPOINTL pptOffset, + _Out_ PSIZEL psizTrg, + _In_ PPOINTL pptlSrc, + _In_ PSIZEL psizSrc) +{ + LONG 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 +IntEngBitBlt( + _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) +{ + BOOL bResult; + RECTL rcClipped; + POINTL ptOffset, ptSrc, ptMask; + SIZEL sizTrg; + PFN_DrvBitBlt pfnBitBlt; + +//__debugbreak(); + + /* Sanity checks */ + ASSERT(IS_VALID_ROP4(rop4)); + ASSERT(psoTrg); + 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); + rcClipped.top = max(prclTrg->top, 0); + rcClipped.right = min(prclTrg->right, psoTrg->sizlBitmap.cx); + rcClipped.bottom = min(prclTrg->bottom, psoTrg->sizlBitmap.cy); + + /* If no clip object is given, use trivial one */ + if (!pco) pco = (CLIPOBJ*)&gxcoTrivial; + + /* Check if there is something to clip */ + if (pco->iDComplexity != DC_TRIVIAL) + { + /* Clip the target rect to the bounds of the clipping region */ + RECTL_bIntersectRect(&rcClipped, &rcClipped, &pco->rclBounds); + } + + /* Don't pass a clip object with a single rectangle */ +// if (pco->iDComplexity == DC_RECT) pco = (CLIPOBJ*)&gxcoTrivial; + + /* Calculate initial offset and size */ + ptOffset.x = rcClipped.left - prclTrg->left; + ptOffset.y = rcClipped.top - prclTrg->top; + sizTrg.cx = rcClipped.right - rcClipped.left; + sizTrg.cy = rcClipped.bottom - rcClipped.top; + + /* Check if the ROP uses a source */ + if (ROP4_USES_SOURCE(rop4)) + { + /* Must have a source surface and point */ + ASSERT(psoSrc); + ASSERT(pptlSrc); + + /* Get the source point */ + ptSrc = *pptlSrc; + + /* Clip against the extents of the source surface */ + AdjustOffsetAndSize(&ptOffset, &sizTrg, &ptSrc, &psoSrc->sizlBitmap); + } + else + { + psoSrc = NULL; + 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 */ + ASSERT(psoMask); + ASSERT(pptlMask); + + /* Get the mask point */ + ptMask = *pptlMask; + + /* Clip against the extents of the mask surface */ + AdjustOffsetAndSize(&ptOffset, &sizTrg, &ptMask, &psoMask->sizlBitmap); + } + else + { + psoMask = NULL; + 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 */ + rcClipped.left = prclTrg->left + ptOffset.x; + rcClipped.top = prclTrg->top + ptOffset.y; + rcClipped.right = rcClipped.left + sizTrg.cx; + rcClipped.bottom = rcClipped.top + sizTrg.cy; + + /* Is the target surface device managed? */ + if (SURFOBJ_flags(psoTrg) & HOOK_BITBLT) + { + /* Is the source a different device managed surface? */ + if (psoSrc && (psoSrc->hdev != psoTrg->hdev) && + (SURFOBJ_flags(psoSrc) & HOOK_BITBLT)) + { + ERR("Need to copy to standard bitmap format!\n"); + ASSERT(FALSE); + } + + pfnBitBlt = GDIDEVFUNCS(psoTrg).BitBlt; + } + /* Otherwise is the source surface device managed? */ + else if (psoSrc && (SURFOBJ_flags(psoSrc) & HOOK_BITBLT)) + { + pfnBitBlt = GDIDEVFUNCS(psoSrc).BitBlt; + } + else + { + pfnBitBlt = EngBitBlt; + } + + bResult = pfnBitBlt(psoTrg, + psoSrc, + psoMask, + pco, + pxlo, + &rcClipped, + psoSrc ? &ptSrc : NULL, + psoMask ? &ptMask : NULL, + pbo, + pptlBrush, + rop4); + + // FIXME: cleanup temp surface! + + return bResult; +} + +BOOL +APIENTRY +NtGdiEngBitBlt( + IN SURFOBJ *psoTrgUMPD, + IN SURFOBJ *psoSrcUMPD, + IN SURFOBJ *psoMaskUMPD, + IN CLIPOBJ *pcoUMPD, + IN XLATEOBJ *pxloUMPD, + IN RECTL *prclTrg, + IN POINTL *pptlSrc, + IN POINTL *pptlMask, + IN BRUSHOBJ *pboUMPD, + IN POINTL *pptlBrush, + IN ROP4 rop4) +{ + RECTL rclTrg; + POINTL ptlSrc, ptlMask, ptlBrush; + HSURF hsurfTrg, hsurfSrc = NULL, hsurfMask = NULL; + HANDLE hBrushObj; // HUMPDOBJ + SURFOBJ *psoTrg, *psoSrc, *psoMask; + CLIPOBJ *pco; + XLATEOBJ *pxlo; + BRUSHOBJ *pbo; + BOOL bResult; + + _SEH2_TRY + { + ProbeForRead(prclTrg, sizeof(RECTL), 1); + rclTrg = *prclTrg; + + ProbeForRead(psoTrgUMPD, sizeof(SURFOBJ), 1); + hsurfTrg = psoTrgUMPD->hsurf; + + if (ROP4_USES_SOURCE(rop4)) + { + ProbeForRead(pptlSrc, sizeof(POINTL), 1); + ptlSrc = *pptlSrc; + + ProbeForRead(psoSrcUMPD, sizeof(SURFOBJ), 1); + hsurfSrc = psoSrcUMPD->hsurf; + } + + if (ROP4_USES_MASK(rop4)) + { + ProbeForRead(pptlMask, sizeof(POINTL), 1); + ptlMask = *pptlMask; + + ProbeForRead(psoMaskUMPD, sizeof(SURFOBJ), 1); + hsurfMask = psoMaskUMPD->hsurf; + } + + if (ROP4_USES_PATTERN(rop4)) + { + ProbeForRead(pptlBrush, sizeof(POINTL), 1); + ptlBrush = *pptlBrush; + + ProbeForRead(psoSrcUMPD, sizeof(SURFOBJ), 1); + hBrushObj = pboUMPD->pvRbrush; // FIXME + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return FALSE); + } + _SEH2_END; + + // FIXME: these need to be converted/locked! + psoTrg = NULL; + psoSrc = NULL; + psoMask = NULL; + pco = NULL; + pxlo = NULL; + pbo = NULL; + + bResult = EngBitBlt(psoTrg, + psoSrc, + psoMask, + pco, + pxlo, + &rclTrg, + pptlSrc ? &ptlSrc : NULL, + pptlMask ? &ptlMask : NULL, + pbo, + pptlBrush ? &ptlBrush : NULL, + rop4); + + 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; +} + Propchange: trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 56212: [DIBLIB] - Implement spacial even more optimized versions of SRCCOPY on equal surfaces for 8, 16, 24 and 32bpp. - Add the right-to-left versions to the function tables - Add _CALCSH...
by tkreuzer＠svn.reactos.org 22 Mar '12

22 Mar '12

Author: tkreuzer Date: Thu Mar 22 20:12:50 2012 New Revision: 56212 URL: http://svn.reactos.org/svn/reactos?rev=56212&view=rev Log: [DIBLIB] - Implement spacial even more optimized versions of SRCCOPY on equal surfaces for 8,16,24 and 32bpp. - Add the right-to-left versions to the function tables - Add _CALCSHIFT macro(s) to calculate the shift in the dib functions, instead of precalculating it in EngBitBlt. This costs us a few bytes per function (yes, with so many functions, every byte counts!) but since it's only for 1 and 4 bpp and improves the code by keeping DIB specific code out of the Eng function, it's reasonable to do so. - Add optional optimization pragmas Modified: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCCOPY.c trunk/reactos/subsystems/win32/win32k/diblib/DibLib.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_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] Thu Mar 22 20:12:50 2012 @@ -1,5 +1,55 @@ #include "DibLib.h" + +VOID +FASTCALL +Dib_BitBlt_SRCCOPY_EqSurf(PBLTDATA pBltData) +{ + ULONG cLines, cjWidth = pBltData->ulWidth * pBltData->jDstBpp; + PBYTE pjDestBase = pBltData->siDst.pjBase; + PBYTE pjSrcBase = pBltData->siSrc.pjBase; + + /* Loop all lines */ + cLines = pBltData->ulHeight; + while (cLines--) + { + memcpy(pjDestBase, pjSrcBase, cjWidth); + pjDestBase += pBltData->siDst.lDelta; + pjSrcBase += pBltData->siSrc.lDelta; + } +} + +#define Dib_BitBlt_SRCCOPY_S8_D8_EqSurf Dib_BitBlt_SRCCOPY_EqSurf +#define Dib_BitBlt_SRCCOPY_S16_D16_EqSurf Dib_BitBlt_SRCCOPY_EqSurf +#define Dib_BitBlt_SRCCOPY_S24_D24_EqSurf Dib_BitBlt_SRCCOPY_EqSurf + +/* special movsd optimization on x86 */ +#if defined(_M_IX86) || defined(_M_AMD64) +VOID +FASTCALL +Dib_BitBlt_SRCCOPY_S32_D32_EqSurf(PBLTDATA pBltData) +{ + ULONG cLines, cRows = pBltData->ulWidth; + PBYTE pjDestBase = pBltData->siDst.pjBase; + PBYTE pjSrcBase = pBltData->siSrc.pjBase; + + /* Loop all lines */ + cLines = pBltData->ulHeight; + while (cLines--) + { + __movsd((PULONG)pjDestBase, (PULONG)pjSrcBase, cRows); + pjDestBase += pBltData->siDst.lDelta; + pjSrcBase += pBltData->siSrc.lDelta; + } +} +#else +#define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf Dib_BitBlt_SRCCOPY_EqSurf +#endif + +#define Dib_BitBlt_SRCCOPY_S8_D8_EqSurf_manual 1 +#define Dib_BitBlt_SRCCOPY_S16_D16_EqSurf_manual 1 +#define Dib_BitBlt_SRCCOPY_S24_D24_EqSurf_manual 1 +#define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf_manual 1 #define __USES_SOURCE 1 #define __USES_PATTERN 0 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] Thu Mar 22 20:12:50 2012 @@ -1,5 +1,7 @@ #include "DibLib.h" + +BYTE ajShift4[2] = {4, 0}; enum { 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] Thu Mar 22 20:12:50 2012 @@ -9,6 +9,21 @@ #include <windef.h> #include <wingdi.h> #include <winddi.h> + +#ifdef _OPTIMIZE_DIBLIB +#ifdef _MSC_VER +#pragma optimize("g", on) +#else +#pragma GCC optimize("O3") +#endif +#endif + +typedef +ULONG +(NTAPI *PFN_XLATE)(XLATEOBJ* pxlo, ULONG ulColor); + +extern BYTE ajShift4[2]; + #include "DibLib_interface.h" #define _DibXlate(pBltData, ulColor) (pBltData->pfnXlate(pBltData->pxlo, ulColor)) @@ -16,51 +31,54 @@ #define __PASTE_(s1,s2) s1##s2 #define __PASTE(s1,s2) __PASTE_(s1,s2) -#define __DIB_FUNCTION_NAME_SRCDSTEQ2(name, src_bpp, dst_bpp) Dib_ ## name ## _S ## src_bpp ## _D ## dst_bpp ## _EqSurf -#define __DIB_FUNCTION_NAME_SRCDSTEQ(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDSTEQ2(name, src_bpp, dst_bpp) - -#define __DIB_FUNCTION_NAME_SRCDSTEQR2L2(name, src_bpp, dst_bpp) Dib_ ## name ## _S ## src_bpp ## _D ## dst_bpp ## _EqSurfR2L -#define __DIB_FUNCTION_NAME_SRCDSTEQR2L(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDSTEQR2L2(name, src_bpp, dst_bpp) - #define __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) Dib_ ## name ## _S ## src_bpp ## _D ## dst_bpp #define __DIB_FUNCTION_NAME_SRCDST(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) #define __DIB_FUNCTION_NAME_DST2(name, dst_bpp) Dib_ ## name ## _D ## dst_bpp #define __DIB_FUNCTION_NAME_DST(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_DST2(name, dst_bpp) +#define __DIB_FUNCTION_NAME_SRCDSTEQ(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) ## _EqSurf +#define __DIB_FUNCTION_NAME_SRCDSTEQL2R(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) ## _EqSurfL2R +#define __DIB_FUNCTION_NAME_SRCDSTEQR2L(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) ## _EqSurfR2L #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 _SHIFT_1(x) x +#define _CALCSHIFT_1(pShift, x) (void)(*(pShift) = (7 - ((x) & 7))) #define _ReadPixel_4(pjSource, jShift) (((*(pjSource)) >> (jShift)) & 15) #define _WritePixel_4(pjDest, jShift, ulColor) (void)(*(pjDest) = (UCHAR)((*(pjDest) & ~(15<<(jShift))) | ((ulColor)<<(jShift)))) #define _NextPixel_4(ppj, pjShift) (void)((*(ppj) += (*(pjShift) & 1)), (*(pjShift)) -= 4, *(pjShift) &= 7) #define _NextPixelR2L_4(ppj, pjShift) (void)((*(pjShift)) -= 4, *(pjShift) &= 7, (*(ppj) -= (*(pjShift) & 1))) #define _SHIFT_4(x) x +#define _CALCSHIFT_4(pShift, x) (void)(*(pShift) = ajShift4[(x) & 1]) #define _ReadPixel_8(pjSource, x) (*(UCHAR*)(pjSource)) #define _WritePixel_8(pjDest, x, ulColor) (void)(*(UCHAR*)(pjDest) = (UCHAR)(ulColor)) #define _NextPixel_8(ppj, pjShift) (void)(*(ppj) += 1) #define _NextPixelR2L_8(ppj, pjShift) (void)(*(ppj) -= 1) #define _SHIFT_8(x) +#define _CALCSHIFT_8(pShift, x) #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 _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 _SHIFT_24(x) +#define _CALCSHIFT_24(pShift, x) #define _ReadPixel_32(pjSource, x) (*(ULONG*)(pjSource)) #define _WritePixel_32(pjDest, x, ulColor) (void)(*(ULONG*)(pjDest) = (ulColor)) #define _NextPixel_32(ppj, pjShift) (void)(*(ppj) += 4) #define _NextPixelR2L_32(ppj, pjShift) (void)(*(ppj) -= 4) #define _SHIFT_32(x) +#define _CALCSHIFT_32(pShift, x) 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] Thu Mar 22 20:12:50 2012 @@ -44,7 +44,15 @@ PFN_DIBFUNCTION __PASTE(gapfn, __FUNCTIONNAME)[7][7] = { - {0, 0, 0, 0, 0, 0}, + { + 0, + __DIB_FUNCTION_NAME_SRCDSTEQR2L(__FUNCTIONNAME, 1, 1), + __DIB_FUNCTION_NAME_SRCDSTEQR2L(__FUNCTIONNAME, 4, 4), + __DIB_FUNCTION_NAME_SRCDSTEQR2L(__FUNCTIONNAME, 8, 8), + __DIB_FUNCTION_NAME_SRCDSTEQR2L(__FUNCTIONNAME, 16, 16), + __DIB_FUNCTION_NAME_SRCDSTEQR2L(__FUNCTIONNAME, 24, 24), + __DIB_FUNCTION_NAME_SRCDSTEQR2L(__FUNCTIONNAME, 32, 32), + }, { __DIB_FUNCTION_NAME_SRCDSTEQ(__FUNCTIONNAME, 1, 1), __DIB_FUNCTION_NAME_SRCDST(__FUNCTIONNAME, 1, 1), 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] Thu Mar 22 20:12:50 2012 @@ -9,6 +9,9 @@ #define _WritePixel(pj, jShift, c) __PASTE(_WritePixel_, _DEST_BPP)(pj, jShift, c) #define _NextPixel(bpp, ppj, pjShift) __PASTE(_NextPixel_, bpp)(ppj, pjShift) #define _SHIFT(bpp, x) __PASTE(_SHIFT_, bpp)(x) +#define _CALCSHIFT(bpp, pshift, x) __PASTE(_CALCSHIFT_, bpp)(pshift, x) + +#if (__PASTE(_DibFunction, _manual) != 1) VOID FASTCALL @@ -42,7 +45,7 @@ pjPatBase = pBltData->siPat.pjBase; pjPatBase += pBltData->siPat.ptOrig.y * pBltData->siPat.lDelta; pjPattern = pjPatBase + pBltData->siPat.ptOrig.x * _DEST_BPP / 8; - _SHIFT(_DEST_BPP, jPatShift = pBltData->siPat.jShift0;) + _CALCSHIFT(_DEST_BPP, &jPatShift, pBltData->siPat.ptOrig.x); cPatLines = pBltData->ulPatHeight - pBltData->siPat.ptOrig.y; cPatRows = pBltData->ulPatWidth - pBltData->siPat.ptOrig.x; #endif @@ -57,14 +60,14 @@ { /* Set current bit pointers and shifts */ pjDest = pjDestBase; - _SHIFT(_DEST_BPP, jDstShift = pBltData->siDst.jShift0;) + _CALCSHIFT(_DEST_BPP, &jDstShift, pBltData->siDst.ptOrig.x); #if __USES_SOURCE pjSource = pjSrcBase; - _SHIFT(_SOURCE_BPP, jSrcShift = pBltData->siSrc.jShift0;) + _CALCSHIFT(_SOURCE_BPP, &jSrcShift, pBltData->siSrc.ptOrig.x); #endif #if __USES_MASK pjMask = pjMaskBase; - jMskShift = pBltData->siMsk.jShift0; + _CALCSHIFT_1(&jMskShift, pBltData->siMsk.ptOrig.x); #endif /* Loop all rows */ @@ -126,5 +129,7 @@ } } +#endif // manual + #undef _DibFunction #undef __FUNCTIONNAME2 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] Thu Mar 22 20:12:50 2012 @@ -1,17 +1,14 @@ #include "RopFunctions.h" - -typedef -ULONG -(NTAPI *PFN_XLATE)(XLATEOBJ* pxlo, ULONG ulColor); typedef struct { ULONG iFormat; + PBYTE pvScan0; PBYTE pjBase; LONG lDelta; POINTL ptOrig; - BYTE jShift0; + BYTE jBpp; } SURFINFO; typedef struct @@ -30,6 +27,7 @@ ULONG rop4; PFN_DOROP apfnDoRop[2]; ULONG ulSolidColor; + BYTE jDstBpp; } BLTDATA, *PBLTDATA; typedef

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