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

msvcp90: Remove MSVCRT_ prefix from new() and delete(). 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2021-08-26 14:20:53 +02:00 committed by Alexandre Julliard
parent 6cca4e254c
commit 3a86f0a68f
13 changed files with 427 additions and 423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
dlls/msvcirt/msvcirt.c
View File

@ -38,6 +38,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcirt);
#define RESERVE_SIZE 512 #define RESERVE_SIZE 512
#define STATEBUF_SIZE 8 #define STATEBUF_SIZE 8
void* (__cdecl *operator_new)(SIZE_T);
void (__cdecl *operator_delete)(void*);
/* ?sh_none@filebuf@@2HB */ /* ?sh_none@filebuf@@2HB */
const int filebuf_sh_none = 0x800; const int filebuf_sh_none = 0x800;
/* ?sh_read@filebuf@@2HB */ /* ?sh_read@filebuf@@2HB */
@ -397,7 +400,7 @@ void __thiscall streambuf_dtor(streambuf *this)
{ {
TRACE("(%p)\n", this); TRACE("(%p)\n", this);
if (this->allocated) if (this->allocated)
MSVCRT_operator_delete(this->base); operator_delete(this->base);
DeleteCriticalSection(&this->lock); DeleteCriticalSection(&this->lock);
} }
@ -423,11 +426,11 @@ streambuf* __thiscall streambuf_vector_dtor(streambuf *this, unsigned int flags)
for (i = *ptr-1; i >= 0; i--) for (i = *ptr-1; i >= 0; i--)
streambuf_dtor(this+i); streambuf_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
streambuf_dtor(this); streambuf_dtor(this);
if (flags & 1) if (flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
} }
@ -438,7 +441,7 @@ streambuf* __thiscall streambuf_scalar_dtor(streambuf *this, unsigned int flags)
{ {
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
streambuf_dtor(this); streambuf_dtor(this);
if (flags & 1) MSVCRT_operator_delete(this); if (flags & 1) operator_delete(this);
return this; return this;
} }
@ -451,7 +454,7 @@ int __thiscall streambuf_doallocate(streambuf *this)
char *reserve; char *reserve;
TRACE("(%p)\n", this); TRACE("(%p)\n", this);
reserve = MSVCRT_operator_new(RESERVE_SIZE); reserve = operator_new(RESERVE_SIZE);
if (!reserve) if (!reserve)
return EOF; return EOF;
@ -670,7 +673,7 @@ void __thiscall streambuf_setb(streambuf *this, char *ba, char *eb, int delete)
{ {
TRACE("(%p %p %p %d)\n", this, ba, eb, delete); TRACE("(%p %p %p %d)\n", this, ba, eb, delete);
if (this->allocated) if (this->allocated)
MSVCRT_operator_delete(this->base); operator_delete(this->base);
this->allocated = delete; this->allocated = delete;
this->base = ba; this->base = ba;
this->ebuf = eb; this->ebuf = eb;
@ -1027,11 +1030,11 @@ filebuf* __thiscall filebuf_vector_dtor(filebuf *this, unsigned int flags)
for (i = *ptr-1; i >= 0; i--) for (i = *ptr-1; i >= 0; i--)
filebuf_dtor(this+i); filebuf_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
filebuf_dtor(this); filebuf_dtor(this);
if (flags & 1) if (flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
} }
@ -1042,7 +1045,7 @@ filebuf* __thiscall filebuf_scalar_dtor(filebuf *this, unsigned int flags)
{ {
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
filebuf_dtor(this); filebuf_dtor(this);
if (flags & 1) MSVCRT_operator_delete(this); if (flags & 1) operator_delete(this);
return this; return this;
} }
@ -1200,7 +1203,7 @@ streambuf* __thiscall filebuf_setbuf(filebuf *this, char *buffer, int length)
this->base.unbuffered = 1; this->base.unbuffered = 1;
} else { } else {
if (this->base.allocated) { if (this->base.allocated) {
MSVCRT_operator_delete(this->base.base); operator_delete(this->base.base);
this->base.allocated = 0; this->base.allocated = 0;
} }
@ -1395,7 +1398,7 @@ void __thiscall strstreambuf_dtor(strstreambuf *this)
if (this->f_free) if (this->f_free)
this->f_free(this->base.base); this->f_free(this->base.base);
else else
MSVCRT_operator_delete(this->base.base); operator_delete(this->base.base);
} }
streambuf_dtor(&this->base); streambuf_dtor(&this->base);
} }
@ -1420,11 +1423,11 @@ strstreambuf* __thiscall strstreambuf_vector_dtor(strstreambuf *this, unsigned i
for (i = *ptr-1; i >= 0; i--) for (i = *ptr-1; i >= 0; i--)
strstreambuf_dtor(this+i); strstreambuf_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
strstreambuf_dtor(this); strstreambuf_dtor(this);
if (flags & 1) if (flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
} }
@ -1435,7 +1438,7 @@ strstreambuf* __thiscall strstreambuf_scalar_dtor(strstreambuf *this, unsigned i
{ {
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
strstreambuf_dtor(this); strstreambuf_dtor(this);
if (flags & 1) MSVCRT_operator_delete(this); if (flags & 1) operator_delete(this);
return this; return this;
} }
@ -1455,7 +1458,7 @@ int __thiscall strstreambuf_doallocate(strstreambuf *this)
if (this->f_alloc) if (this->f_alloc)
new_buffer = this->f_alloc(new_size); new_buffer = this->f_alloc(new_size);
else else
new_buffer = MSVCRT_operator_new(new_size); new_buffer = operator_new(new_size);
if (!new_buffer) if (!new_buffer)
return EOF; return EOF;
if (this->base.ebuf) { if (this->base.ebuf) {
@ -1475,7 +1478,7 @@ int __thiscall strstreambuf_doallocate(strstreambuf *this)
if (this->f_free) if (this->f_free)
this->f_free(this->base.base); this->f_free(this->base.base);
else else
MSVCRT_operator_delete(this->base.base); operator_delete(this->base.base);
} }
streambuf_setb(&this->base, new_buffer, new_buffer + new_size, 0); streambuf_setb(&this->base, new_buffer, new_buffer + new_size, 0);
return 1; return 1;
@ -1654,11 +1657,11 @@ stdiobuf* __thiscall stdiobuf_vector_dtor(stdiobuf *this, unsigned int flags)
for (i = *ptr-1; i >= 0; i--) for (i = *ptr-1; i >= 0; i--)
stdiobuf_dtor(this+i); stdiobuf_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
stdiobuf_dtor(this); stdiobuf_dtor(this);
if (flags & 1) if (flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
} }
@ -1669,7 +1672,7 @@ stdiobuf* __thiscall stdiobuf_scalar_dtor(stdiobuf *this, unsigned int flags)
{ {
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
stdiobuf_dtor(this); stdiobuf_dtor(this);
if (flags & 1) MSVCRT_operator_delete(this); if (flags & 1) operator_delete(this);
return this; return this;
} }
@ -1740,7 +1743,7 @@ int __thiscall stdiobuf_setrwbuf(stdiobuf *this, int read_size, int write_size)
return 0; return 0;
} }
/* get a new buffer */ /* get a new buffer */
reserve = MSVCRT_operator_new(buffer_size); reserve = operator_new(buffer_size);
if (!reserve) if (!reserve)
return 0; return 0;
streambuf_setb(&this->base, reserve, reserve + buffer_size, 1); streambuf_setb(&this->base, reserve, reserve + buffer_size, 1);
@ -1933,11 +1936,11 @@ ios* __thiscall ios_vector_dtor(ios *this, unsigned int flags)
for (i = *ptr-1; i >= 0; i--) for (i = *ptr-1; i >= 0; i--)
ios_dtor(this+i); ios_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
ios_dtor(this); ios_dtor(this);
if (flags & 1) if (flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
} }
@ -1948,7 +1951,7 @@ ios* __thiscall ios_scalar_dtor(ios *this, unsigned int flags)
{ {
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
ios_dtor(this); ios_dtor(this);
if (flags & 1) MSVCRT_operator_delete(this); if (flags & 1) operator_delete(this);
return this; return this;
} }
@ -2495,11 +2498,11 @@ ostream* __thiscall ostream_vector_dtor(ios *base, unsigned int flags)
for (i = *ptr-1; i >= 0; i--) for (i = *ptr-1; i >= 0; i--)
ostream_vbase_dtor(this+i); ostream_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
ostream_vbase_dtor(this); ostream_vbase_dtor(this);
if (flags & 1) if (flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
} }
@ -2516,7 +2519,7 @@ ostream* __thiscall ostream_scalar_dtor(ios *base, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
ostream_vbase_dtor(this); ostream_vbase_dtor(this);
if (flags & 1) MSVCRT_operator_delete(this); if (flags & 1) operator_delete(this);
return this; return this;
} }
@ -3042,7 +3045,7 @@ ostream* __thiscall ostrstream_copy_ctor(ostream *this, const ostream *copy, BOO
DEFINE_THISCALL_WRAPPER(ostrstream_buffer_ctor, 20) DEFINE_THISCALL_WRAPPER(ostrstream_buffer_ctor, 20)
ostream* __thiscall ostrstream_buffer_ctor(ostream *this, char *buffer, int length, int mode, BOOL virt_init) ostream* __thiscall ostrstream_buffer_ctor(ostream *this, char *buffer, int length, int mode, BOOL virt_init)
{ {
strstreambuf *ssb = MSVCRT_operator_new(sizeof(strstreambuf)); strstreambuf *ssb = operator_new(sizeof(strstreambuf));
TRACE("(%p %p %d %d %d)\n", this, buffer, length, mode, virt_init); TRACE("(%p %p %d %d %d)\n", this, buffer, length, mode, virt_init);
@ -3063,7 +3066,7 @@ ostream* __thiscall ostrstream_buffer_ctor(ostream *this, char *buffer, int leng
DEFINE_THISCALL_WRAPPER(ostrstream_ctor, 8) DEFINE_THISCALL_WRAPPER(ostrstream_ctor, 8)
ostream* __thiscall ostrstream_ctor(ostream *this, BOOL virt_init) ostream* __thiscall ostrstream_ctor(ostream *this, BOOL virt_init)
{ {
strstreambuf *ssb = MSVCRT_operator_new(sizeof(strstreambuf)); strstreambuf *ssb = operator_new(sizeof(strstreambuf));
TRACE("(%p %d)\n", this, virt_init); TRACE("(%p %d)\n", this, virt_init);
@ -3118,7 +3121,7 @@ DEFINE_THISCALL_WRAPPER(ofstream_buffer_ctor, 20)
ostream* __thiscall ofstream_buffer_ctor(ostream *this, filedesc fd, char *buffer, int length, BOOL virt_init) ostream* __thiscall ofstream_buffer_ctor(ostream *this, filedesc fd, char *buffer, int length, BOOL virt_init)
{ {
ios *base; ios *base;
filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); filebuf *fb = operator_new(sizeof(filebuf));
TRACE("(%p %d %p %d %d)\n", this, fd, buffer, length, virt_init); TRACE("(%p %d %p %d %d)\n", this, fd, buffer, length, virt_init);
@ -3143,7 +3146,7 @@ DEFINE_THISCALL_WRAPPER(ofstream_fd_ctor, 12)
ostream* __thiscall ofstream_fd_ctor(ostream *this, filedesc fd, BOOL virt_init) ostream* __thiscall ofstream_fd_ctor(ostream *this, filedesc fd, BOOL virt_init)
{ {
ios *base; ios *base;
filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); filebuf *fb = operator_new(sizeof(filebuf));
TRACE("(%p %d %d)\n", this, fd, virt_init); TRACE("(%p %d %d)\n", this, fd, virt_init);
@ -3168,7 +3171,7 @@ DEFINE_THISCALL_WRAPPER(ofstream_open_ctor, 20)
ostream* __thiscall ofstream_open_ctor(ostream *this, const char *name, int mode, int protection, BOOL virt_init) ostream* __thiscall ofstream_open_ctor(ostream *this, const char *name, int mode, int protection, BOOL virt_init)
{ {
ios *base; ios *base;
filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); filebuf *fb = operator_new(sizeof(filebuf));
TRACE("(%p %s %d %d %d)\n", this, name, mode, protection, virt_init); TRACE("(%p %s %d %d %d)\n", this, name, mode, protection, virt_init);
@ -3433,11 +3436,11 @@ istream* __thiscall istream_vector_dtor(ios *base, unsigned int flags)
for (i = *ptr-1; i >= 0; i--) for (i = *ptr-1; i >= 0; i--)
istream_vbase_dtor(this+i); istream_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
istream_vbase_dtor(this); istream_vbase_dtor(this);
if (flags & 1) if (flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
} }
@ -3454,7 +3457,7 @@ istream* __thiscall istream_scalar_dtor(ios *base, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
istream_vbase_dtor(this); istream_vbase_dtor(this);
if (flags & 1) MSVCRT_operator_delete(this); if (flags & 1) operator_delete(this);
return this; return this;
} }
@ -4293,7 +4296,7 @@ DEFINE_THISCALL_WRAPPER(istrstream_buffer_ctor, 16)
istream* __thiscall istrstream_buffer_ctor(istream *this, char *buffer, int length, BOOL virt_init) istream* __thiscall istrstream_buffer_ctor(istream *this, char *buffer, int length, BOOL virt_init)
{ {
ios *base; ios *base;
strstreambuf *ssb = MSVCRT_operator_new(sizeof(strstreambuf)); strstreambuf *ssb = operator_new(sizeof(strstreambuf));
TRACE("(%p %p %d %d)\n", this, buffer, length, virt_init); TRACE("(%p %p %d %d)\n", this, buffer, length, virt_init);
@ -4352,7 +4355,7 @@ DEFINE_THISCALL_WRAPPER(ifstream_buffer_ctor, 20)
istream* __thiscall ifstream_buffer_ctor(istream *this, filedesc fd, char *buffer, int length, BOOL virt_init) istream* __thiscall ifstream_buffer_ctor(istream *this, filedesc fd, char *buffer, int length, BOOL virt_init)
{ {
ios *base; ios *base;
filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); filebuf *fb = operator_new(sizeof(filebuf));
TRACE("(%p %d %p %d %d)\n", this, fd, buffer, length, virt_init); TRACE("(%p %d %p %d %d)\n", this, fd, buffer, length, virt_init);
@ -4377,7 +4380,7 @@ DEFINE_THISCALL_WRAPPER(ifstream_fd_ctor, 12)
istream* __thiscall ifstream_fd_ctor(istream *this, filedesc fd, BOOL virt_init) istream* __thiscall ifstream_fd_ctor(istream *this, filedesc fd, BOOL virt_init)
{ {
ios *base; ios *base;
filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); filebuf *fb = operator_new(sizeof(filebuf));
TRACE("(%p %d %d)\n", this, fd, virt_init); TRACE("(%p %d %d)\n", this, fd, virt_init);
@ -4402,7 +4405,7 @@ DEFINE_THISCALL_WRAPPER(ifstream_open_ctor, 20)
istream* __thiscall ifstream_open_ctor(istream *this, const char *name, ios_open_mode mode, int protection, BOOL virt_init) istream* __thiscall ifstream_open_ctor(istream *this, const char *name, ios_open_mode mode, int protection, BOOL virt_init)
{ {
ios *base; ios *base;
filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); filebuf *fb = operator_new(sizeof(filebuf));
TRACE("(%p %s %d %d %d)\n", this, name, mode, protection, virt_init); TRACE("(%p %s %d %d %d)\n", this, name, mode, protection, virt_init);
@ -4646,11 +4649,11 @@ iostream* __thiscall iostream_vector_dtor(ios *base, unsigned int flags)
for (i = *ptr-1; i >= 0; i--) for (i = *ptr-1; i >= 0; i--)
iostream_vbase_dtor(this+i); iostream_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
iostream_vbase_dtor(this); iostream_vbase_dtor(this);
if (flags & 1) if (flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
} }
@ -4666,7 +4669,7 @@ iostream* __thiscall iostream_scalar_dtor(ios *base, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
iostream_vbase_dtor(this); iostream_vbase_dtor(this);
if (flags & 1) MSVCRT_operator_delete(this); if (flags & 1) operator_delete(this);
return this; return this;
} }
@ -4715,7 +4718,7 @@ iostream* __thiscall strstream_copy_ctor(iostream *this, const iostream *copy, B
DEFINE_THISCALL_WRAPPER(strstream_buffer_ctor, 20) DEFINE_THISCALL_WRAPPER(strstream_buffer_ctor, 20)
iostream* __thiscall strstream_buffer_ctor(iostream *this, char *buffer, int length, int mode, BOOL virt_init) iostream* __thiscall strstream_buffer_ctor(iostream *this, char *buffer, int length, int mode, BOOL virt_init)
{ {
strstreambuf *ssb = MSVCRT_operator_new(sizeof(strstreambuf)); strstreambuf *ssb = operator_new(sizeof(strstreambuf));
TRACE("(%p %p %d %d %d)\n", this, buffer, length, mode, virt_init); TRACE("(%p %p %d %d %d)\n", this, buffer, length, mode, virt_init);
@ -4737,7 +4740,7 @@ iostream* __thiscall strstream_buffer_ctor(iostream *this, char *buffer, int len
DEFINE_THISCALL_WRAPPER(strstream_ctor, 8) DEFINE_THISCALL_WRAPPER(strstream_ctor, 8)
iostream* __thiscall strstream_ctor(iostream *this, BOOL virt_init) iostream* __thiscall strstream_ctor(iostream *this, BOOL virt_init)
{ {
strstreambuf *ssb = MSVCRT_operator_new(sizeof(strstreambuf)); strstreambuf *ssb = operator_new(sizeof(strstreambuf));
TRACE("(%p %d)\n", this, virt_init); TRACE("(%p %d)\n", this, virt_init);
@ -4789,7 +4792,7 @@ iostream* __thiscall stdiostream_copy_ctor(iostream *this, const iostream *copy,
DEFINE_THISCALL_WRAPPER(stdiostream_file_ctor, 12) DEFINE_THISCALL_WRAPPER(stdiostream_file_ctor, 12)
iostream* __thiscall stdiostream_file_ctor(iostream *this, FILE *file, BOOL virt_init) iostream* __thiscall stdiostream_file_ctor(iostream *this, FILE *file, BOOL virt_init)
{ {
stdiobuf *stb = MSVCRT_operator_new(sizeof(stdiobuf)); stdiobuf *stb = operator_new(sizeof(stdiobuf));
TRACE("(%p %p %d)\n", this, file, virt_init); TRACE("(%p %p %d)\n", this, file, virt_init);
@ -4827,7 +4830,7 @@ DEFINE_THISCALL_WRAPPER(fstream_buffer_ctor, 20)
iostream* __thiscall fstream_buffer_ctor(iostream *this, filedesc fd, char *buffer, int length, BOOL virt_init) iostream* __thiscall fstream_buffer_ctor(iostream *this, filedesc fd, char *buffer, int length, BOOL virt_init)
{ {
ios *base; ios *base;
filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); filebuf *fb = operator_new(sizeof(filebuf));
TRACE("(%p %d %p %d %d)\n", this, fd, buffer, length, virt_init); TRACE("(%p %d %p %d %d)\n", this, fd, buffer, length, virt_init);
@ -4852,7 +4855,7 @@ DEFINE_THISCALL_WRAPPER(fstream_fd_ctor, 12)
iostream* __thiscall fstream_fd_ctor(iostream *this, filedesc fd, BOOL virt_init) iostream* __thiscall fstream_fd_ctor(iostream *this, filedesc fd, BOOL virt_init)
{ {
ios *base; ios *base;
filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); filebuf *fb = operator_new(sizeof(filebuf));
TRACE("(%p %d %d)\n", this, fd, virt_init); TRACE("(%p %d %d)\n", this, fd, virt_init);
@ -4877,7 +4880,7 @@ DEFINE_THISCALL_WRAPPER(fstream_open_ctor, 20)
iostream* __thiscall fstream_open_ctor(iostream *this, const char *name, ios_open_mode mode, int protection, BOOL virt_init) iostream* __thiscall fstream_open_ctor(iostream *this, const char *name, ios_open_mode mode, int protection, BOOL virt_init)
{ {
ios *base; ios *base;
filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); filebuf *fb = operator_new(sizeof(filebuf));
TRACE("(%p %s %d %d %d)\n", this, name, mode, protection, virt_init); TRACE("(%p %s %d %d %d)\n", this, name, mode, protection, virt_init);
@ -5048,7 +5051,7 @@ void __cdecl ios_sync_with_stdio(void)
ios_sunk_with_stdio++; ios_sunk_with_stdio++;
/* calls to [io]stream_assign_sb automatically destroy the old buffers */ /* calls to [io]stream_assign_sb automatically destroy the old buffers */
if ((new_buf = MSVCRT_operator_new(sizeof(stdiobuf)))) { if ((new_buf = operator_new(sizeof(stdiobuf)))) {
stdiobuf_file_ctor(new_buf, stdin); stdiobuf_file_ctor(new_buf, stdin);
istream_assign_sb(&cin.is, &new_buf->base); istream_assign_sb(&cin.is, &new_buf->base);
} else } else
@ -5056,7 +5059,7 @@ void __cdecl ios_sync_with_stdio(void)
cin.vbase.delbuf = 1; cin.vbase.delbuf = 1;
ios_setf(&cin.vbase, FLAGS_stdio); ios_setf(&cin.vbase, FLAGS_stdio);
if ((new_buf = MSVCRT_operator_new(sizeof(stdiobuf)))) { if ((new_buf = operator_new(sizeof(stdiobuf)))) {
stdiobuf_file_ctor(new_buf, stdout); stdiobuf_file_ctor(new_buf, stdout);
stdiobuf_setrwbuf(new_buf, 0, 80); stdiobuf_setrwbuf(new_buf, 0, 80);
ostream_assign_sb(&cout.os, &new_buf->base); ostream_assign_sb(&cout.os, &new_buf->base);
@ -5065,7 +5068,7 @@ void __cdecl ios_sync_with_stdio(void)
cout.vbase.delbuf = 1; cout.vbase.delbuf = 1;
ios_setf(&cout.vbase, FLAGS_unitbuf | FLAGS_stdio); ios_setf(&cout.vbase, FLAGS_unitbuf | FLAGS_stdio);
if ((new_buf = MSVCRT_operator_new(sizeof(stdiobuf)))) { if ((new_buf = operator_new(sizeof(stdiobuf)))) {
stdiobuf_file_ctor(new_buf, stderr); stdiobuf_file_ctor(new_buf, stderr);
stdiobuf_setrwbuf(new_buf, 0, 80); stdiobuf_setrwbuf(new_buf, 0, 80);
ostream_assign_sb(&cerr.os, &new_buf->base); ostream_assign_sb(&cerr.os, &new_buf->base);
@ -5074,7 +5077,7 @@ void __cdecl ios_sync_with_stdio(void)
cerr.vbase.delbuf = 1; cerr.vbase.delbuf = 1;
ios_setf(&cerr.vbase, FLAGS_unitbuf | FLAGS_stdio); ios_setf(&cerr.vbase, FLAGS_unitbuf | FLAGS_stdio);
if ((new_buf = MSVCRT_operator_new(sizeof(stdiobuf)))) { if ((new_buf = operator_new(sizeof(stdiobuf)))) {
stdiobuf_file_ctor(new_buf, stderr); stdiobuf_file_ctor(new_buf, stderr);
stdiobuf_setrwbuf(new_buf, 0, 512); stdiobuf_setrwbuf(new_buf, 0, 512);
ostream_assign_sb(&MSVCP_clog.os, &new_buf->base); ostream_assign_sb(&MSVCP_clog.os, &new_buf->base);
@ -5114,9 +5117,6 @@ DEFINE_VTBL_WRAPPER(56);
#endif #endif
void* (__cdecl *MSVCRT_operator_new)(SIZE_T);
void (__cdecl *MSVCRT_operator_delete)(void*);
void __cdecl _mtlock(CRITICAL_SECTION *crit) void __cdecl _mtlock(CRITICAL_SECTION *crit)
{ {
TRACE("(%p)\n", crit); TRACE("(%p)\n", crit);
@ -5135,13 +5135,13 @@ static void init_cxx_funcs(void)
if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */ if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */
{ {
MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPEAX_K@Z"); operator_new = (void*)GetProcAddress(hmod, "??2@YAPEAX_K@Z");
MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPEAX@Z"); operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPEAX@Z");
} }
else else
{ {
MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPAXI@Z"); operator_new = (void*)GetProcAddress(hmod, "??2@YAPAXI@Z");
MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPAX@Z"); operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPAX@Z");
} }
} }
@ -5169,28 +5169,28 @@ static void init_io(void *base)
init_fstream_rtti(base); init_fstream_rtti(base);
#endif #endif
if ((fb = MSVCRT_operator_new(sizeof(filebuf)))) { if ((fb = operator_new(sizeof(filebuf)))) {
filebuf_fd_ctor(fb, 0); filebuf_fd_ctor(fb, 0);
istream_withassign_sb_ctor(&cin.is, &fb->base, TRUE); istream_withassign_sb_ctor(&cin.is, &fb->base, TRUE);
} else } else
istream_withassign_sb_ctor(&cin.is, NULL, TRUE); istream_withassign_sb_ctor(&cin.is, NULL, TRUE);
Iostream_init_ios_ctor(NULL, &cin.vbase, 0); Iostream_init_ios_ctor(NULL, &cin.vbase, 0);
if ((fb = MSVCRT_operator_new(sizeof(filebuf)))) { if ((fb = operator_new(sizeof(filebuf)))) {
filebuf_fd_ctor(fb, 1); filebuf_fd_ctor(fb, 1);
ostream_withassign_sb_ctor(&cout.os, &fb->base, TRUE); ostream_withassign_sb_ctor(&cout.os, &fb->base, TRUE);
} else } else
ostream_withassign_sb_ctor(&cout.os, NULL, TRUE); ostream_withassign_sb_ctor(&cout.os, NULL, TRUE);
Iostream_init_ios_ctor(NULL, &cout.vbase, -1); Iostream_init_ios_ctor(NULL, &cout.vbase, -1);
if ((fb = MSVCRT_operator_new(sizeof(filebuf)))) { if ((fb = operator_new(sizeof(filebuf)))) {
filebuf_fd_ctor(fb, 2); filebuf_fd_ctor(fb, 2);
ostream_withassign_sb_ctor(&cerr.os, &fb->base, TRUE); ostream_withassign_sb_ctor(&cerr.os, &fb->base, TRUE);
} else } else
ostream_withassign_sb_ctor(&cerr.os, NULL, TRUE); ostream_withassign_sb_ctor(&cerr.os, NULL, TRUE);
Iostream_init_ios_ctor(NULL, &cerr.vbase, 1); Iostream_init_ios_ctor(NULL, &cerr.vbase, 1);
if ((fb = MSVCRT_operator_new(sizeof(filebuf)))) { if ((fb = operator_new(sizeof(filebuf)))) {
filebuf_fd_ctor(fb, 2); filebuf_fd_ctor(fb, 2);
ostream_withassign_sb_ctor(&MSVCP_clog.os, &fb->base, TRUE); ostream_withassign_sb_ctor(&MSVCP_clog.os, &fb->base, TRUE);
} else } else

172
dlls/msvcp60/ios.c
View File

@ -1015,7 +1015,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor(basic_streambuf_char
mutex_ctor(&this->lock); mutex_ctor(&this->lock);
#endif #endif
#if _MSVCP_VER >= 70 #if _MSVCP_VER >= 70
this->loc = MSVCRT_operator_new(sizeof(locale)); this->loc = operator_new(sizeof(locale));
#endif #endif
locale_ctor(IOS_LOCALE(this)); locale_ctor(IOS_LOCALE(this));
basic_streambuf_char__Init_empty(this); basic_streambuf_char__Init_empty(this);
@ -1035,7 +1035,7 @@ void __thiscall basic_streambuf_char_dtor(basic_streambuf_char *this)
#endif #endif
locale_dtor(IOS_LOCALE(this)); locale_dtor(IOS_LOCALE(this));
#if _MSVCP_VER >= 70 #if _MSVCP_VER >= 70
MSVCRT_operator_delete(this->loc); operator_delete(this->loc);
#endif #endif
} }
@ -1049,11 +1049,11 @@ basic_streambuf_char* __thiscall basic_streambuf_char_vector_dtor(basic_streambu
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_streambuf_char_dtor(this+i); basic_streambuf_char_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_streambuf_char_dtor(this); basic_streambuf_char_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -1865,7 +1865,7 @@ basic_streambuf_wchar* __thiscall basic_streambuf_wchar_ctor(basic_streambuf_wch
mutex_ctor(&this->lock); mutex_ctor(&this->lock);
#endif #endif
#if _MSVCP_VER >= 70 #if _MSVCP_VER >= 70
this->loc = MSVCRT_operator_new(sizeof(locale)); this->loc = operator_new(sizeof(locale));
#endif #endif
locale_ctor(IOS_LOCALE(this)); locale_ctor(IOS_LOCALE(this));
basic_streambuf_wchar__Init_empty(this); basic_streambuf_wchar__Init_empty(this);
@ -1898,7 +1898,7 @@ void __thiscall basic_streambuf_wchar_dtor(basic_streambuf_wchar *this)
#endif #endif
locale_dtor(IOS_LOCALE(this)); locale_dtor(IOS_LOCALE(this));
#if _MSVCP_VER >= 70 #if _MSVCP_VER >= 70
MSVCRT_operator_delete(this->loc); operator_delete(this->loc);
#endif #endif
} }
@ -1912,11 +1912,11 @@ basic_streambuf_wchar* __thiscall basic_streambuf_wchar_vector_dtor(basic_stream
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_streambuf_wchar_dtor(this+i); basic_streambuf_wchar_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_streambuf_wchar_dtor(this); basic_streambuf_wchar_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -2757,7 +2757,7 @@ void __thiscall basic_filebuf_char__Initcvt_cvt(basic_filebuf_char *this, codecv
if(codecvt_base_always_noconv(&cvt->base)) { if(codecvt_base_always_noconv(&cvt->base)) {
this->cvt = NULL; this->cvt = NULL;
}else { }else {
this->str = MSVCRT_operator_new(sizeof(basic_string_char)); this->str = operator_new(sizeof(basic_string_char));
MSVCP_basic_string_char_ctor(this->str); MSVCP_basic_string_char_ctor(this->str);
this->cvt = cvt; this->cvt = cvt;
} }
@ -2839,7 +2839,7 @@ void __thiscall basic_filebuf_char_dtor(basic_filebuf_char *this)
basic_filebuf_char_close(this); basic_filebuf_char_close(this);
if(this->str) { if(this->str) {
MSVCP_basic_string_char_dtor(this->str); MSVCP_basic_string_char_dtor(this->str);
MSVCRT_operator_delete(this->str); operator_delete(this->str);
} }
locale_dtor(&this->loc); locale_dtor(&this->loc);
basic_streambuf_char_dtor(&this->base); basic_streambuf_char_dtor(&this->base);
@ -2855,11 +2855,11 @@ basic_filebuf_char* __thiscall basic_filebuf_char_vector_dtor(basic_filebuf_char
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_filebuf_char_dtor(this+i); basic_filebuf_char_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_filebuf_char_dtor(this); basic_filebuf_char_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -3431,7 +3431,7 @@ void __thiscall basic_filebuf_wchar_dtor(basic_filebuf_wchar *this)
basic_filebuf_wchar_close(this); basic_filebuf_wchar_close(this);
if(this->str) { if(this->str) {
MSVCP_basic_string_char_dtor(this->str); MSVCP_basic_string_char_dtor(this->str);
MSVCRT_operator_delete(this->str); operator_delete(this->str);
} }
locale_dtor(&this->loc); locale_dtor(&this->loc);
basic_streambuf_wchar_dtor(&this->base); basic_streambuf_wchar_dtor(&this->base);
@ -3447,11 +3447,11 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_vector_dtor(basic_filebuf_wc
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_filebuf_wchar_dtor(this+i); basic_filebuf_wchar_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_filebuf_wchar_dtor(this); basic_filebuf_wchar_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -3912,7 +3912,7 @@ void __thiscall basic_stringbuf_char__Init(basic_stringbuf_char *this, const cha
this->seekhigh = NULL; this->seekhigh = NULL;
if(count && str) { if(count && str) {
char *buf = MSVCRT_operator_new(count); char *buf = operator_new(count);
if(!buf) { if(!buf) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -3982,7 +3982,7 @@ void __thiscall basic_stringbuf_char__Tidy(basic_stringbuf_char *this)
TRACE("(%p)\n", this); TRACE("(%p)\n", this);
if(this->state & STRINGBUF_allocated) { if(this->state & STRINGBUF_allocated) {
MSVCRT_operator_delete(basic_streambuf_char_eback(&this->base)); operator_delete(basic_streambuf_char_eback(&this->base));
this->seekhigh = NULL; this->seekhigh = NULL;
this->state &= ~STRINGBUF_allocated; this->state &= ~STRINGBUF_allocated;
} }
@ -4013,12 +4013,12 @@ basic_stringbuf_char* __thiscall basic_stringbuf_char_vector_dtor(basic_stringbu
for (i = *ptr - 1; i >= 0; i--) for (i = *ptr - 1; i >= 0; i--)
basic_stringbuf_char_dtor(this+i); basic_stringbuf_char_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
}else { }else {
basic_stringbuf_char_dtor(this); basic_stringbuf_char_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -4050,7 +4050,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met
oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0); oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0);
size = oldsize|0xf; size = oldsize|0xf;
size += size/2; size += size/2;
buf = MSVCRT_operator_new(size); buf = operator_new(size);
if(!buf) { if(!buf) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -4079,7 +4079,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met
buf+(basic_streambuf_char_gptr(&this->base)-ptr), buf+(basic_streambuf_char_gptr(&this->base)-ptr),
basic_streambuf_char_pptr(&this->base)+1); basic_streambuf_char_pptr(&this->base)+1);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} }
return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta);
@ -4289,7 +4289,7 @@ void __thiscall basic_stringbuf_wchar__Init(basic_stringbuf_wchar *this, const w
this->seekhigh = NULL; this->seekhigh = NULL;
if(count && str) { if(count && str) {
wchar_t *buf = MSVCRT_operator_new(count*sizeof(wchar_t)); wchar_t *buf = operator_new(count*sizeof(wchar_t));
if(!buf) { if(!buf) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -4391,7 +4391,7 @@ void __thiscall basic_stringbuf_wchar__Tidy(basic_stringbuf_wchar *this)
TRACE("(%p)\n", this); TRACE("(%p)\n", this);
if(this->state & STRINGBUF_allocated) { if(this->state & STRINGBUF_allocated) {
MSVCRT_operator_delete(basic_streambuf_wchar_eback(&this->base)); operator_delete(basic_streambuf_wchar_eback(&this->base));
this->seekhigh = NULL; this->seekhigh = NULL;
this->state &= ~STRINGBUF_allocated; this->state &= ~STRINGBUF_allocated;
} }
@ -4424,12 +4424,12 @@ basic_stringbuf_wchar* __thiscall basic_stringbuf_wchar_vector_dtor(basic_string
for (i = *ptr - 1; i >= 0; i--) for (i = *ptr - 1; i >= 0; i--)
basic_stringbuf_wchar_dtor(this+i); basic_stringbuf_wchar_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
}else { }else {
basic_stringbuf_wchar_dtor(this); basic_stringbuf_wchar_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -4463,7 +4463,7 @@ unsigned short __thiscall basic_stringbuf_wchar_overflow(basic_stringbuf_wchar *
oldsize = (ptr ? basic_streambuf_wchar_epptr(&this->base)-basic_streambuf_wchar_eback(&this->base): 0); oldsize = (ptr ? basic_streambuf_wchar_epptr(&this->base)-basic_streambuf_wchar_eback(&this->base): 0);
size = oldsize|0xf; size = oldsize|0xf;
size += size/2; size += size/2;
buf = MSVCRT_operator_new(size*sizeof(wchar_t)); buf = operator_new(size*sizeof(wchar_t));
if(!buf) { if(!buf) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -4492,7 +4492,7 @@ unsigned short __thiscall basic_stringbuf_wchar_overflow(basic_stringbuf_wchar *
buf+(basic_streambuf_wchar_gptr(&this->base)-ptr), buf+(basic_streambuf_wchar_gptr(&this->base)-ptr),
basic_streambuf_wchar_pptr(&this->base)+1); basic_streambuf_wchar_pptr(&this->base)+1);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} }
return (*basic_streambuf_wchar__Pninc(&this->base) = meta); return (*basic_streambuf_wchar__Pninc(&this->base) = meta);
@ -4721,13 +4721,13 @@ void __cdecl ios_base_Tidy(ios_base *this)
for(arr_cur=this->arr; arr_cur; arr_cur=arr_next) { for(arr_cur=this->arr; arr_cur; arr_cur=arr_next) {
arr_next = arr_cur->next; arr_next = arr_cur->next;
MSVCRT_operator_delete(arr_cur); operator_delete(arr_cur);
} }
this->arr = NULL; this->arr = NULL;
for(event_cur=this->calls; event_cur; event_cur=event_next) { for(event_cur=this->calls; event_cur; event_cur=event_next) {
event_next = event_cur->next; event_next = event_cur->next;
MSVCRT_operator_delete(event_cur); operator_delete(event_cur);
} }
this->calls = NULL; this->calls = NULL;
} }
@ -4739,7 +4739,7 @@ void __cdecl ios_base_Ios_base_dtor(ios_base *obj)
TRACE("(%p)\n", obj); TRACE("(%p)\n", obj);
locale_dtor(IOS_LOCALE(obj)); locale_dtor(IOS_LOCALE(obj));
#if _MSVCP_VER >= 70 #if _MSVCP_VER >= 70
MSVCRT_operator_delete(obj->loc); operator_delete(obj->loc);
#endif #endif
ios_base_Tidy(obj); ios_base_Tidy(obj);
} }
@ -4762,11 +4762,11 @@ ios_base* __thiscall ios_base_vector_dtor(ios_base *this, unsigned int flags)
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
ios_base_dtor(this+i); ios_base_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
ios_base_dtor(this); ios_base_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -4778,10 +4778,10 @@ void* __thiscall iosb_vector_dtor(void *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
INT_PTR *ptr = (INT_PTR *)this-1; INT_PTR *ptr = (INT_PTR *)this-1;
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -4808,7 +4808,7 @@ IOS_BASE_iosarray* __thiscall ios_base_Findarr(ios_base *this, int index)
} }
} }
p = MSVCRT_operator_new(sizeof(IOS_BASE_iosarray)); p = operator_new(sizeof(IOS_BASE_iosarray));
p->next = this->arr; p->next = this->arr;
p->index = index; p->index = index;
p->long_val = 0; p->long_val = 0;
@ -4844,7 +4844,7 @@ void __thiscall ios_base_register_callback(ios_base *this, IOS_BASE_event_callba
TRACE("(%p %p %d)\n", this, callback, index); TRACE("(%p %p %d)\n", this, callback, index);
event = MSVCRT_operator_new(sizeof(IOS_BASE_fnarray)); event = operator_new(sizeof(IOS_BASE_fnarray));
event->next = this->calls; event->next = this->calls;
event->index = index; event->index = index;
event->event_handler = callback; event->event_handler = callback;
@ -5035,7 +5035,7 @@ void __thiscall ios_base__Init(ios_base *this)
this->arr = NULL; this->arr = NULL;
this->calls = NULL; this->calls = NULL;
#if _MSVCP_VER >= 70 #if _MSVCP_VER >= 70
this->loc = MSVCRT_operator_new(sizeof(locale)); this->loc = operator_new(sizeof(locale));
#endif #endif
locale_ctor(IOS_LOCALE(this)); locale_ctor(IOS_LOCALE(this));
} }
@ -5349,11 +5349,11 @@ basic_ios_char* __thiscall basic_ios_char_vector_dtor(basic_ios_char *this, unsi
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ios_char_dtor(this+i); basic_ios_char_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ios_char_dtor(this); basic_ios_char_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -5616,11 +5616,11 @@ basic_ios_wchar* __thiscall basic_ios_wchar_vector_dtor(basic_ios_wchar *this, u
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ios_wchar_dtor(this+i); basic_ios_wchar_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ios_wchar_dtor(this); basic_ios_wchar_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -5928,11 +5928,11 @@ basic_ostream_char* __thiscall basic_ostream_char_vector_dtor(basic_ios_char *ba
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ostream_char_vbase_dtor(this+i); basic_ostream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ostream_char_vbase_dtor(this); basic_ostream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -6755,11 +6755,11 @@ basic_ostream_wchar* __thiscall basic_ostream_wchar_vector_dtor(basic_ios_wchar
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ostream_wchar_vbase_dtor(this+i); basic_ostream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ostream_wchar_vbase_dtor(this); basic_ostream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -7783,11 +7783,11 @@ basic_istream_char* __thiscall basic_istream_char_vector_dtor(basic_ios_char *ba
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_istream_char_vbase_dtor(this+i); basic_istream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_istream_char_vbase_dtor(this); basic_istream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -9233,11 +9233,11 @@ basic_istream_wchar* __thiscall basic_istream_wchar_vector_dtor(basic_ios_wchar
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_istream_wchar_vbase_dtor(this+i); basic_istream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_istream_wchar_vbase_dtor(this); basic_istream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -10689,11 +10689,11 @@ basic_iostream_char* __thiscall basic_iostream_char_vector_dtor(basic_ios_char *
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_iostream_char_vbase_dtor(this+i); basic_iostream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_iostream_char_vbase_dtor(this); basic_iostream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -10799,11 +10799,11 @@ basic_iostream_wchar* __thiscall basic_iostream_wchar_vector_dtor(basic_ios_wcha
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_iostream_wchar_vbase_dtor(this+i); basic_iostream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_iostream_wchar_vbase_dtor(this); basic_iostream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -10946,11 +10946,11 @@ basic_ofstream_char* __thiscall basic_ofstream_char_vector_dtor(basic_ios_char *
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ofstream_char_vbase_dtor(this+i); basic_ofstream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ofstream_char_vbase_dtor(this); basic_ofstream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -11156,11 +11156,11 @@ basic_ofstream_wchar* __thiscall basic_ofstream_wchar_vector_dtor(basic_ios_wcha
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ofstream_wchar_vbase_dtor(this+i); basic_ofstream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ofstream_wchar_vbase_dtor(this); basic_ofstream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -11347,11 +11347,11 @@ basic_ifstream_char* __thiscall basic_ifstream_char_vector_dtor(basic_ios_char *
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ifstream_char_vbase_dtor(this+i); basic_ifstream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ifstream_char_vbase_dtor(this); basic_ifstream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -11557,11 +11557,11 @@ basic_ifstream_wchar* __thiscall basic_ifstream_wchar_vector_dtor(basic_ios_wcha
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ifstream_wchar_vbase_dtor(this+i); basic_ifstream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ifstream_wchar_vbase_dtor(this); basic_ifstream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -11750,11 +11750,11 @@ basic_fstream_char* __thiscall basic_fstream_char_vector_dtor(basic_ios_char *ba
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_fstream_char_vbase_dtor(this+i); basic_fstream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_fstream_char_vbase_dtor(this); basic_fstream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -11962,11 +11962,11 @@ basic_fstream_wchar* __thiscall basic_fstream_wchar_vector_dtor(basic_ios_wchar
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_fstream_wchar_vbase_dtor(this+i); basic_fstream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_fstream_wchar_vbase_dtor(this); basic_fstream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -12136,11 +12136,11 @@ basic_ostringstream_char* __thiscall basic_ostringstream_char_vector_dtor(basic_
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ostringstream_char_vbase_dtor(this+i); basic_ostringstream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ostringstream_char_vbase_dtor(this); basic_ostringstream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -12312,11 +12312,11 @@ basic_ostringstream_wchar* __thiscall basic_ostringstream_wchar_vector_dtor(basi
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ostringstream_wchar_vbase_dtor(this+i); basic_ostringstream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ostringstream_wchar_vbase_dtor(this); basic_ostringstream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -12459,11 +12459,11 @@ basic_istringstream_char* __thiscall basic_istringstream_char_vector_dtor(basic_
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_istringstream_char_vbase_dtor(this+i); basic_istringstream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_istringstream_char_vbase_dtor(this); basic_istringstream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -12635,11 +12635,11 @@ basic_istringstream_wchar* __thiscall basic_istringstream_wchar_vector_dtor(basi
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_istringstream_wchar_vbase_dtor(this+i); basic_istringstream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_istringstream_wchar_vbase_dtor(this); basic_istringstream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -12785,11 +12785,11 @@ basic_stringstream_char* __thiscall basic_stringstream_char_vector_dtor(basic_io
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_stringstream_char_vbase_dtor(this+i); basic_stringstream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_stringstream_char_vbase_dtor(this); basic_stringstream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -12965,11 +12965,11 @@ basic_stringstream_wchar* __thiscall basic_stringstream_wchar_vector_dtor(basic_
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_stringstream_wchar_vbase_dtor(this+i); basic_stringstream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_stringstream_wchar_vbase_dtor(this); basic_stringstream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -13130,7 +13130,7 @@ void __thiscall strstreambuf__Tidy(strstreambuf *this)
if(this->pfree) if(this->pfree)
this->pfree(basic_streambuf_char_eback(&this->base)); this->pfree(basic_streambuf_char_eback(&this->base));
else else
MSVCRT_operator_delete(basic_streambuf_char_eback(&this->base)); operator_delete(basic_streambuf_char_eback(&this->base));
} }
this->endsave = NULL; this->endsave = NULL;
@ -13161,11 +13161,11 @@ strstreambuf* __thiscall strstreambuf_vector_dtor(strstreambuf *this, unsigned i
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
strstreambuf_dtor(this+i); strstreambuf_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
strstreambuf_dtor(this); strstreambuf_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -13249,7 +13249,7 @@ int __thiscall strstreambuf_overflow(strstreambuf *this, int c)
if(this->palloc) if(this->palloc)
buf = this->palloc(size); buf = this->palloc(size);
else else
buf = MSVCRT_operator_new(size); buf = operator_new(size);
if(!buf) if(!buf)
return EOF; return EOF;
@ -13258,7 +13258,7 @@ int __thiscall strstreambuf_overflow(strstreambuf *this, int c)
if(this->pfree) if(this->pfree)
this->pfree(ptr); this->pfree(ptr);
else else
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} }
this->strmode |= STRSTATE_Allocated; this->strmode |= STRSTATE_Allocated;
@ -13473,11 +13473,11 @@ ostrstream* __thiscall ostrstream_vector_dtor(basic_ios_char *base, unsigned int
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
ostrstream_vbase_dtor(this+i); ostrstream_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
ostrstream_vbase_dtor(this); ostrstream_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -13676,11 +13676,11 @@ strstream* __thiscall strstream_vector_dtor(basic_ios_char *base, unsigned int f
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
strstream_vbase_dtor(this+i); strstream_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
strstream_vbase_dtor(this); strstream_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;

12
dlls/msvcp60/main.c
View File

@ -58,8 +58,8 @@ DEFINE_VTBL_WRAPPER(56);
/* ?_Fpz@std@@3_JB */ /* ?_Fpz@std@@3_JB */
const __int64 std_Fpz = 0; const __int64 std_Fpz = 0;
void* (__cdecl *MSVCRT_operator_new)(size_t); void* (__cdecl *operator_new)(size_t);
void (__cdecl *MSVCRT_operator_delete)(void*); void (__cdecl *operator_delete)(void*);
void* (__cdecl *MSVCRT_set_new_handler)(void*); void* (__cdecl *MSVCRT_set_new_handler)(void*);
static void init_cxx_funcs(void) static void init_cxx_funcs(void)
@ -68,14 +68,14 @@ static void init_cxx_funcs(void)
if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */ if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */
{ {
MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPEAX_K@Z"); operator_new = (void*)GetProcAddress(hmod, "??2@YAPEAX_K@Z");
MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPEAX@Z"); operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPEAX@Z");
MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z"); MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z");
} }
else else
{ {
MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPAXI@Z"); operator_new = (void*)GetProcAddress(hmod, "??2@YAPAXI@Z");
MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPAX@Z"); operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPAX@Z");
MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z"); MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z");
} }
} }

4
dlls/msvcp60/msvcp.h
View File

@ -32,8 +32,8 @@ void __cdecl _invalid_parameter(const wchar_t*, const wchar_t*,
const wchar_t*, unsigned int, uintptr_t); const wchar_t*, unsigned int, uintptr_t);
BOOL __cdecl __uncaught_exception(void); BOOL __cdecl __uncaught_exception(void);
extern void* (__cdecl *MSVCRT_operator_new)(size_t); extern void* (__cdecl *operator_new)(size_t);
extern void (__cdecl *MSVCRT_operator_delete)(void*); extern void (__cdecl *operator_delete)(void*);
/* basic_string<char, char_traits<char>, allocator<char>> */ /* basic_string<char, char_traits<char>, allocator<char>> */
typedef struct typedef struct

8
dlls/msvcp90/details.c
View File

@ -100,7 +100,7 @@ _Concurrent_queue_base_v4* __thiscall _Concurrent_queue_base_v4_ctor(
{ {
TRACE("(%p %Iu)\n", this, size); TRACE("(%p %Iu)\n", this, size);
this->data = MSVCRT_operator_new(sizeof(*this->data)); this->data = operator_new(sizeof(*this->data));
memset(this->data, 0, sizeof(*this->data)); memset(this->data, 0, sizeof(*this->data));
this->vtable = &_Concurrent_queue_base_v4_vtable; this->vtable = &_Concurrent_queue_base_v4_vtable;
@ -122,7 +122,7 @@ DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4_dtor, 4)
void __thiscall _Concurrent_queue_base_v4_dtor(_Concurrent_queue_base_v4 *this) void __thiscall _Concurrent_queue_base_v4_dtor(_Concurrent_queue_base_v4 *this)
{ {
TRACE("(%p)\n", this); TRACE("(%p)\n", this);
MSVCRT_operator_delete(this->data); operator_delete(this->data);
} }
DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4_vector_dtor, 8) DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4_vector_dtor, 8)
@ -136,11 +136,11 @@ _Concurrent_queue_base_v4* __thiscall _Concurrent_queue_base_v4_vector_dtor(
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
_Concurrent_queue_base_v4_dtor(this+i); _Concurrent_queue_base_v4_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
if(flags & 1) if(flags & 1)
_Concurrent_queue_base_v4_dtor(this); _Concurrent_queue_base_v4_dtor(this);
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;

24
dlls/msvcp90/exception.c
View File

@ -133,11 +133,11 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
MSVCP_exception_dtor(this+i); MSVCP_exception_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
MSVCP_exception_dtor(this); MSVCP_exception_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -149,7 +149,7 @@ void * __thiscall MSVCP_exception_scalar_dtor(exception *this, unsigned int flag
{ {
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
MSVCP_exception_dtor(this); MSVCP_exception_dtor(this);
if (flags & 1) MSVCRT_operator_delete(this); if (flags & 1) operator_delete(this);
return this; return this;
} }
@ -249,11 +249,11 @@ void * __thiscall MSVCP_bad_alloc_vector_dtor(bad_alloc *this, unsigned int flag
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
MSVCP_bad_alloc_dtor(this+i); MSVCP_bad_alloc_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
MSVCP_bad_alloc_dtor(this); MSVCP_bad_alloc_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -353,11 +353,11 @@ void* __thiscall MSVCP_logic_error_vector_dtor(
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
MSVCP_logic_error_dtor(this+i); MSVCP_logic_error_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
MSVCP_logic_error_dtor(this); MSVCP_logic_error_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -369,7 +369,7 @@ void * __thiscall MSVCP_logic_error_scalar_dtor(logic_error *this, unsigned int
{ {
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
MSVCP_logic_error_dtor(this); MSVCP_logic_error_dtor(this);
if (flags & 1) MSVCRT_operator_delete(this); if (flags & 1) operator_delete(this);
return this; return this;
} }
@ -597,11 +597,11 @@ void* __thiscall MSVCP_runtime_error_vector_dtor(
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
MSVCP_runtime_error_dtor(this+i); MSVCP_runtime_error_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
MSVCP_runtime_error_dtor(this); MSVCP_runtime_error_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -793,11 +793,11 @@ void * __thiscall MSVCP_bad_cast_vector_dtor(bad_cast *this, unsigned int flags)
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
MSVCP_bad_cast_dtor(this+i); MSVCP_bad_cast_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
MSVCP_bad_cast_dtor(this); MSVCP_bad_cast_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;

166
dlls/msvcp90/ios.c
View File

@ -1256,7 +1256,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor(basic_streambuf_char
mutex_ctor(&this->lock); mutex_ctor(&this->lock);
#endif #endif
#if _MSVCP_VER >= 70 #if _MSVCP_VER >= 70
this->loc = MSVCRT_operator_new(sizeof(locale)); this->loc = operator_new(sizeof(locale));
#endif #endif
locale_ctor(IOS_LOCALE(this)); locale_ctor(IOS_LOCALE(this));
basic_streambuf_char__Init_empty(this); basic_streambuf_char__Init_empty(this);
@ -1276,7 +1276,7 @@ void __thiscall basic_streambuf_char_dtor(basic_streambuf_char *this)
#endif #endif
locale_dtor(IOS_LOCALE(this)); locale_dtor(IOS_LOCALE(this));
#if _MSVCP_VER >= 70 #if _MSVCP_VER >= 70
MSVCRT_operator_delete(this->loc); operator_delete(this->loc);
#endif #endif
} }
@ -1290,11 +1290,11 @@ basic_streambuf_char* __thiscall basic_streambuf_char_vector_dtor(basic_streambu
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_streambuf_char_dtor(this+i); basic_streambuf_char_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_streambuf_char_dtor(this); basic_streambuf_char_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -2127,7 +2127,7 @@ basic_streambuf_wchar* __thiscall basic_streambuf_wchar_ctor(basic_streambuf_wch
mutex_ctor(&this->lock); mutex_ctor(&this->lock);
#endif #endif
#if _MSVCP_VER >= 70 #if _MSVCP_VER >= 70
this->loc = MSVCRT_operator_new(sizeof(locale)); this->loc = operator_new(sizeof(locale));
#endif #endif
locale_ctor(IOS_LOCALE(this)); locale_ctor(IOS_LOCALE(this));
basic_streambuf_wchar__Init_empty(this); basic_streambuf_wchar__Init_empty(this);
@ -2160,7 +2160,7 @@ void __thiscall basic_streambuf_wchar_dtor(basic_streambuf_wchar *this)
#endif #endif
locale_dtor(IOS_LOCALE(this)); locale_dtor(IOS_LOCALE(this));
#if _MSVCP_VER >= 70 #if _MSVCP_VER >= 70
MSVCRT_operator_delete(this->loc); operator_delete(this->loc);
#endif #endif
} }
@ -2174,11 +2174,11 @@ basic_streambuf_wchar* __thiscall basic_streambuf_wchar_vector_dtor(basic_stream
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_streambuf_wchar_dtor(this+i); basic_streambuf_wchar_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_streambuf_wchar_dtor(this); basic_streambuf_wchar_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -3175,11 +3175,11 @@ basic_filebuf_char* __thiscall basic_filebuf_char_vector_dtor(basic_filebuf_char
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_filebuf_char_dtor(this+i); basic_filebuf_char_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_filebuf_char_dtor(this); basic_filebuf_char_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -3832,11 +3832,11 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_vector_dtor(basic_filebuf_wc
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_filebuf_wchar_dtor(this+i); basic_filebuf_wchar_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_filebuf_wchar_dtor(this); basic_filebuf_wchar_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -4330,7 +4330,7 @@ void __thiscall basic_stringbuf_char__Init(basic_stringbuf_char *this, const cha
this->seekhigh = NULL; this->seekhigh = NULL;
if(count && str) { if(count && str) {
char *buf = MSVCRT_operator_new(count); char *buf = operator_new(count);
if(!buf) { if(!buf) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -4400,7 +4400,7 @@ void __thiscall basic_stringbuf_char__Tidy(basic_stringbuf_char *this)
TRACE("(%p)\n", this); TRACE("(%p)\n", this);
if(this->state & STRINGBUF_allocated) { if(this->state & STRINGBUF_allocated) {
MSVCRT_operator_delete(basic_streambuf_char_eback(&this->base)); operator_delete(basic_streambuf_char_eback(&this->base));
this->seekhigh = NULL; this->seekhigh = NULL;
this->state &= ~STRINGBUF_allocated; this->state &= ~STRINGBUF_allocated;
} }
@ -4431,12 +4431,12 @@ basic_stringbuf_char* __thiscall basic_stringbuf_char_vector_dtor(basic_stringbu
for (i = *ptr - 1; i >= 0; i--) for (i = *ptr - 1; i >= 0; i--)
basic_stringbuf_char_dtor(this+i); basic_stringbuf_char_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
}else { }else {
basic_stringbuf_char_dtor(this); basic_stringbuf_char_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -4468,7 +4468,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met
oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0); oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0);
size = oldsize|0xf; size = oldsize|0xf;
size += size/2; size += size/2;
buf = MSVCRT_operator_new(size); buf = operator_new(size);
if(!buf) { if(!buf) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -4497,7 +4497,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met
buf+(basic_streambuf_char_gptr(&this->base)-ptr), buf+(basic_streambuf_char_gptr(&this->base)-ptr),
basic_streambuf_char_pptr(&this->base)+1); basic_streambuf_char_pptr(&this->base)+1);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} }
return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta);
@ -4707,7 +4707,7 @@ void __thiscall basic_stringbuf_wchar__Init(basic_stringbuf_wchar *this, const w
this->seekhigh = NULL; this->seekhigh = NULL;
if(count && str) { if(count && str) {
wchar_t *buf = MSVCRT_operator_new(count*sizeof(wchar_t)); wchar_t *buf = operator_new(count*sizeof(wchar_t));
if(!buf) { if(!buf) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -4809,7 +4809,7 @@ void __thiscall basic_stringbuf_wchar__Tidy(basic_stringbuf_wchar *this)
TRACE("(%p)\n", this); TRACE("(%p)\n", this);
if(this->state & STRINGBUF_allocated) { if(this->state & STRINGBUF_allocated) {
MSVCRT_operator_delete(basic_streambuf_wchar_eback(&this->base)); operator_delete(basic_streambuf_wchar_eback(&this->base));
this->seekhigh = NULL; this->seekhigh = NULL;
this->state &= ~STRINGBUF_allocated; this->state &= ~STRINGBUF_allocated;
} }
@ -4842,12 +4842,12 @@ basic_stringbuf_wchar* __thiscall basic_stringbuf_wchar_vector_dtor(basic_string
for (i = *ptr - 1; i >= 0; i--) for (i = *ptr - 1; i >= 0; i--)
basic_stringbuf_wchar_dtor(this+i); basic_stringbuf_wchar_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
}else { }else {
basic_stringbuf_wchar_dtor(this); basic_stringbuf_wchar_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -4881,7 +4881,7 @@ unsigned short __thiscall basic_stringbuf_wchar_overflow(basic_stringbuf_wchar *
oldsize = (ptr ? basic_streambuf_wchar_epptr(&this->base)-basic_streambuf_wchar_eback(&this->base): 0); oldsize = (ptr ? basic_streambuf_wchar_epptr(&this->base)-basic_streambuf_wchar_eback(&this->base): 0);
size = oldsize|0xf; size = oldsize|0xf;
size += size/2; size += size/2;
buf = MSVCRT_operator_new(size*sizeof(wchar_t)); buf = operator_new(size*sizeof(wchar_t));
if(!buf) { if(!buf) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -4910,7 +4910,7 @@ unsigned short __thiscall basic_stringbuf_wchar_overflow(basic_stringbuf_wchar *
buf+(basic_streambuf_wchar_gptr(&this->base)-ptr), buf+(basic_streambuf_wchar_gptr(&this->base)-ptr),
basic_streambuf_wchar_pptr(&this->base)+1); basic_streambuf_wchar_pptr(&this->base)+1);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} }
return (*basic_streambuf_wchar__Pninc(&this->base) = meta); return (*basic_streambuf_wchar__Pninc(&this->base) = meta);
@ -5138,13 +5138,13 @@ void __cdecl ios_base_Tidy(ios_base *this)
for(arr_cur=this->arr; arr_cur; arr_cur=arr_next) { for(arr_cur=this->arr; arr_cur; arr_cur=arr_next) {
arr_next = arr_cur->next; arr_next = arr_cur->next;
MSVCRT_operator_delete(arr_cur); operator_delete(arr_cur);
} }
this->arr = NULL; this->arr = NULL;
for(event_cur=this->calls; event_cur; event_cur=event_next) { for(event_cur=this->calls; event_cur; event_cur=event_next) {
event_next = event_cur->next; event_next = event_cur->next;
MSVCRT_operator_delete(event_cur); operator_delete(event_cur);
} }
this->calls = NULL; this->calls = NULL;
} }
@ -5156,7 +5156,7 @@ void __cdecl ios_base_Ios_base_dtor(ios_base *obj)
TRACE("(%p)\n", obj); TRACE("(%p)\n", obj);
locale_dtor(IOS_LOCALE(obj)); locale_dtor(IOS_LOCALE(obj));
#if _MSVCP_VER >= 70 #if _MSVCP_VER >= 70
MSVCRT_operator_delete(obj->loc); operator_delete(obj->loc);
#endif #endif
ios_base_Tidy(obj); ios_base_Tidy(obj);
} }
@ -5179,11 +5179,11 @@ ios_base* __thiscall ios_base_vector_dtor(ios_base *this, unsigned int flags)
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
ios_base_dtor(this+i); ios_base_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
ios_base_dtor(this); ios_base_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -5195,10 +5195,10 @@ void* __thiscall iosb_vector_dtor(void *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
INT_PTR *ptr = (INT_PTR *)this-1; INT_PTR *ptr = (INT_PTR *)this-1;
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -5225,7 +5225,7 @@ IOS_BASE_iosarray* __thiscall ios_base_Findarr(ios_base *this, int index)
} }
} }
p = MSVCRT_operator_new(sizeof(IOS_BASE_iosarray)); p = operator_new(sizeof(IOS_BASE_iosarray));
p->next = this->arr; p->next = this->arr;
p->index = index; p->index = index;
p->long_val = 0; p->long_val = 0;
@ -5261,7 +5261,7 @@ void __thiscall ios_base_register_callback(ios_base *this, IOS_BASE_event_callba
TRACE("(%p %p %d)\n", this, callback, index); TRACE("(%p %p %d)\n", this, callback, index);
event = MSVCRT_operator_new(sizeof(IOS_BASE_fnarray)); event = operator_new(sizeof(IOS_BASE_fnarray));
event->next = this->calls; event->next = this->calls;
event->index = index; event->index = index;
event->event_handler = callback; event->event_handler = callback;
@ -5452,7 +5452,7 @@ void __thiscall ios_base__Init(ios_base *this)
this->arr = NULL; this->arr = NULL;
this->calls = NULL; this->calls = NULL;
#if _MSVCP_VER >= 70 #if _MSVCP_VER >= 70
this->loc = MSVCRT_operator_new(sizeof(locale)); this->loc = operator_new(sizeof(locale));
#endif #endif
locale_ctor(IOS_LOCALE(this)); locale_ctor(IOS_LOCALE(this));
} }
@ -5778,11 +5778,11 @@ basic_ios_char* __thiscall basic_ios_char_vector_dtor(basic_ios_char *this, unsi
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ios_char_dtor(this+i); basic_ios_char_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ios_char_dtor(this); basic_ios_char_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -6045,11 +6045,11 @@ basic_ios_wchar* __thiscall basic_ios_wchar_vector_dtor(basic_ios_wchar *this, u
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ios_wchar_dtor(this+i); basic_ios_wchar_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ios_wchar_dtor(this); basic_ios_wchar_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -6362,11 +6362,11 @@ basic_ostream_char* __thiscall basic_ostream_char_vector_dtor(basic_ios_char *ba
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ostream_char_vbase_dtor(this+i); basic_ostream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ostream_char_vbase_dtor(this); basic_ostream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -7216,11 +7216,11 @@ basic_ostream_wchar* __thiscall basic_ostream_wchar_vector_dtor(basic_ios_wchar
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ostream_wchar_vbase_dtor(this+i); basic_ostream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ostream_wchar_vbase_dtor(this); basic_ostream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -8252,11 +8252,11 @@ basic_istream_char* __thiscall basic_istream_char_vector_dtor(basic_ios_char *ba
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_istream_char_vbase_dtor(this+i); basic_istream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_istream_char_vbase_dtor(this); basic_istream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -9774,11 +9774,11 @@ basic_istream_wchar* __thiscall basic_istream_wchar_vector_dtor(basic_ios_wchar
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_istream_wchar_vbase_dtor(this+i); basic_istream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_istream_wchar_vbase_dtor(this); basic_istream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -11299,11 +11299,11 @@ basic_iostream_char* __thiscall basic_iostream_char_vector_dtor(basic_ios_char *
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_iostream_char_vbase_dtor(this+i); basic_iostream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_iostream_char_vbase_dtor(this); basic_iostream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -11413,11 +11413,11 @@ basic_iostream_wchar* __thiscall basic_iostream_wchar_vector_dtor(basic_ios_wcha
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_iostream_wchar_vbase_dtor(this+i); basic_iostream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_iostream_wchar_vbase_dtor(this); basic_iostream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -11573,11 +11573,11 @@ basic_ofstream_char* __thiscall basic_ofstream_char_vector_dtor(basic_ios_char *
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ofstream_char_vbase_dtor(this+i); basic_ofstream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ofstream_char_vbase_dtor(this); basic_ofstream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -11847,11 +11847,11 @@ basic_ofstream_wchar* __thiscall basic_ofstream_wchar_vector_dtor(basic_ios_wcha
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ofstream_wchar_vbase_dtor(this+i); basic_ofstream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ofstream_wchar_vbase_dtor(this); basic_ofstream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -12099,11 +12099,11 @@ basic_ifstream_char* __thiscall basic_ifstream_char_vector_dtor(basic_ios_char *
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ifstream_char_vbase_dtor(this+i); basic_ifstream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ifstream_char_vbase_dtor(this); basic_ifstream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -12391,11 +12391,11 @@ basic_ifstream_wchar* __thiscall basic_ifstream_wchar_vector_dtor(basic_ios_wcha
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ifstream_wchar_vbase_dtor(this+i); basic_ifstream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ifstream_wchar_vbase_dtor(this); basic_ifstream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -12645,11 +12645,11 @@ basic_fstream_char* __thiscall basic_fstream_char_vector_dtor(basic_ios_char *ba
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_fstream_char_vbase_dtor(this+i); basic_fstream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_fstream_char_vbase_dtor(this); basic_fstream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -12938,11 +12938,11 @@ basic_fstream_wchar* __thiscall basic_fstream_wchar_vector_dtor(basic_ios_wchar
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_fstream_wchar_vbase_dtor(this+i); basic_fstream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_fstream_wchar_vbase_dtor(this); basic_fstream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -13155,11 +13155,11 @@ basic_ostringstream_char* __thiscall basic_ostringstream_char_vector_dtor(basic_
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ostringstream_char_vbase_dtor(this+i); basic_ostringstream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ostringstream_char_vbase_dtor(this); basic_ostringstream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -13335,11 +13335,11 @@ basic_ostringstream_wchar* __thiscall basic_ostringstream_wchar_vector_dtor(basi
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_ostringstream_wchar_vbase_dtor(this+i); basic_ostringstream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_ostringstream_wchar_vbase_dtor(this); basic_ostringstream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -13486,11 +13486,11 @@ basic_istringstream_char* __thiscall basic_istringstream_char_vector_dtor(basic_
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_istringstream_char_vbase_dtor(this+i); basic_istringstream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_istringstream_char_vbase_dtor(this); basic_istringstream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -13666,11 +13666,11 @@ basic_istringstream_wchar* __thiscall basic_istringstream_wchar_vector_dtor(basi
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_istringstream_wchar_vbase_dtor(this+i); basic_istringstream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_istringstream_wchar_vbase_dtor(this); basic_istringstream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -13820,11 +13820,11 @@ basic_stringstream_char* __thiscall basic_stringstream_char_vector_dtor(basic_io
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_stringstream_char_vbase_dtor(this+i); basic_stringstream_char_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_stringstream_char_vbase_dtor(this); basic_stringstream_char_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -14004,11 +14004,11 @@ basic_stringstream_wchar* __thiscall basic_stringstream_wchar_vector_dtor(basic_
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
basic_stringstream_wchar_vbase_dtor(this+i); basic_stringstream_wchar_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
basic_stringstream_wchar_vbase_dtor(this); basic_stringstream_wchar_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -14170,7 +14170,7 @@ void __thiscall strstreambuf__Tidy(strstreambuf *this)
if(this->pfree) if(this->pfree)
this->pfree(basic_streambuf_char_eback(&this->base)); this->pfree(basic_streambuf_char_eback(&this->base));
else else
MSVCRT_operator_delete(basic_streambuf_char_eback(&this->base)); operator_delete(basic_streambuf_char_eback(&this->base));
} }
this->endsave = NULL; this->endsave = NULL;
@ -14201,11 +14201,11 @@ strstreambuf* __thiscall strstreambuf_vector_dtor(strstreambuf *this, unsigned i
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
strstreambuf_dtor(this+i); strstreambuf_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
strstreambuf_dtor(this); strstreambuf_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -14289,7 +14289,7 @@ int __thiscall strstreambuf_overflow(strstreambuf *this, int c)
if(this->palloc) if(this->palloc)
buf = this->palloc(size); buf = this->palloc(size);
else else
buf = MSVCRT_operator_new(size); buf = operator_new(size);
if(!buf) if(!buf)
return EOF; return EOF;
@ -14298,7 +14298,7 @@ int __thiscall strstreambuf_overflow(strstreambuf *this, int c)
if(this->pfree) if(this->pfree)
this->pfree(ptr); this->pfree(ptr);
else else
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} }
this->strmode |= STRSTATE_Allocated; this->strmode |= STRSTATE_Allocated;
@ -14516,11 +14516,11 @@ ostrstream* __thiscall ostrstream_vector_dtor(basic_ios_char *base, unsigned int
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
ostrstream_vbase_dtor(this+i); ostrstream_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
ostrstream_vbase_dtor(this); ostrstream_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -15208,11 +15208,11 @@ strstream* __thiscall strstream_vector_dtor(basic_ios_char *base, unsigned int f
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
strstream_vbase_dtor(this+i); strstream_vbase_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
strstream_vbase_dtor(this); strstream_vbase_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;

274
dlls/msvcp90/locale.c
View File

@ -273,11 +273,11 @@ locale_facet* __thiscall locale_facet_vector_dtor(locale_facet *this, unsigned i
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
locale_facet_dtor(this+i); locale_facet_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
locale_facet_dtor(this); locale_facet_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -295,7 +295,7 @@ static struct list lazy_facets = LIST_INIT(lazy_facets);
/* ?facet_Register@facet@locale@std@@CAXPEAV123@@Z */ /* ?facet_Register@facet@locale@std@@CAXPEAV123@@Z */
void __cdecl locale_facet_register(locale_facet *add) void __cdecl locale_facet_register(locale_facet *add)
{ {
facets_elem *head = MSVCRT_operator_new(sizeof(*head)); facets_elem *head = operator_new(sizeof(*head));
if(!head) { if(!head) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -1054,11 +1054,11 @@ collate* __thiscall collate_char_vector_dtor(collate *this, unsigned int flags)
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
collate_char_dtor(this+i); collate_char_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
collate_char_dtor(this); collate_char_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -1079,7 +1079,7 @@ size_t __cdecl collate_char__Getcat(const locale_facet **facet, const locale *lo
TRACE("(%p %p)\n", facet, loc); TRACE("(%p %p)\n", facet, loc);
if(facet && !*facet) { if(facet && !*facet) {
*facet = MSVCRT_operator_new(sizeof(collate)); *facet = operator_new(sizeof(collate));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -1336,11 +1336,11 @@ collate* __thiscall collate_wchar_vector_dtor(collate *this, unsigned int flags)
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
collate_wchar_dtor(this+i); collate_wchar_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
collate_wchar_dtor(this); collate_wchar_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -1371,7 +1371,7 @@ size_t __cdecl collate_wchar__Getcat(const locale_facet **facet, const locale *l
TRACE("(%p %p)\n", facet, loc); TRACE("(%p %p)\n", facet, loc);
if(facet && !*facet) { if(facet && !*facet) {
*facet = MSVCRT_operator_new(sizeof(collate)); *facet = operator_new(sizeof(collate));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -1617,11 +1617,11 @@ ctype_base* __thiscall ctype_base_vector_dtor(ctype_base *this, unsigned int fla
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
ctype_base_dtor(this+i); ctype_base_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
ctype_base_dtor(this); ctype_base_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -1751,11 +1751,11 @@ ctype_char* __thiscall ctype_char_vector_dtor(ctype_char *this, unsigned int fla
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
ctype_char_dtor(this+i); ctype_char_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
ctype_char_dtor(this); ctype_char_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -1935,7 +1935,7 @@ size_t __cdecl ctype_char__Getcat(const locale_facet **facet, const locale *loc)
if(facet && !*facet) { if(facet && !*facet) {
_Locinfo locinfo; _Locinfo locinfo;
*facet = MSVCRT_operator_new(sizeof(ctype_char)); *facet = operator_new(sizeof(ctype_char));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -2386,11 +2386,11 @@ ctype_wchar* __thiscall ctype_wchar_vector_dtor(ctype_wchar *this, unsigned int
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
ctype_wchar_dtor(this+i); ctype_wchar_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
ctype_wchar_dtor(this); ctype_wchar_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -2740,7 +2740,7 @@ size_t __cdecl ctype_wchar__Getcat(const locale_facet **facet, const locale *loc
if(facet && !*facet) { if(facet && !*facet) {
_Locinfo locinfo; _Locinfo locinfo;
*facet = MSVCRT_operator_new(sizeof(ctype_wchar)); *facet = operator_new(sizeof(ctype_wchar));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -3169,11 +3169,11 @@ codecvt_base* __thiscall codecvt_base_vector_dtor(codecvt_base *this, unsigned i
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
codecvt_base_dtor(this+i); codecvt_base_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
codecvt_base_dtor(this); codecvt_base_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -3316,11 +3316,11 @@ codecvt_char* __thiscall codecvt_char_vector_dtor(codecvt_char *this, unsigned i
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
codecvt_char_dtor(this+i); codecvt_char_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
codecvt_char_dtor(this); codecvt_char_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -3333,7 +3333,7 @@ size_t __cdecl codecvt_char__Getcat(const locale_facet **facet, const locale *lo
TRACE("(%p %p)\n", facet, loc); TRACE("(%p %p)\n", facet, loc);
if(facet && !*facet) { if(facet && !*facet) {
*facet = MSVCRT_operator_new(sizeof(codecvt_char)); *facet = operator_new(sizeof(codecvt_char));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -3653,11 +3653,11 @@ codecvt_wchar* __thiscall codecvt_wchar_vector_dtor(codecvt_wchar *this, unsigne
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
codecvt_wchar_dtor(this+i); codecvt_wchar_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
codecvt_wchar_dtor(this); codecvt_wchar_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -3672,7 +3672,7 @@ size_t __cdecl codecvt_wchar__Getcat(const locale_facet **facet, const locale *l
if(facet && !*facet) { if(facet && !*facet) {
_Locinfo locinfo; _Locinfo locinfo;
*facet = MSVCRT_operator_new(sizeof(codecvt_wchar)); *facet = operator_new(sizeof(codecvt_wchar));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -3731,7 +3731,7 @@ size_t __cdecl codecvt_short__Getcat(const locale_facet **facet, const locale *l
if(facet && !*facet) { if(facet && !*facet) {
_Locinfo locinfo; _Locinfo locinfo;
*facet = MSVCRT_operator_new(sizeof(codecvt_wchar)); *facet = operator_new(sizeof(codecvt_wchar));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -4058,17 +4058,17 @@ void __thiscall numpunct_char__Init(numpunct_char *this, const _Locinfo *locinfo
TRACE("(%p %p %d)\n", this, locinfo, isdef); TRACE("(%p %p %d)\n", this, locinfo, isdef);
len = strlen(_Locinfo__Getfalse(locinfo))+1; len = strlen(_Locinfo__Getfalse(locinfo))+1;
this->false_name = MSVCRT_operator_new(len); this->false_name = operator_new(len);
if(this->false_name) if(this->false_name)
memcpy((char*)this->false_name, _Locinfo__Getfalse(locinfo), len); memcpy((char*)this->false_name, _Locinfo__Getfalse(locinfo), len);
len = strlen(_Locinfo__Gettrue(locinfo))+1; len = strlen(_Locinfo__Gettrue(locinfo))+1;
this->true_name = MSVCRT_operator_new(len); this->true_name = operator_new(len);
if(this->true_name) if(this->true_name)
memcpy((char*)this->true_name, _Locinfo__Gettrue(locinfo), len); memcpy((char*)this->true_name, _Locinfo__Gettrue(locinfo), len);
if(isdef) { if(isdef) {
this->grouping = MSVCRT_operator_new(1); this->grouping = operator_new(1);
if(this->grouping) if(this->grouping)
*(char*)this->grouping = 0; *(char*)this->grouping = 0;
@ -4078,7 +4078,7 @@ void __thiscall numpunct_char__Init(numpunct_char *this, const _Locinfo *locinfo
const struct lconv *lc = _Locinfo__Getlconv(locinfo); const struct lconv *lc = _Locinfo__Getlconv(locinfo);
len = strlen(lc->grouping)+1; len = strlen(lc->grouping)+1;
this->grouping = MSVCRT_operator_new(len); this->grouping = operator_new(len);
if(this->grouping) if(this->grouping)
memcpy((char*)this->grouping, lc->grouping, len); memcpy((char*)this->grouping, lc->grouping, len);
@ -4087,9 +4087,9 @@ void __thiscall numpunct_char__Init(numpunct_char *this, const _Locinfo *locinfo
} }
if(!this->false_name || !this->true_name || !this->grouping) { if(!this->false_name || !this->true_name || !this->grouping) {
MSVCRT_operator_delete((char*)this->grouping); operator_delete((char*)this->grouping);
MSVCRT_operator_delete((char*)this->false_name); operator_delete((char*)this->false_name);
MSVCRT_operator_delete((char*)this->true_name); operator_delete((char*)this->true_name);
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -4103,9 +4103,9 @@ void __thiscall numpunct_char__Tidy(numpunct_char *this)
{ {
TRACE("(%p)\n", this); TRACE("(%p)\n", this);
MSVCRT_operator_delete((char*)this->grouping); operator_delete((char*)this->grouping);
MSVCRT_operator_delete((char*)this->false_name); operator_delete((char*)this->false_name);
MSVCRT_operator_delete((char*)this->true_name); operator_delete((char*)this->true_name);
} }
/* ??0?$numpunct@D@std@@QAE@ABV_Locinfo@1@I_N@Z */ /* ??0?$numpunct@D@std@@QAE@ABV_Locinfo@1@I_N@Z */
@ -4177,11 +4177,11 @@ numpunct_char* __thiscall numpunct_char_vector_dtor(numpunct_char *this, unsigne
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
numpunct_char_dtor(this+i); numpunct_char_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
numpunct_char_dtor(this); numpunct_char_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -4194,7 +4194,7 @@ size_t __cdecl numpunct_char__Getcat(const locale_facet **facet, const locale *l
TRACE("(%p %p)\n", facet, loc); TRACE("(%p %p)\n", facet, loc);
if(facet && !*facet) { if(facet && !*facet) {
*facet = MSVCRT_operator_new(sizeof(numpunct_char)); *facet = operator_new(sizeof(numpunct_char));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -4398,20 +4398,20 @@ void __thiscall numpunct_wchar__Init(numpunct_wchar *this,
to_convert = _Locinfo__Getfalse(locinfo); to_convert = _Locinfo__Getfalse(locinfo);
len = MultiByteToWideChar(cvt.page, 0, to_convert, -1, NULL, 0); len = MultiByteToWideChar(cvt.page, 0, to_convert, -1, NULL, 0);
this->false_name = MSVCRT_operator_new(len*sizeof(WCHAR)); this->false_name = operator_new(len*sizeof(WCHAR));
if(this->false_name) if(this->false_name)
MultiByteToWideChar(cvt.page, 0, to_convert, -1, MultiByteToWideChar(cvt.page, 0, to_convert, -1,
(wchar_t*)this->false_name, len); (wchar_t*)this->false_name, len);
to_convert = _Locinfo__Gettrue(locinfo); to_convert = _Locinfo__Gettrue(locinfo);
len = MultiByteToWideChar(cvt.page, 0, to_convert, -1, NULL, 0); len = MultiByteToWideChar(cvt.page, 0, to_convert, -1, NULL, 0);
this->true_name = MSVCRT_operator_new(len*sizeof(WCHAR)); this->true_name = operator_new(len*sizeof(WCHAR));
if(this->true_name) if(this->true_name)
MultiByteToWideChar(cvt.page, 0, to_convert, -1, MultiByteToWideChar(cvt.page, 0, to_convert, -1,
(wchar_t*)this->true_name, len); (wchar_t*)this->true_name, len);
if(isdef) { if(isdef) {
this->grouping = MSVCRT_operator_new(1); this->grouping = operator_new(1);
if(this->grouping) if(this->grouping)
*(char*)this->grouping = 0; *(char*)this->grouping = 0;
@ -4421,7 +4421,7 @@ void __thiscall numpunct_wchar__Init(numpunct_wchar *this,
const struct lconv *lc = _Locinfo__Getlconv(locinfo); const struct lconv *lc = _Locinfo__Getlconv(locinfo);
len = strlen(lc->grouping)+1; len = strlen(lc->grouping)+1;
this->grouping = MSVCRT_operator_new(len); this->grouping = operator_new(len);
if(this->grouping) if(this->grouping)
memcpy((char*)this->grouping, lc->grouping, len); memcpy((char*)this->grouping, lc->grouping, len);
@ -4430,9 +4430,9 @@ void __thiscall numpunct_wchar__Init(numpunct_wchar *this,
} }
if(!this->false_name || !this->true_name || !this->grouping) { if(!this->false_name || !this->true_name || !this->grouping) {
MSVCRT_operator_delete((char*)this->grouping); operator_delete((char*)this->grouping);
MSVCRT_operator_delete((wchar_t*)this->false_name); operator_delete((wchar_t*)this->false_name);
MSVCRT_operator_delete((wchar_t*)this->true_name); operator_delete((wchar_t*)this->true_name);
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -4448,9 +4448,9 @@ void __thiscall numpunct_wchar__Tidy(numpunct_wchar *this)
{ {
TRACE("(%p)\n", this); TRACE("(%p)\n", this);
MSVCRT_operator_delete((char*)this->grouping); operator_delete((char*)this->grouping);
MSVCRT_operator_delete((wchar_t*)this->false_name); operator_delete((wchar_t*)this->false_name);
MSVCRT_operator_delete((wchar_t*)this->true_name); operator_delete((wchar_t*)this->true_name);
} }
/* ??0?$numpunct@_W@std@@QAE@ABV_Locinfo@1@I_N@Z */ /* ??0?$numpunct@_W@std@@QAE@ABV_Locinfo@1@I_N@Z */
@ -4564,11 +4564,11 @@ numpunct_wchar* __thiscall numpunct_wchar_vector_dtor(numpunct_wchar *this, unsi
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
numpunct_wchar_dtor(this+i); numpunct_wchar_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
numpunct_wchar_dtor(this); numpunct_wchar_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -4581,7 +4581,7 @@ size_t __cdecl numpunct_wchar__Getcat(const locale_facet **facet, const locale *
TRACE("(%p %p)\n", facet, loc); TRACE("(%p %p)\n", facet, loc);
if(facet && !*facet) { if(facet && !*facet) {
*facet = MSVCRT_operator_new(sizeof(numpunct_wchar)); *facet = operator_new(sizeof(numpunct_wchar));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -4636,7 +4636,7 @@ size_t __cdecl numpunct_short__Getcat(const locale_facet **facet, const locale *
TRACE("(%p %p)\n", facet, loc); TRACE("(%p %p)\n", facet, loc);
if(facet && !*facet) { if(facet && !*facet) {
*facet = MSVCRT_operator_new(sizeof(numpunct_wchar)); *facet = operator_new(sizeof(numpunct_wchar));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -5044,11 +5044,11 @@ num_get* __thiscall num_get_wchar_vector_dtor(num_get *this, unsigned int flags)
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
num_get_wchar_dtor(this+i); num_get_wchar_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
num_get_wchar_dtor(this); num_get_wchar_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -5063,7 +5063,7 @@ size_t __cdecl num_get_wchar__Getcat(const locale_facet **facet, const locale *l
if(facet && !*facet) { if(facet && !*facet) {
_Locinfo locinfo; _Locinfo locinfo;
*facet = MSVCRT_operator_new(sizeof(num_get)); *facet = operator_new(sizeof(num_get));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -6294,11 +6294,11 @@ num_get* __thiscall num_get_char_vector_dtor(num_get *this, unsigned int flags)
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
num_get_char_dtor(this+i); num_get_char_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
num_get_char_dtor(this); num_get_char_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -6313,7 +6313,7 @@ size_t __cdecl num_get_char__Getcat(const locale_facet **facet, const locale *lo
if(facet && !*facet) { if(facet && !*facet) {
_Locinfo locinfo; _Locinfo locinfo;
*facet = MSVCRT_operator_new(sizeof(num_get)); *facet = operator_new(sizeof(num_get));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -7245,11 +7245,11 @@ num_put* __thiscall num_put_char_vector_dtor(num_put *this, unsigned int flags)
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
num_put_char_dtor(this+i); num_put_char_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
num_put_char_dtor(this); num_put_char_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -7264,7 +7264,7 @@ size_t __cdecl num_put_char__Getcat(const locale_facet **facet, const locale *lo
if(facet && !*facet) { if(facet && !*facet) {
_Locinfo locinfo; _Locinfo locinfo;
*facet = MSVCRT_operator_new(sizeof(num_put)); *facet = operator_new(sizeof(num_put));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -7690,13 +7690,13 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t
size = _scprintf(fmt, prec, v); size = _scprintf(fmt, prec, v);
/* TODO: don't use dynamic allocation */ /* TODO: don't use dynamic allocation */
tmp = MSVCRT_operator_new(size*2); tmp = operator_new(size*2);
if(!tmp) { if(!tmp) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
} }
num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v)); num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v));
MSVCRT_operator_delete(tmp); operator_delete(tmp);
return ret; return ret;
} }
@ -8022,11 +8022,11 @@ num_put* __thiscall num_put_wchar_vector_dtor(num_put *this, unsigned int flags)
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
num_put_wchar_dtor(this+i); num_put_wchar_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
num_put_wchar_dtor(this); num_put_wchar_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -8041,7 +8041,7 @@ size_t __cdecl num_put_wchar__Getcat(const locale_facet **facet, const locale *l
if(facet && !*facet) { if(facet && !*facet) {
_Locinfo locinfo; _Locinfo locinfo;
*facet = MSVCRT_operator_new(sizeof(num_put)); *facet = operator_new(sizeof(num_put));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -8072,7 +8072,7 @@ size_t __cdecl num_put_short__Getcat(const locale_facet **facet, const locale *l
if(facet && !*facet) { if(facet && !*facet) {
_Locinfo locinfo; _Locinfo locinfo;
*facet = MSVCRT_operator_new(sizeof(num_put)); *facet = operator_new(sizeof(num_put));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -8639,14 +8639,14 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_do_put_double(const num_put
size = _scprintf(fmt, prec, v); size = _scprintf(fmt, prec, v);
/* TODO: don't use dynamic allocation */ /* TODO: don't use dynamic allocation */
tmp = MSVCRT_operator_new(size*2); tmp = operator_new(size*2);
if(!tmp) { if(!tmp) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
} }
num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v), num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v),
numpunct_wchar_use_facet(IOS_LOCALE(base))); numpunct_wchar_use_facet(IOS_LOCALE(base)));
MSVCRT_operator_delete(tmp); operator_delete(tmp);
return ret; return ret;
} }
@ -8674,14 +8674,14 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put
size = _scprintf(fmt, prec, v); size = _scprintf(fmt, prec, v);
/* TODO: don't use dynamic allocation */ /* TODO: don't use dynamic allocation */
tmp = MSVCRT_operator_new(size*2); tmp = operator_new(size*2);
if(!tmp) { if(!tmp) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
} }
num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v), num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v),
numpunct_short_use_facet(IOS_LOCALE(base))); numpunct_short_use_facet(IOS_LOCALE(base)));
MSVCRT_operator_delete(tmp); operator_delete(tmp);
return ret; return ret;
} }
@ -9075,11 +9075,11 @@ time_put* __thiscall time_put_char_vector_dtor(time_put *this, unsigned int flag
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
time_put_char_dtor(this+i); time_put_char_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
time_put_char_dtor(this); time_put_char_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -9094,7 +9094,7 @@ size_t __cdecl time_put_char__Getcat(const locale_facet **facet, const locale *l
if(facet && !*facet) { if(facet && !*facet) {
_Locinfo locinfo; _Locinfo locinfo;
*facet = MSVCRT_operator_new(sizeof(time_put)); *facet = operator_new(sizeof(time_put));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -9447,11 +9447,11 @@ time_put* __thiscall time_put_wchar_vector_dtor(time_put *this, unsigned int fla
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
time_put_wchar_dtor(this+i); time_put_wchar_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
time_put_wchar_dtor(this); time_put_wchar_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -9464,7 +9464,7 @@ size_t __cdecl time_put_wchar__Getcat(const locale_facet **facet, const locale *
TRACE("(%p %p)\n", facet, loc); TRACE("(%p %p)\n", facet, loc);
if(facet && !*facet) { if(facet && !*facet) {
*facet = MSVCRT_operator_new(sizeof(time_put)); *facet = operator_new(sizeof(time_put));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -9519,7 +9519,7 @@ size_t __cdecl time_put_short__Getcat(const locale_facet **facet, const locale *
TRACE("(%p %p)\n", facet, loc); TRACE("(%p %p)\n", facet, loc);
if(facet && !*facet) { if(facet && !*facet) {
*facet = MSVCRT_operator_new(sizeof(time_put)); *facet = operator_new(sizeof(time_put));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -9797,7 +9797,7 @@ void __thiscall time_get_char__Init(time_get_char *this, const _Locinfo *locinfo
days = _Locinfo__Getdays(locinfo); days = _Locinfo__Getdays(locinfo);
len = strlen(days)+1; len = strlen(days)+1;
this->days = MSVCRT_operator_new(len); this->days = operator_new(len);
if(!this->days) if(!this->days)
{ {
ERR("Out of memory\n"); ERR("Out of memory\n");
@ -9807,10 +9807,10 @@ void __thiscall time_get_char__Init(time_get_char *this, const _Locinfo *locinfo
months = _Locinfo__Getmonths(locinfo); months = _Locinfo__Getmonths(locinfo);
len = strlen(months)+1; len = strlen(months)+1;
this->months = MSVCRT_operator_new(len); this->months = operator_new(len);
if(!this->months) if(!this->months)
{ {
MSVCRT_operator_delete((char*)this->days); operator_delete((char*)this->days);
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -9879,8 +9879,8 @@ void __thiscall time_get_char__Tidy(time_get_char *this)
{ {
TRACE("(%p)\n", this); TRACE("(%p)\n", this);
MSVCRT_operator_delete((char*)this->days); operator_delete((char*)this->days);
MSVCRT_operator_delete((char*)this->months); operator_delete((char*)this->months);
} }
/* ??1?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MAE@XZ */ /* ??1?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MAE@XZ */
@ -9903,11 +9903,11 @@ time_get_char* __thiscall time_get_char_vector_dtor(time_get_char *this, unsigne
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
time_get_char_dtor(this+i); time_get_char_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
time_get_char_dtor(this); time_get_char_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -9922,7 +9922,7 @@ unsigned int __cdecl time_get_char__Getcat(const locale_facet **facet, const loc
if(facet && !*facet) { if(facet && !*facet) {
_Locinfo locinfo; _Locinfo locinfo;
*facet = MSVCRT_operator_new(sizeof(time_get_char)); *facet = operator_new(sizeof(time_get_char));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -10666,7 +10666,7 @@ static wchar_t* create_time_get_str(const wchar_t *str)
int len; int len;
len = lstrlenW(str)+1; len = lstrlenW(str)+1;
ret = MSVCRT_operator_new(len * sizeof(wchar_t)); ret = operator_new(len * sizeof(wchar_t));
if(ret) if(ret)
memcpy(ret, str, len*sizeof(wchar_t)); memcpy(ret, str, len*sizeof(wchar_t));
return ret; return ret;
@ -10680,7 +10680,7 @@ static wchar_t* create_time_get_str(const char *str, const _Locinfo *locinfo)
_Locinfo__Getcvt(locinfo, &cvt); _Locinfo__Getcvt(locinfo, &cvt);
len = MultiByteToWideChar(cvt.page, 0, str, -1, NULL, 0); len = MultiByteToWideChar(cvt.page, 0, str, -1, NULL, 0);
ret = MSVCRT_operator_new(len*sizeof(WCHAR)); ret = operator_new(len*sizeof(WCHAR));
if(ret) if(ret)
MultiByteToWideChar(cvt.page, 0, str, -1, ret, len); MultiByteToWideChar(cvt.page, 0, str, -1, ret, len);
return ret; return ret;
@ -10712,7 +10712,7 @@ void __thiscall time_get_wchar__Init(time_get_wchar *this, const _Locinfo *locin
#endif #endif
if(!this->months) if(!this->months)
{ {
MSVCRT_operator_delete((wchar_t*)this->days); operator_delete((wchar_t*)this->days);
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -10780,8 +10780,8 @@ void __thiscall time_get_wchar__Tidy(time_get_wchar *this)
{ {
TRACE("(%p)\n", this); TRACE("(%p)\n", this);
MSVCRT_operator_delete((wchar_t*)this->days); operator_delete((wchar_t*)this->days);
MSVCRT_operator_delete((wchar_t*)this->months); operator_delete((wchar_t*)this->months);
} }
/* ??1?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@MAE@XZ */ /* ??1?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@MAE@XZ */
@ -10804,11 +10804,11 @@ time_get_wchar* __thiscall time_get_wchar_vector_dtor(time_get_wchar *this, unsi
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
time_get_wchar_dtor(this+i); time_get_wchar_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
time_get_wchar_dtor(this); time_get_wchar_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -10823,7 +10823,7 @@ unsigned int __cdecl time_get_wchar__Getcat(const locale_facet **facet, const lo
if(facet && !*facet) { if(facet && !*facet) {
_Locinfo locinfo; _Locinfo locinfo;
*facet = MSVCRT_operator_new(sizeof(time_get_wchar)); *facet = operator_new(sizeof(time_get_wchar));
if(!*facet) { if(!*facet) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -11595,7 +11595,7 @@ locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const
locale_facet_ctor_refs(&this->facet, 1); locale_facet_ctor_refs(&this->facet, 1);
this->facet.vtable = &locale__Locimp_vtable; this->facet.vtable = &locale__Locimp_vtable;
if(copy->facetvec) { if(copy->facetvec) {
this->facetvec = MSVCRT_operator_new(copy->facet_cnt*sizeof(locale_facet*)); this->facetvec = operator_new(copy->facet_cnt*sizeof(locale_facet*));
if(!this->facetvec) { if(!this->facetvec) {
_Lockit_dtor(&lock); _Lockit_dtor(&lock);
ERR("Out of memory\n"); ERR("Out of memory\n");
@ -11635,7 +11635,7 @@ void __thiscall locale__Locimp_dtor(locale__Locimp *this)
if(this->facetvec[i] && call_locale_facet__Decref(this->facetvec[i])) if(this->facetvec[i] && call_locale_facet__Decref(this->facetvec[i]))
call_locale_facet_vector_dtor(this->facetvec[i], 1); call_locale_facet_vector_dtor(this->facetvec[i], 1);
MSVCRT_operator_delete(this->facetvec); operator_delete(this->facetvec);
locale_string_char_dtor(&this->name); locale_string_char_dtor(&this->name);
} }
@ -11656,11 +11656,11 @@ locale__Locimp* __thiscall locale__Locimp_vector_dtor(locale__Locimp *this, unsi
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
locale__Locimp_dtor(this+i); locale__Locimp_dtor(this+i);
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
locale__Locimp_dtor(this); locale__Locimp_dtor(this);
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -11674,7 +11674,7 @@ locale__Locimp* __cdecl locale__Locimp__New_Locimp(const locale__Locimp *copy)
TRACE("(%p)\n", copy); TRACE("(%p)\n", copy);
ret = MSVCRT_operator_new(sizeof(locale__Locimp)); ret = operator_new(sizeof(locale__Locimp));
if(!ret) { if(!ret) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -11691,7 +11691,7 @@ locale__Locimp* __cdecl locale__Locimp__New_Locimp_transparent(bool transparent)
TRACE("(%x)\n", transparent); TRACE("(%x)\n", transparent);
ret = MSVCRT_operator_new(sizeof(locale__Locimp)); ret = operator_new(sizeof(locale__Locimp));
if(!ret) { if(!ret) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -11716,7 +11716,7 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet
if(new_size < 40) if(new_size < 40)
new_size = 40; new_size = 40;
new_facetvec = MSVCRT_operator_new(sizeof(locale_facet*)*new_size); new_facetvec = operator_new(sizeof(locale_facet*)*new_size);
if(!new_facetvec) { if(!new_facetvec) {
_Lockit_dtor(&lock); _Lockit_dtor(&lock);
ERR("Out of memory\n"); ERR("Out of memory\n");
@ -11726,7 +11726,7 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet
memset(new_facetvec, 0, sizeof(locale_facet*)*new_size); memset(new_facetvec, 0, sizeof(locale_facet*)*new_size);
memcpy(new_facetvec, locimp->facetvec, sizeof(locale_facet*)*locimp->facet_cnt); memcpy(new_facetvec, locimp->facetvec, sizeof(locale_facet*)*locimp->facet_cnt);
MSVCRT_operator_delete(locimp->facetvec); operator_delete(locimp->facetvec);
locimp->facetvec = new_facetvec; locimp->facetvec = new_facetvec;
locimp->facet_cnt = new_size; locimp->facet_cnt = new_size;
} }
@ -11771,7 +11771,7 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l
if(loc) { if(loc) {
ctype = ctype_short_use_facet(loc); ctype = ctype_short_use_facet(loc);
}else { }else {
ctype = MSVCRT_operator_new(sizeof(ctype_wchar)); ctype = operator_new(sizeof(ctype_wchar));
if(!ctype) { if(!ctype) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -11787,7 +11787,7 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l
if(loc) { if(loc) {
numget = num_get_short_use_facet(loc); numget = num_get_short_use_facet(loc);
}else { }else {
numget = MSVCRT_operator_new(sizeof(num_get)); numget = operator_new(sizeof(num_get));
if(!numget) { if(!numget) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -11803,7 +11803,7 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l
if(loc) { if(loc) {
numput = num_put_short_use_facet(loc); numput = num_put_short_use_facet(loc);
}else { }else {
numput = MSVCRT_operator_new(sizeof(num_put)); numput = operator_new(sizeof(num_put));
if(!numput) { if(!numput) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -11819,7 +11819,7 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l
if(loc) { if(loc) {
numpunct = numpunct_short_use_facet(loc); numpunct = numpunct_short_use_facet(loc);
}else { }else {
numpunct = MSVCRT_operator_new(sizeof(numpunct_wchar)); numpunct = operator_new(sizeof(numpunct_wchar));
if(!numpunct) { if(!numpunct) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -11835,7 +11835,7 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l
if(loc) { if(loc) {
c = collate_short_use_facet(loc); c = collate_short_use_facet(loc);
}else { }else {
c = MSVCRT_operator_new(sizeof(collate)); c = operator_new(sizeof(collate));
if(!c) { if(!c) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -11851,7 +11851,7 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l
if(loc) { if(loc) {
t = time_put_short_use_facet(loc); t = time_put_short_use_facet(loc);
}else { }else {
t = MSVCRT_operator_new(sizeof(time_put)); t = operator_new(sizeof(time_put));
if(!t) { if(!t) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -11867,7 +11867,7 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l
if(loc) { if(loc) {
codecvt = codecvt_short_use_facet(loc); codecvt = codecvt_short_use_facet(loc);
}else { }else {
codecvt = MSVCRT_operator_new(sizeof(codecvt_wchar)); codecvt = operator_new(sizeof(codecvt_wchar));
if(!codecvt) { if(!codecvt) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -11893,7 +11893,7 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc
if(loc) { if(loc) {
ctype = ctype_wchar_use_facet(loc); ctype = ctype_wchar_use_facet(loc);
}else { }else {
ctype = MSVCRT_operator_new(sizeof(ctype_wchar)); ctype = operator_new(sizeof(ctype_wchar));
if(!ctype) { if(!ctype) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -11909,7 +11909,7 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc
if(loc) { if(loc) {
numget = num_get_wchar_use_facet(loc); numget = num_get_wchar_use_facet(loc);
}else { }else {
numget = MSVCRT_operator_new(sizeof(num_get)); numget = operator_new(sizeof(num_get));
if(!numget) { if(!numget) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -11925,7 +11925,7 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc
if(loc) { if(loc) {
numput = num_put_wchar_use_facet(loc); numput = num_put_wchar_use_facet(loc);
}else { }else {
numput = MSVCRT_operator_new(sizeof(num_put)); numput = operator_new(sizeof(num_put));
if(!numput) { if(!numput) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -11941,7 +11941,7 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc
if(loc) { if(loc) {
numpunct = numpunct_wchar_use_facet(loc); numpunct = numpunct_wchar_use_facet(loc);
}else { }else {
numpunct = MSVCRT_operator_new(sizeof(numpunct_wchar)); numpunct = operator_new(sizeof(numpunct_wchar));
if(!numpunct) { if(!numpunct) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -11957,7 +11957,7 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc
if(loc) { if(loc) {
c = collate_wchar_use_facet(loc); c = collate_wchar_use_facet(loc);
}else { }else {
c = MSVCRT_operator_new(sizeof(collate)); c = operator_new(sizeof(collate));
if(!c) { if(!c) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -11973,7 +11973,7 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc
if(loc) { if(loc) {
t = time_get_wchar_use_facet(loc); t = time_get_wchar_use_facet(loc);
}else { }else {
t = MSVCRT_operator_new(sizeof(time_get_wchar)); t = operator_new(sizeof(time_get_wchar));
if(!t) { if(!t) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -11989,7 +11989,7 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc
if(loc) { if(loc) {
t = time_put_wchar_use_facet(loc); t = time_put_wchar_use_facet(loc);
}else { }else {
t = MSVCRT_operator_new(sizeof(time_put)); t = operator_new(sizeof(time_put));
if(!t) { if(!t) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -12005,7 +12005,7 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc
if(loc) { if(loc) {
codecvt = codecvt_wchar_use_facet(loc); codecvt = codecvt_wchar_use_facet(loc);
}else { }else {
codecvt = MSVCRT_operator_new(sizeof(codecvt_wchar)); codecvt = operator_new(sizeof(codecvt_wchar));
if(!codecvt) { if(!codecvt) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -12031,7 +12031,7 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc
if(loc) { if(loc) {
ctype = ctype_char_use_facet(loc); ctype = ctype_char_use_facet(loc);
}else { }else {
ctype = MSVCRT_operator_new(sizeof(ctype_char)); ctype = operator_new(sizeof(ctype_char));
if(!ctype) { if(!ctype) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -12047,7 +12047,7 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc
if(loc) { if(loc) {
numget = num_get_char_use_facet(loc); numget = num_get_char_use_facet(loc);
}else { }else {
numget = MSVCRT_operator_new(sizeof(num_get)); numget = operator_new(sizeof(num_get));
if(!numget) { if(!numget) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -12063,7 +12063,7 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc
if(loc) { if(loc) {
numput = num_put_char_use_facet(loc); numput = num_put_char_use_facet(loc);
}else { }else {
numput = MSVCRT_operator_new(sizeof(num_put)); numput = operator_new(sizeof(num_put));
if(!numput) { if(!numput) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -12079,7 +12079,7 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc
if(loc) { if(loc) {
numpunct = numpunct_char_use_facet(loc); numpunct = numpunct_char_use_facet(loc);
}else { }else {
numpunct = MSVCRT_operator_new(sizeof(numpunct_char)); numpunct = operator_new(sizeof(numpunct_char));
if(!numpunct) { if(!numpunct) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -12095,7 +12095,7 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc
if(loc) { if(loc) {
c = collate_char_use_facet(loc); c = collate_char_use_facet(loc);
}else { }else {
c = MSVCRT_operator_new(sizeof(collate)); c = operator_new(sizeof(collate));
if(!c) { if(!c) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -12111,7 +12111,7 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc
if(loc) { if(loc) {
t = time_get_char_use_facet(loc); t = time_get_char_use_facet(loc);
}else { }else {
t = MSVCRT_operator_new(sizeof(time_get_char)); t = operator_new(sizeof(time_get_char));
if(!t) { if(!t) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -12127,7 +12127,7 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc
if(loc) { if(loc) {
t = time_put_char_use_facet(loc); t = time_put_char_use_facet(loc);
}else { }else {
t = MSVCRT_operator_new(sizeof(time_put)); t = operator_new(sizeof(time_put));
if(!t) { if(!t) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -12143,7 +12143,7 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc
if(loc) { if(loc) {
codecvt = codecvt_char_use_facet(loc); codecvt = codecvt_char_use_facet(loc);
}else { }else {
codecvt = MSVCRT_operator_new(sizeof(codecvt_char)); codecvt = operator_new(sizeof(codecvt_char));
if(!codecvt) { if(!codecvt) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -12194,7 +12194,7 @@ locale__Locimp* __cdecl locale__Init(void)
return global_locale; return global_locale;
} }
global_locale = MSVCRT_operator_new(sizeof(locale__Locimp)); global_locale = operator_new(sizeof(locale__Locimp));
if(!global_locale) { if(!global_locale) {
_Lockit_dtor(&lock); _Lockit_dtor(&lock);
ERR("Out of memory\n"); ERR("Out of memory\n");
@ -12254,7 +12254,7 @@ locale* __thiscall locale_ctor_locale_locale(locale *this, const locale *loc, co
TRACE("(%p %p %p %d)\n", this, loc, other, cat); TRACE("(%p %p %p %d)\n", this, loc, other, cat);
this->ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); this->ptr = operator_new(sizeof(locale__Locimp));
if(!this->ptr) { if(!this->ptr) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -12292,11 +12292,11 @@ locale* __thiscall locale_ctor_locale_cstr(locale *this, const locale *loc, cons
_Locinfo_ctor_cat_cstr(&locinfo, cat, locname); _Locinfo_ctor_cat_cstr(&locinfo, cat, locname);
if(!memcmp(locale_string_char_c_str(&locinfo.newlocname), "*", 2)) { if(!memcmp(locale_string_char_c_str(&locinfo.newlocname), "*", 2)) {
_Locinfo_dtor(&locinfo); _Locinfo_dtor(&locinfo);
MSVCRT_operator_delete(this->ptr); operator_delete(this->ptr);
throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name");
} }
this->ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); this->ptr = operator_new(sizeof(locale__Locimp));
if(!this->ptr) { if(!this->ptr) {
ERR("Out of memory\n"); ERR("Out of memory\n");
_Locinfo_dtor(&locinfo); _Locinfo_dtor(&locinfo);
@ -12318,7 +12318,7 @@ locale* __thiscall locale_ctor_cstr(locale *this, const char *locname, category
TRACE("(%p %s %d)\n", this, locname, cat); TRACE("(%p %s %d)\n", this, locname, cat);
this->ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); this->ptr = operator_new(sizeof(locale__Locimp));
if(!this->ptr) { if(!this->ptr) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -12330,7 +12330,7 @@ locale* __thiscall locale_ctor_cstr(locale *this, const char *locname, category
_Locinfo_ctor_cat_cstr(&locinfo, cat, locname); _Locinfo_ctor_cat_cstr(&locinfo, cat, locname);
if(!memcmp(locale_string_char_c_str(&locinfo.newlocname), "*", 2)) { if(!memcmp(locale_string_char_c_str(&locinfo.newlocname), "*", 2)) {
_Locinfo_dtor(&locinfo); _Locinfo_dtor(&locinfo);
MSVCRT_operator_delete(this->ptr); operator_delete(this->ptr);
throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name");
} }
@ -12370,7 +12370,7 @@ void __thiscall locale_dtor(locale *this)
if(this->ptr && call_locale_facet__Decref(&this->ptr->facet)) if(this->ptr && call_locale_facet__Decref(&this->ptr->facet))
{ {
locale__Locimp_dtor(this->ptr); locale__Locimp_dtor(this->ptr);
MSVCRT_operator_delete(this->ptr); operator_delete(this->ptr);
} }
} }
@ -12409,7 +12409,7 @@ locale* __thiscall locale__Addfac(locale *this, locale_facet *facet, size_t id,
TRACE("(%p %p %Iu %Iu)\n", this, facet, id, catmask); TRACE("(%p %p %Iu %Iu)\n", this, facet, id, catmask);
if(this->ptr->facet.refs > 1) { if(this->ptr->facet.refs > 1) {
locale__Locimp *new_ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); locale__Locimp *new_ptr = operator_new(sizeof(locale__Locimp));
if(!new_ptr) { if(!new_ptr) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -12486,7 +12486,7 @@ locale* __cdecl locale_empty(locale *ret)
locale__Init(); locale__Init();
ret->ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); ret->ptr = operator_new(sizeof(locale__Locimp));
if(!ret->ptr) { if(!ret->ptr) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -13205,13 +13205,13 @@ void free_locale(void)
if(global_locale) { if(global_locale) {
locale_dtor(&classic_locale); locale_dtor(&classic_locale);
locale__Locimp_dtor(global_locale); locale__Locimp_dtor(global_locale);
MSVCRT_operator_delete(global_locale); operator_delete(global_locale);
} }
LIST_FOR_EACH_ENTRY_SAFE(iter, safe, &lazy_facets, facets_elem, entry) { LIST_FOR_EACH_ENTRY_SAFE(iter, safe, &lazy_facets, facets_elem, entry) {
list_remove(&iter->entry); list_remove(&iter->entry);
if(call_locale_facet__Decref(iter->fac)) if(call_locale_facet__Decref(iter->fac))
call_locale_facet_vector_dtor(iter->fac, 1); call_locale_facet_vector_dtor(iter->fac, 1);
MSVCRT_operator_delete(iter); operator_delete(iter);
} }
} }

12
dlls/msvcp90/memory.c
View File

@ -70,7 +70,7 @@ void* __thiscall MSVCP_allocator_char_assign(void *this, const void *assign)
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_deallocate, 12) DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_deallocate, 12)
void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, size_t size) void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, size_t size)
{ {
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} }
/* ?allocate@?$allocator@D@std@@QAEPADI@Z */ /* ?allocate@?$allocator@D@std@@QAEPADI@Z */
@ -78,7 +78,7 @@ void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, size_t si
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8) DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8)
char* __thiscall MSVCP_allocator_char_allocate(void *this, size_t count) char* __thiscall MSVCP_allocator_char_allocate(void *this, size_t count)
{ {
return MSVCRT_operator_new(count); return operator_new(count);
} }
/* ?allocate@?$allocator@D@std@@QAEPADIPBX@Z */ /* ?allocate@?$allocator@D@std@@QAEPADIPBX@Z */
@ -162,7 +162,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_deallocate, 12)
void __thiscall MSVCP_allocator_wchar_deallocate(void *this, void __thiscall MSVCP_allocator_wchar_deallocate(void *this,
wchar_t *ptr, size_t size) wchar_t *ptr, size_t size)
{ {
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} }
/* ?allocate@?$allocator@_W@std@@QAEPA_WI@Z */ /* ?allocate@?$allocator@_W@std@@QAEPA_WI@Z */
@ -175,7 +175,7 @@ wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void *this, size_t count)
return NULL; return NULL;
} }
return MSVCRT_operator_new(count * sizeof(wchar_t)); return operator_new(count * sizeof(wchar_t));
} }
/* ?allocate@?$allocator@_W@std@@QAEPA_WIPBX@Z */ /* ?allocate@?$allocator@_W@std@@QAEPA_WIPBX@Z */
@ -260,7 +260,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_deallocate, 12)
void __thiscall MSVCP_allocator_short_deallocate(void *this, void __thiscall MSVCP_allocator_short_deallocate(void *this,
unsigned short *ptr, size_t size) unsigned short *ptr, size_t size)
{ {
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} }
/* ?allocate@?$allocator@G@std@@QAEPAGI@Z */ /* ?allocate@?$allocator@G@std@@QAEPAGI@Z */
@ -274,7 +274,7 @@ unsigned short* __thiscall MSVCP_allocator_short_allocate(
return NULL; return NULL;
} }
return MSVCRT_operator_new(count * sizeof(unsigned short)); return operator_new(count * sizeof(unsigned short));
} }
/* ?allocate@?$allocator@G@std@@QAEPAGIPBX@Z */ /* ?allocate@?$allocator@G@std@@QAEPAGIPBX@Z */

18
dlls/msvcp90/misc.c
View File

@ -262,7 +262,7 @@ typedef struct __Container_proxy {
DEFINE_THISCALL_WRAPPER(mutex_ctor, 4) DEFINE_THISCALL_WRAPPER(mutex_ctor, 4)
mutex* __thiscall mutex_ctor(mutex *this) mutex* __thiscall mutex_ctor(mutex *this)
{ {
CRITICAL_SECTION *cs = MSVCRT_operator_new(sizeof(*cs)); CRITICAL_SECTION *cs = operator_new(sizeof(*cs));
if(!cs) { if(!cs) {
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
@ -281,7 +281,7 @@ void __thiscall mutex_dtor(mutex *this)
{ {
((CRITICAL_SECTION*)this->mutex)->DebugInfo->Spare[0] = 0; ((CRITICAL_SECTION*)this->mutex)->DebugInfo->Spare[0] = 0;
DeleteCriticalSection(this->mutex); DeleteCriticalSection(this->mutex);
MSVCRT_operator_delete(this->mutex); operator_delete(this->mutex);
} }
/* ?_Lock@_Mutex@std@@QAEXXZ */ /* ?_Lock@_Mutex@std@@QAEXXZ */
@ -765,7 +765,7 @@ void __cdecl _Mtx_init_in_situ(_Mtx_t mtx, int flags)
int __cdecl _Mtx_init(_Mtx_t *mtx, int flags) int __cdecl _Mtx_init(_Mtx_t *mtx, int flags)
{ {
*mtx = MSVCRT_operator_new(sizeof(**mtx)); *mtx = operator_new(sizeof(**mtx));
_Mtx_init_in_situ(*mtx, flags); _Mtx_init_in_situ(*mtx, flags);
return 0; return 0;
} }
@ -778,7 +778,7 @@ void __cdecl _Mtx_destroy_in_situ(_Mtx_t mtx)
void __cdecl _Mtx_destroy(_Mtx_arg_t mtx) void __cdecl _Mtx_destroy(_Mtx_arg_t mtx)
{ {
call_func1(critical_section_dtor, &MTX_T_FROM_ARG(mtx)->cs); call_func1(critical_section_dtor, &MTX_T_FROM_ARG(mtx)->cs);
MSVCRT_operator_delete(MTX_T_FROM_ARG(mtx)); operator_delete(MTX_T_FROM_ARG(mtx));
} }
int __cdecl _Mtx_current_owns(_Mtx_arg_t mtx) int __cdecl _Mtx_current_owns(_Mtx_arg_t mtx)
@ -875,7 +875,7 @@ void __cdecl _Cnd_init_in_situ(_Cnd_t cnd)
int __cdecl _Cnd_init(_Cnd_t *cnd) int __cdecl _Cnd_init(_Cnd_t *cnd)
{ {
*cnd = MSVCRT_operator_new(sizeof(**cnd)); *cnd = operator_new(sizeof(**cnd));
_Cnd_init_in_situ(*cnd); _Cnd_init_in_situ(*cnd);
return 0; return 0;
} }
@ -940,7 +940,7 @@ void __cdecl _Cnd_destroy(_Cnd_arg_t cnd)
{ {
if(cnd) { if(cnd) {
_Cnd_broadcast(cnd); _Cnd_broadcast(cnd);
MSVCRT_operator_delete(CND_T_FROM_ARG(cnd)); operator_delete(CND_T_FROM_ARG(cnd));
} }
} }
@ -1075,10 +1075,10 @@ custom_category* __thiscall custom_category_vector_dtor(custom_category *this, u
INT_PTR i, *ptr = (INT_PTR *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
MSVCRT_operator_delete(ptr); operator_delete(ptr);
} else { } else {
if(flags & 1) if(flags & 1)
MSVCRT_operator_delete(this); operator_delete(this);
} }
return this; return this;
@ -1624,7 +1624,7 @@ LONGLONG __cdecl _Query_perf_frequency(void)
void __cdecl threads__Mtx_new(void **mtx) void __cdecl threads__Mtx_new(void **mtx)
{ {
*mtx = MSVCRT_operator_new(sizeof(CRITICAL_SECTION)); *mtx = operator_new(sizeof(CRITICAL_SECTION));
InitializeCriticalSection(*mtx); InitializeCriticalSection(*mtx);
} }

9
dlls/msvcp90/msvcp90.h
View File

@ -41,8 +41,13 @@ void __cdecl _invalid_parameter_noinfo(void);
BOOL __cdecl __uncaught_exception(void); BOOL __cdecl __uncaught_exception(void);
int __cdecl _callnewh(size_t); int __cdecl _callnewh(size_t);
extern void* (__cdecl *MSVCRT_operator_new)(size_t); #if _MSVCP_VER >= 140
extern void (__cdecl *MSVCRT_operator_delete)(void*); 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*); extern void* (__cdecl *MSVCRT_set_new_handler)(void*);
#if _MSVCP_VER >= 110 #if _MSVCP_VER >= 110

19
dlls/msvcp90/msvcp_main.c
View File

@ -54,8 +54,6 @@ DEFINE_VTBL_WRAPPER(56);
#endif #endif
void* (__cdecl *MSVCRT_operator_new)(size_t);
void (__cdecl *MSVCRT_operator_delete)(void*);
void* (__cdecl *MSVCRT_set_new_handler)(void*); void* (__cdecl *MSVCRT_set_new_handler)(void*);
#if _MSVCP_VER >= 110 #if _MSVCP_VER >= 110
@ -79,7 +77,7 @@ bool (__cdecl *Context_IsCurrentTaskCollectionCanceling)(void);
#endif #endif
#if _MSVCP_VER >= 140 #if _MSVCP_VER >= 140
static void* __cdecl operator_new(size_t size) void* __cdecl operator_new(size_t size)
{ {
void *retval; void *retval;
int freed; int freed;
@ -100,7 +98,7 @@ static void* __cdecl operator_new(size_t size)
return NULL; return NULL;
} }
static void __cdecl operator_delete(void *mem) void __cdecl operator_delete(void *mem)
{ {
TRACE("(%p)\n", mem); TRACE("(%p)\n", mem);
free(mem); free(mem);
@ -110,6 +108,9 @@ void __cdecl _invalid_parameter(const wchar_t *expr, const wchar_t *func, const
{ {
_invalid_parameter_noinfo(); _invalid_parameter_noinfo();
} }
#else
void* (__cdecl *operator_new)(size_t);
void (__cdecl *operator_delete)(void*);
#endif #endif
static void init_cxx_funcs(void) static void init_cxx_funcs(void)
@ -122,8 +123,6 @@ static void init_cxx_funcs(void)
if (!hmod) FIXME( "%s not loaded\n", MSVCRT_NAME(_MSVCP_VER) ); if (!hmod) FIXME( "%s not loaded\n", MSVCRT_NAME(_MSVCP_VER) );
#if _MSVCP_VER >= 140 #if _MSVCP_VER >= 140
MSVCRT_operator_new = operator_new;
MSVCRT_operator_delete = operator_delete;
MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "_set_new_handler"); MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "_set_new_handler");
hcon = LoadLibraryA( CONCRT_NAME(_MSVCP_VER) ); hcon = LoadLibraryA( CONCRT_NAME(_MSVCP_VER) );
@ -131,14 +130,14 @@ static void init_cxx_funcs(void)
#else #else
if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */ if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */
{ {
MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPEAX_K@Z"); operator_new = (void*)GetProcAddress(hmod, "??2@YAPEAX_K@Z");
MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPEAX@Z"); operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPEAX@Z");
MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z"); MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z");
} }
else else
{ {
MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPAXI@Z"); operator_new = (void*)GetProcAddress(hmod, "??2@YAPAXI@Z");
MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPAX@Z"); operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPAX@Z");
MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z"); MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z");
} }
#endif #endif

8
dlls/msvcp90/string.c
View File

@ -1630,7 +1630,7 @@ void __thiscall _Yarn_char__Tidy(_Yarn_char *this)
TRACE("(%p)\n", this); TRACE("(%p)\n", this);
if(this->str) if(this->str)
MSVCRT_operator_delete(this->str); operator_delete(this->str);
this->str = NULL; this->str = NULL;
} }
@ -1647,7 +1647,7 @@ _Yarn_char* __thiscall _Yarn_char_op_assign_cstr(_Yarn_char *this, const char *s
if(str) { if(str) {
size_t len = strlen(str); size_t len = strlen(str);
this->str = MSVCRT_operator_new((len+1)*sizeof(char)); this->str = operator_new((len+1)*sizeof(char));
if(!this->str) { if(!this->str) {
ERR("out of memory\n"); ERR("out of memory\n");
return NULL; return NULL;
@ -1741,7 +1741,7 @@ void __thiscall _Yarn_wchar__Tidy(_Yarn_wchar *this)
TRACE("(%p)\n", this); TRACE("(%p)\n", this);
if(this->str) if(this->str)
MSVCRT_operator_delete(this->str); operator_delete(this->str);
this->str = NULL; this->str = NULL;
} }
@ -1767,7 +1767,7 @@ _Yarn_wchar* __thiscall _Yarn_wchar_op_assign_cstr(_Yarn_wchar *this, const wcha
if(str) { if(str) {
size_t len = wcslen(str); size_t len = wcslen(str);
this->str = MSVCRT_operator_new((len+1)*sizeof(wchar_t)); this->str = operator_new((len+1)*sizeof(wchar_t));
if(!this->str) { if(!this->str) {
ERR("out of memory\n"); ERR("out of memory\n");
return NULL; return NULL;