Oleg Krylov : comctl32: Correctly map toolbar bitmap mask color in case of non-default color scheme .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 21b94d4cf4b159c11dfdec5aa6b62de0a72b4f71
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=21b94d4cf4b159c11dfdec5a...

Author: Oleg Krylov <oleg.krylov(a)gmail.com>
Date:   Fri Aug 18 17:05:17 2006 +0300

comctl32: Correctly map toolbar bitmap mask color in case of non-default color scheme.

---

 dlls/comctl32/toolbar.c |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index c1926cb..108bf04 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -2689,48 +2689,48 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa
 	switch (lpAddBmp->nID)
     {
 	    case IDB_STD_SMALL_COLOR:
-		hbmLoad = LoadBitmapW (COMCTL32_hModule,
-				       MAKEINTRESOURCEW(IDB_STD_SMALL));
+		hbmLoad = CreateMappedBitmap (COMCTL32_hModule,
+                                              IDB_STD_SMALL, 0, NULL, 0);
 		nIndex = ImageList_AddMasked (himlDef,
 					      hbmLoad, comctl32_color.clrBtnFace);
 		DeleteObject (hbmLoad);
 		break;
 
 	    case IDB_STD_LARGE_COLOR:
-		hbmLoad = LoadBitmapW (COMCTL32_hModule,
-				       MAKEINTRESOURCEW(IDB_STD_LARGE));
+		hbmLoad = CreateMappedBitmap (COMCTL32_hModule,
+                                              IDB_STD_LARGE, 0, NULL, 0);
 		nIndex = ImageList_AddMasked (himlDef,
 					      hbmLoad, comctl32_color.clrBtnFace);
 		DeleteObject (hbmLoad);
 		break;
 
 	    case IDB_VIEW_SMALL_COLOR:
-		hbmLoad = LoadBitmapW (COMCTL32_hModule,
-				       MAKEINTRESOURCEW(IDB_VIEW_SMALL));
+		hbmLoad = CreateMappedBitmap (COMCTL32_hModule,
+                                              IDB_VIEW_SMALL, 0, NULL, 0);
 		nIndex = ImageList_AddMasked (himlDef,
 					      hbmLoad, comctl32_color.clrBtnFace);
 		DeleteObject (hbmLoad);
 		break;
 
 	    case IDB_VIEW_LARGE_COLOR:
-		hbmLoad = LoadBitmapW (COMCTL32_hModule,
-				       MAKEINTRESOURCEW(IDB_VIEW_LARGE));
+		hbmLoad = CreateMappedBitmap (COMCTL32_hModule,
+                                              IDB_VIEW_LARGE, 0, NULL, 0);
 		nIndex = ImageList_AddMasked (himlDef,
 					      hbmLoad, comctl32_color.clrBtnFace);
 		DeleteObject (hbmLoad);
 		break;
 
 	    case IDB_HIST_SMALL_COLOR:
-		hbmLoad = LoadBitmapW (COMCTL32_hModule,
-				       MAKEINTRESOURCEW(IDB_HIST_SMALL));
+		hbmLoad = CreateMappedBitmap (COMCTL32_hModule,
+                                              IDB_HIST_SMALL, 0, NULL, 0);
 		nIndex = ImageList_AddMasked (himlDef,
 					      hbmLoad, comctl32_color.clrBtnFace);
 		DeleteObject (hbmLoad);
 		break;
 
 	    case IDB_HIST_LARGE_COLOR:
-		hbmLoad = LoadBitmapW (COMCTL32_hModule,
-				       MAKEINTRESOURCEW(IDB_HIST_LARGE));
+		hbmLoad = CreateMappedBitmap (COMCTL32_hModule,
+                                              IDB_HIST_LARGE, 0, NULL, 0);
 		nIndex = ImageList_AddMasked (himlDef,
 					      hbmLoad, comctl32_color.clrBtnFace);
 		DeleteObject (hbmLoad);
@@ -2744,7 +2744,7 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa
     }
     else
     {
-	hbmLoad = LoadBitmapW (lpAddBmp->hInst, (LPWSTR)lpAddBmp->nID);
+        hbmLoad = CreateMappedBitmap(lpAddBmp->hInst, lpAddBmp->nID, 0, NULL, 0);
 	nIndex = ImageList_AddMasked (himlDef, hbmLoad, comctl32_color.clrBtnFace);
 	DeleteObject (hbmLoad);
     }