Piotr Caban : msvcr100: Add missing fields to lconv structure.

[Alexandre Julliard]

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

Author: Piotr Caban 
Date:   Wed May  4 14:29:50 2016 +0200

msvcr100: Add missing fields to lconv structure.

Signed-off-by: Piotr Caban 
Signed-off-by: Alexandre Julliard

---

dlls/msvcrt/locale.c | 16 ++++++++--------
 dlls/msvcrt/msvcrt.h |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c
index a1551c2..eed5a37 100644
--- a/dlls/msvcrt/locale.c
+++ b/dlls/msvcrt/locale.c
@@ -769,7 +769,7 @@ void free_locinfo(MSVCRT_pthreadlocinfo locinfo)
         MSVCRT_free(locinfo->lconv->mon_grouping);
         MSVCRT_free(locinfo->lconv->positive_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_thousands_sep);
         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;
     unsigned short cp[6] = { 0 };
     char buf[256];
-#if _MSVCR_VER >= 120
+#if _MSVCR_VER >= 100
     MSVCRT_wchar_t wbuf[256];
 #endif
     int i, ret, size;
@@ -1262,7 +1262,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
             return NULL;
         }

-#if _MSVCR_VER >= 120
+#if _MSVCR_VER >= 100
         i = GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_SINTLSYMBOL
                 |LOCALE_NOUSEROVERRIDE, wbuf, 256);
         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->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_currency_symbol = 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;
         }

-#if _MSVCR_VER >= 120
+#if _MSVCR_VER >= 100
         i = GetLocaleInfoW(lcid[MSVCRT_LC_NUMERIC], LOCALE_SDECIMAL
                 |LOCALE_NOUSEROVERRIDE, wbuf, 256);
         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->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_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,
                 (void**)&newlocinfo->lconv->negative_sign);

-#if _MSVCR_VER >= 120
+#if _MSVCR_VER >= 100
         swap_pointers((void**)&locinfo->lconv->_W_int_curr_symbol,
                 (void**)&newlocinfo->lconv->_W_int_curr_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,
                 (void**)&newlocinfo->lconv->grouping);

-#if _MSVCR_VER >= 120
+#if _MSVCR_VER >= 100
         swap_pointers((void**)&locinfo->lconv->_W_decimal_point,
                 (void**)&newlocinfo->lconv->_W_decimal_point);
         swap_pointers((void**)&locinfo->lconv->_W_thousands_sep,
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index 5c26866..2d3fc94 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -410,7 +410,7 @@ struct MSVCRT_lconv {
     char n_sep_by_space;
     char p_sign_posn;
     char n_sign_posn;
-#if _MSVCR_VER >= 120
+#if _MSVCR_VER >= 100
     MSVCRT_wchar_t* _W_decimal_point;
     MSVCRT_wchar_t* _W_thousands_sep;
     MSVCRT_wchar_t* _W_int_curr_symbol;