ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcr100: Add missing fields to lconv structure. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2016-05-04 14:29:50 +02:00 committed by Alexandre Julliard
parent a8399b3872
commit de12cd580a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/msvcrt/locale.c
View File

@ -769,7 +769,7 @@ void free_locinfo(MSVCRT_pthreadlocinfo locinfo)
MSVCRT_free(locinfo->lconv->mon_grouping); MSVCRT_free(locinfo->lconv->mon_grouping);
MSVCRT_free(locinfo->lconv->positive_sign); MSVCRT_free(locinfo->lconv->positive_sign);
MSVCRT_free(locinfo->lconv->negative_sign); MSVCRT_free(locinfo->lconv->negative_sign);
#if _MSVCR_VER >= 120 #if _MSVCR_VER >= 100
MSVCRT_free(locinfo->lconv->_W_decimal_point); MSVCRT_free(locinfo->lconv->_W_decimal_point);
MSVCRT_free(locinfo->lconv->_W_thousands_sep); MSVCRT_free(locinfo->lconv->_W_thousands_sep);
MSVCRT_free(locinfo->lconv->_W_int_curr_symbol); MSVCRT_free(locinfo->lconv->_W_int_curr_symbol);
@ -908,7 +908,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
LCID lcid[6] = { 0 }, lcid_tmp; LCID lcid[6] = { 0 }, lcid_tmp;
unsigned short cp[6] = { 0 }; unsigned short cp[6] = { 0 };
char buf[256]; char buf[256];
#if _MSVCR_VER >= 120 #if _MSVCR_VER >= 100
MSVCRT_wchar_t wbuf[256]; MSVCRT_wchar_t wbuf[256];
#endif #endif
int i, ret, size; int i, ret, size;
@ -1262,7 +1262,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
return NULL; return NULL;
} }
#if _MSVCR_VER >= 120 #if _MSVCR_VER >= 100
i = GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_SINTLSYMBOL i = GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_SINTLSYMBOL
|LOCALE_NOUSEROVERRIDE, wbuf, 256); |LOCALE_NOUSEROVERRIDE, wbuf, 256);
if(i && (locinfo->lconv->_W_int_curr_symbol = MSVCRT_malloc(i * sizeof(MSVCRT_wchar_t)))) if(i && (locinfo->lconv->_W_int_curr_symbol = MSVCRT_malloc(i * sizeof(MSVCRT_wchar_t))))
@ -1355,7 +1355,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
locinfo->lconv->p_sign_posn = 127; locinfo->lconv->p_sign_posn = 127;
locinfo->lconv->n_sign_posn = 127; locinfo->lconv->n_sign_posn = 127;
#if _MSVCR_VER >= 120 #if _MSVCR_VER >= 100
locinfo->lconv->_W_int_curr_symbol = MSVCRT_malloc(sizeof(MSVCRT_wchar_t)); locinfo->lconv->_W_int_curr_symbol = MSVCRT_malloc(sizeof(MSVCRT_wchar_t));
locinfo->lconv->_W_currency_symbol = MSVCRT_malloc(sizeof(MSVCRT_wchar_t)); locinfo->lconv->_W_currency_symbol = MSVCRT_malloc(sizeof(MSVCRT_wchar_t));
locinfo->lconv->_W_mon_decimal_point = MSVCRT_malloc(sizeof(MSVCRT_wchar_t)); locinfo->lconv->_W_mon_decimal_point = MSVCRT_malloc(sizeof(MSVCRT_wchar_t));
@ -1436,7 +1436,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
return NULL; return NULL;
} }
#if _MSVCR_VER >= 120 #if _MSVCR_VER >= 100
i = GetLocaleInfoW(lcid[MSVCRT_LC_NUMERIC], LOCALE_SDECIMAL i = GetLocaleInfoW(lcid[MSVCRT_LC_NUMERIC], LOCALE_SDECIMAL
|LOCALE_NOUSEROVERRIDE, wbuf, 256); |LOCALE_NOUSEROVERRIDE, wbuf, 256);
if(i && (locinfo->lconv->_W_decimal_point = MSVCRT_malloc(i * sizeof(MSVCRT_wchar_t)))) if(i && (locinfo->lconv->_W_decimal_point = MSVCRT_malloc(i * sizeof(MSVCRT_wchar_t))))
@ -1475,7 +1475,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
locinfo->lconv->thousands_sep[0] = '\0'; locinfo->lconv->thousands_sep[0] = '\0';
locinfo->lconv->grouping[0] = '\0'; locinfo->lconv->grouping[0] = '\0';
#if _MSVCR_VER >= 120 #if _MSVCR_VER >= 100
locinfo->lconv->_W_decimal_point = MSVCRT_malloc(sizeof(MSVCRT_wchar_t[2])); locinfo->lconv->_W_decimal_point = MSVCRT_malloc(sizeof(MSVCRT_wchar_t[2]));
locinfo->lconv->_W_thousands_sep = MSVCRT_malloc(sizeof(MSVCRT_wchar_t)); locinfo->lconv->_W_thousands_sep = MSVCRT_malloc(sizeof(MSVCRT_wchar_t));
@ -1719,7 +1719,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale)
swap_pointers((void**)&locinfo->lconv->negative_sign, swap_pointers((void**)&locinfo->lconv->negative_sign,
(void**)&newlocinfo->lconv->negative_sign); (void**)&newlocinfo->lconv->negative_sign);
#if _MSVCR_VER >= 120 #if _MSVCR_VER >= 100
swap_pointers((void**)&locinfo->lconv->_W_int_curr_symbol, swap_pointers((void**)&locinfo->lconv->_W_int_curr_symbol,
(void**)&newlocinfo->lconv->_W_int_curr_symbol); (void**)&newlocinfo->lconv->_W_int_curr_symbol);
swap_pointers((void**)&locinfo->lconv->_W_currency_symbol, swap_pointers((void**)&locinfo->lconv->_W_currency_symbol,
@ -1767,7 +1767,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale)
swap_pointers((void**)&locinfo->lconv->grouping, swap_pointers((void**)&locinfo->lconv->grouping,
(void**)&newlocinfo->lconv->grouping); (void**)&newlocinfo->lconv->grouping);
#if _MSVCR_VER >= 120 #if _MSVCR_VER >= 100
swap_pointers((void**)&locinfo->lconv->_W_decimal_point, swap_pointers((void**)&locinfo->lconv->_W_decimal_point,
(void**)&newlocinfo->lconv->_W_decimal_point); (void**)&newlocinfo->lconv->_W_decimal_point);
swap_pointers((void**)&locinfo->lconv->_W_thousands_sep, swap_pointers((void**)&locinfo->lconv->_W_thousands_sep,

2
dlls/msvcrt/msvcrt.h
View File

@ -410,7 +410,7 @@ struct MSVCRT_lconv {
char n_sep_by_space; char n_sep_by_space;
char p_sign_posn; char p_sign_posn;
char n_sign_posn; char n_sign_posn;
#if _MSVCR_VER >= 120 #if _MSVCR_VER >= 100
MSVCRT_wchar_t* _W_decimal_point; MSVCRT_wchar_t* _W_decimal_point;
MSVCRT_wchar_t* _W_thousands_sep; MSVCRT_wchar_t* _W_thousands_sep;
MSVCRT_wchar_t* _W_int_curr_symbol; MSVCRT_wchar_t* _W_int_curr_symbol;