[WIN32K]

Add Windows compatible alignment code.

svn path=/branches/reactos-yarotows/; revision=47618

diff --git a/subsystems/win32/win32k/eng/surface.c b/subsystems/win32/win32k/eng/surface.c
index db5d380..cd23060 100644 (file)
--- a/subsystems/win32/win32k/eng/surface.c
+++ b/subsystems/win32/win32k/eng/surface.c
@@ -221,14 +221,25 @@ SURFACE_bSetBitmapBits(
 {
     SURFOBJ *pso = &psurf->SurfObj;
     PVOID pvSection;
+    UCHAR cBitsPixel;
 
     /* Only bitmaps can have bits */
     ASSERT(psurf->SurfObj.iType == STYPE_BITMAP);
 
-    /* If no width is given, calculate it */
-    if (!ulWidth)
-        ulWidth = DIB_GetDIBWidthBytes(pso->sizlBitmap.cx, 
-                                       BitsPerFormat(pso->iBitmapFormat));
+    /* Get bits per pixel from the format */
+    cBitsPixel = gajBitsPerFormat[pso->iBitmapFormat];
+
+    /* Is a width in bytes given? */
+    if (ulWidth)
+    {
+        /* Align the width (Windows compatibility) */
+        ulWidth = ((((ulWidth << 3) / cBitsPixel) * cBitsPixel + 31) & ~31) >> 3;
+    }
+    else
+    {
+        /* Calculate width from the bitmap width in pixels */
+        ulWidth = ((pso->sizlBitmap.cx * cBitsPixel + 31) & ~31) >> 3;
+    }
 
     /* Calculate the bitmap size in bytes */
     pso->cjBits = ulWidth * pso->sizlBitmap.cy;