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

msvcp90: Allocate facetvec of size at least 40 in locale::_Locimp::_Locimp_Addfac. 

Matlab depends on facetvec internal buffer not being reallocated.

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:35 +02:00 committed by Alexandre Julliard
parent 1dcf51f0fc
commit a8399b3872
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msvcp90/locale.c
View File

@ -10204,8 +10204,8 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet
MSVCP_size_t new_size = id+1; MSVCP_size_t new_size = id+1;
locale_facet **new_facetvec; locale_facet **new_facetvec;
if(new_size < locale_id__Id_cnt+1) if(new_size < 40)
new_size = locale_id__Id_cnt+1; new_size = 40;
new_facetvec = MSVCRT_operator_new(sizeof(locale_facet*)*new_size); new_facetvec = MSVCRT_operator_new(sizeof(locale_facet*)*new_size);
if(!new_facetvec) { if(!new_facetvec) {

35
dlls/msvcp90/tests/misc.c
View File

@ -81,6 +81,22 @@ typedef struct {
float imag; float imag;
} complex_float; } complex_float;
typedef struct {
void *vtable;
size_t refs;
} locale_facet;
typedef unsigned char MSVCP_bool;
typedef struct _locale__Locimp {
locale_facet facet;
locale_facet **facetvec;
size_t facet_cnt;
int catmask;
MSVCP_bool transparent;
basic_string_char name;
} locale__Locimp;
static void* (__cdecl *p_set_invalid_parameter_handler)(void*); static void* (__cdecl *p_set_invalid_parameter_handler)(void*);
static _locale_t (__cdecl *p__get_current_locale)(void); static _locale_t (__cdecl *p__get_current_locale)(void);
static void (__cdecl *p__free_locale)(_locale_t); static void (__cdecl *p__free_locale)(_locale_t);
@ -102,6 +118,7 @@ static MSVCP__Ctypevec* (__cdecl *p__Getctype)(MSVCP__Ctypevec*);
static /*MSVCP__Collvec*/ULONGLONG (__cdecl *p__Getcoll)(void); static /*MSVCP__Collvec*/ULONGLONG (__cdecl *p__Getcoll)(void);
static wctrans_t (__cdecl *p_wctrans)(const char*); static wctrans_t (__cdecl *p_wctrans)(const char*);
static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t); static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t);
static void (__cdecl *p_locale__Locimp__Locimp_Addfac)(locale__Locimp*,locale_facet*,size_t);
#undef __thiscall #undef __thiscall
#ifdef __i386__ #ifdef __i386__
@ -250,6 +267,8 @@ static BOOL init(void)
SET(p_std_Ctraits_long_double__Isnan, "?_Isnan@?$_Ctraits@O@std@@SA_NO@Z"); SET(p_std_Ctraits_long_double__Isnan, "?_Isnan@?$_Ctraits@O@std@@SA_NO@Z");
if(sizeof(void*) == 8) { /* 64-bit initialization */ if(sizeof(void*) == 8) { /* 64-bit initialization */
SET(p_locale__Locimp__Locimp_Addfac,
"?_Locimp_Addfac@_Locimp@locale@std@@CAXPEAV123@PEAVfacet@23@_K@Z");
SET(p_char_assign, "?assign@?$char_traits@D@std@@SAXAEADAEBD@Z"); SET(p_char_assign, "?assign@?$char_traits@D@std@@SAXAEADAEBD@Z");
SET(p_wchar_assign, "?assign@?$char_traits@_W@std@@SAXAEA_WAEB_W@Z"); SET(p_wchar_assign, "?assign@?$char_traits@_W@std@@SAXAEA_WAEB_W@Z");
SET(p_short_assign, "?assign@?$char_traits@G@std@@SAXAEAGAEBG@Z"); SET(p_short_assign, "?assign@?$char_traits@G@std@@SAXAEAGAEBG@Z");
@ -310,6 +329,8 @@ static BOOL init(void)
SET(p_complex_float_pow_cf, SET(p_complex_float_pow_cf,
"??$pow@M@std@@YA?AV?$complex@M@0@AEBV10@AEBM@Z"); "??$pow@M@std@@YA?AV?$complex@M@0@AEBV10@AEBM@Z");
} else { } else {
SET(p_locale__Locimp__Locimp_Addfac,
"?_Locimp_Addfac@_Locimp@locale@std@@CAXPAV123@PAVfacet@23@I@Z");
#ifdef __arm__ #ifdef __arm__
SET(p_char_assign, "?assign@?$char_traits@D@std@@SAXAADABD@Z"); SET(p_char_assign, "?assign@?$char_traits@D@std@@SAXAADABD@Z");
SET(p_wchar_assign, "?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z"); SET(p_wchar_assign, "?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z");
@ -1050,6 +1071,19 @@ static void test_vbtable_size_exports(void)
} }
} }
static void test_locale__Locimp__Locimp_Addfac(void)
{
locale__Locimp locimp;
locale_facet facet;
memset(&locimp, 0, sizeof(locimp));
memset(&facet, 0, sizeof(facet));
p_locale__Locimp__Locimp_Addfac(&locimp, &facet, 1);
ok(locimp.facet_cnt == 40, "locimp.facet_cnt = %d\n", (int)locimp.facet_cnt);
}
START_TEST(misc) START_TEST(misc)
{ {
if(!init()) if(!init())
@ -1068,6 +1102,7 @@ START_TEST(misc)
test_Ctraits_math_functions(); test_Ctraits_math_functions();
test_complex(); test_complex();
test_vbtable_size_exports(); test_vbtable_size_exports();
test_locale__Locimp__Locimp_Addfac();
ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");