From 8a230af1a7e98e5d49e5bf8d312d2d04f239a32d Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Fri, 8 Aug 2014 16:14:38 +0000 Subject: [PATCH] =?utf8?q?[WIN32SS]=20Fix=20new=20cursoricon=20implementat?= =?utf8?q?ion=20build.=20Dedicated=20to=20Jim=20and=20J=C3=A9rome.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=63840 --- reactos/win32ss/user/ntuser/cursoricon.c | 2 +- reactos/win32ss/user/ntuser/cursoricon_new.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/reactos/win32ss/user/ntuser/cursoricon.c b/reactos/win32ss/user/ntuser/cursoricon.c index 0476291e8fa..335aa87e216 100644 --- a/reactos/win32ss/user/ntuser/cursoricon.c +++ b/reactos/win32ss/user/ntuser/cursoricon.c @@ -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 */ /* diff --git a/reactos/win32ss/user/ntuser/cursoricon_new.c b/reactos/win32ss/user/ntuser/cursoricon_new.c index a6fbb23c377..40e28458ea2 100644 --- a/reactos/win32ss/user/ntuser/cursoricon_new.c +++ b/reactos/win32ss/user/ntuser/cursoricon_new.c @@ -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; } -- 2.17.1