[ros-diffs] [zguo] 64944: [WIN32SS] Cherrypick fix for OffByOne browser where parent desktop handle is null for 0.3.17. CORE-8665

Author: zguo
Date: Thu Oct 23 20:52:25 2014
New Revision: 64944

URL: http://svn.reactos.org/svn/reactos?rev=64944&view=rev
Log:
[WIN32SS]
Cherrypick fix for OffByOne browser where parent desktop handle is null for 0.3.17.

CORE-8665

Modified:
    branches/0.3.17/reactos/   (props changed)
    branches/0.3.17/reactos/win32ss/user/ntuser/callproc.c

Propchange: branches/0.3.17/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Thu Oct 23 20:52:25 2014
@@ -18,4 +18,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64909
+/trunk/reactos:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64859,64909

Modified: branches/0.3.17/reactos/win32ss/user/ntuser/callproc.c
URL:
http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/win32ss/user/ntu…
==============================================================================
--- branches/0.3.17/reactos/win32ss/user/ntuser/callproc.c	[iso-8859-1] (original)
+++ branches/0.3.17/reactos/win32ss/user/ntuser/callproc.c	[iso-8859-1] Thu Oct 23
20:52:25 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);