[ros-diffs] [tfaber] 67250: [MSVCR*] - Don't bother to clean up at process exit (Wine commit 66a54686 by Alexandre Julliard)

Author: tfaber
Date: Sat Apr 18 12:15:15 2015
New Revision: 67250

URL: http://svn.reactos.org/svn/reactos?rev=67250&view=rev
Log:
[MSVCR*]
- Don't bother to clean up at process exit (Wine commit 66a54686 by Alexandre
Julliard)

Modified:
    trunk/reactos/dll/win32/crtdll/dllmain.c
    trunk/reactos/dll/win32/msvcrt/dllmain.c
    trunk/reactos/dll/win32/msvcrt20/msvcrt20.c
    trunk/reactos/dll/win32/msvcrt40/msvcrt40.c

Modified: trunk/reactos/dll/win32/crtdll/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/dllmain.c…
==============================================================================
--- trunk/reactos/dll/win32/crtdll/dllmain.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crtdll/dllmain.c	[iso-8859-1] Sat Apr 18 12:15:15 2015
@@ -160,6 +160,7 @@
         TRACE("Detach\n");
         /* Deinit of the WINE code */
         msvcrt_free_io();
+        if (reserved) break;
         msvcrt_free_mt_locks();
         //msvcrt_free_console();
         //msvcrt_free_args();
@@ -169,12 +170,12 @@
           return FALSE;
         //MSVCRT__free_locale(MSVCRT_locale);
 
-    if (__winitenv && __winitenv != _wenviron)
+        if (__winitenv && __winitenv != _wenviron)
             FreeEnvironment((char**)__winitenv);
         if (_wenviron)
             FreeEnvironment((char**)_wenviron);
 
-    if (__initenv && __initenv != _environ)
+        if (__initenv && __initenv != _environ)
             FreeEnvironment(__initenv);
         if (_environ)
             FreeEnvironment(_environ);

Modified: trunk/reactos/dll/win32/msvcrt/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/dllmain.c…
==============================================================================
--- trunk/reactos/dll/win32/msvcrt/dllmain.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvcrt/dllmain.c	[iso-8859-1] Sat Apr 18 12:15:15 2015
@@ -97,6 +97,7 @@
         TRACE("Detach\n");
         /* Deinit of the WINE code */
         msvcrt_free_io();
+        if (reserved) break;
         msvcrt_free_mt_locks();
         //msvcrt_free_console();
         //msvcrt_free_args();
@@ -107,12 +108,12 @@
         if(global_locale)
           MSVCRT__free_locale(global_locale);
 
-    if (__winitenv && __winitenv != _wenviron)
+        if (__winitenv && __winitenv != _wenviron)
             FreeEnvironment((char**)__winitenv);
         if (_wenviron)
             FreeEnvironment((char**)_wenviron);
 
-    if (__initenv && __initenv != _environ)
+        if (__initenv && __initenv != _environ)
             FreeEnvironment(__initenv);
         if (_environ)
             FreeEnvironment(_environ);

Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2…
==============================================================================
--- trunk/reactos/dll/win32/msvcrt20/msvcrt20.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvcrt20/msvcrt20.c	[iso-8859-1] Sat Apr 18 12:15:15 2015
@@ -116,6 +116,7 @@
         TRACE("Detach\n");
         /* Deinit of the WINE code */
         msvcrt_free_io();
+        if (reserved) break;
         msvcrt_free_mt_locks();
         //msvcrt_free_console();
         //msvcrt_free_args();
@@ -126,12 +127,12 @@
         if(global_locale)
           MSVCRT__free_locale(global_locale);
 
-    if (__winitenv && __winitenv != _wenviron)
+        if (__winitenv && __winitenv != _wenviron)
             FreeEnvironment((char**)__winitenv);
         if (_wenviron)
             FreeEnvironment((char**)_wenviron);
 
-    if (__initenv && __initenv != _environ)
+        if (__initenv && __initenv != _environ)
             FreeEnvironment(__initenv);
         if (_environ)
             FreeEnvironment(_environ);

Modified: trunk/reactos/dll/win32/msvcrt40/msvcrt40.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt40/msvcrt4…
==============================================================================
--- trunk/reactos/dll/win32/msvcrt40/msvcrt40.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvcrt40/msvcrt40.c	[iso-8859-1] Sat Apr 18 12:15:15 2015
@@ -112,6 +112,7 @@
         TRACE("Detach\n");
         /* Deinit of the WINE code */
         msvcrt_free_io();
+        if (reserved) break;
         msvcrt_free_mt_locks();
         //msvcrt_free_console();
         //msvcrt_free_args();
@@ -122,12 +123,12 @@
         if(global_locale)
           MSVCRT__free_locale(global_locale);
 
-    if (__winitenv && __winitenv != _wenviron)
+        if (__winitenv && __winitenv != _wenviron)
             FreeEnvironment((char**)__winitenv);
         if (_wenviron)
             FreeEnvironment((char**)_wenviron);
 
-    if (__initenv && __initenv != _environ)
+        if (__initenv && __initenv != _environ)
             FreeEnvironment(__initenv);
         if (_environ)
             FreeEnvironment(_environ);