Changeset 9437 for trunk/src/user32/loadres.cpp

Timestamp:

Nov 27, 2002, 2:56:27 PM (23 years ago)

Author:

sandervl

Message:

CopyBitmap fix + use PM bitmaps for standard user32 frame buttons in OS/2 GUI mode

File:

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

trunk/src/user32/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.39 2002-03-22 12:51:17 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.40 2002-11-27 13:56:26 sandervl Exp $ */
 
 /*
@@ -166 +166 @@
     int size;
 
+    //if in OS/2 mode, then we must replace the standard button bitmaps
+    //(min, max, restore, close)
+#ifdef NEW_WGSS
+    if(fOS2Look && (hinst == hInstanceUser32 || !hinst)) {
+        switch((ULONG)lpszName) {
+        case OBM_CLOSE:
+            return CopyImage(hBmpCloseButton, IMAGE_BITMAP, 0, 0, 0);
+        case OBM_CLOSED:
+            return CopyImage(hBmpCloseButtonDown, IMAGE_BITMAP, 0, 0, 0);
+        case OBM_RESTORE:
+            return CopyImage(hBmpRestoreButton, IMAGE_BITMAP, 0, 0, 0);
+        case OBM_RESTORED:
+            return CopyImage(hBmpRestoreButtonDown, IMAGE_BITMAP, 0, 0, 0);
+        case OBM_REDUCE:
+            return CopyImage(hBmpMinButton, IMAGE_BITMAP, 0, 0, 0);
+        case OBM_REDUCED:
+            return CopyImage(hBmpMinButtonDown, IMAGE_BITMAP, 0, 0, 0);
+        case OBM_ZOOM:
+            return CopyImage(hBmpMaxButton, IMAGE_BITMAP, 0, 0, 0);
+        case OBM_ZOOMD:
+            return CopyImage(hBmpMaxButtonDown, IMAGE_BITMAP, 0, 0, 0);
+        }
+    }
+#endif
     if (!(fuLoad & LR_LOADFROMFILE))
     {
@@ -304 +328 @@
     }
 
+#ifdef __WIN32OS2__
+    BITMAPINFO* pInfo;
+    HBITMAP oldbmp;
+    HDC     hdc;
+    int     colortablesize, bmpsize, headersize;
+    char   *pBitmapData;
+
+    colortablesize = 0;
+
+    if(bm.bmBitsPixel <= 8) {
+        colortablesize = sizeof(RGBQUAD)*(1<<bm.bmBitsPixel);
+    }
+    bmpsize = DIB_GetDIBImageBytes(bm.bmWidth, bm.bmHeight, bm.bmBitsPixel);
+    headersize = sizeof(BITMAPINFO)+colortablesize+3*sizeof(DWORD); //+ extra space for > 8bpp images
+
+    pInfo = (BITMAPINFO *)malloc(headersize+bmpsize); 
+    if(pInfo == NULL) {
+        DebugInt3();
+        return 0;
+    }
+    pBitmapData = (char*)((char *)pInfo + headersize);
+    memset(pInfo, 0, headersize+bmpsize);
+
+    hdc = CreateCompatibleDC(0);
+
+    pInfo->bmiHeader.biSize     = sizeof(BITMAPINFOHEADER);
+    pInfo->bmiHeader.biPlanes   = bm.bmPlanes;
+    pInfo->bmiHeader.biBitCount = bm.bmBitsPixel;
+    pInfo->bmiHeader.biWidth    = bm.bmWidth;
+    pInfo->bmiHeader.biHeight   = bm.bmHeight;
+
+    GetDIBits(hdc, hBitmap, 0, bm.bmHeight, pBitmapData, pInfo, DIB_RGB_COLORS);
+
+    res = CreateDIBitmap(hdc, &pInfo->bmiHeader, CBM_INIT, pBitmapData, 
+                         pInfo, DIB_RGB_COLORS );
+
+    DeleteDC(hdc);
+    free(pInfo);
+#else
     bm.bmBits = NULL;
     res = CreateBitmapIndirect(&bm);
@@ -315 +378 @@
         HeapFree( GetProcessHeap(), 0, buf );
     }
+#endif
     return res;
 }