Changeset 8097 for trunk/src

Timestamp:

Mar 18, 2002, 2:03:53 PM (23 years ago)

Author:

sandervl

Message:

PF: fix for 24 bpp bitmaps

Location:

trunk/src/user32

Files:

• dib.cpp (modified) (2 diffs)
• oslibwin.cpp (modified) (2 diffs)
• oslibwin.h (modified) (3 diffs)

trunk/src/user32/dib.cpp

@@ -1 @@
-/* $Id: dib.cpp,v 1.8 2000-11-15 20:44:26 sandervl Exp $ */
+/* $Id: dib.cpp,v 1.9 2002-03-18 13:03:53 sandervl Exp $ */
 
 /*
@@ -82 +82 @@
     else  /* assume BITMAPINFOHEADER */
     {
-        colors = info->bmiHeader.biClrUsed;
-        if (!colors && (info->bmiHeader.biBitCount <= 8))
-            colors = 1 << info->bmiHeader.biBitCount;
+#ifdef __WIN32OS2__
+        /* many windows apps write bitmaps that have 0x1000000 in biClrUsed when
+           in 24 bpp, so I think we can do generic action 24bpp - no clrUsed */
+        colors = 0;
+        if (info->bmiHeader.biBitCount <= 8)
+        {
+#endif
+           colors = info->bmiHeader.biClrUsed;
+           if (!colors)
+              colors = 1 << info->bmiHeader.biBitCount;
+#ifdef __WIN32OS2__
+        }
+#endif
         return sizeof(BITMAPINFOHEADER) + colors *
                ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD));

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.115 2002-03-05 16:09:17 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.116 2002-03-18 13:03:53 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -250 +250 @@
   return WinSetWindowULong(hwnd, offset, value);
 }
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibWinGetMinPosition(HWND hwnd, PSWP pswp, PPOINTL pointl)
+{
+  return WinGetMinPosition(hwnd, pswp, pointl);
+}
+
 //******************************************************************************
 //******************************************************************************

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.64 2002-01-20 15:26:21 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.65 2002-03-18 13:03:53 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -28 +28 @@
    ULONG   ulReserved2;
 } SWP, *PSWP;
+typedef POINTL *PPOINTL;
 #endif
 
@@ -198 +199 @@
 BOOL OSLibWinSetDlgItemText(HWND hwndDlg,ULONG idItem,char* pszText);
 BOOL OSLibWinQueryPointerPos(PPOINT pptlPoint); //pptlPoint == POINTL pointer!
+BOOL OSLibWinGetMinPosition(HWND hwndDlg,PSWP swp, PPOINTL pointl);
 BOOL OSLibWinSetPointerPos(int x, int y);