msvcrt: Fix locale initialization.

2548742b · Piotr Caban · Alexandre Julliard · f2f56d56 · 2548742b
Commit 2548742b authored Apr 15, 2010 by Piotr Caban Committed by Alexandre Julliard Apr 16, 2010
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

main.c dlls/msvcrt/main.c +3 -5

No files found.
--- a/dlls/msvcrt/main.c
+++ b/dlls/msvcrt/main.c
@@ -87,14 +87,12 @@ 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();
-        return FALSE;
-    }
-    if (!msvcrt_init_tls()) {
-      _free_locale(MSVCRT_locale);
-      msvcrt_free_mt_locks();
+        msvcrt_free_tls_mem();
        return FALSE;
    }
    msvcrt_init_io();