Changeset 4590 for trunk/src

Timestamp:

Nov 14, 2000, 3:28:22 PM (25 years ago)

Author:

sandervl

Message:

SetDIBits fix for monochrome bitmaps

Location:

trunk/src/gdi32

Files:

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

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.11 2000-11-09 18:16:56 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.12 2000-11-14 14:28:22 sandervl Exp $ */
 
 /*
@@ -14 +14 @@
 #include <stdarg.h>
 #include <string.h>
-#include "misc.h"
+#include <misc.h>
+#include <winuser32.h>
 #include "dibsect.h"
 
-#define DBG_LOCALLOG    DBG_dibitmap
+#define DBG_LOCALLOG    DBG_dibitmap
 #include "dbglocal.h"
 
 //******************************************************************************
 //******************************************************************************
-HBITMAP WIN32API CreateDIBitmap(HDC hdc, const BITMAPINFOHEADER *lpbmih, 
-                                DWORD fdwInit, const void *lpbInit, 
+HBITMAP WIN32API CreateDIBitmap(HDC hdc, const BITMAPINFOHEADER *lpbmih,
+                                DWORD fdwInit, const void *lpbInit,
                                 const BITMAPINFO *lpbmi, UINT fuUsage)
 {
@@ -32 +33 @@
   //     to 8bpp by Open32)
   if(lpbmih->biBitCount == 1) {
-        dprintf(("WARNING: CreateDIBitmap doesn't handle 1bpp bitmaps very well!!!!!"));
-  }
-  
+    dprintf(("WARNING: CreateDIBitmap doesn't handle 1bpp bitmaps very well!!!!!"));
+  }
+
   //TEMPORARY HACK TO PREVENT CRASH IN OPEN32 (WSeB GA)
 
@@ -49 +50 @@
   // however wants to copy it later on ...
   int biBitCount = lpbmih->biBitCount;
-  
+
   if (lpbmih->biBitCount != lpbmi->bmiHeader.biBitCount)
   {
@@ -55 +56 @@
              lpbmih->biBitCount,
              lpbmi->bmiHeader.biBitCount));
-             
+
     ((BITMAPINFOHEADER *)lpbmih)->biBitCount = lpbmi->bmiHeader.biBitCount;
   }
@@ -61 +62 @@
   rc = O32_CreateDIBitmap(hdc, lpbmih, fdwInit, lpbInit, lpbmi, fuUsage);
 
-  dprintf(("GDI32: CreateDIBitmap %x %x %x %x returned %x", hdc, fdwInit, lpbInit, fuUsage, rc));
+  dprintf(("GDI32: CreateDIBitmap %x %x %x %x returned %x (%d,%d, bps %d)", hdc, fdwInit, lpbInit, fuUsage, rc, lpbmih->biWidth, lpbmih->biHeight, lpbmih->biBitCount));
 
   ((BITMAPINFOHEADER *)lpbmih)->biHeight   = iHeight;
@@ -120 +121 @@
   if(pbmi->bmiHeader.biWidth < 0)
   {
-        dprintf(("CreateDIBSection: width %d", pbmi->bmiHeader.biWidth));
-        pbmi->bmiHeader.biWidth = -pbmi->bmiHeader.biWidth;
-        fFlip = FLIP_HOR;
+    dprintf(("CreateDIBSection: width %d", pbmi->bmiHeader.biWidth));
+        pbmi->bmiHeader.biWidth = -pbmi->bmiHeader.biWidth;
+        fFlip = FLIP_HOR;
   }
   iHeight = pbmi->bmiHeader.biHeight;
   if(pbmi->bmiHeader.biHeight < 0)
   {
-        dprintf(("CreateDIBSection: height %d", pbmi->bmiHeader.biHeight));
-        pbmi->bmiHeader.biHeight = -pbmi->bmiHeader.biHeight;
-        fFlip |= FLIP_VERT;
+    dprintf(("CreateDIBSection: height %d", pbmi->bmiHeader.biHeight));
+        pbmi->bmiHeader.biHeight = -pbmi->bmiHeader.biHeight;
+        fFlip |= FLIP_VERT;
   }
 
   //SvL: RP7 (update) calls this api with hdc == 0
   if(hdc == 0) {
-        hdc = GetWindowDC(GetDesktopWindow());
-        fCreateDC = TRUE;
+    hdc = GetWindowDC(GetDesktopWindow());
+    fCreateDC = TRUE;
   }
   res = O32_CreateDIBitmap(hdc, &pbmi->bmiHeader, 0, NULL, pbmi, iUsage);
@@ -181 +182 @@
       pbmi->bmiHeader.biHeight = iHeight;
 
-      if(fCreateDC)     ReleaseDC(GetDesktopWindow(), hdc);
+      if(fCreateDC) ReleaseDC(GetDesktopWindow(), hdc);
       return(res);
     }
   }
-  if(fCreateDC) ReleaseDC(GetDesktopWindow(), hdc);
+  if(fCreateDC) ReleaseDC(GetDesktopWindow(), hdc);
 
   /* Error.  */
