Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 12:29:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix warnings, and compilation of dib24bppc.c/dib32bppc.c

Browse source 
svn path=/trunk/; revision=28777
This commit is contained in:
Hervé Poussineau 2007-09-02 16:33:00 +00:00
parent f503e01b03
commit 2d5d8783a9
3 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsystems/win32/win32k/dib/dib16bpp.c
View file

@ -130,7 +130,7 @@ DIB_16BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
"r"(SurfObj->lDelta), "r"(y2 - y1), "a"(c) "r"(SurfObj->lDelta), "r"(y2 - y1), "a"(c)
: "cc", "memory", "%ecx"); : "cc", "memory", "%ecx");
#else #else
PBYTE byteaddr = (ULONG_PTR)SurfObj->pvScan0 + y1 * SurfObj->lDelta; PBYTE byteaddr = (PBYTE)(ULONG_PTR)SurfObj->pvScan0 + y1 * SurfObj->lDelta;
PWORD addr = (PWORD)byteaddr + x; PWORD addr = (PWORD)byteaddr + x;
LONG lDelta = SurfObj->lDelta; LONG lDelta = SurfObj->lDelta;

3
reactos/subsystems/win32/win32k/dib/dib24bppc.c
View file

@ -43,6 +43,9 @@ DIB_24BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
} }
else else
{ {
ULONG Fill[3];
ULONG MultiCount;
/* Align to 4-byte address */ /* Align to 4-byte address */
while (0 != ((ULONG_PTR) addr & 0x3)) while (0 != ((ULONG_PTR) addr & 0x3))
{ {

31
reactos/subsystems/win32/win32k/dib/dib32bppc.c
View file

@ -26,26 +26,27 @@
VOID VOID
DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
{ {
PBYTE byteaddr = (ULONG_PTR)SurfObj->pvScan0 + y * SurfObj->lDelta; PBYTE byteaddr = (PBYTE)((ULONG_PTR)SurfObj->pvScan0 + y * SurfObj->lDelta);
PDWORD addr = (PDWORD)byteaddr + x1; PDWORD addr = (PDWORD)byteaddr + x1;
LONG cx = x1; LONG cx = x1;
while(cx < x2)
{ while(cx < x2)
*addr = (DWORD)c; {
++addr; *addr = (DWORD)c;
++cx; ++addr;
} ++cx;
}
} }
BOOLEAN BOOLEAN
DIB_32BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) DIB_32BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color)
{ {
ULONG DestY; ULONG DestY;
for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++)
{ {
DIB_32BPP_HLine (DestSurface, DestRect->left, DestRect->right, DestY, color); DIB_32BPP_HLine (DestSurface, DestRect->left, DestRect->right, DestY, color);
} }
return TRUE; return TRUE;
} }