[ros-diffs] [jgardou] 47451: [WIN32K] - Simplify UserDrawIconEx - NtUserCreateCursorIconHandle : Get Information from bitmaps even on indirect creation and fix calculation of icon height in case of monochrome icons. Fixes ~15 user32:cursoricon winetests.

Author: jgardou
Date: Sun May 30 18:31:56 2010
New Revision: 47451

URL: http://svn.reactos.org/svn/reactos?rev=47451&view=rev
Log:
[WIN32K]
  - Simplify UserDrawIconEx
  - NtUserCreateCursorIconHandle : Get Information from bitmaps even on indirect creation
and fix calculation of icon height in case of monochrome icons.
Fixes ~15 user32:cursoricon winetests.

Modified:
    branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c

Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win…
==============================================================================
--- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1]
(original)
+++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sun
May 30 18:31:56 2010
@@ -556,7 +556,7 @@
             /* Copy bitmaps and size info */
             if (Indirect)
             {
-                // FIXME: WTF?
+                /* Convert bitmaps to unowned objects, so that they can be shared between
processes */
                 CurIcon->IconInfo.hbmMask =
BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask);
                 GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL);
                 if(CurIcon->IconInfo.hbmColor)
@@ -565,27 +565,24 @@
                     GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL);
                 }
             }
-            else
+            if (CurIcon->IconInfo.hbmColor &&
+                    (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor)))
             {
-                if (CurIcon->IconInfo.hbmColor &&
-                        (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor)))
+                CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx;
+                CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy;
+                SURFACE_UnlockSurface(psurfBmp);
+                GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL);
+            }
+            if (CurIcon->IconInfo.hbmMask &&
+                    (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask)))
+            {
+                if(!CurIcon->IconInfo.hbmColor)
                 {
                     CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx;
-                    CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy;
-                    SURFACE_UnlockSurface(psurfBmp);
-                    GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL);
+                    CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy/2;
                 }
-                if (CurIcon->IconInfo.hbmMask &&
-                        (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask)))
-                {
-                    if(!CurIcon->IconInfo.hbmColor)
-                    {
-                        CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx;
-                        CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy*2;
-                    }
-                    SURFACE_UnlockSurface(psurfBmp);
-                    GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL);
-                }
+                SURFACE_UnlockSurface(psurfBmp);
+                GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL);
             }
 
             /* Calculate icon hotspot */
@@ -1332,11 +1329,12 @@
     SIZE IconSize;
     INT iOldBkColor = 0, iOldTxtColor = 0;
 
-    HDC hMemDC, hOffDC = NULL;
+    HDC hMemDC, hDestDC = hDc;
     HGDIOBJ hOldOffBrush = 0;
     HGDIOBJ hOldOffBmp = 0;
     HBITMAP hTmpBmp = 0, hOffBmp = 0;
     BOOL bAlpha = FALSE;
+    INT x=xLeft, y=yTop;
 
     hbmMask = pIcon->IconInfo.hbmMask;
     hbmColor = pIcon->IconInfo.hbmColor;
@@ -1370,9 +1368,6 @@
         IconSize.cx = bm.bmWidth;
         IconSize.cy = bm.bmHeight/2;
     }
-
-    if (!diFlags)
-        diFlags = DI_NORMAL;
 
     /* NtGdiCreateCompatibleBitmap will create a monochrome bitmap
        when cxWidth or cyHeight is 0 */
