[ros-diffs] [tkreuzer] 51885: [WIN32K] - Fix the bitmap alignment issue that caused broken scrollbar pattern

Author: tkreuzer
Date: Tue May 24 15:35:30 2011
New Revision: 51885

URL: http://svn.reactos.org/svn/reactos?rev=51885&view=rev
Log:
[WIN32K]
- Fix the bitmap alignment issue that caused broken scrollbar pattern

Modified:
    trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c
    trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Tue May 24 15:35:30
2011
@@ -92,7 +92,9 @@
   HANDLE  hPowerRequestEvent,
   HANDLE  hMediaRequestEvent)
 {
-    static const WORD wPattern55AA[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa,
0x5555, 0xaaaa };
+    static const WORD wPattern55AA[] =
+    { 0x5555, 0, 0xaaaa, 0, 0x5555, 0, 0xaaaa, 0,
+      0x5555, 0, 0xaaaa, 0, 0x5555, 0, 0xaaaa, 0 };
     HBITMAP hPattern55AABitmap = NULL;
     NTSTATUS Status;
 

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] Tue May 24
15:35:30 2011
@@ -154,23 +154,15 @@
     IN UINT cBitsPixel,
     IN OPTIONAL PVOID pvBits)
 {
-    HBITMAP hbmp;
     /* Call the extended function */
-    hbmp = GreCreateBitmapEx(nWidth,
+    return GreCreateBitmapEx(nWidth,
                              nHeight,
                              0, /* auto width */
                              BitmapFormat(cBitsPixel * cPlanes, BI_RGB),
                              0, /* no bitmap flags */
                              0, /* auto size */
-                             NULL,
+                             pvBits,
                              DDB_SURFACE /* DDB */);
-    if (pvBits && hbmp)
-    {
-       PSURFACE psurf = SURFACE_ShareLockSurface(hbmp);
-       UnsafeSetBitmapBits(psurf, 0, pvBits);
-       SURFACE_ShareUnlockSurface(psurf);
-    }
-    return hbmp;
 }
 
 HBITMAP