[ros-diffs] [hpoussin] 28777: Fix warnings, and compilation of dib24bppc.c/dib32bppc.c

[hpoussin at svn.reactos.org]

Author: hpoussin
Date: Sun Sep  2 20:33:00 2007
New Revision: 28777

URL: http://svn.reactos.org/svn/reactos?rev=28777&view=rev
Log:
Fix warnings, and compilation of dib24bppc.c/dib32bppc.c

Modified:
    trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c
    trunk/reactos/subsystems/win32/win32k/dib/dib24bppc.c
    trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c

Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c?rev=28777&r1=28776&r2=28777&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c (original)
+++ trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c Sun Sep  2 20:33:00 2007
@@ -130,7 +130,7 @@
       "r"(SurfObj->lDelta), "r"(y2 - y1), "a"(c)
     : "cc", "memory", "%ecx");
 #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;
     LONG lDelta = SurfObj->lDelta;
 

Modified: trunk/reactos/subsystems/win32/win32k/dib/dib24bppc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/dib/dib24bppc.c?rev=28777&r1=28776&r2=28777&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/dib/dib24bppc.c (original)
+++ trunk/reactos/subsystems/win32/win32k/dib/dib24bppc.c Sun Sep  2 20:33:00 2007
@@ -43,6 +43,9 @@
     }
   else
     {
+      ULONG Fill[3];
+      ULONG MultiCount;
+
       /* Align to 4-byte address */
       while (0 != ((ULONG_PTR) addr & 0x3))
         {
@@ -86,4 +89,4 @@
           addr += 1;
         }
     }
-}
+}

Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c?rev=28777&r1=28776&r2=28777&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c (original)
+++ trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c Sun Sep  2 20:33:00 2007
@@ -26,26 +26,27 @@
 VOID
 DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
 {
-  PBYTE byteaddr = (ULONG_PTR)SurfObj->pvScan0 + y * SurfObj->lDelta;  
-  PDWORD addr = (PDWORD)byteaddr + x1;		
-  LONG cx = x1;
-  while(cx < x2) 
-  {
-    *addr = (DWORD)c;
-    ++addr;
-    ++cx;
-   }	  
+    PBYTE byteaddr = (PBYTE)((ULONG_PTR)SurfObj->pvScan0 + y * SurfObj->lDelta);
+    PDWORD addr = (PDWORD)byteaddr + x1;
+    LONG cx = x1;
+
+    while(cx < x2) 
+    {
+        *addr = (DWORD)c;
+        ++addr;
+        ++cx;
+    }
 }
 
 BOOLEAN 
 DIB_32BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color)
-{			 
-  ULONG DestY;	
+{
+    ULONG DestY;
 
-  for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++)
-  {
-    DIB_32BPP_HLine (DestSurface, DestRect->left, DestRect->right, DestY, color);
-  }
+    for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++)
+    {
+        DIB_32BPP_HLine (DestSurface, DestRect->left, DestRect->right, DestY, color);
+    }
 
-  return TRUE;
-}
+    return TRUE;
+}