Author: jgardou
Date: Thu Oct 23 11:45:50 2014
New Revision: 64918
URL: http://svn.reactos.org/svn/reactos?rev=64918&view=rev
Log:
[USER32]
- Cursoricon objects are allocated on the user heap, not the desktop heap.
CORE-7575
Modified:
trunk/reactos/win32ss/user/user32/windows/class.c
Modified: trunk/reactos/win32ss/user/user32/windows/class.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/windows/class.c?rev=64918&r1=64917&r2=64918&view=diff
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Thu Oct 23
11:45:50 2014
@@ -714,15 +714,15 @@
break;
#ifdef NEW_CURSORICON
case GCLP_HCURSOR:
- Ret = Class->spcur ?
(ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spcur))->h : 0;
+ Ret = Class->spcur ?
(ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spcur))->h : 0;
break;
case GCLP_HICON:
- Ret = Class->spicn ?
(ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spicn))->h : 0;
+ Ret = Class->spicn ?
(ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spicn))->h : 0;
break;
case GCLP_HICONSM:
- Ret = Class->spicnSm ?
(ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spicnSm))->h : 0;
+ Ret = Class->spicnSm ?
(ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spicnSm))->h : 0;
break;
#else
case GCLP_HCURSOR:
@@ -805,15 +805,15 @@
#ifdef NEW_CURSORICON
case GCLP_HCURSOR:
- Ret = Class->spcur ?
(ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spcur))->h : 0;
+ Ret = Class->spcur ?
(ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spcur))->h : 0;
break;
case GCLP_HICON:
- Ret = Class->spicn ?
(ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spicn))->h : 0;
+ Ret = Class->spicn ?
(ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spicn))->h : 0;
break;
case GCLP_HICONSM:
- Ret = Class->spicnSm ?
(ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spicnSm))->h : 0;
+ Ret = Class->spicnSm ?
(ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spicnSm))->h : 0;
break;
#else
case GCLP_HCURSOR:
