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

[Win32k]

Browse source 
- rpdeskParent can be NULL and should not be depended on! Fixes CORE-8665.

svn path=/trunk/; revision=64859
This commit is contained in:
James Tabor 2014-10-21 03:02:07 +00:00
parent ccf02b054c
commit 5c5affcc22
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
reactos/win32ss/user/ntuser/callproc.c
View file

@ -7,6 +7,7 @@
*/ */
#include <win32k.h> #include <win32k.h>
DBG_DEFAULT_CHANNEL(UserClass);
/* CALLPROC ******************************************************************/ /* CALLPROC ******************************************************************/
@ -110,6 +111,7 @@ UserGetCPD(
{ {
PCLS pCls; PCLS pCls;
PWND pWnd; PWND pWnd;
PDESKTOP pDesk;
PCALLPROCDATA CallProc = NULL; PCALLPROCDATA CallProc = NULL;
PTHREADINFO pti; PTHREADINFO pti;
@ -131,7 +133,14 @@ UserGetCPD(
// No luck, create a new one for the requested proc. // No luck, create a new one for the requested proc.
if (!CallProc) if (!CallProc)
{ {
CallProc = CreateCallProc( pCls->rpdeskParent, if (!pCls->rpdeskParent)
{
TRACE("Null DESKTOP Atom %d\n",pCls->atomClassName);
pDesk = pti->rpdesk;
}
else
pDesk = pCls->rpdeskParent;
CallProc = CreateCallProc( pDesk,
(WNDPROC)ProcIn, (WNDPROC)ProcIn,
!!(Flags & UserGetCPDA2U), !!(Flags & UserGetCPDA2U),
pti->ppi); pti->ppi);