Changeset 6595 for trunk/src/user32/oslibres.cpp

Timestamp:

Aug 26, 2001, 4:23:35 PM (24 years ago)

Author:

sandervl

Message:

several icon/cursor fixes

File:

• trunk/src/user32/oslibres.cpp (modified) (4 diffs)

trunk/src/user32/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.19 2001-08-25 10:54:19 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.20 2001-08-26 14:23:33 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -25 +25 @@
 #include "oslibres.h"
 #include "pmwindow.h"
+#include <wingdi32.h>
 
 #define DBG_LOCALLOG    DBG_oslibres
@@ -307 +308 @@
         pBmpColor->ulColorEncoding  = BCE_RGB;
 
-            os2rgb                      = &pBmpColor->argbColor[0];
-            rgb                         = (RGBQUAD *)(pXorBits);
-
-            if(pXorBmp->bmBitsPixel <= 8) {
-                for(i=0;i<(1<<pXorBmp->bmBitsPixel);i++) {
-                        os2rgb->bRed   = rgb->rgbRed;
-                        os2rgb->bBlue  = rgb->rgbBlue;
-                        os2rgb->bGreen = rgb->rgbGreen;
-                        os2rgb++;
-                        rgb++;
-                }
+        os2rgb                      = &pBmpColor->argbColor[0];
+        rgb                         = (RGBQUAD *)(pXorBits);
+
+        if(pXorBmp->bmBitsPixel <= 8) {
+            for(i=0;i<(1<<pXorBmp->bmBitsPixel);i++) {
+                    os2rgb->bRed   = rgb->rgbRed;
+                    os2rgb->bBlue  = rgb->rgbBlue;
+                    os2rgb->bGreen = rgb->rgbGreen;
+                    os2rgb++;
+                    rgb++;
+            }
         }
 
@@ -329 +330 @@
                     src  += pXorBmp->bmWidthBytes;
                 }
+        }
+        else    
+        if(pXorBmp->bmBitsPixel == 16) {
+                ConvertRGB555to565(os2rgb, rgb, pXorBmp->bmHeight * pXorBmp->bmWidthBytes);
         }
         else    memcpy(os2rgb, rgb, pXorBmp->bmHeight * pXorBmp->bmWidthBytes);