Changeset 4598 for trunk/src

Timestamp:

Nov 15, 2000, 5:10:41 PM (25 years ago)

Author:

sandervl

Message:

SetDIBits bugfix (WORD vs DWORD aligned scanlines)

Location:

trunk/src/gdi32

Files:

• dibitmap.cpp (modified) (2 diffs)
• gdi32.cpp (modified) (5 diffs)

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.12 2000-11-14 14:28:22 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.13 2000-11-15 16:10:40 sandervl Exp $ */
 
 /*
@@ -314 +314 @@
     //SvL: Open32's SetDIBits really messes things up for 1 bpp bitmaps, must use SetBitmapBits
     if(pBitmapInfo->bmiHeader.biBitCount == 1 && startscan == 0 && numlines == pBitmapInfo->bmiHeader.biHeight)
-    {
-        int   linewidth = DIB_GetDIBWidthBytes(pBitmapInfo->bmiHeader.biWidth, 1);
-        char *newpix    = (char *)malloc(linewidth*pBitmapInfo->bmiHeader.biHeight);
+    {//WARNING: hack alert!
+        int   dibwidth  = DIB_GetDIBWidthBytes(pBitmapInfo->bmiHeader.biWidth, 1);
+        int   bmpwidth  = BITMAP_GetWidthBytes(pBitmapInfo->bmiHeader.biWidth, 1);
+        char *newpix    = (char *)malloc(dibwidth*pBitmapInfo->bmiHeader.biHeight);
         char *orgpix    = (char *)pBits;
         int   ret;
 
-        newpix += ((pBitmapInfo->bmiHeader.biHeight-1)*linewidth);
+        dprintf(("Flipping 1bpp bitmap and calling SetBitmapBits (WORKAROUND) (%d -> %d)", dibwidth, bmpwidth));
+        newpix += ((pBitmapInfo->bmiHeader.biHeight-1)*bmpwidth);
 
         //flip bitmap here; SetDIBits assumes origin is left bottom, SetBitmapBits left top
+        //SetDIBits assumes DWORD aligned data
+        //SetBitmapBits assumes WORD aligned data
         for(int i=0;i<pBitmapInfo->bmiHeader.biHeight;i++) {
-            memcpy(newpix, orgpix, linewidth);
-            newpix -= linewidth;
-            orgpix += linewidth;
+            memcpy(newpix, orgpix, bmpwidth);
+
+            newpix -= bmpwidth;
+            orgpix += dibwidth;
         }
-        newpix += linewidth;
+        newpix += bmpwidth;
         ret = O32_SetBitmapBits(hBitmap, pBitmapInfo->bmiHeader.biSizeImage, newpix);
 

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.61 2000-11-14 14:28:22 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.62 2000-11-15 16:10:41 sandervl Exp $ */
 
 /*
@@ -118 +118 @@
     dprintf(("GDI32: CreateDIBPatternBrushPt %x %x", buffer, usage));
     return O32_CreateDIBPatternBrushPt(buffer, usage);
+}
+/*****************************************************************************
+ * Name      : HBRUSH CreateDIBPatternBrush
+ * Purpose   : The CreateDIBPatternBrush function creates a logical brush that
+ *             has the pattern specified by the specified device-independent
+ *             bitmap (DIB). The brush can subsequently be selected into any
+ *             device context that is associated with a device that supports
+ *             raster operations.
+ *
+ *             This function is provided only for compatibility with applications
+ *             written for versions of Windows earlier than 3.0. For Win32-based
+ *             applications, use the CreateDIBPatternBrushPt function.
+ * Parameters: HGLOBAL hglbDIBPacked Identifies a global memory object containing
+ *             a packed DIB, which consists of a BITMAPINFO structure immediately
+ *             followed by an array of bytes defining the pixels of the bitmap.
+ *             UINT    fuColorSpec   color table data
+ * Variables :
+ * Result    : TRUE / FALSE
+ * Remark    :
+ * Status    : ODIN32 COMPLETELY UNTESTED
+ *
+ * Author    : Patrick Haller [Mon, 1998/06/15 08:00]
+ *             Markus Montkowski [Wen, 1999/01/12 20:00]
+ *****************************************************************************/
+
+HBRUSH WIN32API CreateDIBPatternBrush( HGLOBAL hglbDIBPacked,
+                                       UINT    fuColorSpec)
+{
+  BITMAPINFO *lpMem;
+  HBRUSH ret = 0;
+
+  lpMem = (BITMAPINFO *)GlobalLock(hglbDIBPacked);
+  if(NULL!=lpMem)
+  {
+      dprintf(("GDI32: CreateDIBPatternBrush (%08xh, %08xh) %x (%d,%d) bpp %d",
+                hglbDIBPacked, fuColorSpec, lpMem, lpMem->bmiHeader.biWidth, 
+                lpMem->bmiHeader.biHeight, lpMem->bmiHeader.biBitCount));
+
+      ret = CreateDIBPatternBrushPt( lpMem,
+                                    fuColorSpec);
+      GlobalUnlock(hglbDIBPacked);
+  }
+  else {
+      dprintf(("ERROR: CreateDIBPatternBrush (%08xh, %08xh) -> INVALID memory handle!!",
+                hglbDIBPacked, fuColorSpec));
+  }
+  return (ret);
 }
 //******************************************************************************
