Piotr Caban : msvcp90: Fixed locale_ctor_cstr implementation.

Alexandre Julliard julliard at winehq.org
Thu Sep 6 13:37:22 CDT 2012


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

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Thu Sep  6 11:41:31 2012 +0200

msvcp90: Fixed locale_ctor_cstr implementation.

---

 dlls/msvcp100/locale.c |    4 +++-
 dlls/msvcp90/locale.c  |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c
index b217232..1bba834 100644
--- a/dlls/msvcp100/locale.c
+++ b/dlls/msvcp100/locale.c
@@ -8142,7 +8142,9 @@ locale* __thiscall locale_ctor_cstr(locale *this, const char *locname, category
         ERR("Out of memory\n");
         throw_exception(EXCEPTION_BAD_ALLOC, NULL);
     }
-    this->ptr = locale__Init();
+    locale__Locimp_ctor(this->ptr);
+
+    locale__Init();
 
     _Locinfo_ctor_cat_cstr(&locinfo, cat, locname);
     if(!memcmp(MSVCP_basic_string_char_c_str(&locinfo.newlocname), "*", 2)) {
diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c
index 7e6b10f..1d9eb33 100644
--- a/dlls/msvcp90/locale.c
+++ b/dlls/msvcp90/locale.c
@@ -8293,7 +8293,9 @@ locale* __thiscall locale_ctor_cstr(locale *this, const char *locname, category
         ERR("Out of memory\n");
         throw_exception(EXCEPTION_BAD_ALLOC, NULL);
     }
-    this->ptr = locale__Init();
+    locale__Locimp_ctor(this->ptr);
+
+    locale__Init();
 
     _Locinfo_ctor_cat_cstr(&locinfo, cat, locname);
     if(!memcmp(MSVCP_basic_string_char_c_str(&locinfo.newlocname), "*", 2)) {




More information about the wine-cvs mailing list