Piotr Caban : msvcrt: Pass pthreadlocinfo to set_lc_locale_name function.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Sep 25 15:22:02 CDT 2015
Module: wine
Branch: master
Commit: 905daf251a6d383a894ff34113f80c603d041e84
URL: http://source.winehq.org/git/wine.git/?a=commit;h=905daf251a6d383a894ff34113f80c603d041e84
Author: Piotr Caban <piotr at codeweavers.com>
Date: Thu Sep 24 16:15:50 2015 +0200
msvcrt: Pass pthreadlocinfo to set_lc_locale_name function.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
---
dlls/msvcrt/locale.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c
index b5fca6e..6320d3a 100644
--- a/dlls/msvcrt/locale.c
+++ b/dlls/msvcrt/locale.c
@@ -830,9 +830,9 @@ void CDECL MSVCRT__free_locale(MSVCRT__locale_t locale)
}
#if _MSVCR_VER >= 110
-static inline BOOL set_lc_locale_name(MSVCRT__locale_t loc, int cat)
+static inline BOOL set_lc_locale_name(MSVCRT_pthreadlocinfo locinfo, int cat)
{
- LCID lcid = loc->locinfo->lc_handle[cat];
+ LCID lcid = locinfo->lc_handle[cat];
WCHAR buf[100];
int len;
@@ -843,14 +843,14 @@ static inline BOOL set_lc_locale_name(MSVCRT__locale_t loc, int cat)
if(LocaleNameToLCID(buf, 0) != lcid)
len = LCIDToLocaleName(lcid, buf, 100, 0);
- if(!len || !(loc->locinfo->lc_name[cat] = MSVCRT_malloc(len*sizeof(MSVCRT_wchar_t))))
+ if(!len || !(locinfo->lc_name[cat] = MSVCRT_malloc(len*sizeof(MSVCRT_wchar_t))))
return FALSE;
- memcpy(loc->locinfo->lc_name[cat], buf, len*sizeof(MSVCRT_wchar_t));
+ memcpy(locinfo->lc_name[cat], buf, len*sizeof(MSVCRT_wchar_t));
return TRUE;
}
#else
-static inline BOOL set_lc_locale_name(MSVCRT__locale_t loc, int cat)
+static inline BOOL set_lc_locale_name(MSVCRT_pthreadlocinfo locinfo, int cat)
{
return TRUE;
}
@@ -1013,7 +1013,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale)
loc->locinfo->lc_collate_cp = loc->locinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage;
- if(!set_lc_locale_name(loc, MSVCRT_LC_COLLATE)) {
+ if(!set_lc_locale_name(loc->locinfo, MSVCRT_LC_COLLATE)) {
MSVCRT__free_locale(loc);
return NULL;
}
@@ -1063,7 +1063,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale)
for(j=cp_info.LeadByte[i]; j<=cp_info.LeadByte[i+1]; j++)
loc->locinfo->ctype1[j+1] |= MSVCRT__LEADBYTE;
- if(!set_lc_locale_name(loc, MSVCRT_LC_CTYPE)) {
+ if(!set_lc_locale_name(loc->locinfo, MSVCRT_LC_CTYPE)) {
MSVCRT__free_locale(loc);
return NULL;
}
@@ -1301,7 +1301,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale)
}
#endif
- if(!set_lc_locale_name(loc, MSVCRT_LC_MONETARY)) {
+ if(!set_lc_locale_name(loc->locinfo, MSVCRT_LC_MONETARY)) {
MSVCRT__free_locale(loc);
return NULL;
}
@@ -1434,7 +1434,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale)
}
#endif
- if(!set_lc_locale_name(loc, MSVCRT_LC_NUMERIC)) {
+ if(!set_lc_locale_name(loc->locinfo, MSVCRT_LC_NUMERIC)) {
MSVCRT__free_locale(loc);
return NULL;
}
@@ -1476,7 +1476,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale)
return NULL;
}
- if(!set_lc_locale_name(loc, MSVCRT_LC_TIME)) {
+ if(!set_lc_locale_name(loc->locinfo, MSVCRT_LC_TIME)) {
MSVCRT__free_locale(loc);
return NULL;
}
More information about the wine-cvs
mailing list