[WIN32SS]
authorSylvain Petreolle <spetreolle@yahoo.fr>
Fri, 8 Aug 2014 16:14:38 +0000 (16:14 +0000)
committerSylvain Petreolle <spetreolle@yahoo.fr>
Fri, 8 Aug 2014 16:14:38 +0000 (16:14 +0000)
Fix new cursoricon implementation build.
Dedicated to Jim and J√©rome.

svn path=/trunk/; revision=63840

reactos/win32ss/user/ntuser/cursoricon.c
reactos/win32ss/user/ntuser/cursoricon_new.c

index 0476291..335aa87 100644 (file)
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS Win32k subsystem
  * PURPOSE:          Cursor and icon functions
- * FILE:             subsystems/win32/win32k/ntuser/cursoricon.c
+ * FILE:             win32ss/user/ntuser/cursoricon.c
  * PROGRAMER:        ReactOS Team
  */
 /*
index a6fbb23..40e2845 100644 (file)
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS Win32k subsystem
  * PURPOSE:          Cursor and icon functions
- * FILE:             subsystems/win32/win32k/ntuser/cursoricon.c
+ * FILE:             win32ss/user/ntuser/cursoricon.c
  * PROGRAMER:        ReactOS Team
  */
 /*
@@ -298,7 +298,7 @@ IntDestroyCursor(
 
     if (!(CurIcon = UserGetCurIconObject(hCurIcon)))
     {
-        RETURN(FALSE);
+        return(FALSE);
     }
 
     ret = IntDestroyCurIconObject(CurIcon, bForce);
@@ -1291,7 +1291,7 @@ UserDrawIconEx(
         /* We now have our destination surface */
         psurfDest = psurfOffScreen;
 #else
-        pdcClipObj = pdc->rosdc.CombinedClip;
+        pdcClipObj = &pdc->co.ClipObj;
         /* Paint the brush */
         EBRUSHOBJ_vInit(&eboFill, pbrush, psurfDest, 0x00FFFFFF, 0, NULL);
         
@@ -1322,7 +1322,7 @@ UserDrawIconEx(
     {
         /* We directly draw to the DC */
         TRACE("Performing on screen rendering.\n");
-        pdcClipObj = pdc->rosdc.CombinedClip;
+        pdcClipObj = &pdc->co.ClipObj;
         // psurfOffScreen = NULL;
     }