Bitmap device-independent (DIP) transparency corrections

Author: GasDauMin

src/Win32Utils.cpp

@@ -157,14 +157,14 @@ namespace Win32Utils
   }
   #endif
 
-  HBITMAP CreateBitmap(int biWidth, int biHeight, UINT biPlanes, UINT biBitCount, HDC hDc)
+  HBITMAP CreateBitmapWithAlphaChannel(int biWidth, int biHeight, HDC hDc)
   {
     BITMAPINFO bmi;
     bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
     bmi.bmiHeader.biWidth = biWidth;
     bmi.bmiHeader.biHeight = biHeight;
-    bmi.bmiHeader.biPlanes = biPlanes;
-    bmi.bmiHeader.biBitCount = biBitCount;
+    bmi.bmiHeader.biPlanes = 1;
+    bmi.bmiHeader.biBitCount = 32;
     bmi.bmiHeader.biCompression = BI_RGB;
     bmi.bmiHeader.biSizeImage = biWidth * biHeight * 4;
     VOID* pvBits;
@@ -204,11 +204,11 @@ namespace Win32Utils
       return NULL;
 
     HWND hWndDesktop = GetDesktopWindow();
-    HDC hdcDesktop = GetDC(hWndDesktop);
-    HDC hDcMem = CreateCompatibleDC(hdcDesktop);
+    HDC hDcDesktop = GetDC(hWndDesktop);
+    HDC hDcMem = CreateCompatibleDC(hDcDesktop);
 
     // Create a 32bbp bitmap and select it.
-    HBITMAP hBitmap = CreateBitmap(bitmap_width, bitmap_height, 1, BITS_PER_PIXEL, hDcMem);
+    HBITMAP hBitmap = CreateBitmapWithAlphaChannel(bitmap_width, bitmap_height, hDcMem);
     HBITMAP hbmOld = (HBITMAP)SelectObject(hDcMem, hBitmap);
 
   #if 0
@@ -280,7 +280,7 @@ namespace Win32Utils
     // Clean up.
     SelectObject(hDcMem, hbmOld);
     DeleteDC(hDcMem);
-    ReleaseDC(hWndDesktop, hdcDesktop);
+    ReleaseDC(hWndDesktop, hDcDesktop);
 
     return hBitmap;
   }

src/Win32Utils.h

@@ -35,7 +35,7 @@ namespace Win32Utils
   RGBQUAD ToRgbQuad(const DWORD & iColor);
   SIZE GetBitmapSize(HBITMAP hBitmap);
   BOOL FillTransparentPixels(HBITMAP hBitmap, COLORREF background_color);
-  HBITMAP CreateBitmap(int biWidth, int biHeight, UINT biPlanes, UINT biBitCount, HDC hDc);
+  HBITMAP CreateBitmapWithAlphaChannel(int biWidth, int biHeight, HDC hDc);
   HBITMAP CopyAsBitmap(HICON hIcon, const int bitmap_width, const int bitmap_height);
   HBITMAP CopyAsBitmap(HICON hIcon);
   bool CreateBmpFile(const char * path, HBITMAP hBitmap);

src/shellext.cpp

@@ -356,12 +356,6 @@ void CContextMenu::BuildMenuTree(HMENU hMenu, shellanything::Menu * menu, UINT &
         //Convert the icon to a bitmap (with invisible background)
         hBitmap = Win32Utils::CopyAsBitmap(hIcon);
 
-      #if 0
-        //Remove the invisible background and replace by the default popup menu color
-        COLORREF menu_background_color = GetSysColor(COLOR_MENU);
-        Win32Utils::FillTransparentPixels(hBitmap, menu_background_color);
-      #endif
-
         DestroyIcon(hIconLarge);
         DestroyIcon(hIconSmall);
 

test/TestBitmapCache.cpp

@@ -40,12 +40,6 @@ namespace shellanything { namespace test
     SIZE icon_size = Win32Utils::GetIconSize(hIconLarge);
     HBITMAP hBitmap = Win32Utils::CopyAsBitmap(hIconLarge, icon_size.cx, icon_size.cy);
 
-  #if 0
-    //Remove the invisible background and replace by red color
-    COLORREF background_color = RGB(255,0,255); //pink
-    Win32Utils::FillTransparentPixels(hBitmap, background_color);
-  #endif
-
     DestroyIcon(hIconLarge);
     DestroyIcon(hIconSmall);
 
@@ -63,12 +57,6 @@ namespace shellanything { namespace test
     SIZE icon_size = Win32Utils::GetIconSize(hIconLarge);
     HBITMAP hBitmap = Win32Utils::CopyAsBitmap(hIconLarge, icon_size.cx, icon_size.cy);
 
-  #if 0
-    //Remove the invisible background and replace by red color
-    COLORREF background_color = RGB(255,0,255); //pink
-    Win32Utils::FillTransparentPixels(hBitmap, background_color);
-  #endif
-
     DestroyIcon(hIconLarge);
     DestroyIcon(hIconSmall);
 

test/TestWin32Registry.cpp

@@ -234,12 +234,6 @@ namespace shellanything { namespace test
         SIZE icon_size = Win32Utils::GetIconSize(hIconBest);
         HBITMAP hBitmap = Win32Utils::CopyAsBitmap(hIconBest, icon_size.cx, icon_size.cy);
 
-      #if 0
-        //Remove the invisible background and replace by red color
-        COLORREF background_color = RGB(255,0,255); //pink
-        Win32Utils::FillTransparentPixels(hBitmap, background_color);
-      #endif
-
         DestroyIcon(hIconLarge);
         DestroyIcon(hIconSmall);
 
@@ -321,12 +315,6 @@ namespace shellanything { namespace test
       SIZE icon_size = Win32Utils::GetIconSize(hIconLarge);
       HBITMAP hBitmap = Win32Utils::CopyAsBitmap(hIconLarge, icon_size.cx, icon_size.cy);
 
-    #if 0
-      //Remove the invisible background and replace by red color
-      COLORREF background_color = RGB(255,0,255); //pink
-      Win32Utils::FillTransparentPixels(hBitmap, background_color);
-    #endif
-
       DestroyIcon(hIconLarge);
       DestroyIcon(hIconSmall);
 

test/TestWin32Utils.cpp

@@ -59,12 +59,6 @@ namespace shellanything { namespace test
       SIZE icon_size = Win32Utils::GetIconSize(hIconLarge);
       HBITMAP hBitmap = Win32Utils::CopyAsBitmap(hIconLarge, icon_size.cx, icon_size.cy);
 
-    #if 0
-      //Remove the invisible background and replace by red color
-      COLORREF background_color = RGB(255,0,255); //pink
-      Win32Utils::FillTransparentPixels(hBitmap, background_color);
-    #endif
-
       DestroyIcon(hIconLarge);
       DestroyIcon(hIconSmall);
 
@@ -114,13 +108,6 @@ namespace shellanything { namespace test
       SIZE icon_size = Win32Utils::GetIconSize(hIconLarge);
       HBITMAP hBitmap = Win32Utils::CopyAsBitmap(hIconLarge, icon_size.cx, icon_size.cy);
 
-    #if 0
-      //Remove the invisible background and replace by red color
-      static const COLORREF color_pink  = RGB(255,  0,255);
-      static const COLORREF color_white = RGB(255,255,255);
-      Win32Utils::FillTransparentPixels(hBitmap, color_pink);
-    #endif
-
       DestroyIcon(hIconLarge);
       DestroyIcon(hIconSmall);