Changeset 8873 for trunk/src

Timestamp:

Jul 15, 2002, 1:19:05 PM (23 years ago)

Author:

sandervl

Message:

Handle management updates

File:

• trunk/src/gdi32/dibitmap.cpp (modified) (8 diffs)

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.31 2002-07-15 10:02:28 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.32 2002-07-15 11:19:05 sandervl Exp $ */
 
 /*
@@ -136 +136 @@
     if(rc) { 
         STATS_CreateDIBitmap(rc, hdc, lpbmih, fdwInit, lpbInit, lpbmi, fuUsage);
-#ifdef NEW_GDIHANDLES
         if(bitfields[1] == RGB565_GREEN_MASK) {
             //mark bitmap as RGB565
@@ -142 +141 @@
             ObjSetHandleFlag(rc, OBJHANDLE_FLAG_BMP_RGB565, TRUE);
         }
-#endif
     }
 
@@ -152 +150 @@
 {
     HBITMAP hBitmap;
-#ifdef NEW_GDIHANDLES
     pDCData pHps;  
 
@@ -161 +158 @@
         return 0;
     }
-#endif
 
     hBitmap = O32_CreateCompatibleBitmap(hdc, nWidth, nHeight);
@@ -167 +163 @@
     if(hBitmap) {
         STATS_CreateCompatibleBitmap(hBitmap,hdc, nWidth, nHeight);
-#ifdef NEW_GDIHANDLES
         if(pHps->hwnd == 1) { //1 == HWND_DESKTOP
             dprintf(("Screen compatible bitmap"));
             ObjSetHandleFlag(hBitmap, OBJHANDLE_FLAG_BMP_SCREEN_COMPATIBLE, 1);
         }
-#endif
     }
 
@@ -398 +392 @@
         case 16: //RGB 565
         {
-#ifdef NEW_GDIHANDLES
             DWORD dwFlags;
 
@@ -413 +406 @@
             }
             break;
-#else
-            ((DWORD*)(lpbi->bmiColors))[0] = RGB555_RED_MASK;
-            ((DWORD*)(lpbi->bmiColors))[1] = RGB555_GREEN_MASK;
-            ((DWORD*)(lpbi->bmiColors))[2] = RGB555_BLUE_MASK;
-#endif
         }
         case 24: