[ros-diffs] [fireball] 42877: - Pass a direct bitmap bits pointer. It's yet unknown why bitmap object's bmBits pointer contains NULL (a corresponding FIXME comment is added). - Issue 20 from Arwinss wiki is fixed.

fireball at svn.reactos.org fireball at svn.reactos.org
Sun Aug 23 11:58:18 CEST 2009


Author: fireball
Date: Sun Aug 23 11:58:17 2009
New Revision: 42877

URL: http://svn.reactos.org/svn/reactos?rev=42877&view=rev
Log:
- Pass a direct bitmap bits pointer. It's yet unknown why bitmap object's bmBits pointer contains NULL (a corresponding FIXME comment is added).
- Issue 20 from Arwinss wiki is fixed.

Modified:
    branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c

Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c?rev=42877&r1=42876&r2=42877&view=diff
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Sun Aug 23 11:58:17 2009
@@ -241,7 +241,10 @@
     iconinfo->hbmMask = CreateBitmap ( ciconinfo->nWidth, height,
                                 1, 1, ciconinfo + 1);
     if( GetObjectW(iconinfo->hbmMask, sizeof(bitmap), &bitmap))
-        RosGdiCreateBitmap(NULL, iconinfo->hbmMask, &bitmap, bitmap.bmBits);
+    {
+        // FIXME: Why bitmap.bmBits is NULL when it's supposed to be a valid pointer from above ?!
+        RosGdiCreateBitmap(NULL, iconinfo->hbmMask, &bitmap, /*bitmap.bmBits*/ ciconinfo + 1);
+    }
 }
 
 void CDECL RosDrv_SetCursor( CURSORICONINFO *lpCursor )




More information about the Ros-diffs mailing list