8 May
2005
8 May
'05
2:12 a.m.
remove whitespace from end of lines
Modified: trunk/reactos/subsys/win32k/dib/dib.c
Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c
Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c
Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c
Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c
Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c
Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c
Modified: trunk/reactos/subsys/win32k/eng/bitblt.c
Modified: trunk/reactos/subsys/win32k/eng/clip.c
Modified: trunk/reactos/subsys/win32k/eng/debug.c
Modified: trunk/reactos/subsys/win32k/eng/device.c
Modified: trunk/reactos/subsys/win32k/eng/event.c
Modified: trunk/reactos/subsys/win32k/eng/float.c
Modified: trunk/reactos/subsys/win32k/eng/gradient.c
Modified: trunk/reactos/subsys/win32k/eng/mouse.c
Modified: trunk/reactos/subsys/win32k/eng/objects.h
Modified: trunk/reactos/subsys/win32k/eng/paint.c
Modified: trunk/reactos/subsys/win32k/eng/palette.c
Modified: trunk/reactos/subsys/win32k/eng/surface.c
Modified: trunk/reactos/subsys/win32k/eng/transblt.c
Modified: trunk/reactos/subsys/win32k/eng/xlate.c
Modified: trunk/reactos/subsys/win32k/include/desktop.h
Modified: trunk/reactos/subsys/win32k/include/inteng.h
Modified: trunk/reactos/subsys/win32k/include/intgdi.h
Modified: trunk/reactos/subsys/win32k/include/menu.h
Modified: trunk/reactos/subsys/win32k/include/msgqueue.h
Modified: trunk/reactos/subsys/win32k/include/winpos.h
Modified: trunk/reactos/subsys/win32k/include/winsta.h
Modified: trunk/reactos/subsys/win32k/ldr/loader.c
Modified: trunk/reactos/subsys/win32k/main/dllmain.c
Modified: trunk/reactos/subsys/win32k/main/svctabm.c
Modified: trunk/reactos/subsys/win32k/misc/driver.c
Modified: trunk/reactos/subsys/win32k/misc/object.c
Modified: trunk/reactos/subsys/win32k/misc/ssec.c
Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c
Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c
Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c
Modified: trunk/reactos/subsys/win32k/ntuser/callback.c
Modified: trunk/reactos/subsys/win32k/ntuser/caret.c
Modified: trunk/reactos/subsys/win32k/ntuser/class.c
Modified: trunk/reactos/subsys/win32k/ntuser/csr.c
Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c
Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c
Modified: trunk/reactos/subsys/win32k/ntuser/focus.c
Modified: trunk/reactos/subsys/win32k/ntuser/guicheck.c
Modified: trunk/reactos/subsys/win32k/ntuser/hook.c
Modified: trunk/reactos/subsys/win32k/ntuser/hotkey.c
Modified: trunk/reactos/subsys/win32k/ntuser/input.c
Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c
Modified: trunk/reactos/subsys/win32k/ntuser/menu.c
Modified: trunk/reactos/subsys/win32k/ntuser/message.c
Modified: trunk/reactos/subsys/win32k/ntuser/misc.c
Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c
Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c
Modified: trunk/reactos/subsys/win32k/ntuser/painting.c
Modified: trunk/reactos/subsys/win32k/ntuser/prop.c
Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c
Modified: trunk/reactos/subsys/win32k/ntuser/timer.c
Modified: trunk/reactos/subsys/win32k/ntuser/useratom.c
Modified: trunk/reactos/subsys/win32k/ntuser/vis.c
Modified: trunk/reactos/subsys/win32k/ntuser/windc.c
Modified: trunk/reactos/subsys/win32k/ntuser/window.c
Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c
Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c
Modified: trunk/reactos/subsys/win32k/objects/bezier.c
Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c
Modified: trunk/reactos/subsys/win32k/objects/brush.c
Modified: trunk/reactos/subsys/win32k/objects/cliprgn.c
Modified: trunk/reactos/subsys/win32k/objects/coord.c
Modified: trunk/reactos/subsys/win32k/objects/dc.c
Modified: trunk/reactos/subsys/win32k/objects/dib.c
Modified: trunk/reactos/subsys/win32k/objects/fillshap.c
Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c
Modified: trunk/reactos/subsys/win32k/objects/icm.c
Modified: trunk/reactos/subsys/win32k/objects/line.c
Modified: trunk/reactos/subsys/win32k/objects/palette.c
Modified: trunk/reactos/subsys/win32k/objects/path.c
Modified: trunk/reactos/subsys/win32k/objects/pen.c
Modified: trunk/reactos/subsys/win32k/objects/polyfill.c
Modified: trunk/reactos/subsys/win32k/objects/region.c
Modified: trunk/reactos/subsys/win32k/objects/stockobj.c
Modified: trunk/reactos/subsys/win32k/objects/wingl.c
_____
Modified: trunk/reactos/subsys/win32k/dib/dib.c
--- trunk/reactos/subsys/win32k/dib/dib.c 2005-05-08 02:08:57 UTC
(rev 15105)
+++ trunk/reactos/subsys/win32k/dib/dib.c 2005-05-08 02:11:54 UTC
(rev 15106)
@@ -95,7 +95,7 @@
ULONG ResultNibble;
ULONG Result;
ULONG i;
- static const ULONG ExpandDest[16] =
+ static const ULONG ExpandDest[16] =
{
0x55555555 /* 0000 */,
0x555555AA /* 0001 */,
@@ -114,7 +114,7 @@
0xAAAAAA55 /* 1110 */,
0xAAAAAAAA /* 1111 */,
};
- static const ULONG ExpandSource[16] =
+ static const ULONG ExpandSource[16] =
{
0x33333333 /* 0000 */,
0x333333CC /* 0001 */,
@@ -133,7 +133,7 @@
0xCCCCCC33 /* 1110 */,
0xCCCCCCCC /* 1111 */,
};
- static const ULONG ExpandPattern[16] =
+ static const ULONG ExpandPattern[16] =
{
0x0F0F0F0F /* 0000 */,
0x0F0F0FF0 /* 0001 */,
@@ -180,7 +180,7 @@
for (i = 0; i < 8; i++)
{
ResultNibble = Rop & ExpandDest[Dest & 0xF] & ExpandSource[Source
& 0xF] & ExpandPattern[Pattern & 0xF];
- Result |= (((ResultNibble & 0xFF000000) ? 0x8 : 0x0) |
((ResultNibble & 0x00FF0000) ? 0x4 : 0x0) |
+ Result |= (((ResultNibble & 0xFF000000) ? 0x8 : 0x0) |
((ResultNibble & 0x00FF0000) ? 0x4 : 0x0) |
((ResultNibble & 0x0000FF00) ? 0x2 : 0x0) | ((ResultNibble &
0x000000FF) ? 0x1 : 0x0)) << (i * 4);
Dest >>= 4;
Source >>= 4;
_____
Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c
--- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-05-08 02:08:57 UTC
(rev 15105)
+++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-05-08 02:11:54 UTC
(rev 15106)
@@ -310,8 +310,8 @@
ULONG RoundedRight;
UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4);
- UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4);
-
+ UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4);
+
RoundedRight = BltInfo->DestRect.right -
((BltInfo->DestRect.right - BltInfo->DestRect.left) &
0x1);
SourceY = BltInfo->SourcePoint.y;
@@ -324,7 +324,7 @@
{
if (BltInfo->PatternSurface)
{
- PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) %
+ PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) %
BltInfo->PatternSurface->sizlBitmap.cy;
}
else
@@ -337,11 +337,11 @@
for (DestY = BltInfo->DestRect.top; DestY <
BltInfo->DestRect.bottom; DestY++)
{
SourceX = BltInfo->SourcePoint.x;
-
+
for (DestX = BltInfo->DestRect.left; DestX < RoundedRight; DestX
+= 2, DestBits++, SourceX += 2)
{
Dest = *DestBits;
-
+
if (UsesSource)
{
Source = DIB_GetSource(BltInfo->SourceSurface, SourceX,
SourceY, BltInfo->XlateSourceToDest);
@@ -369,7 +369,7 @@
if (BltInfo->PatternSurface)
{
Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX +
BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx,
PatternY, BltInfo->XlatePatternToDest);
- }
+ }
DIB_16BPP_PutPixel(BltInfo->DestSurface, DestX, DestY,
DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xFFFF);
DestBits = (PULONG)((ULONG_PTR)DestBits + 2);
@@ -386,7 +386,7 @@
((BltInfo->DestRect.right - BltInfo->DestRect.left) << 1) +
BltInfo->DestSurface->lDelta);
}
-
+
return TRUE;
}
@@ -415,22 +415,22 @@
}*/ /* if */
// This one should be correct, but it's too long
-/*
+/*
unsigned char r1, g1, b1, r2, g2, b2, rr, gr, br;
unsigned short res;
-
+
r1 = (a & 0xF800) >> 11;
g1 = (a & 0x7E0) >> 5;
b1 = (a & 0x1F);
-
+
r2 = (b & 0xF800) >> 11;
g2 = (b & 0x7E0) >> 5;
b2 = (b & 0x1F);
-
+
rr = (r1+r2) / 2;
gr = (g1+g2) / 2;
br = (b1+b2) / 2;
-
+
res = (rr << 11) + (gr << 5) + br;
return res;
@@ -473,7 +473,7 @@
UINT DestY, RECTL *DestRect)
{
LONG Left, Right;
-
+
while (ClipSpans[*SpanIndex].Y < DestY
|| (ClipSpans[*SpanIndex].Y == DestY
&& ClipSpans[*SpanIndex].X + ClipSpans[*SpanIndex].Width <
DestRect->left))
@@ -561,7 +561,7 @@
} /* if */
PrevSource = Source;
} /* if */
-
+
if (E >= Mid && PrevSourceAhead != (PIXEL *)((BYTE *)Source +
SourceSurf->lDelta)) {
int x;
ScaleLineAvg16(ScanLineAhead, (PIXEL *)((BYTE *)Source +
SourceSurf->lDelta), SourceRect->right - SourceRect->left,
DestRect->right - DestRect->left);
@@ -629,46 +629,46 @@
case BMF_24BPP:
case BMF_32BPP:
/* Not implemented yet. */
- return FALSE;
+ return FALSE;
break;
case BMF_16BPP:
return ScaleRectAvg16(DestSurf, SourceSurf, DestRect,
SourceRect, MaskOrigin, BrushOrigin,
ClipRegion, ColorTranslation, Mode);
break;
-
+
default:
DPRINT1("DIB_16BPP_StretchBlt: Unhandled Source BPP: %u\n",
BitsPerFormat(SourceSurf->iBitmapFormat));
return FALSE;
}
-
-
+
+
return TRUE;
}
-BOOLEAN
+BOOLEAN
DIB_16BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
RECTL* DestRect, POINTL *SourcePoint,
XLATEOBJ *ColorTranslation, ULONG iTransColor)
{
ULONG RoundedRight, X, Y, SourceX, SourceY, Source, wd, Dest;
ULONG *DestBits;
-
+
RoundedRight = DestRect->right - ((DestRect->right - DestRect->left)
& 0x1);
SourceY = SourcePoint->y;
DestBits = (ULONG*)(DestSurf->pvScan0 +
(DestRect->left << 1) +
DestRect->top * DestSurf->lDelta);
wd = DestSurf->lDelta - ((DestRect->right - DestRect->left) << 1);
-
+
for(Y = DestRect->top; Y < DestRect->bottom; Y++)
{
SourceX = SourcePoint->x;
for(X = DestRect->left; X < RoundedRight; X += 2, DestBits++,
SourceX += 2)
{
Dest = *DestBits;
-
+
Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY);
if(Source != iTransColor)
{
@@ -685,7 +685,7 @@
*DestBits = Dest;
}
-
+
if(X < DestRect->right)
{
Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY);
@@ -693,13 +693,13 @@
{
*((USHORT*)DestBits) =
(USHORT)XLATEOBJ_iXlate(ColorTranslation, Source);
}
-
+
DestBits = (PULONG)((ULONG_PTR)DestBits + 2);
}
SourceY++;
DestBits = (ULONG*)((ULONG_PTR)DestBits + wd);
}
-
+
return TRUE;
}
_____
Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c
--- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-05-08 02:08:57 UTC
(rev 15105)
+++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-05-08 02:11:54 UTC
(rev 15106)
@@ -352,7 +352,7 @@
UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4);
UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4);
- RoundedRight = BltInfo->DestRect.right -
+ RoundedRight = BltInfo->DestRect.right -
((BltInfo->DestRect.right - BltInfo->DestRect.left) &
31);
SourceY = BltInfo->SourcePoint.y;
@@ -360,7 +360,7 @@
{
if (BltInfo->PatternSurface)
{
- PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) %
+ PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) %
BltInfo->PatternSurface->sizlBitmap.cy;
}
else
@@ -383,7 +383,7 @@
{
#if 0
/* FIXME: This case is completely untested!!! */
-
+
Dest = *((PBYTE)DestBits);
NoBits = 31 - (DestX & 31);
@@ -402,12 +402,12 @@
Pattern |= (DIB_GetSource(PatternObj, (X + BrushOrigin.x
+ k) % PatternWidth, PatternY, BltInfo->XlatePatternToDest) << (31 -
k));
}
- Dest = DIB_DoRop(Rop4, Dest, Source, Pattern);
+ Dest = DIB_DoRop(Rop4, Dest, Source, Pattern);
Dest &= ~((1 << (31 - NoBits)) - 1);
Dest |= *((PBYTE)DestBits) & ((1 << (31 - NoBits)) - 1);
*DestBits = Dest;
-
+
DestX += NoBits;
SourceX += NoBits;
#endif
@@ -441,7 +441,7 @@
}
}
- *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern);
+ *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern);
}
if (DestX < BltInfo->DestRect.right)
@@ -474,7 +474,7 @@
PatternY %= BltInfo->PatternSurface->sizlBitmap.cy;
}
}
-
+
return TRUE;
}
@@ -490,7 +490,7 @@
return FALSE;
}
-BOOLEAN
+BOOLEAN
DIB_1BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
RECTL* DestRect, POINTL *SourcePoint,
XLATEOBJ *ColorTranslation, ULONG iTransColor)
_____
Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c
--- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-05-08 02:08:57 UTC
(rev 15105)
+++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-05-08 02:11:54 UTC
(rev 15106)
@@ -246,7 +246,7 @@
UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4);
UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4);
-
+
SourceY = BltInfo->SourcePoint.y;
DestBits = (PBYTE)(
BltInfo->DestSurface->pvScan0 +
@@ -257,7 +257,7 @@
{
if (BltInfo->PatternSurface)
{
- PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) %
+ PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) %
BltInfo->PatternSurface->sizlBitmap.cy;
}
else
@@ -269,11 +269,11 @@
for (DestY = BltInfo->DestRect.top; DestY <
BltInfo->DestRect.bottom; DestY++)
{
SourceX = BltInfo->SourcePoint.x;
-
+
for (DestX = BltInfo->DestRect.left; DestX <
BltInfo->DestRect.right; DestX++, DestBits += 3, SourceX++)
{
Dest = *((PUSHORT)DestBits) + (*(DestBits + 2) << 16);
-
+
if (UsesSource)
{
Source = DIB_GetSource(BltInfo->SourceSurface, SourceX,
SourceY, BltInfo->XlateSourceToDest);
@@ -298,7 +298,7 @@
DestBits -= (BltInfo->DestRect.right - BltInfo->DestRect.left) *
3;
DestBits += BltInfo->DestSurface->lDelta;
}
-
+
return TRUE;
}
@@ -312,20 +312,20 @@
return FALSE;
}
-BOOLEAN
+BOOLEAN
DIB_24BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
RECTL* DestRect, POINTL *SourcePoint,
XLATEOBJ *ColorTranslation, ULONG iTransColor)
{
ULONG X, Y, SourceX, SourceY, Source, wd, Dest;
BYTE *DestBits;
-
+
SourceY = SourcePoint->y;
DestBits = (BYTE*)(DestSurf->pvScan0 +
(DestRect->left << 2) +
DestRect->top * DestSurf->lDelta);
wd = DestSurf->lDelta - ((DestRect->right - DestRect->left) << 2);
-
+
for(Y = DestRect->top; Y < DestRect->bottom; Y++)
{
SourceX = SourcePoint->x;
@@ -339,11 +339,11 @@
*(DestBits + 2) = Dest >> 16;
}
}
-
+
SourceY++;
DestBits = (BYTE*)((ULONG_PTR)DestBits + wd);
}
-
+
return TRUE;
}
_____
Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c
--- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-05-08 02:08:57 UTC
(rev 15105)
+++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-05-08 02:11:54 UTC
(rev 15106)
@@ -306,7 +306,7 @@
{
if (BltInfo->PatternSurface)
{
- PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) %
+ PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) %
BltInfo->PatternSurface->sizlBitmap.cy;
}
else
@@ -314,15 +314,15 @@
Pattern = BltInfo->Brush->iSolidColor;
}
}
-
+
for (DestY = BltInfo->DestRect.top; DestY <
BltInfo->DestRect.bottom; DestY++)
{
SourceX = BltInfo->SourcePoint.x;
-
+
for (DestX = BltInfo->DestRect.left; DestX <
BltInfo->DestRect.right; DestX++, DestBits++, SourceX++)
{
Dest = *DestBits;
-
+
if (UsesSource)
{
Source = DIB_GetSource(BltInfo->SourceSurface, SourceX,
SourceY, BltInfo->XlateSourceToDest);
@@ -347,7 +347,7 @@
((BltInfo->DestRect.right - BltInfo->DestRect.left) << 2) +
BltInfo->DestSurface->lDelta);
}
-
+
return TRUE;
}
@@ -398,13 +398,13 @@
while (skip-- > 0)
*Target++ = *Source;
}
-
+
static BOOLEAN
FinalCopy32(PIXEL *Target, PIXEL *Source, PSPAN ClipSpans, UINT
ClipSpansCount, UINT *SpanIndex,
UINT DestY, RECTL *DestRect)
{
LONG Left, Right;
-
+
while (ClipSpans[*SpanIndex].Y < DestY
|| (ClipSpans[*SpanIndex].Y == DestY
&& ClipSpans[*SpanIndex].X + ClipSpans[*SpanIndex].Width <
DestRect->left))
@@ -458,7 +458,7 @@
UINT ClipSpansCount;
UINT SpanIndex;
LONG DestY;
-
+
if (! ClipobjToSpans(&ClipSpans, &ClipSpansCount, ClipRegion,
DestRect))
{
return FALSE;
@@ -492,7 +492,7 @@
} /* if */
PrevSource = Source;
} /* if */
-
+
if (E >= Mid && PrevSourceAhead != (PIXEL *)((BYTE *)Source +
SourceSurf->lDelta)) {
int x;
ScaleLineAvg32(ScanLineAhead, (PIXEL *)((BYTE *)Source +
SourceSurf->lDelta), SourceRect->right - SourceRect->left,
DestRect->right - DestRect->left);
@@ -500,7 +500,7 @@
ScanLine[x] = average32(ScanLine[x], ScanLineAhead[x]);
PrevSourceAhead = (PIXEL *)((BYTE *)Source + SourceSurf->lDelta);
} /* if */
-
+
if (! FinalCopy32(Target, ScanLine, ClipSpans, ClipSpansCount,
&SpanIndex, DestY, DestRect))
{
/* No more spans, everything else is clipped away, we're done
*/
@@ -560,38 +560,38 @@
case BMF_16BPP:
case BMF_24BPP:
/* Not implemented yet. */
- return FALSE;
+ return FALSE;
break;
-
+
case BMF_32BPP:
return ScaleRectAvg32(DestSurf, SourceSurf, DestRect,
SourceRect, MaskOrigin, BrushOrigin,
ClipRegion, ColorTranslation, Mode);
break;
-
+
default:
//DPRINT1("DIB_32BPP_StretchBlt: Unhandled Source BPP: %u\n",
BitsPerFormat(SourceSurf->iBitmapFormat));
return FALSE;
}
-
-
+
+
return TRUE;
}
-BOOLEAN
+BOOLEAN
DIB_32BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
RECTL* DestRect, POINTL *SourcePoint,
XLATEOBJ *ColorTranslation, ULONG iTransColor)
{
ULONG X, Y, SourceX, SourceY, Source, wd;
ULONG *DestBits;
-
+
SourceY = SourcePoint->y;
DestBits = (ULONG*)(DestSurf->pvScan0 +
(DestRect->left << 2) +
DestRect->top * DestSurf->lDelta);
wd = DestSurf->lDelta - ((DestRect->right - DestRect->left) << 2);
-
+
for(Y = DestRect->top; Y < DestRect->bottom; Y++)
{
SourceX = SourcePoint->x;
@@ -603,11 +603,11 @@
*DestBits = XLATEOBJ_iXlate(ColorTranslation, Source);
}
}
-
+
SourceY++;
DestBits = (ULONG*)((ULONG_PTR)DestBits + wd);
}
-
+
return TRUE;
}
_____
Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c
--- trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-05-08 02:08:57 UTC
(rev 15105)
+++ trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-05-08 02:11:54 UTC
(rev 15106)
@@ -231,7 +231,7 @@
BOOLEAN UsesPattern;
PULONG DestBits;
LONG RoundedRight;
- static const ULONG ExpandSolidColor[16] =
+ static const ULONG ExpandSolidColor[16] =
{
0x00000000 /* 0 */,
0x11111111 /* 1 */,
@@ -262,7 +262,7 @@
{
if (BltInfo->PatternSurface)
{
- PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) %
+ PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) %
BltInfo->PatternSurface->sizlBitmap.cy;
}
else
@@ -292,7 +292,7 @@
if (BltInfo->PatternSurface)
{
Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX +
BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx,
PatternY, BltInfo->XlatePatternToDest);
- }
+ }
DIB_4BPP_PutPixel(BltInfo->DestSurface, DestX, DestY,
DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF);
@@ -307,13 +307,13 @@
if (UsesSource)
{
Source =
- (DIB_GetSource(BltInfo->SourceSurface, SourceX + 1,
SourceY, BltInfo->XlateSourceToDest)) |
+ (DIB_GetSource(BltInfo->SourceSurface, SourceX + 1,
SourceY, BltInfo->XlateSourceToDest)) |
(DIB_GetSource(BltInfo->SourceSurface, SourceX + 0,
SourceY, BltInfo->XlateSourceToDest) << 4) |
- (DIB_GetSource(BltInfo->SourceSurface, SourceX + 3,
SourceY, BltInfo->XlateSourceToDest) << 8) |
+ (DIB_GetSource(BltInfo->SourceSurface, SourceX + 3,
SourceY, BltInfo->XlateSourceToDest) << 8) |
(DIB_GetSource(BltInfo->SourceSurface, SourceX + 2,
SourceY, BltInfo->XlateSourceToDest) << 12) |
- (DIB_GetSource(BltInfo->SourceSurface, SourceX + 5,
SourceY, BltInfo->XlateSourceToDest) << 16) |
+ (DIB_GetSource(BltInfo->SourceSurface, SourceX + 5,
SourceY, BltInfo->XlateSourceToDest) << 16) |
(DIB_GetSource(BltInfo->SourceSurface, SourceX + 4,
SourceY, BltInfo->XlateSourceToDest) << 20) |
- (DIB_GetSource(BltInfo->SourceSurface, SourceX + 7,
SourceY, BltInfo->XlateSourceToDest) << 24) |
+ (DIB_GetSource(BltInfo->SourceSurface, SourceX + 7,
SourceY, BltInfo->XlateSourceToDest) << 24) |
(DIB_GetSource(BltInfo->SourceSurface, SourceX + 6,
SourceY, BltInfo->XlateSourceToDest) << 28);
}
if (BltInfo->PatternSurface)
@@ -327,7 +327,7 @@
Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX +
BltInfo->BrushOrigin.x + 7) % BltInfo->PatternSurface->sizlBitmap.cx,
PatternY, BltInfo->XlatePatternToDest) << 24;
Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX +
BltInfo->BrushOrigin.x + 6) % BltInfo->PatternSurface->sizlBitmap.cx,
PatternY, BltInfo->XlatePatternToDest) << 28;
}
- *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern);
+ *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern);
}
/* Process the rest of pixel on the line */
@@ -341,9 +341,9 @@
if (BltInfo->PatternSurface)
{
Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX +
BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx,
PatternY, BltInfo->XlatePatternToDest);
- }
+ }
DIB_4BPP_PutPixel(BltInfo->DestSurface, DestX, DestY,
DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF);
- }
+ }
SourceY++;
if (BltInfo->PatternSurface)
@@ -366,7 +366,7 @@
return FALSE;
}
-BOOLEAN
+BOOLEAN
DIB_4BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
RECTL* DestRect, POINTL *SourcePoint,
XLATEOBJ *ColorTranslation, ULONG iTransColor)
_____
Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c
--- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-05-08 02:08:57 UTC
(rev 15105)
+++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-05-08 02:11:54 UTC
(rev 15106)
@@ -271,7 +271,7 @@
{
if (BltInfo->PatternSurface)
{
- PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) %
+ PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) %
BltInfo->PatternSurface->sizlBitmap.cy;
}
else
@@ -311,7 +311,7 @@
Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX +
BltInfo->BrushOrigin.x + 3) % BltInfo->PatternSurface->sizlBitmap.cx,
PatternY, BltInfo->XlatePatternToDest) << 24;
}
- *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern);
+ *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern);
}
if (DestX < BltInfo->DestRect.right)
@@ -319,7 +319,7 @@
for (; DestX < BltInfo->DestRect.right; DestX++)
{
Dest = DIB_8BPP_GetPixel(BltInfo->DestSurface, DestX,
DestY);
-
+
if (UsesSource)
{
Source = DIB_GetSource(BltInfo->SourceSurface, SourceX +
(DestX - BltInfo->DestRect.left), SourceY, BltInfo->XlateSourceToDest);
@@ -397,7 +397,7 @@
UINT DestY, RECTL *DestRect)
{
LONG Left, Right;
-
+
while (ClipSpans[*SpanIndex].Y < DestY
|| (ClipSpans[*SpanIndex].Y == DestY
&& ClipSpans[*SpanIndex].X + ClipSpans[*SpanIndex].Width <
DestRect->left))
@@ -485,7 +485,7 @@
} /* if */
PrevSource = Source;
} /* if */
-
+
if (E >= Mid && PrevSourceAhead != (PIXEL *)((BYTE *)Source +
SourceSurf->lDelta)) {
int x;
ScaleLineAvg8(ScanLineAhead, (PIXEL *)((BYTE *)Source +
SourceSurf->lDelta), SourceRect->right - SourceRect->left,
DestRect->right - DestRect->left);
@@ -493,7 +493,7 @@
ScanLine[x] = average8(ScanLine[x], ScanLineAhead[x]);
PrevSourceAhead = (PIXEL *)((BYTE *)Source + SourceSurf->lDelta);
} /* if */
-
+
if (! FinalCopy8(Target, ScanLine, ClipSpans, ClipSpansCount,
&SpanIndex, DestY, DestRect))
{
/* No more spans, everything else is clipped away, we're done
*/
@@ -552,36 +552,36 @@
case BMF_24BPP:
case BMF_32BPP:
/* Not implemented yet. */
- return FALSE;
+ return FALSE;
break;
-
+
case BMF_8BPP:
return ScaleRectAvg8(DestSurf, SourceSurf, DestRect,
SourceRect, MaskOrigin, BrushOrigin,
ClipRegion, ColorTranslation, Mode);
break;
-
+
default:
DPRINT1("DIB_8BPP_StretchBlt: Unhandled Source BPP: %u\n",
BitsPerFormat(SourceSurf->iBitmapFormat));
return FALSE;
}
-
+
return TRUE;
}
-BOOLEAN
+BOOLEAN
DIB_8BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
RECTL* DestRect, POINTL *SourcePoint,
XLATEOBJ *ColorTranslation, ULONG iTransColor)
{
ULONG RoundedRight, X, Y, SourceX, SourceY, Source, wd, Dest;
ULONG *DestBits;
-
+
RoundedRight = DestRect->right - ((DestRect->right - DestRect->left)
& 0x3);
SourceY = SourcePoint->y;
DestBits = (ULONG*)(DestSurf->pvScan0 + DestRect->left +
(DestRect->top * DestSurf->lDelta));
wd = DestSurf->lDelta - (DestRect->right - DestRect->left);
-
+
for(Y = DestRect->top; Y < DestRect->bottom; Y++)
{
DestBits = (ULONG*)(DestSurf->pvScan0 + DestRect->left +
@@ -590,7 +590,7 @@
for (X = DestRect->left; X < RoundedRight; X += 4, DestBits++)
{
Dest = *DestBits;
-
+
Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY);
if(Source != iTransColor)
{
@@ -604,14 +604,14 @@
Dest &= 0xFFFF00FF;
Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 8) &
0xFF00);
}
-
+
Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY);
if(Source != iTransColor)
{
Dest &= 0xFF00FFFF;
Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 16) &
0xFF0000);
}
-
+
Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY);
if(Source != iTransColor)
{
@@ -621,7 +621,7 @@
*DestBits = Dest;
}
-
+
if(X < DestRect->right)
{
for (; X < DestRect->right; X++)
@@ -636,7 +636,7 @@
}
SourceY++;
}
-
+
return TRUE;
}
_____
Modified: trunk/reactos/subsys/win32k/eng/bitblt.c
--- trunk/reactos/subsys/win32k/eng/bitblt.c 2005-05-08 02:08:57 UTC
(rev 15105)
+++ trunk/reactos/subsys/win32k/eng/bitblt.c 2005-05-08 02:11:54 UTC
(rev 15106)
@@ -75,7 +75,7 @@
static BOOLEAN STDCALL
BltMask(SURFOBJ* Dest,
SURFOBJ* Source,
- SURFOBJ* Mask,
+ SURFOBJ* Mask,
XLATEOBJ* ColorTranslation,
RECTL* DestRect,
POINTL* SourcePoint,
@@ -93,7 +93,7 @@
SURFOBJ *PatternObj = NULL;
PBITMAPOBJ PatternBitmap;
ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0;
-
+
if (Mask == NULL)
{
return FALSE;
@@ -126,10 +126,10 @@
{
lMask = tMask;
c8 = SourcePoint->x & 0x07;
-
+
if(PatternBitmap != NULL)
PatternY = (DestRect->top + j) % PatternHeight;
-
+
for (i = 0; i < dx; i++)
{
if (0 != (*lMask & maskbit[c8]))
@@ -165,7 +165,7 @@
static BOOLEAN STDCALL
BltPatCopy(SURFOBJ* Dest,
SURFOBJ* Source,
- SURFOBJ* Mask,
+ SURFOBJ* Mask,
XLATEOBJ* ColorTranslation,
RECTL* DestRect,
POINTL* SourcePoint,
@@ -375,7 +375,7 @@
OutputRect.right = DestRect->right + Translate.x;
OutputRect.top = DestRect->top + Translate.y;
OutputRect.bottom = DestRect->bottom + Translate.y;
-
+
if(BrushOrigin)
{
AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x;
@@ -644,7 +644,7 @@
)
{
// www.osr.com/ddk/graphics/gdifncs_0bs7.htm
-
+
POINTL InputPoint;
RECTL InputRect;
RECTL OutputRect;
@@ -669,7 +669,7 @@
InputPoint.x = InputRect.left + Translate.x;
InputPoint.y = InputRect.top + Translate.y;
-
+
OutputRect = *prclDest;
/* Check for degenerate case: if height or width of OutputRect is 0
pixels there's
@@ -690,7 +690,7 @@
OutputRect.right = prclDest->right + Translate.x;
OutputRect.top = prclDest->top + Translate.y;
OutputRect.bottom = prclDest->bottom + Translate.y;
-
+
if (NULL != BrushOrigin)
{
AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x;
@@ -707,8 +707,8 @@
DPRINT("EngStretchBlt isn't capable of handling mask yet.\n");
IntEngLeave(&EnterLeaveDest);
IntEngLeave(&EnterLeaveSource);
-
- return FALSE;
+
+ return FALSE;
}
else
{
@@ -803,7 +803,7 @@
static BOOLEAN STDCALL
AlphaBltMask(SURFOBJ* Dest,
SURFOBJ* Source,
- SURFOBJ* Mask,
+ SURFOBJ* Mask,
XLATEOBJ* ColorTranslation,
XLATEOBJ* SrcColorTranslation,
RECTL* DestRect,
@@ -826,7 +826,7 @@
r = (int)GetRValue(BrushColor);
g = (int)GetGValue(BrushColor);
b = (int)GetBValue(BrushColor);
-
+
tMask = Mask->pvScan0 + (SourcePoint->y * Mask->lDelta) +
SourcePoint->x;
for (j = 0; j < dy; j++)
{
@@ -845,7 +845,7 @@
Background = DIB_GetSource(Dest, DestRect->left +
i, DestRect->top + j,
SrcColorTranslation);
- NewColor =
+ NewColor =
RGB((*lMask * (r - GetRValue(Background)) >>
8) + GetRValue(Background),
(*lMask * (g - GetGValue(Background)) >>
8) + GetGValue(Background),
(*lMask * (b - GetBValue(Background)) >>
8) + GetBValue(Background));
@@ -976,7 +976,7 @@
OutputRect.right = DestRect->right + Translate.x;
OutputRect.top = DestRect->top + Translate.y;
OutputRect.bottom = DestRect->bottom + Translate.y;
-
+
if(BrushOrigin)
{
AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x;
_____
Modified: trunk/reactos/subsys/win32k/eng/clip.c
--- trunk/reactos/subsys/win32k/eng/clip.c 2005-05-08 02:08:57 UTC
(rev 15105)
+++ trunk/reactos/subsys/win32k/eng/clip.c 2005-05-08 02:11:54 UTC
(rev 15106)
@@ -17,7 +17,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id$
- *
+ *
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* PURPOSE: GDI Clipping Functions
@@ -206,13 +206,13 @@
IntEngCreateClipRegion(ULONG count, PRECTL pRect, PRECTL rcBounds)
{
CLIPGDI *Clip;
-
+
if(count > 1)
{
RECTL *dest;
-
+
Clip = EngAllocMem(0, sizeof(CLIPGDI) + ((count - 1) *
sizeof(RECTL)), TAG_CLIPOBJ);
-
+
if(Clip != NULL)
{
Clip->EnumRects.c = count;
@@ -228,7 +228,7 @@
Clip->ClipObj.iFComplexity = ((Clip->EnumRects.c <= 4) ? FC_RECT4
: FC_COMPLEX);
Clip->ClipObj.iMode = TC_RECTANGLES;
Clip->ClipObj.rclBounds = *rcBounds;
-
+
return GDIToObj(Clip, CLIP);
}
}
@@ -241,14 +241,14 @@
Clip->EnumRects.c = 1;
Clip->EnumOrder = CD_ANY;
Clip->EnumRects.arcl[0] = *rcBounds;
-
+
Clip->ClipObj.iDComplexity = (((rcBounds->top ==
rcBounds->bottom) &&
(rcBounds->left ==
rcBounds->right))
? DC_TRIVIAL : DC_RECT);
Clip->ClipObj.iFComplexity = FC_RECT;
Clip->ClipObj.iMode = TC_RECTANGLES;
Clip->ClipObj.rclBounds = *rcBounds;
-
+
return GDIToObj(Clip, CLIP);
}
}
@@ -358,7 +358,7 @@
{
return FALSE;
}
-
+
/* copy rectangles */
src = ClipGDI->EnumRects.arcl + ClipGDI->EnumPos;
for(i = 0, dest = pERects->arcl;
@@ -367,7 +367,7 @@
{
*dest = *src;
}
-
+
pERects->c = nCopy;
ClipGDI->EnumPos+=nCopy;
_____
Modified: trunk/reactos/subsys/win32k/eng/debug.c
--- trunk/reactos/subsys/win32k/eng/debug.c 2005-05-08 02:08:57 UTC
(rev 15105)
+++ trunk/reactos/subsys/win32k/eng/debug.c 2005-05-08 02:11:54 UTC
(rev 15106)
@@ -17,7 +17,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id$
- *
+ *
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* PURPOSE: GDI Driver Brush Functions
_____
Modified: trunk/reactos/subsys/win32k/eng/device.c
--- trunk/reactos/subsys/win32k/eng/device.c 2005-05-08 02:08:57 UTC
(rev 15105)
+++ trunk/reactos/subsys/win32k/eng/device.c 2005-05-08 02:11:54 UTC
(rev 15106)
@@ -17,7 +17,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id$
- *
+ *
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* PURPOSE: GDI Driver Device Functions
_____
Modified: trunk/reactos/subsys/win32k/eng/event.c
--- trunk/reactos/subsys/win32k/eng/event.c 2005-05-08 02:08:57 UTC
(rev 15105)
+++ trunk/reactos/subsys/win32k/eng/event.c 2005-05-08 02:11:54 UTC
(rev 15106)
@@ -37,7 +37,7 @@
{
return FALSE;
}
- KeInitializeEvent((PKEVENT)(*Event), SynchronizationEvent, FALSE);
+ KeInitializeEvent((PKEVENT)(*Event), SynchronizationEvent, FALSE);
return TRUE;
}
@@ -69,7 +69,7 @@
if (!NT_SUCCESS(Status))
{
return NULL;
- }
+ }
return (PEVENT)Event;
}
_____
Modified: trunk/reactos/subsys/win32k/eng/float.c
--- trunk/reactos/subsys/win32k/eng/float.c 2005-05-08 02:08:57 UTC
(rev 15105)
[truncated at 1000 lines; 14927 more skipped]
7133
days inactive
7133
days old
0 comments
1 participants
participants (1)
-
sedwards＠svn.reactos.com