- 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

View file

@ -7,6 +7,7 @@
*/
#include <win32k.h>
DBG_DEFAULT_CHANNEL(UserClass);
/* CALLPROC ******************************************************************/
@ -110,6 +111,7 @@ UserGetCPD(
{
PCLS pCls;
PWND pWnd;
PDESKTOP pDesk;
PCALLPROCDATA CallProc = NULL;
PTHREADINFO pti;
@ -131,7 +133,14 @@ UserGetCPD(
// No luck, create a new one for the requested proc.
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,
!!(Flags & UserGetCPDA2U),
pti->ppi);