Piotr Caban : msvcrt: Fix locale initialization.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2548742bb49812aaa6c24dea2d51d092bd3d62e6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2548742bb49812aaa6c24dea2d...

Author: Piotr Caban 
Date:   Thu Apr 15 23:13:59 2010 +0200

msvcrt: Fix locale initialization.

---

dlls/msvcrt/main.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c
index e2184b3..272ba71 100644
--- a/dlls/msvcrt/main.c
+++ b/dlls/msvcrt/main.c
@@ -87,16 +87,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
   switch (fdwReason)
   {
   case DLL_PROCESS_ATTACH:
+    if (!msvcrt_init_tls())
+      return FALSE;
     msvcrt_init_mt_locks();
     if(!MSVCRT_setlocale(0, "C")) {
         msvcrt_free_mt_locks();
+        msvcrt_free_tls_mem();
         return FALSE;
     }
-    if (!msvcrt_init_tls()) {
-      _free_locale(MSVCRT_locale);
-      msvcrt_free_mt_locks();
-      return FALSE;
-    }
     msvcrt_init_io();
     msvcrt_init_console();
     msvcrt_init_args();