Piotr Caban : msvcp110: Use ___lc_locale_name_func in _Getctype.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Jun 17 10:18:11 CDT 2015


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

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Wed Jun 17 11:47:12 2015 +0200

msvcp110: Use ___lc_locale_name_func in _Getctype.

---

 dlls/msvcp90/locale.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c
index 1be7357..45a2af8 100644
--- a/dlls/msvcp90/locale.c
+++ b/dlls/msvcp90/locale.c
@@ -61,6 +61,7 @@ MSVCP_size_t __cdecl _Strftime(char*, MSVCP_size_t, const char*,
 const locale* __cdecl locale_classic(void);
 
 #if _MSVCP_VER >= 110
+wchar_t ** __cdecl ___lc_locale_name_func(void);
 static LCID* ___lc_handle_func(void)
 {
     LCID *ret;
@@ -688,8 +689,7 @@ _Ctypevec* __cdecl _Getctype(_Ctypevec *ret)
 #if _MSVCP_VER < 110
     ret->handle = ___lc_handle_func()[LC_COLLATE];
 #else
-    /* FIXME: use ___lc_locale_name_func() */
-    ret->name = NULL;
+    ret->name = ___lc_locale_name_func()[LC_COLLATE];
 #endif
     ret->delfl = TRUE;
     table = malloc(sizeof(short[256]));




More information about the wine-cvs mailing list