@@ -1384,7 +1379,7 @@
     {
         SURFACE *psurfOff = NULL;
         PFN_DIB_GetPixel fnSource_GetPixel = NULL;
-        INT x, y;
+        INT i, j;
 
         /* In order to correctly display 32 bit icons Windows first scans the image,
            because information about transparency is not stored in any image's
headers */
@@ -1394,11 +1389,11 @@
             fnSource_GetPixel =
DibFunctionsForBitmapFormat[psurfOff->SurfObj.iBitmapFormat].DIB_GetPixel;
             if (fnSource_GetPixel)
             {
-                for (x = 0; x < psurfOff->SurfObj.sizlBitmap.cx; x++)
+                for (i = 0; i < psurfOff->SurfObj.sizlBitmap.cx; i++)
                 {
-                    for (y = 0; y < psurfOff->SurfObj.sizlBitmap.cy; y++)
+                    for (j = 0; j < psurfOff->SurfObj.sizlBitmap.cy; j++)
                     {
-                        bAlpha = ((BYTE)(fnSource_GetPixel(&psurfOff->SurfObj, x,
y) >> 24) & 0xff);
+                        bAlpha = ((BYTE)(fnSource_GetPixel(&psurfOff->SurfObj, i,
j) >> 24) & 0xff);
                         if (bAlpha)
                             break;
                     }
@@ -1423,8 +1418,8 @@
 
     if (DoFlickerFree)
     {
-        hOffDC = NtGdiCreateCompatibleDC(hDc);
-        if(!hOffDC)
+        hDestDC = NtGdiCreateCompatibleDC(hDc);
+        if(!hDestDC)
         {
             DPRINT1("NtGdiCreateCompatibleBitmap failed!\n");
             Ret = FALSE;
@@ -1436,25 +1431,23 @@
             DPRINT1("NtGdiCreateCompatibleBitmap failed!\n");
             goto Cleanup ;
         }
-        hOldOffBmp = NtGdiSelectBitmap(hOffDC, hOffBmp);
-        hOldOffBrush = NtGdiSelectBrush(hOffDC, hbrFlickerFreeDraw);
-        NtGdiPatBlt(hOffDC, 0, 0, cxWidth, cyHeight, PATCOPY);
-        NtGdiSelectBrush(hOffDC, hOldOffBrush);
-    }
-    else
-    {
-        /* Set Background/foreground colors */
-        iOldTxtColor = IntGdiSetTextColor(hDc, 0); //black
-        iOldBkColor = IntGdiSetBkColor(hDc, 0x00FFFFFF); //white
-    }
-
-
-    if (hbmMask && (diFlags & DI_MASK) && !bAlpha)
+        hOldOffBmp = NtGdiSelectBitmap(hDestDC, hOffBmp);
+        hOldOffBrush = NtGdiSelectBrush(hDestDC, hbrFlickerFreeDraw);
+        NtGdiPatBlt(hDestDC, 0, 0, cxWidth, cyHeight, PATCOPY);
+        NtGdiSelectBrush(hDestDC, hOldOffBrush);
+        x=y=0;
+    }
+
+    /* Set Background/foreground colors */
+    iOldTxtColor = IntGdiSetTextColor(hDc, 0); //black
+    iOldBkColor = IntGdiSetBkColor(hDc, 0x00FFFFFF); //white
+
+    if ((diFlags & DI_MASK) && (!bAlpha || !(diFlags & DI_IMAGE)))
     {
         hTmpBmp = NtGdiSelectBitmap(hMemDC, hbmMask);
-        NtGdiStretchBlt(hOffDC ? hOffDC : hDc,
-                        hOffDC ? 0 : xLeft,
-                        hOffDC ? 0 : yTop,
+        NtGdiStretchBlt(hDestDC,
+                        x,
+                        y,
                         cxWidth,
                         cyHeight,
                         hMemDC,
@@ -1534,9 +1527,9 @@
 
             hTmpBmp = NtGdiSelectBitmap(hMemDC, hMemBmp);
 
-            NtGdiAlphaBlend(hOffDC ? hOffDC : hDc,
-                            hOffDC ? 0 : xLeft,
-                            hOffDC ? 0 : yTop,
+            NtGdiAlphaBlend(hDestDC,
+                            x,
+                            y,
                             cxWidth,
                             cyHeight,
                             hMemDC,
@@ -1555,9 +1548,9 @@
         {
             DWORD rop = (diFlags & DI_MASK) ? SRCINVERT : SRCCOPY ;
             hTmpBmp = NtGdiSelectBitmap(hMemDC, hbmColor);
-            NtGdiStretchBlt(hOffDC ? hOffDC : hDc,
-                            hOffDC ? 0 : xLeft,
-                            hOffDC ? 0 : yTop,
+            NtGdiStretchBlt(hDestDC,
+                            x,
+                            y,
                             cxWidth,
                             cyHeight,
                             hMemDC,
@@ -1571,23 +1564,25 @@
         }
     }
 
-    if(hOffDC)
-    {
-        NtGdiBitBlt(hDc, xLeft, yTop, cxWidth, cyHeight, hOffDC, 0, 0, SRCCOPY, 0, 0);
-    }
-    else
-    {
-        IntGdiSetBkColor(hDc, iOldBkColor);
-        IntGdiSetTextColor(hDc, iOldTxtColor);
-    }
+    if(hDestDC != hDc)
+    {
+        NtGdiBitBlt(hDc, xLeft, yTop, cxWidth, cyHeight, hDestDC, 0, 0, SRCCOPY, 0, 0);
+    }
+
+    /* Restore foreground and background colors */
+    IntGdiSetBkColor(hDc, iOldBkColor);
+    IntGdiSetTextColor(hDc, iOldTxtColor);
 
     Ret = TRUE ;
 
 Cleanup:
     NtGdiDeleteObjectApp(hMemDC);
-    if(hOldOffBmp) NtGdiSelectBitmap(hOffDC, hOldOffBmp);
-    if(hOffDC) NtGdiDeleteObjectApp(hOffDC);
-    if(hOffBmp) NtGdiDeleteObjectApp(hOffBmp);
+    if(hDestDC != hDc)
+    {
+        if(hOldOffBmp) NtGdiSelectBitmap(hDestDC, hOldOffBmp);
+        NtGdiDeleteObjectApp(hDestDC);
+        if(hOffBmp) NtGdiDeleteObjectApp(hOffBmp);
+    }
 
     return Ret;
 }