@@ -271 +272 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API GetDIBits(HDC hdc, HBITMAP hBitmap, UINT uStartScan, UINT cScanLines, 
+int WIN32API GetDIBits(HDC hdc, HBITMAP hBitmap, UINT uStartScan, UINT cScanLines,
                        void *lpvBits, PBITMAPINFO lpbi, UINT uUsage)
 {
@@ -289 +290 @@
        ((DWORD*)(lpbi->bmiColors))[1] = 0x00FF00;
        ((DWORD*)(lpbi->bmiColors))[2] = 0xFF0000;
-       break; 
+       break;
     }
 
@@ -297 +298 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API SetDIBits( HDC arg1, HBITMAP arg2, UINT arg3, UINT arg4, const VOID * arg5, const BITMAPINFO * arg6, UINT  arg7)
-{
-    dprintf(("GDI32: SetDIBits %x %x %x %x %x %x %x\n", arg1, arg2, arg3, arg4, arg5, arg6, arg7));
-
-    if(DIBSection::getSection() != NULL) 
+int WIN32API SetDIBits(HDC hdc, HBITMAP hBitmap, UINT startscan, UINT numlines, const VOID *pBits,
+                       const BITMAPINFO *pBitmapInfo, UINT usage)
+{
+    dprintf(("GDI32: SetDIBits %x %x %x %x %x %x %x", hdc, hBitmap, startscan, numlines, pBits, pBitmapInfo, usage));
+
+    if(DIBSection::getSection() != NULL)
     {
         DIBSection *dsect;
 
-        dsect = DIBSection::find((DWORD)arg2);
+        dsect = DIBSection::find((DWORD)hBitmap);
         if(dsect) {
-           return dsect->SetDIBits(arg1, arg2, arg3, arg4, arg5, (BITMAPINFOHEADER_W *)&arg6->bmiHeader, arg7);
+           return dsect->SetDIBits(hdc, hBitmap, startscan, numlines, pBits, (BITMAPINFOHEADER_W *)&pBitmapInfo->bmiHeader, usage);
         }
     }
-    return O32_SetDIBits(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-}
-//******************************************************************************
-//******************************************************************************
+    //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);
+        char *orgpix    = (char *)pBits;
+        int   ret;
+
+        newpix += ((pBitmapInfo->bmiHeader.biHeight-1)*linewidth);
+
+        //flip bitmap here; SetDIBits assumes origin is left bottom, SetBitmapBits left top
+        for(int i=0;i<pBitmapInfo->bmiHeader.biHeight;i++) {
+            memcpy(newpix, orgpix, linewidth);
+            newpix -= linewidth;
+            orgpix += linewidth;
+        }
+        newpix += linewidth;
+        ret = O32_SetBitmapBits(hBitmap, pBitmapInfo->bmiHeader.biSizeImage, newpix);
+
+        free(newpix);
+        return ret;
+    }
+#ifdef DEBUG
+    if(pBitmapInfo->bmiHeader.biBitCount == 1) {
+        dprintf(("ERROR: SetDIBits does NOT work well for 1 bpp bitmaps!!!!!"));
+    }
+#endif
+    return O32_SetDIBits(hdc, hBitmap, startscan, numlines, pBits, pBitmapInfo, usage);
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.60 2000-11-09 18:16:57 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.61 2000-11-14 14:28:22 sandervl Exp $ */
 
 /*
@@ -114 +114 @@
 //******************************************************************************
 //******************************************************************************
-HBRUSH WIN32API CreateDIBPatternBrushPt( const VOID * arg1, UINT  arg2)
-{
-    dprintf(("GDI32: CreateDIBPatternBrushPt\n"));
-    return O32_CreateDIBPatternBrushPt(arg1, arg2);
+HBRUSH WIN32API CreateDIBPatternBrushPt( const VOID * buffer, UINT usage)
+{
+    dprintf(("GDI32: CreateDIBPatternBrushPt %x %x", buffer, usage));
+    return O32_CreateDIBPatternBrushPt(buffer, usage);
 }
 //******************************************************************************