Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 15:36:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adding small hack to getting SetPixel color right when it is more that 3 bytes long.

Browse source 
This hack allown us pass one more test. (Debuging in progress)

svn path=/trunk/; revision=23904
This commit is contained in:
Magnus Olsen 2006-09-03 22:54:22 +00:00
parent 9fbb616938
commit 09a8680165
1 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
reactos/subsystems/win32/win32k/objects/bitmaps.c
View file

@ -485,14 +485,16 @@ BITMAP_Cleanup(PVOID ObjectBody)
{ {
if (pBmp->dib == NULL) if (pBmp->dib == NULL)
{ {
ExFreePool(pBmp->SurfObj.pvBits); if (pBmp->SurfObj.pvBits != NULL)
ExFreePool(pBmp->SurfObj.pvBits);
} }
else else
{ {
EngFreeUserMem(pBmp->SurfObj.pvBits); if (pBmp->SurfObj.pvBits != NULL)
EngFreeUserMem(pBmp->SurfObj.pvBits);
} }
if (pBmp->hDIBPalette) if (pBmp->hDIBPalette != NULL)
{ {
NtGdiDeleteObject(pBmp->hDIBPalette); NtGdiDeleteObject(pBmp->hDIBPalette);
} }
} }
@ -1066,11 +1068,27 @@ NtGdiSetPixel(
INT Y, INT Y,
COLORREF Color) COLORREF Color)
{ {
DPRINT1("0 NtGdiSetPixel X %ld Y %ld C %ld\n",X,Y,Color);
if (((Color>>24) & 0xff)<0x10)
{
Color = ((Color>>16) & 0x0000ff) | ((Color<<16) & 0xff0000) | (Color & 0x00ff00);
}
DPRINT1("0 NtGdiSetPixel X %ld Y %ld C %ld\n",X,Y,Color);
if (NtGdiSetPixelV(hDC,X,Y,Color)) if (NtGdiSetPixelV(hDC,X,Y,Color))
{ {
return NtGdiGetPixel(hDC,X,Y); Color = NtGdiGetPixel(hDC,X,Y);
DPRINT1("1 NtGdiSetPixel X %ld Y %ld C %ld\n",X,Y,Color);
return Color;
} }
return ((COLORREF) -1);
Color = ((COLORREF) -1);
DPRINT1("2 NtGdiSetPixel X %ld Y %ld C %ld\n",X,Y,Color);
return Color;
} }
BOOL STDCALL BOOL STDCALL