Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-30 16:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIN32K]

Browse source 
- Use a palette created from the DIB infos for surface created through CreateDIBitmap(CBM_CREATEDIB)
CORE-8695 #comment Booting in 16bpp mode is now OK, but some problems remain when switching mode from 16bpp to 32bpp

svn path=/trunk/; revision=64993
This commit is contained in:
Jérôme Gardou 2014-10-25 18:11:36 +00:00
parent 35e122d62f
commit 8680a1f138
1 changed files with 16 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
reactos/win32ss/gdi/ntgdi/dibobj.c
View file

@ -1359,8 +1359,22 @@ IntCreateDIBitmap(
{
if (init & CBM_CREATDIB)
{
PSURFACE Surface;
PPALETTE Palette;
/* Undocumented flag which creates a DDB of the format specified by the bitmap info. */
handle = IntCreateCompatibleBitmap(Dc, width, height, planes, bpp);
if (!handle)
return NULL;
/* The palette must also match the given data */
Surface = SURFACE_ShareLockSurface(handle);
ASSERT(Surface);
Palette = CreateDIBPalette(data, Dc, coloruse);
ASSERT(Palette);
SURFACE_vSetPalette(Surface, Palette);
PALETTE_ShareUnlockPalette(Palette);
SURFACE_ShareUnlockSurface(Surface);
}
else
{
@ -1382,45 +1396,6 @@ IntCreateDIBitmap(
if ((NULL != handle) && (CBM_INIT & init))
{
if (init & CBM_CREATDIB)
{
PSURFACE Surface;
PPALETTE Palette;
NTSTATUS Status = STATUS_SUCCESS;
Surface = SURFACE_ShareLockSurface(handle);
ASSERT(Surface);
Palette = CreateDIBPalette(data, Dc, coloruse);
ASSERT(Palette);
SURFACE_vSetPalette(Surface, Palette);
PALETTE_ShareUnlockPalette(Palette);
if (Surface->SurfObj.pvBits)
{
_SEH2_TRY
{
RtlCopyMemory(Surface->SurfObj.pvBits, bits,
abs(Surface->sizlDim.cy * Surface->SurfObj.lDelta));
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
Status = _SEH2_GetExceptionCode();
}
_SEH2_END
}
SURFACE_ShareUnlockSurface(Surface);
if (!NT_SUCCESS(Status))
{
SetLastNtError(Status);
GreDeleteObject(handle);
handle = NULL;
}
return handle;
}
IntSetDIBits(Dc, handle, 0, height, bits, data, coloruse);
}
@ -1544,13 +1519,13 @@ GreCreateDIBitmapInternal(
{
BITMAPCOREHEADER* CoreHeader = (BITMAPCOREHEADER*)&pbmi->bmiHeader;
bpp = CoreHeader->bcBitCount;
planes = CoreHeader->bcPlanes;
planes = CoreHeader->bcPlanes ? CoreHeader->bcPlanes : 1;
compression = BI_RGB;
}
else
{
bpp = pbmi->bmiHeader.biBitCount;
planes = pbmi->bmiHeader.biPlanes;
planes = pbmi->bmiHeader.biPlanes ? pbmi->bmiHeader.biPlanes : 1;
compression = pbmi->bmiHeader.biCompression;
}
}