Fixed allocation of 16x16 icons.

44016841 · Juergen Schmied · Alexandre Julliard · 52bd50fb · 44016841
Commit 44016841 authored Feb 25, 2000 by Juergen Schmied Committed by Alexandre Julliard Feb 25, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

cursoricon.c objects/cursoricon.c +6 -3

No files found.
--- a/objects/cursoricon.c
+++ b/objects/cursoricon.c
@@ -868,7 +868,7 @@ HGLOBAL CURSORICON_ExtCopy(HGLOBAL Handle, UINT nType,
        }
        else
        {
-            int iTargetCX, iTargetCY;
+            int iTargetCY = iDesiredCY, iTargetCX = iDesiredCX;
            LPBYTE pBits;
            HANDLE hMem;
            HRSRC hRsrc;
@@ -936,8 +936,11 @@ HGLOBAL CURSORICON_ExtCopy(HGLOBAL Handle, UINT nType,

            pBits = (LPBYTE)LockResource( hMem );
         
-            iTargetCY = GetSystemMetrics(SM_CYICON);
-            iTargetCX = GetSystemMetrics(SM_CXICON);
+	    if(nFlags & LR_DEFAULTSIZE)
+	    {
+	        iTargetCY = GetSystemMetrics(SM_CYICON);
+                iTargetCX = GetSystemMetrics(SM_CXICON);
+	    }

            /* Create a New Icon with the proper dimension
            */