Author: fireball Date: Sun Aug 23 11:55:10 2009 New Revision: 42876
URL: http://svn.reactos.org/svn/reactos?rev=42876&view=rev Log: - Create an XLATE for a mouse pointer. - Silence a dprint in RosGdiGetDIBits. - A step to fix an old issue nr. 20 from Arwinss wiki: "Fix mouse cursor being black problem"
Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c
Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32... ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c [iso-8859-1] Sun Aug 23 11:55:10 2009 @@ -357,8 +357,8 @@ /* Create a mask surface */ if (psoMask) { - //EXLATEOBJ exlo; - PPALETTE ppal; + XLATEOBJ *xlo; + //PPALETTE ppal;
hbmp = EngCreateBitmap(psoMask->sizlBitmap, lDelta, @@ -369,25 +369,31 @@
if(pgp->psurfMask) { - ppal = PALETTE_LockPalette(ppdev->DevInfo.hpalDefault); + //ppal = PALETTE_LockPalette(ppdev->DevInfo.hpalDefault); /*EXLATEOBJ_vInitialize(&exlo, &gpalMono, ppal, 0, RGB(0xff,0xff,0xff), RGB(0,0,0));*/ + xlo = IntEngCreateSrcMonoXlate(ppdev->DevInfo.hpalDefault, + RGB(0xff,0xff,0xff), + RGB(0,0,0) + );
rcl.bottom = psoMask->sizlBitmap.cy; + GreCopyBits(&pgp->psurfMask->SurfObj, psoMask, NULL, - NULL,//&exlo.xlo, + xlo, &rcl, (POINTL*)&rcl);
//EXLATEOBJ_vCleanup(&exlo); - if (ppal) - PALETTE_UnlockPalette(ppal); + EngDeleteXlate(xlo); + //if (ppal) + // PALETTE_UnlockPalette(ppal); } } else
Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32... ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c [iso-8859-1] Sun Aug 23 11:55:10 2009 @@ -209,7 +209,7 @@ /* Get a pointer to the DCs */ pDC = DC_Lock(physDev);
- DPRINT1("RosGdiGetDIBits for bitmap %x (user handle %x), StartScan %d, ScanLines %d, height %d\n", + DPRINT("RosGdiGetDIBits for bitmap %x (user handle %x), StartScan %d, ScanLines %d, height %d\n", hBitmap, hUserBitmap, StartScan, ScanLines, dib->dsBm.bmHeight);
/* Set the bits */