From f696300a7ab3fcca049bc0cc8c8e8af5042f0d58 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Tue, 21 Oct 2014 18:59:39 +0000 Subject: [PATCH] [WIN32K] - Use the first frame of an animated cursor in case we're trying to use one. svn path=/trunk/; revision=64876 --- reactos/win32ss/user/ntuser/msgqueue.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/reactos/win32ss/user/ntuser/msgqueue.c b/reactos/win32ss/user/ntuser/msgqueue.c index 94b2b39639b..3a7f3b3549f 100644 --- a/reactos/win32ss/user/ntuser/msgqueue.c +++ b/reactos/win32ss/user/ntuser/msgqueue.c @@ -146,14 +146,20 @@ UserSetCursor( { /* Call GDI to set the new screen cursor */ #ifdef NEW_CURSORICON + PCURICON_OBJECT CursorFrame = NewCursor; + if(NewCursor->CURSORF_flags & CURSORF_ACON) + { + FIXME("Should animate the cursor, using only the first frame now.\n"); + CursorFrame = ((PACON)NewCursor)->aspcur[0]; + } GreSetPointerShape(hdcScreen, - NewCursor->hbmAlpha ? NULL : NewCursor->hbmMask, - NewCursor->hbmAlpha ? NewCursor->hbmAlpha : NewCursor->hbmColor, - NewCursor->xHotspot, - NewCursor->yHotspot, + CursorFrame->hbmAlpha ? NULL : NewCursor->hbmMask, + CursorFrame->hbmAlpha ? NewCursor->hbmAlpha : NewCursor->hbmColor, + CursorFrame->xHotspot, + CursorFrame->yHotspot, gpsi->ptCursor.x, gpsi->ptCursor.y, - NewCursor->hbmAlpha ? SPS_ALPHA : 0); + CursorFrame->hbmAlpha ? SPS_ALPHA : 0); #else GreSetPointerShape(hdcScreen, NewCursor->IconInfo.hbmMask, -- 2.17.1