[ros-diffs] [gedmurphy] 31305: add LR_COPYDELETEORG and ignore LR_COPYFROMRESOURCE

Author: gedmurphy
Date: Tue Dec 18 17:56:01 2007
New Revision: 31305

URL: http://svn.reactos.org/svn/reactos?rev=31305&view=rev
Log:
add LR_COPYDELETEORG and ignore LR_COPYFROMRESOURCE

Modified:
    trunk/reactos/dll/win32/user32/windows/bitmap.c

Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/bi...
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/bitmap.c (original)
+++ trunk/reactos/dll/win32/user32/windows/bitmap.c Tue Dec 18 17:56:01 2007
@@ -797,9 +797,9 @@
     if (!hIconCur)
         return NULL;

-    if (flags & LR_COPYFROMRESOURCE || flags & LR_CREATEDIBSECTION)
+    if (flags & LR_COPYFROMRESOURCE)
     {
-        FIXME("FIXME: LR_COPYFROMRESOURCE and LR_CREATEDIBSECTION are yet not implemented for icons\n");
+        FIXME("FIXME: LR_COPYFROMRESOURCE is yet not implemented for icons\n");
     }

if (NtUserGetIconSize(hIconCur, 0, &origSize.cx, &origSize.cy))
@@ -833,6 +833,10 @@
         }
     }

+    if (hNewIcon && (flags & LR_COPYDELETEORG))
+    {
+        DestroyCursor((HCURSOR)hIconCur);
+    }

return hNewIcon;
 }