Skip to content

W
wine-cw
Commit 415d3a24 authored by Daniel Lehman's avatar Daniel Lehman Committed by Alexandre Julliard
Browse files
Options

msvcp: Free facet and _Locimp in Locimp dtor.

parent e74a99b7
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 40 deletions
dlls/msvcp100/locale.c
View file @ 415d3a24
......@@ -7230,17 +7230,17 @@ locale__Locimp* __cdecl locale__Locimp__Locimp_ctor(locale__Locimp *this, const
DEFINE_THISCALL_WRAPPER(locale__Locimp_dtor, 4)
void __thiscall locale__Locimp_dtor(locale__Locimp *this)
{
MSVCP_size_t i;
TRACE("(%p)\n", this);
if(locale_facet__Decref(&this->facet)) {
MSVCP_size_t i;
for(i=0; i<this->facet_cnt; i++)
if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i]))
call_locale_facet_vector_dtor(this->facetvec[i], 0);
locale_facet_dtor(&this->facet);
for(i=0; i<this->facet_cnt; i++)
if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i]))
call_locale_facet_vector_dtor(this->facetvec[i], 1);
MSVCRT_operator_delete(this->facetvec);
_Yarn_char_dtor(&this->name);
}
MSVCRT_operator_delete(this->facetvec);
_Yarn_char_dtor(&this->name);
}
/* ?_Locimp_dtor@_Locimp@locale@std@@CAXPAV123@@Z */
......@@ -7302,7 +7302,7 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet
}
if(locimp->facetvec[id] && locale_facet__Decref(locimp->facetvec[id]))
call_locale_facet_vector_dtor(locimp->facetvec[id], 0);
call_locale_facet_vector_dtor(locimp->facetvec[id], 1);
locimp->facetvec[id] = facet;
if(facet)
......@@ -7678,8 +7678,10 @@ locale* locale_ctor(locale *this)
void locale_dtor(locale *this)
{
TRACE("(%p)\n", this);
if(this->ptr)
if(this->ptr && locale_facet__Decref(&this->ptr->facet)) {
locale__Locimp_dtor(this->ptr);
MSVCRT_operator_delete(this->ptr);
}
}
/* ??4locale@std@@QAEAAV01@ABV01@@Z */
......
dlls/msvcp60/locale.c
View file @ 415d3a24
......@@ -7240,17 +7240,17 @@ static locale__Locimp* locale__Locimp_copy_ctor(locale__Locimp *this, const loca
/* ??1_Locimp@locale@std@@MEAA@XZ */
static void locale__Locimp_dtor(locale__Locimp *this)
{
MSVCP_size_t i;
TRACE("(%p)\n", this);
if(locale_facet__Decref(&this->facet)) {
MSVCP_size_t i;
for(i=0; i<this->facet_cnt; i++)
if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i]))
call_locale_facet_vector_dtor(this->facetvec[i], 0);
locale_facet_dtor(&this->facet);
for(i=0; i<this->facet_cnt; i++)
if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i]))
call_locale_facet_vector_dtor(this->facetvec[i], 1);
MSVCRT_operator_delete(this->facetvec);
basic_string_char_dtor(&this->name);
}
MSVCRT_operator_delete(this->facetvec);
basic_string_char_dtor(&this->name);
}
DEFINE_THISCALL_WRAPPER(locale__Locimp_vector_dtor, 8)
......@@ -7305,7 +7305,7 @@ static void locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet *
}
if(locimp->facetvec[id] && locale_facet__Decref(locimp->facetvec[id]))
call_locale_facet_vector_dtor(locimp->facetvec[id], 0);
call_locale_facet_vector_dtor(locimp->facetvec[id], 1);
locimp->facetvec[id] = facet;
if(facet)
......@@ -7758,8 +7758,10 @@ DEFINE_THISCALL_WRAPPER(locale_dtor, 4)
void __thiscall locale_dtor(locale *this)
{
TRACE("(%p)\n", this);
if(this->ptr)
if(this->ptr && locale_facet__Decref(&this->ptr->facet)) {
locale__Locimp_dtor(this->ptr);
MSVCRT_operator_delete(this);
}
}
/* ??4locale@std@@QAEAAV01@ABV01@@Z */
......
dlls/msvcp71/locale.c
View file @ 415d3a24
......@@ -7614,17 +7614,17 @@ locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const
/* ??1_Locimp@locale@std@@MEAA@XZ */
static void locale__Locimp_dtor(locale__Locimp *this)
{
MSVCP_size_t i;
TRACE("(%p)\n", this);
if(locale_facet__Decref(&this->facet)) {
MSVCP_size_t i;
for(i=0; i<this->facet_cnt; i++)
if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i]))
call_locale_facet_vector_dtor(this->facetvec[i], 0);
locale_facet_dtor(&this->facet);
for(i=0; i<this->facet_cnt; i++)
if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i]))
call_locale_facet_vector_dtor(this->facetvec[i], 1);
MSVCRT_operator_delete(this->facetvec);
MSVCP_basic_string_char_dtor(&this->name);
}
MSVCRT_operator_delete(this->facetvec);
MSVCP_basic_string_char_dtor(&this->name);
}
DEFINE_THISCALL_WRAPPER(locale__Locimp_vector_dtor, 8)
......@@ -7679,7 +7679,7 @@ static void locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet *
}
if(locimp->facetvec[id] && locale_facet__Decref(locimp->facetvec[id]))
call_locale_facet_vector_dtor(locimp->facetvec[id], 0);
call_locale_facet_vector_dtor(locimp->facetvec[id], 1);
locimp->facetvec[id] = facet;
if(facet)
......@@ -8133,8 +8133,10 @@ DEFINE_THISCALL_WRAPPER(locale_dtor, 4)
void __thiscall locale_dtor(locale *this)
{
TRACE("(%p)\n", this);
if(this->ptr)
if(this->ptr && locale_facet__Decref(&this->ptr->facet)) {
locale__Locimp_dtor(this->ptr);
MSVCRT_operator_delete(this);
}
}
/* ??4locale@std@@QAEAAV01@ABV01@@Z */
......
dlls/msvcp90/locale.c
View file @ 415d3a24
......@@ -7846,17 +7846,17 @@ locale__Locimp* __cdecl locale__Locimp__Locimp_ctor(locale__Locimp *this, const
DEFINE_THISCALL_WRAPPER(locale__Locimp_dtor, 4)
void __thiscall locale__Locimp_dtor(locale__Locimp *this)
{
MSVCP_size_t i;
TRACE("(%p)\n", this);
if(locale_facet__Decref(&this->facet)) {
MSVCP_size_t i;
for(i=0; i<this->facet_cnt; i++)
if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i]))
call_locale_facet_vector_dtor(this->facetvec[i], 0);
locale_facet_dtor(&this->facet);
for(i=0; i<this->facet_cnt; i++)
if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i]))
call_locale_facet_vector_dtor(this->facetvec[i], 1);
MSVCRT_operator_delete(this->facetvec);
MSVCP_basic_string_char_dtor(&this->name);
}
MSVCRT_operator_delete(this->facetvec);
MSVCP_basic_string_char_dtor(&this->name);
}
/* ?_Locimp_dtor@_Locimp@locale@std@@CAXPAV123@@Z */
......@@ -7918,7 +7918,7 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet
}
if(locimp->facetvec[id] && locale_facet__Decref(locimp->facetvec[id]))
call_locale_facet_vector_dtor(locimp->facetvec[id], 0);
call_locale_facet_vector_dtor(locimp->facetvec[id], 1);
locimp->facetvec[id] = facet;
if(facet)
......@@ -8380,8 +8380,11 @@ DEFINE_THISCALL_WRAPPER(locale_dtor, 4)
void __thiscall locale_dtor(locale *this)
{
TRACE("(%p)\n", this);
if(this->ptr)
if(this->ptr && locale_facet__Decref(&this->ptr->facet))
{
locale__Locimp_dtor(this->ptr);
MSVCRT_operator_delete(this->ptr);
}
}
/* ??4locale@std@@QAEAAV01@ABV01@@Z */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment