[gedmurphy] 31924: - blit directly instead of using CopyImage which highlights a kmode bug. - fixes the toolbar problem in the taskbar

Author: gedmurphy
Date: Mon Jan 21 20:03:20 2008
New Revision: 31924

URL: http://svn.reactos.org/svn/reactos?rev=31924&view=rev
Log:
- blit directly instead of using CopyImage which highlights a kmode bug.
- fixes the toolbar problem in the taskbar

Modified:
    branches/ros-branch-0_3_4/reactos/dll/win32/comctl32/toolbar.c

Modified: branches/ros-branch-0_3_4/reactos/dll/win32/comctl32/toolbar.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_4/reactos/dll/win...
==============================================================================
--- branches/ros-branch-0_3_4/reactos/dll/win32/comctl32/toolbar.c (original)
+++ branches/ros-branch-0_3_4/reactos/dll/win32/comctl32/toolbar.c Mon Jan 21 20:03:20 2008
@@ -2668,7 +2668,33 @@
     TRACE("adding hInst=%p nID=%d nButtons=%d\n", bitmap->hInst, bitmap->nID, bitmap->nButtons);
     /* Add bitmaps to the default image list */
     if (bitmap->hInst == NULL)         /* a handle was passed */
-        hbmLoad = (HBITMAP)CopyImage(ULongToHandle(bitmap->nID), IMAGE_BITMAP, 0, 0, 0);
+    {
+        BITMAP  bmp;
+        HBITMAP hOldBitmapBitmap, hOldBitmapLoad;
+        HDC     hdcImage, hdcBitmap;
+
+        /* copy the bitmap before adding it so that the user's bitmap
+         * doesn't get modified.
+         */
+        GetObjectW ((HBITMAP)bitmap->nID, sizeof(BITMAP), (LPVOID)&bmp);
+
+        hdcImage  = CreateCompatibleDC(0);
+        hdcBitmap = CreateCompatibleDC(0);
+
+        /* create new bitmap */
+        hbmLoad = CreateBitmap (bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes, bmp.bmBitsPixel, NULL);
+        hOldBitmapBitmap = SelectObject(hdcBitmap, (HBITMAP)bitmap->nID);
+        hOldBitmapLoad = SelectObject(hdcImage, hbmLoad);
+
+        /* Copy the user's image */
+        BitBlt (hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight,
+                hdcBitmap, 0, 0, SRCCOPY);
+
+        SelectObject (hdcImage, hOldBitmapLoad);
+        SelectObject (hdcBitmap, hOldBitmapBitmap);
+        DeleteDC (hdcImage);
+        DeleteDC (hdcBitmap);
+    }
     else
         hbmLoad = CreateMappedBitmap(bitmap->hInst, bitmap->nID, 0, NULL, 0);