Author: gschneider
Date: Wed Oct 1 05:05:02 2008
New Revision: 36607
URL:
http://svn.reactos.org/svn/reactos?rev=36607&view=rev
Log:
[FORMATTING], spelling, misc cleanup. No functional changes.
Modified:
trunk/reactos/subsystems/win32/win32k/eng/bitblt.c
trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c
trunk/reactos/subsystems/win32/win32k/objects/dibobj.c
Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Wed Oct 1 05:05:02
2008
@@ -1065,7 +1065,7 @@
BlendObj->BlendFunction.AlphaFormat);
- /* Validate input */
+ /* Validate output */
OutputRect = *DestRect;
if (OutputRect.right < OutputRect.left)
{
Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Wed Oct 1
05:05:02 2008
@@ -755,8 +755,7 @@
Bitmap.bmWidthBytes = abs(bmp->SurfObj.lDelta);
Bitmap.bmPlanes = 1;
Bitmap.bmBitsPixel = BitsPerFormat(bmp->SurfObj.iBitmapFormat);
- //Bitmap.bmBits = bmp->SurfObj.pvBits;
- Bitmap.bmBits = NULL; /* not set accoring wine test confirm in win2k */
+ Bitmap.bmBits = NULL; /* not set according to wine test, confirmed in win2k */
memcpy(buffer, &Bitmap, Count);
}
return Count;
Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Oct 1
05:05:02 2008
@@ -549,9 +549,9 @@
ProbeForWrite(Info, sizeof(BITMAPINFO), 1);
coreheader = (BITMAPCOREHEADER*) Info;
- coreheader->bcWidth =BitmapObj->SurfObj.sizlBitmap.cx;
+ coreheader->bcWidth = BitmapObj->SurfObj.sizlBitmap.cx;
coreheader->bcPlanes = 1;
- coreheader->bcBitCount =
BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat);
+ coreheader->bcBitCount =
BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat);
coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy;
if (BitmapObj->SurfObj.lDelta > 0)
@@ -665,7 +665,7 @@
{
Info->bmiColors[Index].rgbRed =
DestPalette->IndexedColors[Index].peRed;
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 @@
if (!hDc)
{
- hDc = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE);
+ hDc = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE);
if (!hDc)
{
SetLastWin32Error(ERROR_INVALID_HANDLE);
@@ -1031,7 +1031,7 @@
IN OPTIONAL HANDLE hSection,
IN DWORD dwOffset,
IN LPBITMAPINFO bmi,
- DWORD Usage,
+ DWORD Usage,
IN UINT cjHeader,
IN FLONG fl,
IN ULONG_PTR dwColorSpace,
@@ -1148,7 +1148,8 @@
case 16:
dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB
: 0x7c00;
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:
dib->dsBitfields[0] = 0xff0000;
@@ -1164,11 +1165,8 @@
}
dib->dshSection = section;
dib->dsOffset = offset;
- }
-
- // Create Device Dependent Bitmap and add DIB pointer
- if (dib)
- {
+
+ // Create Device Dependent Bitmap and add DIB pointer
Size.cx = bm.bmWidth;
Size.cy = abs(bm.bmHeight);
res = IntCreateBitmap(Size, bm.bmWidthBytes,
@@ -1312,7 +1310,6 @@
if (NULL == palGDI)
{
-// RELEASEDCINFO(hDC);
return NULL;
}
@@ -1344,7 +1341,6 @@
lpRGB[i].rgbBlue = palGDI->IndexedColors[*lpIndex].peBlue;
lpIndex++;
}
-// RELEASEDCINFO(hDC);
PALETTE_UnlockPalette(palGDI);
return lpRGB;