[WIN32K]

 - Use the first frame of an animated cursor in case we're trying to use one.

svn path=/trunk/; revision=64876

diff --git a/reactos/win32ss/user/ntuser/msgqueue.c b/reactos/win32ss/user/ntuser/msgqueue.c
index 94b2b39..3a7f3b3 100644 (file)
--- 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
         {
             /* 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,
             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,
                                gpsi->ptCursor.x,
                                gpsi->ptCursor.y,

-                               NewCursor->hbmAlpha ? SPS_ALPHA : 0);
+                               CursorFrame->hbmAlpha ? SPS_ALPHA : 0);

 #else
             GreSetPointerShape(hdcScreen,
                                NewCursor->IconInfo.hbmMask,
 #else
             GreSetPointerShape(hdcScreen,
                                NewCursor->IconInfo.hbmMask,