Changeset 9624 for trunk/src

Timestamp:

Jan 5, 2003, 5:34:58 PM (23 years ago)

Author:

sandervl

Message:

Added workaround for handling black & white cursors

Location:

trunk/src/user32

Files:

• oslibres.cpp (modified) (2 diffs)
• winicon.cpp (modified) (2 diffs)

trunk/src/user32/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.33 2002-12-18 12:28:05 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.34 2003-01-05 16:34:58 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -415 +415 @@
         rgb                         = (RGBQUAD *)(pXorBits);
 
+#if 0
+        if(pXorBmp->bmBitsPixel == 1) {
+            os2rgb->bRed = os2rgb->bBlue = os2rgb->bGreen = 0;
+            os2rgb++;
+            os2rgb->bRed = os2rgb->bBlue = os2rgb->bGreen = 0xff;
+            os2rgb++;
+        }
+        else
+#endif
         if(pXorBmp->bmBitsPixel <= 8) {
             for(i=0;i<(1<<pXorBmp->bmBitsPixel);i++) {

trunk/src/user32/winicon.cpp

@@ -1 @@
-/* $Id: winicon.cpp,v 1.38 2002-11-26 14:41:07 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.39 2003-01-05 16:34:58 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -1111 +1111 @@
         return 0;
     }
-
     /* Now create the CURSORICONINFO structure */
     GetObjectA( hXorBits, sizeof(bmpXor), &bmpXor );
     GetObjectA( hAndBits, sizeof(bmpAnd), &bmpAnd );
     colortablesize = 0;
+
+    //SvL: Workaround for problem with B&W cursor XOR bitmaps
+    //     End result = inverted PM cursor; not sure what's actually causing
+    //     this...
+    //     So we let GetDIBits convert the mono cursor to 8bpp
+    if(bmpXor.bmBitsPixel == 1)
+    {
+        bmpXor.bmBitsPixel = 8;
+        bmpXor.bmWidthBytes *= 8;
+    }
 
     if(bmpXor.bmBitsPixel <= 8) {