Skip to content

W
wine-winehq
Commit ff5d176c authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcp90: Always throw bad_alloc exception in operator_new on allocation failure.

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 3a86f0a6
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 393 deletions
dlls/msvcp60/ios.c
View file @ ff5d176c
......@@ -3913,10 +3913,6 @@ void __thiscall basic_stringbuf_char__Init(basic_stringbuf_char *this, const cha
if(count && str) {
char *buf = operator_new(count);
if(!buf) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
memcpy(buf, str, count);
this->seekhigh = buf + count;
......@@ -4051,10 +4047,6 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met
size = oldsize|0xf;
size += size/2;
buf = operator_new(size);
if(!buf) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
if(!oldsize) {
this->seekhigh = buf;
......@@ -4290,10 +4282,6 @@ void __thiscall basic_stringbuf_wchar__Init(basic_stringbuf_wchar *this, const w
if(count && str) {
wchar_t *buf = operator_new(count*sizeof(wchar_t));
if(!buf) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
memcpy(buf, str, count*sizeof(wchar_t));
this->seekhigh = buf + count;
......@@ -4464,10 +4452,6 @@ unsigned short __thiscall basic_stringbuf_wchar_overflow(basic_stringbuf_wchar *
size = oldsize|0xf;
size += size/2;
buf = operator_new(size*sizeof(wchar_t));
if(!buf) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
if(!oldsize) {
this->seekhigh = buf;
......
dlls/msvcp60/main.c
View file @ ff5d176c
......@@ -58,24 +58,36 @@ DEFINE_VTBL_WRAPPER(56);
/* ?_Fpz@std@@3_JB */
const __int64 std_Fpz = 0;
void* (__cdecl *operator_new)(size_t);
void (__cdecl *operator_delete)(void*);
static void* (__cdecl *MSVCRT_operator_new)(size_t);
static void (__cdecl *MSVCRT_operator_delete)(void*);
void* (__cdecl *MSVCRT_set_new_handler)(void*);
void* __cdecl operator_new(size_t size)
{
void *ret = MSVCRT_operator_new(size);
if (!ret) throw_exception(EXCEPTION_BAD_ALLOC, "bad allocation");
return ret;
}
void __cdecl operator_delete(void *mem)
{
MSVCRT_operator_delete(mem);
}
static void init_cxx_funcs(void)
{
HMODULE hmod = GetModuleHandleA("msvcrt.dll");
if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */
{
operator_new = (void*)GetProcAddress(hmod, "??2@YAPEAX_K@Z");
operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPEAX@Z");
MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPEAX_K@Z");
MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPEAX@Z");
MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z");
}
else
{
operator_new = (void*)GetProcAddress(hmod, "??2@YAPAXI@Z");
operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPAX@Z");
MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPAXI@Z");
MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPAX@Z");
MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z");
}
}
......
dlls/msvcp60/msvcp.h
View file @ ff5d176c
......@@ -32,8 +32,8 @@ void __cdecl _invalid_parameter(const wchar_t*, const wchar_t*,
const wchar_t*, unsigned int, uintptr_t);
BOOL __cdecl __uncaught_exception(void);
extern void* (__cdecl *operator_new)(size_t);
extern void (__cdecl *operator_delete)(void*);
void* __cdecl operator_new(size_t);
void __cdecl operator_delete(void*);
/* basic_string<char, char_traits<char>, allocator<char>> */
typedef struct
......
dlls/msvcp90/ios.c
View file @ ff5d176c
......@@ -4331,10 +4331,6 @@ void __thiscall basic_stringbuf_char__Init(basic_stringbuf_char *this, const cha
if(count && str) {
char *buf = operator_new(count);
if(!buf) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
memcpy(buf, str, count);
this->seekhigh = buf + count;
......@@ -4469,10 +4465,6 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met
size = oldsize|0xf;
size += size/2;
buf = operator_new(size);
if(!buf) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
if(!oldsize) {
this->seekhigh = buf;
......@@ -4708,10 +4700,6 @@ void __thiscall basic_stringbuf_wchar__Init(basic_stringbuf_wchar *this, const w
if(count && str) {
wchar_t *buf = operator_new(count*sizeof(wchar_t));
if(!buf) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
memcpy(buf, str, count*sizeof(wchar_t));
this->seekhigh = buf + count;
......@@ -4882,10 +4870,6 @@ unsigned short __thiscall basic_stringbuf_wchar_overflow(basic_stringbuf_wchar *
size = oldsize|0xf;
size += size/2;
buf = operator_new(size*sizeof(wchar_t));
if(!buf) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
if(!oldsize) {
this->seekhigh = buf;
......
dlls/msvcp90/locale.c
View file @ ff5d176c
......@@ -296,11 +296,6 @@ static struct list lazy_facets = LIST_INIT(lazy_facets);
void __cdecl locale_facet_register(locale_facet *add)
{
facets_elem *head = operator_new(sizeof(*head));
if(!head) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
head->fac = add;
list_add_head(&lazy_facets, &head->entry);
}
......@@ -715,16 +710,14 @@ _Ctypevec __cdecl _Getctype(void)
#else
if((name = ___lc_locale_name_func()[LC_COLLATE])) {
size = wcslen(name)+1;
ret.name = malloc(size*sizeof(*name));
if(!ret.name) throw_exception(EXCEPTION_BAD_ALLOC, NULL);
ret.name = operator_new(size*sizeof(*name));
memcpy(ret.name, name, size*sizeof(*name));
} else {
ret.name = NULL;
}
#endif
ret.delfl = TRUE;
table = malloc(sizeof(short[256]));
if(!table) throw_exception(EXCEPTION_BAD_ALLOC, NULL);
table = operator_new(sizeof(short[256]));
memcpy(table, __pctype_func(), sizeof(short[256]));
ret.table = table;
return ret;
......@@ -1080,11 +1073,6 @@ size_t __cdecl collate_char__Getcat(const locale_facet **facet, const locale *lo
if(facet && !*facet) {
*facet = operator_new(sizeof(collate));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
collate_char_ctor_name((collate*)*facet,
locale_string_char_c_str(&loc->ptr->name), 0);
}
......@@ -1372,11 +1360,6 @@ size_t __cdecl collate_wchar__Getcat(const locale_facet **facet, const locale *l
if(facet && !*facet) {
*facet = operator_new(sizeof(collate));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
collate_wchar_ctor_name((collate*)*facet,
locale_string_char_c_str(&loc->ptr->name), 0);
}
......@@ -1936,12 +1919,6 @@ size_t __cdecl ctype_char__Getcat(const locale_facet **facet, const locale *loc)
_Locinfo locinfo;
*facet = operator_new(sizeof(ctype_char));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
_Locinfo_ctor_cstr(&locinfo, locale_string_char_c_str(&loc->ptr->name));
ctype_char_ctor_locinfo((ctype_char*)*facet, &locinfo, 0);
_Locinfo_dtor(&locinfo);
......@@ -2741,12 +2718,6 @@ size_t __cdecl ctype_wchar__Getcat(const locale_facet **facet, const locale *loc
_Locinfo locinfo;
*facet = operator_new(sizeof(ctype_wchar));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
_Locinfo_ctor_cstr(&locinfo, locale_string_char_c_str(&loc->ptr->name));
ctype_wchar_ctor_locinfo((ctype_wchar*)*facet, &locinfo, 0);
_Locinfo_dtor(&locinfo);
......@@ -3334,11 +3305,6 @@ size_t __cdecl codecvt_char__Getcat(const locale_facet **facet, const locale *lo
if(facet && !*facet) {
*facet = operator_new(sizeof(codecvt_char));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
codecvt_char_ctor((codecvt_char*)*facet);
}
......@@ -3673,12 +3639,6 @@ size_t __cdecl codecvt_wchar__Getcat(const locale_facet **facet, const locale *l
_Locinfo locinfo;
*facet = operator_new(sizeof(codecvt_wchar));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
_Locinfo_ctor_cstr(&locinfo, locale_string_char_c_str(&loc->ptr->name));
codecvt_wchar_ctor_locinfo((codecvt_wchar*)*facet, &locinfo, 0);
_Locinfo_dtor(&locinfo);
......@@ -3732,12 +3692,6 @@ size_t __cdecl codecvt_short__Getcat(const locale_facet **facet, const locale *l
_Locinfo locinfo;
*facet = operator_new(sizeof(codecvt_wchar));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
_Locinfo_ctor_cstr(&locinfo, locale_string_char_c_str(&loc->ptr->name));
codecvt_short_ctor((codecvt_wchar*)*facet);
_Locinfo_dtor(&locinfo);
......@@ -4059,17 +4013,14 @@ void __thiscall numpunct_char__Init(numpunct_char *this, const _Locinfo *locinfo
len = strlen(_Locinfo__Getfalse(locinfo))+1;
this->false_name = operator_new(len);
if(this->false_name)
memcpy((char*)this->false_name, _Locinfo__Getfalse(locinfo), len);
len = strlen(_Locinfo__Gettrue(locinfo))+1;
this->true_name = operator_new(len);
if(this->true_name)
memcpy((char*)this->true_name, _Locinfo__Gettrue(locinfo), len);
if(isdef) {
this->grouping = operator_new(1);
if(this->grouping)
*(char*)this->grouping = 0;
this->dp = '.';
......@@ -4079,21 +4030,11 @@ void __thiscall numpunct_char__Init(numpunct_char *this, const _Locinfo *locinfo
len = strlen(lc->grouping)+1;
this->grouping = operator_new(len);
if(this->grouping)
memcpy((char*)this->grouping, lc->grouping, len);
this->dp = lc->decimal_point[0];
this->sep = lc->thousands_sep[0];
}
if(!this->false_name || !this->true_name || !this->grouping) {
operator_delete((char*)this->grouping);
operator_delete((char*)this->false_name);
operator_delete((char*)this->true_name);
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
}
/* ?_Tidy@?$numpunct@D@std@@AAEXXZ */
......@@ -4195,11 +4136,6 @@ size_t __cdecl numpunct_char__Getcat(const locale_facet **facet, const locale *l
if(facet && !*facet) {
*facet = operator_new(sizeof(numpunct_char));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
numpunct_char_ctor_name((numpunct_char*)*facet,
locale_string_char_c_str(&loc->ptr->name), 0, TRUE);
}
......@@ -4399,20 +4335,17 @@ void __thiscall numpunct_wchar__Init(numpunct_wchar *this,
to_convert = _Locinfo__Getfalse(locinfo);
len = MultiByteToWideChar(cvt.page, 0, to_convert, -1, NULL, 0);
this->false_name = operator_new(len*sizeof(WCHAR));
if(this->false_name)
MultiByteToWideChar(cvt.page, 0, to_convert, -1,
(wchar_t*)this->false_name, len);
to_convert = _Locinfo__Gettrue(locinfo);
len = MultiByteToWideChar(cvt.page, 0, to_convert, -1, NULL, 0);
this->true_name = operator_new(len*sizeof(WCHAR));
if(this->true_name)
MultiByteToWideChar(cvt.page, 0, to_convert, -1,
(wchar_t*)this->true_name, len);
if(isdef) {
this->grouping = operator_new(1);
if(this->grouping)
*(char*)this->grouping = 0;
this->dp = '.';
......@@ -4422,21 +4355,11 @@ void __thiscall numpunct_wchar__Init(numpunct_wchar *this,
len = strlen(lc->grouping)+1;
this->grouping = operator_new(len);
if(this->grouping)
memcpy((char*)this->grouping, lc->grouping, len);
this->dp = mb_to_wc(lc->decimal_point[0], &cvt);
this->sep = mb_to_wc(lc->thousands_sep[0], &cvt);
}
if(!this->false_name || !this->true_name || !this->grouping) {
operator_delete((char*)this->grouping);
operator_delete((wchar_t*)this->false_name);
operator_delete((wchar_t*)this->true_name);
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
}
/* ?_Tidy@?$numpunct@_W@std@@AAEXXZ */
......@@ -4582,11 +4505,6 @@ size_t __cdecl numpunct_wchar__Getcat(const locale_facet **facet, const locale *
if(facet && !*facet) {
*facet = operator_new(sizeof(numpunct_wchar));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
numpunct_wchar_ctor_name((numpunct_wchar*)*facet,
locale_string_char_c_str(&loc->ptr->name), 0, TRUE);
}
......@@ -4637,11 +4555,6 @@ size_t __cdecl numpunct_short__Getcat(const locale_facet **facet, const locale *
if(facet && !*facet) {
*facet = operator_new(sizeof(numpunct_wchar));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
numpunct_short_ctor_name((numpunct_wchar*)*facet,
locale_string_char_c_str(&loc->ptr->name), 0, TRUE);
}
......@@ -5064,12 +4977,6 @@ size_t __cdecl num_get_wchar__Getcat(const locale_facet **facet, const locale *l
_Locinfo locinfo;
*facet = operator_new(sizeof(num_get));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
_Locinfo_ctor_cstr(&locinfo, locale_string_char_c_str(&loc->ptr->name));
num_get_wchar_ctor_locinfo((num_get*)*facet, &locinfo, 0);
_Locinfo_dtor(&locinfo);
......@@ -6314,12 +6221,6 @@ size_t __cdecl num_get_char__Getcat(const locale_facet **facet, const locale *lo
_Locinfo locinfo;
*facet = operator_new(sizeof(num_get));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
_Locinfo_ctor_cstr(&locinfo, locale_string_char_c_str(&loc->ptr->name));
num_get_char_ctor_locinfo((num_get*)*facet, &locinfo, 0);
_Locinfo_dtor(&locinfo);
......@@ -7265,12 +7166,6 @@ size_t __cdecl num_put_char__Getcat(const locale_facet **facet, const locale *lo
_Locinfo locinfo;
*facet = operator_new(sizeof(num_put));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
_Locinfo_ctor_cstr(&locinfo, locale_string_char_c_str(&loc->ptr->name));
num_put_char_ctor_locinfo((num_put*)*facet, &locinfo, 0);
_Locinfo_dtor(&locinfo);
......@@ -7691,10 +7586,6 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t
/* TODO: don't use dynamic allocation */
tmp = operator_new(size*2);
if(!tmp) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v));
operator_delete(tmp);
return ret;
......@@ -8042,12 +7933,6 @@ size_t __cdecl num_put_wchar__Getcat(const locale_facet **facet, const locale *l
_Locinfo locinfo;
*facet = operator_new(sizeof(num_put));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
_Locinfo_ctor_cstr(&locinfo, locale_string_char_c_str(&loc->ptr->name));
num_put_wchar_ctor_locinfo((num_put*)*facet, &locinfo, 0);
_Locinfo_dtor(&locinfo);
......@@ -8073,12 +7958,6 @@ size_t __cdecl num_put_short__Getcat(const locale_facet **facet, const locale *l
_Locinfo locinfo;
*facet = operator_new(sizeof(num_put));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
_Locinfo_ctor_cstr(&locinfo, locale_string_char_c_str(&loc->ptr->name));
num_put_short_ctor_locinfo((num_put*)*facet, &locinfo, 0);
_Locinfo_dtor(&locinfo);
......@@ -8640,10 +8519,6 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_do_put_double(const num_put
/* TODO: don't use dynamic allocation */
tmp = operator_new(size*2);
if(!tmp) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v),
numpunct_wchar_use_facet(IOS_LOCALE(base)));
operator_delete(tmp);
......@@ -8675,10 +8550,6 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put
/* TODO: don't use dynamic allocation */
tmp = operator_new(size*2);
if(!tmp) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v),
numpunct_short_use_facet(IOS_LOCALE(base)));
operator_delete(tmp);
......@@ -9095,12 +8966,6 @@ size_t __cdecl time_put_char__Getcat(const locale_facet **facet, const locale *l
_Locinfo locinfo;
*facet = operator_new(sizeof(time_put));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
_Locinfo_ctor_cstr(&locinfo, locale_string_char_c_str(&loc->ptr->name));
time_put_char_ctor_locinfo((time_put*)*facet, &locinfo, 0);
_Locinfo_dtor(&locinfo);
......@@ -9465,11 +9330,6 @@ size_t __cdecl time_put_wchar__Getcat(const locale_facet **facet, const locale *
if(facet && !*facet) {
*facet = operator_new(sizeof(time_put));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
time_put_wchar_ctor_name((time_put*)*facet,
locale_string_char_c_str(&loc->ptr->name), 0);
}
......@@ -9520,11 +9380,6 @@ size_t __cdecl time_put_short__Getcat(const locale_facet **facet, const locale *
if(facet && !*facet) {
*facet = operator_new(sizeof(time_put));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
time_put_short_ctor_name((time_put*)*facet,
locale_string_char_c_str(&loc->ptr->name), 0);
}
......@@ -9798,23 +9653,11 @@ void __thiscall time_get_char__Init(time_get_char *this, const _Locinfo *locinfo
days = _Locinfo__Getdays(locinfo);
len = strlen(days)+1;
this->days = operator_new(len);
if(!this->days)
{
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
memcpy((char*)this->days, days, len);
months = _Locinfo__Getmonths(locinfo);
len = strlen(months)+1;
this->months = operator_new(len);
if(!this->months)
{
operator_delete((char*)this->days);
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
memcpy((char*)this->months, months, len);
this->dateorder = _Locinfo__Getdateorder(locinfo);
......@@ -9923,12 +9766,6 @@ unsigned int __cdecl time_get_char__Getcat(const locale_facet **facet, const loc
_Locinfo locinfo;
*facet = operator_new(sizeof(time_get_char));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
_Locinfo_ctor_cstr(&locinfo, locale_string_char_c_str(&loc->ptr->name));
time_get_char_ctor_locinfo((time_get_char*)*facet, &locinfo, 0);
_Locinfo_dtor(&locinfo);
......@@ -10667,7 +10504,6 @@ static wchar_t* create_time_get_str(const wchar_t *str)
len = lstrlenW(str)+1;
ret = operator_new(len * sizeof(wchar_t));
if(ret)
memcpy(ret, str, len*sizeof(wchar_t));
return ret;
}
......@@ -10681,7 +10517,6 @@ static wchar_t* create_time_get_str(const char *str, const _Locinfo *locinfo)
_Locinfo__Getcvt(locinfo, &cvt);
len = MultiByteToWideChar(cvt.page, 0, str, -1, NULL, 0);
ret = operator_new(len*sizeof(WCHAR));
if(ret)
MultiByteToWideChar(cvt.page, 0, str, -1, ret, len);
return ret;
}
......@@ -10699,24 +10534,12 @@ void __thiscall time_get_wchar__Init(time_get_wchar *this, const _Locinfo *locin
#else
this->days = create_time_get_str(_Locinfo__Getdays(locinfo), locinfo);
#endif
if(!this->days)
{
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
#if _MSVCP_VER >=110
this->months = create_time_get_str(_Locinfo__W_Getmonths(locinfo));
#else
this->months = create_time_get_str(_Locinfo__Getmonths(locinfo), locinfo);
#endif
if(!this->months)
{
operator_delete((wchar_t*)this->days);
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
this->dateorder = _Locinfo__Getdateorder(locinfo);
_Locinfo__Getcvt(locinfo, &this->cvt);
......@@ -10824,12 +10647,6 @@ unsigned int __cdecl time_get_wchar__Getcat(const locale_facet **facet, const lo
_Locinfo locinfo;
*facet = operator_new(sizeof(time_get_wchar));
if(!*facet) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return 0;
}
_Locinfo_ctor_cstr(&locinfo, locale_string_char_c_str(&loc->ptr->name));
time_get_wchar_ctor_locinfo((time_get_wchar*)*facet, &locinfo, 0);
_Locinfo_dtor(&locinfo);
......@@ -11596,12 +11413,6 @@ locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const
this->facet.vtable = &locale__Locimp_vtable;
if(copy->facetvec) {
this->facetvec = operator_new(copy->facet_cnt*sizeof(locale_facet*));
if(!this->facetvec) {
_Lockit_dtor(&lock);
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return NULL;
}
for(i=0; i<this->facet_cnt; i++)
{
this->facetvec[i] = copy->facetvec[i];
......@@ -11675,11 +11486,6 @@ locale__Locimp* __cdecl locale__Locimp__New_Locimp(const locale__Locimp *copy)
TRACE("(%p)\n", copy);
ret = operator_new(sizeof(locale__Locimp));
if(!ret) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return NULL;
}
return locale__Locimp_copy_ctor(ret, copy);
}
......@@ -11692,11 +11498,6 @@ locale__Locimp* __cdecl locale__Locimp__New_Locimp_transparent(bool transparent)
TRACE("(%x)\n", transparent);
ret = operator_new(sizeof(locale__Locimp));
if(!ret) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return NULL;
}
return locale__Locimp_ctor_transparent(ret, transparent);
}
......@@ -11717,13 +11518,6 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet
new_size = 40;
new_facetvec = operator_new(sizeof(locale_facet*)*new_size);
if(!new_facetvec) {
_Lockit_dtor(&lock);
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return;
}
memset(new_facetvec, 0, sizeof(locale_facet*)*new_size);
memcpy(new_facetvec, locimp->facetvec, sizeof(locale_facet*)*locimp->facet_cnt);
operator_delete(locimp->facetvec);
......@@ -11772,10 +11566,6 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l
ctype = ctype_short_use_facet(loc);
}else {
ctype = operator_new(sizeof(ctype_wchar));
if(!ctype) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
ctype_short_ctor_locinfo(ctype, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &ctype->base.facet, locale_id_operator_size_t(&ctype_short_id));
......@@ -11788,10 +11578,6 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l
numget = num_get_short_use_facet(loc);
}else {
numget = operator_new(sizeof(num_get));
if(!numget) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
num_get_short_ctor_locinfo(numget, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &numget->facet, locale_id_operator_size_t(&num_get_short_id));
......@@ -11804,10 +11590,6 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l
numput = num_put_short_use_facet(loc);
}else {
numput = operator_new(sizeof(num_put));
if(!numput) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
num_put_short_ctor_locinfo(numput, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &numput->facet, locale_id_operator_size_t(&num_put_short_id));
......@@ -11820,10 +11602,6 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l
numpunct = numpunct_short_use_facet(loc);
}else {
numpunct = operator_new(sizeof(numpunct_wchar));
if(!numpunct) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
numpunct_short_ctor_locinfo(numpunct, locinfo, 0, FALSE);
}
locale__Locimp__Addfac(locimp, &numpunct->facet, locale_id_operator_size_t(&numpunct_short_id));
......@@ -11836,10 +11614,6 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l
c = collate_short_use_facet(loc);
}else {
c = operator_new(sizeof(collate));
if(!c) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
collate_short_ctor_locinfo(c, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &c->facet, locale_id_operator_size_t(&collate_short_id));
......@@ -11852,10 +11626,6 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l
t = time_put_short_use_facet(loc);
}else {
t = operator_new(sizeof(time_put));
if(!t) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
time_put_short_ctor_locinfo(t, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &t->facet, locale_id_operator_size_t(&time_put_short_id));
......@@ -11868,10 +11638,6 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l
codecvt = codecvt_short_use_facet(loc);
}else {
codecvt = operator_new(sizeof(codecvt_wchar));
if(!codecvt) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
codecvt_short_ctor_locinfo(codecvt, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &codecvt->base.facet, locale_id_operator_size_t(&codecvt_short_id));
......@@ -11894,10 +11660,6 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc
ctype = ctype_wchar_use_facet(loc);
}else {
ctype = operator_new(sizeof(ctype_wchar));
if(!ctype) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
ctype_wchar_ctor_locinfo(ctype, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &ctype->base.facet, locale_id_operator_size_t(&ctype_wchar_id));
......@@ -11910,10 +11672,6 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc
numget = num_get_wchar_use_facet(loc);
}else {
numget = operator_new(sizeof(num_get));
if(!numget) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
num_get_wchar_ctor_locinfo(numget, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &numget->facet, locale_id_operator_size_t(&num_get_wchar_id));
......@@ -11926,10 +11684,6 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc
numput = num_put_wchar_use_facet(loc);
}else {
numput = operator_new(sizeof(num_put));
if(!numput) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
num_put_wchar_ctor_locinfo(numput, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &numput->facet, locale_id_operator_size_t(&num_put_wchar_id));
......@@ -11942,10 +11696,6 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc
numpunct = numpunct_wchar_use_facet(loc);
}else {
numpunct = operator_new(sizeof(numpunct_wchar));
if(!numpunct) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
numpunct_wchar_ctor_locinfo(numpunct, locinfo, 0, FALSE);
}
locale__Locimp__Addfac(locimp, &numpunct->facet, locale_id_operator_size_t(&numpunct_wchar_id));
......@@ -11958,10 +11708,6 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc
c = collate_wchar_use_facet(loc);
}else {
c = operator_new(sizeof(collate));
if(!c) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
collate_wchar_ctor_locinfo(c, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &c->facet, locale_id_operator_size_t(&collate_wchar_id));
......@@ -11974,10 +11720,6 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc
t = time_get_wchar_use_facet(loc);
}else {
t = operator_new(sizeof(time_get_wchar));
if(!t) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
time_get_wchar_ctor_locinfo(t, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &t->facet, locale_id_operator_size_t(&time_get_wchar_id));
......@@ -11990,10 +11732,6 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc
t = time_put_wchar_use_facet(loc);
}else {
t = operator_new(sizeof(time_put));
if(!t) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
time_put_wchar_ctor_locinfo(t, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &t->facet, locale_id_operator_size_t(&time_put_wchar_id));
......@@ -12006,10 +11744,6 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc
codecvt = codecvt_wchar_use_facet(loc);
}else {
codecvt = operator_new(sizeof(codecvt_wchar));
if(!codecvt) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
codecvt_wchar_ctor_locinfo(codecvt, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &codecvt->base.facet, locale_id_operator_size_t(&codecvt_wchar_id));
......@@ -12032,10 +11766,6 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc
ctype = ctype_char_use_facet(loc);
}else {
ctype = operator_new(sizeof(ctype_char));
if(!ctype) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
ctype_char_ctor_locinfo(ctype, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &ctype->base.facet, locale_id_operator_size_t(&ctype_char_id));
......@@ -12048,10 +11778,6 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc
numget = num_get_char_use_facet(loc);
}else {
numget = operator_new(sizeof(num_get));
if(!numget) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
num_get_char_ctor_locinfo(numget, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &numget->facet, locale_id_operator_size_t(&num_get_char_id));
......@@ -12064,10 +11790,6 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc
numput = num_put_char_use_facet(loc);
}else {
numput = operator_new(sizeof(num_put));
if(!numput) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
num_put_char_ctor_locinfo(numput, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &numput->facet, locale_id_operator_size_t(&num_put_char_id));
......@@ -12080,10 +11802,6 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc
numpunct = numpunct_char_use_facet(loc);
}else {
numpunct = operator_new(sizeof(numpunct_char));
if(!numpunct) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
numpunct_char_ctor_locinfo(numpunct, locinfo, 0, FALSE);
}
locale__Locimp__Addfac(locimp, &numpunct->facet, locale_id_operator_size_t(&numpunct_char_id));
......@@ -12096,10 +11814,6 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc
c = collate_char_use_facet(loc);
}else {
c = operator_new(sizeof(collate));
if(!c) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
collate_char_ctor_locinfo(c, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &c->facet, locale_id_operator_size_t(&collate_char_id));
......@@ -12112,10 +11826,6 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc
t = time_get_char_use_facet(loc);
}else {
t = operator_new(sizeof(time_get_char));
if(!t) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
time_get_char_ctor_locinfo(t, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &t->facet, locale_id_operator_size_t(&time_get_char_id));
......@@ -12128,10 +11838,6 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc
t = time_put_char_use_facet(loc);
}else {
t = operator_new(sizeof(time_put));
if(!t) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
time_put_char_ctor_locinfo(t, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &t->facet, locale_id_operator_size_t(&time_put_char_id));
......@@ -12144,10 +11850,6 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc
codecvt = codecvt_char_use_facet(loc);
}else {
codecvt = operator_new(sizeof(codecvt_char));
if(!codecvt) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
codecvt_char_ctor_locinfo(codecvt, locinfo, 0);
}
locale__Locimp__Addfac(locimp, &codecvt->base.facet, locale_id_operator_size_t(&codecvt_char_id));
......@@ -12195,13 +11897,6 @@ locale__Locimp* __cdecl locale__Init(void)
}
global_locale = operator_new(sizeof(locale__Locimp));
if(!global_locale) {
_Lockit_dtor(&lock);
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return NULL;
}
locale__Locimp_ctor(global_locale);
global_locale->catmask = (1<<(LC_MAX+1))-1;
locale_string_char_dtor(&global_locale->name);
......@@ -12255,10 +11950,6 @@ locale* __thiscall locale_ctor_locale_locale(locale *this, const locale *loc, co
TRACE("(%p %p %p %d)\n", this, loc, other, cat);
this->ptr = operator_new(sizeof(locale__Locimp));
if(!this->ptr) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
locale__Locimp_copy_ctor(this->ptr, loc->ptr);
_Locinfo_ctor_cat_cstr(&locinfo, loc->ptr->catmask, locale_string_char_c_str(&loc->ptr->name));
......@@ -12297,11 +11988,6 @@ locale* __thiscall locale_ctor_locale_cstr(locale *this, const locale *loc, cons
}
this->ptr = operator_new(sizeof(locale__Locimp));
if(!this->ptr) {
ERR("Out of memory\n");
_Locinfo_dtor(&locinfo);
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
locale__Locimp_copy_ctor(this->ptr, loc->ptr);
locale__Locimp__Makeloc(&locinfo, cat, this->ptr, NULL);
......@@ -12319,10 +12005,6 @@ locale* __thiscall locale_ctor_cstr(locale *this, const char *locname, category
TRACE("(%p %s %d)\n", this, locname, cat);
this->ptr = operator_new(sizeof(locale__Locimp));
if(!this->ptr) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
locale__Locimp_ctor(this->ptr);
locale__Init();
......@@ -12410,11 +12092,6 @@ locale* __thiscall locale__Addfac(locale *this, locale_facet *facet, size_t id,
if(this->ptr->facet.refs > 1) {
locale__Locimp *new_ptr = operator_new(sizeof(locale__Locimp));
if(!new_ptr) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return NULL;
}
locale__Locimp_copy_ctor(new_ptr, this->ptr);
call_locale_facet__Decref(&this->ptr->facet);
this->ptr = new_ptr;
......@@ -12487,10 +12164,6 @@ locale* __cdecl locale_empty(locale *ret)
locale__Init();
ret->ptr = operator_new(sizeof(locale__Locimp));
if(!ret->ptr) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
locale__Locimp_ctor_transparent(ret->ptr, TRUE);
return ret;
}
......
dlls/msvcp90/misc.c
View file @ ff5d176c
......@@ -263,11 +263,6 @@ DEFINE_THISCALL_WRAPPER(mutex_ctor, 4)
mutex* __thiscall mutex_ctor(mutex *this)
{
CRITICAL_SECTION *cs = operator_new(sizeof(*cs));
if(!cs) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
InitializeCriticalSection(cs);
cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section");
this->mutex = cs;
......
dlls/msvcp90/msvcp90.h
View file @ ff5d176c
......@@ -41,13 +41,8 @@ void __cdecl _invalid_parameter_noinfo(void);
BOOL __cdecl __uncaught_exception(void);
int __cdecl _callnewh(size_t);
#if _MSVCP_VER >= 140
void* __cdecl operator_new(size_t);
void __cdecl operator_delete(void*);
#else
extern void* (__cdecl *operator_new)(size_t);
extern void (__cdecl *operator_delete)(void*);
#endif
extern void* (__cdecl *MSVCRT_set_new_handler)(void*);
#if _MSVCP_VER >= 110
......
dlls/msvcp90/msvcp_main.c
View file @ ff5d176c
......@@ -109,8 +109,22 @@ void __cdecl _invalid_parameter(const wchar_t *expr, const wchar_t *func, const
_invalid_parameter_noinfo();
}
#else
void* (__cdecl *operator_new)(size_t);
void (__cdecl *operator_delete)(void*);
static void* (__cdecl *MSVCRT_operator_new)(size_t);
static void (__cdecl *MSVCRT_operator_delete)(void*);
void* __cdecl operator_new(size_t size)
{
void *ret = MSVCRT_operator_new(size);
#if _MSVCP_VER < 80
if (!ret) throw_exception(EXCEPTION_BAD_ALLOC, "bad allocation");
#endif
return ret;
}
void __cdecl operator_delete(void *mem)
{
MSVCRT_operator_delete(mem);
}
#endif
static void init_cxx_funcs(void)
......@@ -130,14 +144,14 @@ static void init_cxx_funcs(void)
#else
if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */
{
operator_new = (void*)GetProcAddress(hmod, "??2@YAPEAX_K@Z");
operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPEAX@Z");
MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPEAX_K@Z");
MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPEAX@Z");
MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z");
}
else
{
operator_new = (void*)GetProcAddress(hmod, "??2@YAPAXI@Z");
operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPAX@Z");
MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPAXI@Z");
MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPAX@Z");
MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z");
}
#endif
......
dlls/msvcp90/string.c
View file @ ff5d176c
......@@ -1648,10 +1648,6 @@ _Yarn_char* __thiscall _Yarn_char_op_assign_cstr(_Yarn_char *this, const char *s
size_t len = strlen(str);
this->str = operator_new((len+1)*sizeof(char));
if(!this->str) {
ERR("out of memory\n");
return NULL;
}
memcpy(this->str, str, (len+1)*sizeof(char));
}
}
......@@ -1768,10 +1764,6 @@ _Yarn_wchar* __thiscall _Yarn_wchar_op_assign_cstr(_Yarn_wchar *this, const wcha
size_t len = wcslen(str);
this->str = operator_new((len+1)*sizeof(wchar_t));
if(!this->str) {
ERR("out of memory\n");
return NULL;
}
memcpy(this->str, str, (len+1)*sizeof(wchar_t));
}
}
......
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