mirror of
https://github.com/reactos/reactos.git
synced 2024-10-06 09:24:11 +00:00
[WIN32K]
- get rid of ROS_DC::BitsPerPixel. 1 - It was a hack. 2 - Its use was inconsistent. svn path=/branches/reactos-yarotows/; revision=46848
This commit is contained in:
parent
c9353947a1
commit
c3731e5552
|
@ -54,8 +54,6 @@ typedef struct _ROS_DC_INFO
|
|||
HRGN hClipRgn; /* Clip region (may be 0) */
|
||||
HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */
|
||||
|
||||
BYTE bitsPerPixel;
|
||||
|
||||
CLIPOBJ *CombinedClip;
|
||||
|
||||
UNICODE_STRING DriverName;
|
||||
|
|
|
@ -106,8 +106,6 @@ DC_InitHack(PDC pdc)
|
|||
GdiSelectVisRgn(pdc->BaseObject.hHmgr, hVisRgn);
|
||||
GreDeleteObject(hVisRgn);
|
||||
ASSERT(pdc->prgnVis);
|
||||
pdc->rosdc.bitsPerPixel = pdc->ppdev->gdiinfo.cBitsPixel *
|
||||
pdc->ppdev->gdiinfo.cPlanes;
|
||||
}
|
||||
|
||||
VOID
|
||||
|
|
|
@ -156,10 +156,10 @@ GdiSelectPalette(
|
|||
return NULL;
|
||||
}
|
||||
|
||||
// FIXME: This looks wrong
|
||||
/* Is this a valid palette for this depth? */
|
||||
if ((pdc->rosdc.bitsPerPixel <= 8 && ppal->Mode == PAL_INDEXED) ||
|
||||
(pdc->rosdc.bitsPerPixel > 8))
|
||||
if ((BitsPerFormat(pdc->dclevel.pSurface->SurfObj.iBitmapFormat) <= 8
|
||||
&& ppal->Mode == PAL_INDEXED) ||
|
||||
(BitsPerFormat(pdc->dclevel.pSurface->SurfObj.iBitmapFormat) > 8))
|
||||
{
|
||||
/* Get old palette, set new one */
|
||||
oldPal = pdc->dclevel.hpal;
|
||||
|
@ -285,18 +285,6 @@ NtGdiSelectBitmap(
|
|||
// If Info DC this is zero and pSurface is moved to DC->pSurfInfo.
|
||||
psurfBmp->hDC = hDC;
|
||||
|
||||
// if we're working with a DIB, get the palette
|
||||
// [fixme: only create if the selected palette is null]
|
||||
if (psurfBmp->hSecure)
|
||||
{
|
||||
// pDC->rosdc.bitsPerPixel = psurfBmp->dib->dsBmih.biBitCount; ???
|
||||
pDC->rosdc.bitsPerPixel = BitsPerFormat(psurfBmp->SurfObj.iBitmapFormat);
|
||||
}
|
||||
else
|
||||
{
|
||||
pDC->rosdc.bitsPerPixel = BitsPerFormat(psurfBmp->SurfObj.iBitmapFormat);
|
||||
}
|
||||
|
||||
/* FIXME; improve by using a region without a handle and selecting it */
|
||||
hVisRgn = IntSysCreateRectRgn( 0,
|
||||
0,
|
||||
|
|
|
@ -48,12 +48,6 @@ DC_vCopyState(PDC pdcSrc, PDC pdcDst, BOOL To)
|
|||
// FIXME: handle refs
|
||||
pdcDst->dclevel.plfnt = pdcSrc->dclevel.plfnt;
|
||||
|
||||
/* ROS hacks */
|
||||
if (pdcDst->dctype != DC_TYPE_MEMORY)
|
||||
{
|
||||
pdcDst->rosdc.bitsPerPixel = pdcSrc->rosdc.bitsPerPixel;
|
||||
}
|
||||
|
||||
/* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */
|
||||
if (To) // Copy "To" SaveDC state.
|
||||
{
|
||||
|
@ -81,11 +75,6 @@ IntGdiCleanDC(HDC hDC)
|
|||
// Clean the DC
|
||||
if (defaultDCstate) DC_vCopyState(defaultDCstate, dc, FALSE);
|
||||
|
||||
if (dc->dctype != DC_TYPE_MEMORY)
|
||||
{
|
||||
dc->rosdc.bitsPerPixel = defaultDCstate->rosdc.bitsPerPixel;
|
||||
}
|
||||
|
||||
DC_UnlockDc(dc);
|
||||
|
||||
return TRUE;
|
||||
|
|
Loading…
Reference in a new issue