From 0b2da4ea54fe4798d2740e0b6c3543ec5f66f4eb Mon Sep 17 00:00:00 2001 From: Ged Murphy Date: Tue, 18 Dec 2007 14:56:01 +0000 Subject: [PATCH] add LR_COPYDELETEORG and ignore LR_COPYFROMRESOURCE svn path=/trunk/; revision=31305 --- reactos/dll/win32/user32/windows/bitmap.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/user32/windows/bitmap.c b/reactos/dll/win32/user32/windows/bitmap.c index 5d86072a3d6..3f542ed6498 100644 --- a/reactos/dll/win32/user32/windows/bitmap.c +++ b/reactos/dll/win32/user32/windows/bitmap.c @@ -797,9 +797,9 @@ CopyIcoCur(HANDLE hIconCur, 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 @@ CopyIcoCur(HANDLE hIconCur, } } + if (hNewIcon && (flags & LR_COPYDELETEORG)) + { + DestroyCursor((HCURSOR)hIconCur); + } return hNewIcon; }