@@ -795 +842 @@
 //******************************************************************************
 //******************************************************************************
-INT WIN32API GetPath( HDC arg1, PPOINT arg2, PBYTE arg3, int  arg4)
-{
-    dprintf(("GDI32: GetPath"));
-    return O32_GetPath(arg1, arg2, arg3, arg4);
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API GetPolyFillMode( HDC arg1)
-{
-    dprintf(("GDI32: GetPolyFillMode"));
-    return O32_GetPolyFillMode(arg1);
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API GetROP2( HDC arg1)
-{
-    dprintf(("GDI32: GetROP2"));
-    return O32_GetROP2(arg1);
+INT WIN32API GetPath( HDC hdc, PPOINT arg2, PBYTE arg3, int  arg4)
+{
+    dprintf(("GDI32: GetPath %x", hdc));
+    return O32_GetPath(hdc, arg2, arg3, arg4);
+}
+//******************************************************************************
+//******************************************************************************
+int WIN32API GetPolyFillMode( HDC hdc)
+{
+    dprintf(("GDI32: GetPolyFillMode", hdc));
+    return O32_GetPolyFillMode(hdc);
+}
+//******************************************************************************
+//******************************************************************************
+int WIN32API GetROP2( HDC hdc)
+{
+    dprintf(("GDI32: GetROP2 %x", hdc));
+    return O32_GetROP2(hdc);
 }
 //******************************************************************************
@@ -823 +870 @@
 //******************************************************************************
 //******************************************************************************
-UINT WIN32API GetTextAlign( HDC arg1)
-{
-    dprintf(("GDI32: GetTextAlign"));
-    return O32_GetTextAlign(arg1);
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API GetTextCharacterExtra( HDC arg1)
-{
-    dprintf(("GDI32: GetTextCharacterExtra"));
-    return O32_GetTextCharacterExtra(arg1);
-}
-//******************************************************************************
-//******************************************************************************
-COLORREF WIN32API GetTextColor( HDC arg1)
-{
-    dprintf(("GDI32: GetTextColor"));
-    return O32_GetTextColor(arg1);
+UINT WIN32API GetTextAlign( HDC hdc)
+{
+    dprintf(("GDI32: GetTextAlign %x", hdc));
+    return O32_GetTextAlign(hdc);
+}
+//******************************************************************************
+//******************************************************************************
+int WIN32API GetTextCharacterExtra( HDC hdc)
+{
+    dprintf(("GDI32: GetTextCharacterExtra", hdc));
+    return O32_GetTextCharacterExtra(hdc);
+}
+//******************************************************************************
+//******************************************************************************
+COLORREF WIN32API GetTextColor( HDC hdc)
+{
+    dprintf(("GDI32: GetTextColor %x", hdc));
+    return O32_GetTextColor(hdc);
 }
 //******************************************************************************
@@ -1552 +1599 @@
 
 
-/*****************************************************************************
- * Name      : HBRUSH CreateDIBPatternBrush
- * Purpose   : The CreateDIBPatternBrush function creates a logical brush that
- *             has the pattern specified by the specified device-independent
- *             bitmap (DIB). The brush can subsequently be selected into any
- *             device context that is associated with a device that supports
- *             raster operations.
- *
- *             This function is provided only for compatibility with applications
- *             written for versions of Windows earlier than 3.0. For Win32-based
- *             applications, use the CreateDIBPatternBrushPt function.
- * Parameters: HGLOBAL hglbDIBPacked Identifies a global memory object containing
- *             a packed DIB, which consists of a BITMAPINFO structure immediately
- *             followed by an array of bytes defining the pixels of the bitmap.
- *             UINT    fuColorSpec   color table data
- * Variables :
- * Result    : TRUE / FALSE
- * Remark    :
- * Status    : ODIN32 COMPLETELY UNTESTED
- *
- * Author    : Patrick Haller [Mon, 1998/06/15 08:00]
- *             Markus Montkowski [Wen, 1999/01/12 20:00]
- *****************************************************************************/
-
-HBRUSH WIN32API CreateDIBPatternBrush( HGLOBAL hglbDIBPacked,
-                                       UINT    fuColorSpec)
-{
-  LPVOID lpMem;
-  HBRUSH ret = 0;
-  dprintf(("GDI32: CreateDIBPatternBrush(%08xh, %08xh) \n",
-           hglbDIBPacked,
-           fuColorSpec));
-
-  lpMem = GlobalLock(hglbDIBPacked);
-  if(NULL!=lpMem)
-  {
-
-    ret = CreateDIBPatternBrushPt( lpMem,
-                                   fuColorSpec);
-    GlobalUnlock(hglbDIBPacked);
-  }
-
-  return (ret);
-}
-
-