Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-08 12:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed setting the cursor size member

Browse source 
svn path=/trunk/; revision=6648
This commit is contained in:
Thomas Bluemel 2003-11-15 12:43:25 +00:00
parent 1b844b220b
commit ef913e1a3b
1 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
reactos/subsys/win32k/objects/cursoricon.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id: cursoricon.c,v 1.18 2003/11/11 17:50:58 weiden Exp $ */
/* $Id: cursoricon.c,v 1.19 2003/11/15 12:43:25 weiden Exp $ */
#undef WIN32_LEAN_AND_MEAN
@ -439,6 +439,7 @@ NtUserCreateCursorIconHandle(PICONINFO IconInfo, BOOL Indirect)
{
PCURICON_OBJECT CurIconObject;
PWINSTATION_OBJECT WinStaObject;
PBITMAPOBJ bmp;
NTSTATUS Status;
HICON Ret;
@ -468,6 +469,23 @@ NtUserCreateCursorIconHandle(PICONINFO IconInfo, BOOL Indirect)
CurIconObject->IconInfo.hbmMask = IntCopyBitmap(CurIconObject->IconInfo.hbmMask);
CurIconObject->IconInfo.hbmColor = IntCopyBitmap(CurIconObject->IconInfo.hbmColor);
}
bmp = BITMAPOBJ_LockBitmap(CurIconObject->IconInfo.hbmColor);
if(bmp)
{
CurIconObject->Size.cx = bmp->size.cx;
CurIconObject->Size.cy = bmp->size.cy;
BITMAPOBJ_UnlockBitmap(CurIconObject->IconInfo.hbmColor);
}
else
{
bmp = BITMAPOBJ_LockBitmap(CurIconObject->IconInfo.hbmMask);
if(bmp)
{
CurIconObject->Size.cx = bmp->size.cx;
CurIconObject->Size.cy = bmp->size.cy / 2;
BITMAPOBJ_UnlockBitmap(CurIconObject->IconInfo.hbmMask);
}
}
}
else
{
@ -951,14 +969,24 @@ NtUserSetCursorIconContents(
goto done;
}
bmp = BITMAPOBJ_LockBitmap(CurIconObject->IconInfo.hbmMask);
if(!bmp)
goto done;
CurIconObject->Size.cx = bmp->size.cx;
CurIconObject->Size.cy = bmp->size.cy;
BITMAPOBJ_UnlockBitmap(CurIconObject->IconInfo.hbmMask);
bmp = BITMAPOBJ_LockBitmap(CurIconObject->IconInfo.hbmColor);
if(bmp)
{
CurIconObject->Size.cx = bmp->size.cx;
CurIconObject->Size.cy = bmp->size.cy;
BITMAPOBJ_UnlockBitmap(CurIconObject->IconInfo.hbmColor);
}
else
{
bmp = BITMAPOBJ_LockBitmap(CurIconObject->IconInfo.hbmMask);
if(!bmp)
goto done;
CurIconObject->Size.cx = bmp->size.cx;
CurIconObject->Size.cy = bmp->size.cy / 2;
BITMAPOBJ_UnlockBitmap(CurIconObject->IconInfo.hbmMask);
}
Ret = TRUE;