[ros-diffs] [spetreolle] 63840: [WIN32SS] Fix new cursoricon implementation build. Dedicated to Jim and Jérome.

Author: spetreolle
Date: Fri Aug  8 16:14:38 2014
New Revision: 63840

URL: http://svn.reactos.org/svn/reactos?rev=63840&view=rev
Log:
[WIN32SS]
Fix new cursoricon implementation build.
Dedicated to Jim and Jérome.

Modified:
    trunk/reactos/win32ss/user/ntuser/cursoricon.c
    trunk/reactos/win32ss/user/ntuser/cursoricon_new.c

Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursori...
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/cursoricon.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/cursoricon.c	[iso-8859-1] Fri Aug  8 16:14:38 2014
@@ -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
  */
 /*

Modified: trunk/reactos/win32ss/user/ntuser/cursoricon_new.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursori...
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/cursoricon_new.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/cursoricon_new.c	[iso-8859-1] Fri Aug  8 16:14:38 2014
@@ -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 @@

if (!(CurIcon = UserGetCurIconObject(hCurIcon)))
     {
-        RETURN(FALSE);
+        return(FALSE);
     }

ret = IntDestroyCurIconObject(CurIcon, bForce);
@@ -1291,7 +1291,7 @@
         /* 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 @@
     {
         /* We directly draw to the DC */
         TRACE("Performing on screen rendering.\n");
-        pdcClipObj = pdc->rosdc.CombinedClip;
+        pdcClipObj = &pdc->co.ClipObj;
         // psurfOffScreen = NULL;
     }