Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-03 10:00:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FORMATTING], spelling, misc cleanup. No functional changes.

Browse source 
svn path=/trunk/; revision=36607
This commit is contained in:
Gregor Schneider 2008-10-01 10:05:02 +00:00
parent bd0da13d89
commit 163d36ceea
3 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsystems/win32/win32k/eng/bitblt.c
View file

@ -1065,7 +1065,7 @@ EngAlphaBlend(IN SURFOBJ *Dest,
BlendObj->BlendFunction.AlphaFormat); BlendObj->BlendFunction.AlphaFormat);
/* Validate input */ /* Validate output */
OutputRect = *DestRect; OutputRect = *DestRect;
if (OutputRect.right < OutputRect.left) if (OutputRect.right < OutputRect.left)
{ {

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

@ -755,8 +755,7 @@ BITMAP_GetObject(BITMAPOBJ * bmp, INT Count, LPVOID buffer)
Bitmap.bmWidthBytes = abs(bmp->SurfObj.lDelta); Bitmap.bmWidthBytes = abs(bmp->SurfObj.lDelta);
Bitmap.bmPlanes = 1; Bitmap.bmPlanes = 1;
Bitmap.bmBitsPixel = BitsPerFormat(bmp->SurfObj.iBitmapFormat); Bitmap.bmBitsPixel = BitsPerFormat(bmp->SurfObj.iBitmapFormat);
//Bitmap.bmBits = bmp->SurfObj.pvBits; Bitmap.bmBits = NULL; /* not set according to wine test, confirmed in win2k */
Bitmap.bmBits = NULL; /* not set accoring wine test confirm in win2k */
memcpy(buffer, &Bitmap, Count); memcpy(buffer, &Bitmap, Count);
} }
return Count; return Count;

20
reactos/subsystems/win32/win32k/objects/dibobj.c
View file

@ -549,9 +549,9 @@ NtGdiGetDIBitsInternal(HDC hDC,
ProbeForWrite(Info, sizeof(BITMAPINFO), 1); ProbeForWrite(Info, sizeof(BITMAPINFO), 1);
coreheader = (BITMAPCOREHEADER*) Info; coreheader = (BITMAPCOREHEADER*) Info;
coreheader->bcWidth =BitmapObj->SurfObj.sizlBitmap.cx; coreheader->bcWidth = BitmapObj->SurfObj.sizlBitmap.cx;
coreheader->bcPlanes = 1; coreheader->bcPlanes = 1;
coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat);
coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy; coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy;
if (BitmapObj->SurfObj.lDelta > 0) if (BitmapObj->SurfObj.lDelta > 0)
@ -665,7 +665,7 @@ NtGdiGetDIBitsInternal(HDC hDC,
{ {
Info->bmiColors[Index].rgbRed = DestPalette->IndexedColors[Index].peRed; Info->bmiColors[Index].rgbRed = DestPalette->IndexedColors[Index].peRed;
Info->bmiColors[Index].rgbGreen = DestPalette->IndexedColors[Index].peGreen; Info->bmiColors[Index].rgbGreen = DestPalette->IndexedColors[Index].peGreen;
Info->bmiColors[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; Info->bmiColors[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue;
} }
} }
@ -990,7 +990,7 @@ NtGdiCreateDIBitmapInternal(IN HDC hDc,
if (!hDc) if (!hDc)
{ {
hDc = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE); hDc = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE);
if (!hDc) if (!hDc)
{ {
SetLastWin32Error(ERROR_INVALID_HANDLE); SetLastWin32Error(ERROR_INVALID_HANDLE);
@ -1031,7 +1031,7 @@ HBITMAP STDCALL NtGdiCreateDIBSection(HDC hDC,
IN OPTIONAL HANDLE hSection, IN OPTIONAL HANDLE hSection,
IN DWORD dwOffset, IN DWORD dwOffset,
IN LPBITMAPINFO bmi, IN LPBITMAPINFO bmi,
DWORD Usage, DWORD Usage,
IN UINT cjHeader, IN UINT cjHeader,
IN FLONG fl, IN FLONG fl,
IN ULONG_PTR dwColorSpace, IN ULONG_PTR dwColorSpace,
@ -1148,7 +1148,8 @@ DIB_CreateDIBSection(
case 16: case 16:
dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0x7c00; dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0x7c00;
dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x03e0; dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x03e0;
dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x001f; break; dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x001f;
break;
case 24: case 24:
dib->dsBitfields[0] = 0xff0000; dib->dsBitfields[0] = 0xff0000;
@ -1164,11 +1165,8 @@ DIB_CreateDIBSection(
} }
dib->dshSection = section; dib->dshSection = section;
dib->dsOffset = offset; dib->dsOffset = offset;
}
// Create Device Dependent Bitmap and add DIB pointer // Create Device Dependent Bitmap and add DIB pointer
if (dib)
{
Size.cx = bm.bmWidth; Size.cx = bm.bmWidth;
Size.cy = abs(bm.bmHeight); Size.cy = abs(bm.bmHeight);
res = IntCreateBitmap(Size, bm.bmWidthBytes, res = IntCreateBitmap(Size, bm.bmWidthBytes,
@ -1312,7 +1310,6 @@ DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi)
if (NULL == palGDI) if (NULL == palGDI)
{ {
// RELEASEDCINFO(hDC);
return NULL; return NULL;
} }
@ -1344,7 +1341,6 @@ DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi)
lpRGB[i].rgbBlue = palGDI->IndexedColors[*lpIndex].peBlue; lpRGB[i].rgbBlue = palGDI->IndexedColors[*lpIndex].peBlue;
lpIndex++; lpIndex++;
} }
// RELEASEDCINFO(hDC);
PALETTE_UnlockPalette(palGDI); PALETTE_UnlockPalette(palGDI);
return lpRGB; return lpRGB;