Do not free a Critical Section we did not initialize. Fixes the silent UM exception...

svn path=/trunk/; revision=17418

diff --git a/reactos/lib/kernel32/misc/dllmain.c b/reactos/lib/kernel32/misc/dllmain.c
index f429dbf..53ed566 100644 (file)
--- a/reactos/lib/kernel32/misc/dllmain.c
+++ b/reactos/lib/kernel32/misc/dllmain.c
@@ -26,6 +26,7 @@ HMODULE hCurrentModule = NULL;
 HANDLE hBaseDir = NULL;
 
 static BOOL DllInitialized = FALSE;
+static BOOL ConsoleInitialized = FALSE;
 
 BOOL STDCALL
 DllMain(HANDLE hInst,
@@ -141,6 +142,7 @@ BasepInitConsole(VOID)
     }
 
     /* Initialize Console Ctrl Handler */
+    ConsoleInitialized = TRUE;
     RtlInitializeCriticalSection(&ConsoleLock);
     SetConsoleCtrlHandler(DefaultConsoleCtrlHandler, TRUE);
 
@@ -289,7 +291,10 @@ DllMain(HANDLE hDll,
             NlsUninit();
 
            /* Delete DLL critical section */
-           RtlDeleteCriticalSection (&ConsoleLock);
+           if (ConsoleInitialized == TRUE)
+             {
+               RtlDeleteCriticalSection (&ConsoleLock);
+             }
            RtlDeleteCriticalSection (&DllLock);
 
            /* Close object base directory */