[gadamopoulos] 55726: [win32k] - remove assertions from the process callout checking that ppiCurrent->rpdeskStartup and ppiCurrent->hdeskStartup are valid. This can happen in case we fail to open t...

Author: gadamopoulos
Date: Sun Feb 19 23:29:28 2012
New Revision: 55726

URL: http://svn.reactos.org/svn/reactos?rev=55726&view=rev
Log:
[win32k]
- remove assertions from the process callout checking that ppiCurrent->rpdeskStartup
and ppiCurrent->hdeskStartup are valid. This can happen in case we fail to open the
initial desktop or window station

Modified:
    trunk/reactos/subsystems/win32/win32k/main/dllmain.c

Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sun Feb 19 23:29:28
2012
@@ -187,10 +187,10 @@
         }
 
         /* Close the startup desktop */
-        ASSERT(ppiCurrent->rpdeskStartup);
-        ASSERT(ppiCurrent->hdeskStartup);
-        ObDereferenceObject(ppiCurrent->rpdeskStartup);
-        ZwClose(ppiCurrent->hdeskStartup);
+        if(ppiCurrent->rpdeskStartup)
+            ObDereferenceObject(ppiCurrent->rpdeskStartup);
+        if(ppiCurrent->hdeskStartup)
+            ZwClose(ppiCurrent->hdeskStartup);
 
         /* Close the current window station */
         UserSetProcessWindowStation(NULL);