Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-31 08:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIN32SS]

Browse source 
Fix new cursoricon implementation build.
Dedicated to Jim and Jérome.


svn path=/trunk/; revision=63840
This commit is contained in:
Sylvain Petreolle 2014-08-08 16:14:38 +00:00
parent 2a1a26424e
commit 8a230af1a7
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/win32ss/user/ntuser/cursoricon.c
View file

@ -2,7 +2,7 @@
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Win32k subsystem * PROJECT: ReactOS Win32k subsystem
* PURPOSE: Cursor and icon functions * PURPOSE: Cursor and icon functions
* FILE: subsystems/win32/win32k/ntuser/cursoricon.c * FILE: win32ss/user/ntuser/cursoricon.c
* PROGRAMER: ReactOS Team * PROGRAMER: ReactOS Team
*/ */
/* /*

8
reactos/win32ss/user/ntuser/cursoricon_new.c
View file

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