[ros-diffs] [jimtabor] 64859: [Win32k] - rpdeskParent can be NULL and should not be depended on! Fixes CORE-8665.

[jimtabor]

Author: jimtabor
Date: Tue Oct 21 03:02:07 2014
New Revision: 64859

URL: http://svn.reactos.org/svn/reactos?rev=64859&view=rev
Log:
[Win32k]
- rpdeskParent can be NULL and should not be depended on! Fixes CORE-8665.

Modified:
    trunk/reactos/win32ss/user/ntuser/callproc.c

Modified: trunk/reactos/win32ss/user/ntuser/callproc.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callproc.c?rev=64859&r1=64858&r2=64859&view=diff
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/callproc.c        [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/callproc.c        [iso-8859-1] Tue Oct 21 
03:02:07 2014
@@ -7,6 +7,7 @@
  */
 
 #include <win32k.h>
+DBG_DEFAULT_CHANNEL(UserClass);
 
 /* CALLPROC ******************************************************************/
 
@@ -110,6 +111,7 @@
 {
    PCLS pCls;
    PWND pWnd;
+   PDESKTOP pDesk;
    PCALLPROCDATA CallProc = NULL;
    PTHREADINFO pti;
 
@@ -131,7 +133,14 @@
    // 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);