Skip to content

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

msvcrt: Fixed vector destructors implementation on 64-bit systems.

parent 645e1589
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 111 deletions
dlls/msvcp100/exception.c
View file @ fef8a52f
...@@ -83,7 +83,7 @@ void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int fl ...@@ -83,7 +83,7 @@ void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int fl
if (flags & 2) if (flags & 2)
{ {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)_this - 1; INT_PTR i, *ptr = (INT_PTR *)_this - 1;
for (i = *ptr - 1; i >= 0; i--) MSVCP_type_info_dtor(_this + i); for (i = *ptr - 1; i >= 0; i--) MSVCP_type_info_dtor(_this + i);
MSVCRT_operator_delete(ptr); MSVCRT_operator_delete(ptr);
...@@ -146,7 +146,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag ...@@ -146,7 +146,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag
TRACE("%p %x\n", this, flags); TRACE("%p %x\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
MSVCP_exception_dtor(this+i); MSVCP_exception_dtor(this+i);
...@@ -220,7 +220,7 @@ void * __thiscall MSVCP_bad_alloc_vector_dtor(bad_alloc *this, unsigned int flag ...@@ -220,7 +220,7 @@ void * __thiscall MSVCP_bad_alloc_vector_dtor(bad_alloc *this, unsigned int flag
TRACE("%p %x\n", this, flags); TRACE("%p %x\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -311,7 +311,7 @@ void* __thiscall MSVCP_logic_error_vector_dtor( ...@@ -311,7 +311,7 @@ void* __thiscall MSVCP_logic_error_vector_dtor(
TRACE("%p %x\n", this, flags); TRACE("%p %x\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -549,7 +549,7 @@ void* __thiscall MSVCP_runtime_error_vector_dtor( ...@@ -549,7 +549,7 @@ void* __thiscall MSVCP_runtime_error_vector_dtor(
TRACE("%p %x\n", this, flags); TRACE("%p %x\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
......
dlls/msvcp100/ios.c
View file @ fef8a52f
...@@ -937,7 +937,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_vector_dtor(basic_streambu ...@@ -937,7 +937,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_vector_dtor(basic_streambu
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -1657,7 +1657,7 @@ basic_streambuf_wchar* __thiscall basic_streambuf_wchar_vector_dtor(basic_stream ...@@ -1657,7 +1657,7 @@ basic_streambuf_wchar* __thiscall basic_streambuf_wchar_vector_dtor(basic_stream
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -2497,7 +2497,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_vector_dtor(basic_filebuf_char ...@@ -2497,7 +2497,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_vector_dtor(basic_filebuf_char
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -3104,7 +3104,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_vector_dtor(basic_filebuf_wc ...@@ -3104,7 +3104,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_vector_dtor(basic_filebuf_wc
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -3674,7 +3674,7 @@ basic_stringbuf_char* __thiscall basic_stringbuf_char_vector_dtor(basic_stringbu ...@@ -3674,7 +3674,7 @@ basic_stringbuf_char* __thiscall basic_stringbuf_char_vector_dtor(basic_stringbu
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *) this - 1; INT_PTR i, *ptr = (INT_PTR *) this - 1;
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);
...@@ -4076,7 +4076,7 @@ basic_stringbuf_wchar* __thiscall basic_stringbuf_wchar_vector_dtor(basic_string ...@@ -4076,7 +4076,7 @@ basic_stringbuf_wchar* __thiscall basic_stringbuf_wchar_vector_dtor(basic_string
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *) this - 1; INT_PTR i, *ptr = (INT_PTR *) this - 1;
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);
...@@ -4407,7 +4407,7 @@ ios_base* __thiscall ios_base_vector_dtor(ios_base *this, unsigned int flags) ...@@ -4407,7 +4407,7 @@ ios_base* __thiscall ios_base_vector_dtor(ios_base *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
ios_base_dtor(this+i); ios_base_dtor(this+i);
...@@ -4426,7 +4426,7 @@ void* __thiscall iosb_vector_dtor(void *this, unsigned int flags) ...@@ -4426,7 +4426,7 @@ 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 = (int *)this-1; INT_PTR *ptr = (INT_PTR *)this-1;
MSVCRT_operator_delete(ptr); MSVCRT_operator_delete(ptr);
} else { } else {
if(flags & 1) if(flags & 1)
...@@ -4950,7 +4950,7 @@ basic_ios_char* __thiscall basic_ios_char_vector_dtor(basic_ios_char *this, unsi ...@@ -4950,7 +4950,7 @@ basic_ios_char* __thiscall basic_ios_char_vector_dtor(basic_ios_char *this, unsi
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -5197,7 +5197,7 @@ basic_ios_wchar* __thiscall basic_ios_wchar_vector_dtor(basic_ios_wchar *this, u ...@@ -5197,7 +5197,7 @@ basic_ios_wchar* __thiscall basic_ios_wchar_vector_dtor(basic_ios_wchar *this, u
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -5485,7 +5485,7 @@ basic_ostream_char* __thiscall basic_ostream_char_vector_dtor(basic_ios_char *ba ...@@ -5485,7 +5485,7 @@ basic_ostream_char* __thiscall basic_ostream_char_vector_dtor(basic_ios_char *ba
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -6273,7 +6273,7 @@ basic_ostream_wchar* __thiscall basic_ostream_wchar_vector_dtor(basic_ios_wchar ...@@ -6273,7 +6273,7 @@ basic_ostream_wchar* __thiscall basic_ostream_wchar_vector_dtor(basic_ios_wchar
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -7212,7 +7212,7 @@ basic_istream_char* __thiscall basic_istream_char_vector_dtor(basic_ios_char *ba ...@@ -7212,7 +7212,7 @@ basic_istream_char* __thiscall basic_istream_char_vector_dtor(basic_ios_char *ba
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -8414,7 +8414,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_vector_dtor(basic_ios_wchar ...@@ -8414,7 +8414,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_vector_dtor(basic_ios_wchar
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -9794,7 +9794,7 @@ basic_iostream_char* __thiscall basic_iostream_char_vector_dtor(basic_ios_char * ...@@ -9794,7 +9794,7 @@ basic_iostream_char* __thiscall basic_iostream_char_vector_dtor(basic_ios_char *
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -9890,7 +9890,7 @@ basic_iostream_wchar* __thiscall basic_iostream_wchar_vector_dtor(basic_ios_wcha ...@@ -9890,7 +9890,7 @@ basic_iostream_wchar* __thiscall basic_iostream_wchar_vector_dtor(basic_ios_wcha
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -10030,7 +10030,7 @@ basic_ofstream_char* __thiscall basic_ofstream_char_vector_dtor(basic_ios_char * ...@@ -10030,7 +10030,7 @@ basic_ofstream_char* __thiscall basic_ofstream_char_vector_dtor(basic_ios_char *
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -10300,7 +10300,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_wchar_vector_dtor(basic_ios_wcha ...@@ -10300,7 +10300,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_wchar_vector_dtor(basic_ios_wcha
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -10539,7 +10539,7 @@ basic_ifstream_char* __thiscall basic_ifstream_char_vector_dtor(basic_ios_char * ...@@ -10539,7 +10539,7 @@ basic_ifstream_char* __thiscall basic_ifstream_char_vector_dtor(basic_ios_char *
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -10809,7 +10809,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_wchar_vector_dtor(basic_ios_wcha ...@@ -10809,7 +10809,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_wchar_vector_dtor(basic_ios_wcha
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -11050,7 +11050,7 @@ basic_fstream_char* __thiscall basic_fstream_char_vector_dtor(basic_ios_char *ba ...@@ -11050,7 +11050,7 @@ basic_fstream_char* __thiscall basic_fstream_char_vector_dtor(basic_ios_char *ba
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -11322,7 +11322,7 @@ basic_fstream_wchar* __thiscall basic_fstream_wchar_vector_dtor(basic_ios_wchar ...@@ -11322,7 +11322,7 @@ basic_fstream_wchar* __thiscall basic_fstream_wchar_vector_dtor(basic_ios_wchar
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -11535,7 +11535,7 @@ basic_ostringstream_char* __thiscall basic_ostringstream_char_vector_dtor(basic_ ...@@ -11535,7 +11535,7 @@ basic_ostringstream_char* __thiscall basic_ostringstream_char_vector_dtor(basic_
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -11711,7 +11711,7 @@ basic_ostringstream_wchar* __thiscall basic_ostringstream_wchar_vector_dtor(basi ...@@ -11711,7 +11711,7 @@ basic_ostringstream_wchar* __thiscall basic_ostringstream_wchar_vector_dtor(basi
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -11858,7 +11858,7 @@ basic_istringstream_char* __thiscall basic_istringstream_char_vector_dtor(basic_ ...@@ -11858,7 +11858,7 @@ basic_istringstream_char* __thiscall basic_istringstream_char_vector_dtor(basic_
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -12034,7 +12034,7 @@ basic_istringstream_wchar* __thiscall basic_istringstream_wchar_vector_dtor(basi ...@@ -12034,7 +12034,7 @@ basic_istringstream_wchar* __thiscall basic_istringstream_wchar_vector_dtor(basi
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -12184,7 +12184,7 @@ basic_stringstream_char* __thiscall basic_stringstream_char_vector_dtor(basic_io ...@@ -12184,7 +12184,7 @@ basic_stringstream_char* __thiscall basic_stringstream_char_vector_dtor(basic_io
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -12364,7 +12364,7 @@ basic_stringstream_wchar* __thiscall basic_stringstream_wchar_vector_dtor(basic_ ...@@ -12364,7 +12364,7 @@ basic_stringstream_wchar* __thiscall basic_stringstream_wchar_vector_dtor(basic_
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -12544,7 +12544,7 @@ strstreambuf* __thiscall strstreambuf_vector_dtor(strstreambuf *this, unsigned i ...@@ -12544,7 +12544,7 @@ strstreambuf* __thiscall strstreambuf_vector_dtor(strstreambuf *this, unsigned i
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
strstreambuf_dtor(this+i); strstreambuf_dtor(this+i);
......
dlls/msvcp100/locale.c
View file @ fef8a52f
...@@ -186,7 +186,7 @@ locale_facet* __thiscall locale_facet_vector_dtor(locale_facet *this, unsigned i ...@@ -186,7 +186,7 @@ locale_facet* __thiscall locale_facet_vector_dtor(locale_facet *this, unsigned i
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
locale_facet_dtor(this+i); locale_facet_dtor(this+i);
...@@ -790,7 +790,7 @@ collate* __thiscall collate_char_vector_dtor(collate *this, unsigned int flags) ...@@ -790,7 +790,7 @@ collate* __thiscall collate_char_vector_dtor(collate *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
collate_char_dtor(this+i); collate_char_dtor(this+i);
...@@ -1023,7 +1023,7 @@ collate* __thiscall collate_wchar_vector_dtor(collate *this, unsigned int flags) ...@@ -1023,7 +1023,7 @@ collate* __thiscall collate_wchar_vector_dtor(collate *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
collate_wchar_dtor(this+i); collate_wchar_dtor(this+i);
...@@ -1223,7 +1223,7 @@ ctype_base* __thiscall ctype_base_vector_dtor(ctype_base *this, unsigned int fla ...@@ -1223,7 +1223,7 @@ ctype_base* __thiscall ctype_base_vector_dtor(ctype_base *this, unsigned int fla
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
ctype_base_dtor(this+i); ctype_base_dtor(this+i);
...@@ -1349,7 +1349,7 @@ ctype_char* __thiscall ctype_char_vector_dtor(ctype_char *this, unsigned int fla ...@@ -1349,7 +1349,7 @@ ctype_char* __thiscall ctype_char_vector_dtor(ctype_char *this, unsigned int fla
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
ctype_char_dtor(this+i); ctype_char_dtor(this+i);
...@@ -1923,7 +1923,7 @@ ctype_wchar* __thiscall ctype_wchar_vector_dtor(ctype_wchar *this, unsigned int ...@@ -1923,7 +1923,7 @@ ctype_wchar* __thiscall ctype_wchar_vector_dtor(ctype_wchar *this, unsigned int
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
ctype_wchar_dtor(this+i); ctype_wchar_dtor(this+i);
...@@ -2606,7 +2606,7 @@ codecvt_base* __thiscall codecvt_base_vector_dtor(codecvt_base *this, unsigned i ...@@ -2606,7 +2606,7 @@ codecvt_base* __thiscall codecvt_base_vector_dtor(codecvt_base *this, unsigned i
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
codecvt_base_dtor(this+i); codecvt_base_dtor(this+i);
...@@ -2736,7 +2736,7 @@ codecvt_char* __thiscall codecvt_char_vector_dtor(codecvt_char *this, unsigned i ...@@ -2736,7 +2736,7 @@ codecvt_char* __thiscall codecvt_char_vector_dtor(codecvt_char *this, unsigned i
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
codecvt_char_dtor(this+i); codecvt_char_dtor(this+i);
...@@ -3030,7 +3030,7 @@ codecvt_wchar* __thiscall codecvt_wchar_vector_dtor(codecvt_wchar *this, unsigne ...@@ -3030,7 +3030,7 @@ codecvt_wchar* __thiscall codecvt_wchar_vector_dtor(codecvt_wchar *this, unsigne
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
codecvt_wchar_dtor(this+i); codecvt_wchar_dtor(this+i);
...@@ -3499,7 +3499,7 @@ numpunct_char* __thiscall numpunct_char_vector_dtor(numpunct_char *this, unsigne ...@@ -3499,7 +3499,7 @@ numpunct_char* __thiscall numpunct_char_vector_dtor(numpunct_char *this, unsigne
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
numpunct_char_dtor(this+i); numpunct_char_dtor(this+i);
...@@ -3852,7 +3852,7 @@ numpunct_wchar* __thiscall numpunct_wchar_vector_dtor(numpunct_wchar *this, unsi ...@@ -3852,7 +3852,7 @@ numpunct_wchar* __thiscall numpunct_wchar_vector_dtor(numpunct_wchar *this, unsi
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
numpunct_wchar_dtor(this+i); numpunct_wchar_dtor(this+i);
...@@ -4289,7 +4289,7 @@ num_get* __thiscall num_get_wchar_vector_dtor(num_get *this, unsigned int flags) ...@@ -4289,7 +4289,7 @@ num_get* __thiscall num_get_wchar_vector_dtor(num_get *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -5438,7 +5438,7 @@ num_get* __thiscall num_get_char_vector_dtor(num_get *this, unsigned int flags) ...@@ -5438,7 +5438,7 @@ num_get* __thiscall num_get_char_vector_dtor(num_get *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -6299,7 +6299,7 @@ num_put* __thiscall num_put_char_vector_dtor(num_put *this, unsigned int flags) ...@@ -6299,7 +6299,7 @@ num_put* __thiscall num_put_char_vector_dtor(num_put *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -6946,7 +6946,7 @@ num_put* __thiscall num_put_wchar_vector_dtor(num_put *this, unsigned int flags) ...@@ -6946,7 +6946,7 @@ num_put* __thiscall num_put_wchar_vector_dtor(num_put *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -7844,7 +7844,7 @@ locale__Locimp* __thiscall locale__Locimp_vector_dtor(locale__Locimp *this, unsi ...@@ -7844,7 +7844,7 @@ locale__Locimp* __thiscall locale__Locimp_vector_dtor(locale__Locimp *this, unsi
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
locale__Locimp_dtor(this+i); locale__Locimp_dtor(this+i);
...@@ -8345,7 +8345,7 @@ locale* __thiscall locale_vector_dtor(locale *this, unsigned int flags) ...@@ -8345,7 +8345,7 @@ locale* __thiscall locale_vector_dtor(locale *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
locale_dtor(this+i); locale_dtor(this+i);
......
dlls/msvcp60/exception.c
View file @ fef8a52f
...@@ -87,7 +87,7 @@ void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int fl ...@@ -87,7 +87,7 @@ void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int fl
if (flags & 2) if (flags & 2)
{ {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)_this - 1; INT_PTR i, *ptr = (INT_PTR *)_this - 1;
for (i = *ptr - 1; i >= 0; i--) MSVCP_type_info_dtor(_this + i); for (i = *ptr - 1; i >= 0; i--) MSVCP_type_info_dtor(_this + i);
MSVCRT_operator_delete(ptr); MSVCRT_operator_delete(ptr);
...@@ -150,7 +150,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag ...@@ -150,7 +150,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag
TRACE("%p %x\n", this, flags); TRACE("%p %x\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
MSVCP_exception_dtor(this+i); MSVCP_exception_dtor(this+i);
...@@ -261,7 +261,7 @@ void * __thiscall MSVCP_bad_alloc_vector_dtor(bad_alloc *this, unsigned int flag ...@@ -261,7 +261,7 @@ void * __thiscall MSVCP_bad_alloc_vector_dtor(bad_alloc *this, unsigned int flag
TRACE("%p %x\n", this, flags); TRACE("%p %x\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -373,7 +373,7 @@ void* __thiscall MSVCP_logic_error_vector_dtor( ...@@ -373,7 +373,7 @@ void* __thiscall MSVCP_logic_error_vector_dtor(
TRACE("%p %x\n", this, flags); TRACE("%p %x\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
......
dlls/msvcp90/exception.c
View file @ fef8a52f
...@@ -83,7 +83,7 @@ void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int fl ...@@ -83,7 +83,7 @@ void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int fl
if (flags & 2) if (flags & 2)
{ {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)_this - 1; INT_PTR i, *ptr = (INT_PTR *)_this - 1;
for (i = *ptr - 1; i >= 0; i--) MSVCP_type_info_dtor(_this + i); for (i = *ptr - 1; i >= 0; i--) MSVCP_type_info_dtor(_this + i);
MSVCRT_operator_delete(ptr); MSVCRT_operator_delete(ptr);
...@@ -146,7 +146,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag ...@@ -146,7 +146,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag
TRACE("%p %x\n", this, flags); TRACE("%p %x\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
MSVCP_exception_dtor(this+i); MSVCP_exception_dtor(this+i);
...@@ -220,7 +220,7 @@ void * __thiscall MSVCP_bad_alloc_vector_dtor(bad_alloc *this, unsigned int flag ...@@ -220,7 +220,7 @@ void * __thiscall MSVCP_bad_alloc_vector_dtor(bad_alloc *this, unsigned int flag
TRACE("%p %x\n", this, flags); TRACE("%p %x\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -311,7 +311,7 @@ void* __thiscall MSVCP_logic_error_vector_dtor( ...@@ -311,7 +311,7 @@ void* __thiscall MSVCP_logic_error_vector_dtor(
TRACE("%p %x\n", this, flags); TRACE("%p %x\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -549,7 +549,7 @@ void* __thiscall MSVCP_runtime_error_vector_dtor( ...@@ -549,7 +549,7 @@ void* __thiscall MSVCP_runtime_error_vector_dtor(
TRACE("%p %x\n", this, flags); TRACE("%p %x\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
......
dlls/msvcp90/ios.c
View file @ fef8a52f
...@@ -927,7 +927,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_vector_dtor(basic_streambu ...@@ -927,7 +927,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_vector_dtor(basic_streambu
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -1643,7 +1643,7 @@ basic_streambuf_wchar* __thiscall basic_streambuf_wchar_vector_dtor(basic_stream ...@@ -1643,7 +1643,7 @@ basic_streambuf_wchar* __thiscall basic_streambuf_wchar_vector_dtor(basic_stream
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -2483,7 +2483,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_vector_dtor(basic_filebuf_char ...@@ -2483,7 +2483,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_vector_dtor(basic_filebuf_char
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -3090,7 +3090,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_vector_dtor(basic_filebuf_wc ...@@ -3090,7 +3090,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_vector_dtor(basic_filebuf_wc
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -3660,7 +3660,7 @@ basic_stringbuf_char* __thiscall basic_stringbuf_char_vector_dtor(basic_stringbu ...@@ -3660,7 +3660,7 @@ basic_stringbuf_char* __thiscall basic_stringbuf_char_vector_dtor(basic_stringbu
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *) this - 1; INT_PTR i, *ptr = (INT_PTR *) this - 1;
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);
...@@ -4062,7 +4062,7 @@ basic_stringbuf_wchar* __thiscall basic_stringbuf_wchar_vector_dtor(basic_string ...@@ -4062,7 +4062,7 @@ basic_stringbuf_wchar* __thiscall basic_stringbuf_wchar_vector_dtor(basic_string
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *) this - 1; INT_PTR i, *ptr = (INT_PTR *) this - 1;
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);
...@@ -4393,7 +4393,7 @@ ios_base* __thiscall ios_base_vector_dtor(ios_base *this, unsigned int flags) ...@@ -4393,7 +4393,7 @@ ios_base* __thiscall ios_base_vector_dtor(ios_base *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
ios_base_dtor(this+i); ios_base_dtor(this+i);
...@@ -4412,7 +4412,7 @@ void* __thiscall iosb_vector_dtor(void *this, unsigned int flags) ...@@ -4412,7 +4412,7 @@ 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 = (int *)this-1; INT_PTR *ptr = (INT_PTR *)this-1;
MSVCRT_operator_delete(ptr); MSVCRT_operator_delete(ptr);
} else { } else {
if(flags & 1) if(flags & 1)
...@@ -4936,7 +4936,7 @@ basic_ios_char* __thiscall basic_ios_char_vector_dtor(basic_ios_char *this, unsi ...@@ -4936,7 +4936,7 @@ basic_ios_char* __thiscall basic_ios_char_vector_dtor(basic_ios_char *this, unsi
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -5183,7 +5183,7 @@ basic_ios_wchar* __thiscall basic_ios_wchar_vector_dtor(basic_ios_wchar *this, u ...@@ -5183,7 +5183,7 @@ basic_ios_wchar* __thiscall basic_ios_wchar_vector_dtor(basic_ios_wchar *this, u
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -5471,7 +5471,7 @@ basic_ostream_char* __thiscall basic_ostream_char_vector_dtor(basic_ios_char *ba ...@@ -5471,7 +5471,7 @@ basic_ostream_char* __thiscall basic_ostream_char_vector_dtor(basic_ios_char *ba
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -6259,7 +6259,7 @@ basic_ostream_wchar* __thiscall basic_ostream_wchar_vector_dtor(basic_ios_wchar ...@@ -6259,7 +6259,7 @@ basic_ostream_wchar* __thiscall basic_ostream_wchar_vector_dtor(basic_ios_wchar
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -7198,7 +7198,7 @@ basic_istream_char* __thiscall basic_istream_char_vector_dtor(basic_ios_char *ba ...@@ -7198,7 +7198,7 @@ basic_istream_char* __thiscall basic_istream_char_vector_dtor(basic_ios_char *ba
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -8400,7 +8400,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_vector_dtor(basic_ios_wchar ...@@ -8400,7 +8400,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_vector_dtor(basic_ios_wchar
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -9780,7 +9780,7 @@ basic_iostream_char* __thiscall basic_iostream_char_vector_dtor(basic_ios_char * ...@@ -9780,7 +9780,7 @@ basic_iostream_char* __thiscall basic_iostream_char_vector_dtor(basic_ios_char *
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -9876,7 +9876,7 @@ basic_iostream_wchar* __thiscall basic_iostream_wchar_vector_dtor(basic_ios_wcha ...@@ -9876,7 +9876,7 @@ basic_iostream_wchar* __thiscall basic_iostream_wchar_vector_dtor(basic_ios_wcha
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -10016,7 +10016,7 @@ basic_ofstream_char* __thiscall basic_ofstream_char_vector_dtor(basic_ios_char * ...@@ -10016,7 +10016,7 @@ basic_ofstream_char* __thiscall basic_ofstream_char_vector_dtor(basic_ios_char *
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -10286,7 +10286,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_wchar_vector_dtor(basic_ios_wcha ...@@ -10286,7 +10286,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_wchar_vector_dtor(basic_ios_wcha
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -10525,7 +10525,7 @@ basic_ifstream_char* __thiscall basic_ifstream_char_vector_dtor(basic_ios_char * ...@@ -10525,7 +10525,7 @@ basic_ifstream_char* __thiscall basic_ifstream_char_vector_dtor(basic_ios_char *
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -10795,7 +10795,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_wchar_vector_dtor(basic_ios_wcha ...@@ -10795,7 +10795,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_wchar_vector_dtor(basic_ios_wcha
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -11036,7 +11036,7 @@ basic_fstream_char* __thiscall basic_fstream_char_vector_dtor(basic_ios_char *ba ...@@ -11036,7 +11036,7 @@ basic_fstream_char* __thiscall basic_fstream_char_vector_dtor(basic_ios_char *ba
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -11308,7 +11308,7 @@ basic_fstream_wchar* __thiscall basic_fstream_wchar_vector_dtor(basic_ios_wchar ...@@ -11308,7 +11308,7 @@ basic_fstream_wchar* __thiscall basic_fstream_wchar_vector_dtor(basic_ios_wchar
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -11521,7 +11521,7 @@ basic_ostringstream_char* __thiscall basic_ostringstream_char_vector_dtor(basic_ ...@@ -11521,7 +11521,7 @@ basic_ostringstream_char* __thiscall basic_ostringstream_char_vector_dtor(basic_
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -11697,7 +11697,7 @@ basic_ostringstream_wchar* __thiscall basic_ostringstream_wchar_vector_dtor(basi ...@@ -11697,7 +11697,7 @@ basic_ostringstream_wchar* __thiscall basic_ostringstream_wchar_vector_dtor(basi
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -11844,7 +11844,7 @@ basic_istringstream_char* __thiscall basic_istringstream_char_vector_dtor(basic_ ...@@ -11844,7 +11844,7 @@ basic_istringstream_char* __thiscall basic_istringstream_char_vector_dtor(basic_
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -12020,7 +12020,7 @@ basic_istringstream_wchar* __thiscall basic_istringstream_wchar_vector_dtor(basi ...@@ -12020,7 +12020,7 @@ basic_istringstream_wchar* __thiscall basic_istringstream_wchar_vector_dtor(basi
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -12170,7 +12170,7 @@ basic_stringstream_char* __thiscall basic_stringstream_char_vector_dtor(basic_io ...@@ -12170,7 +12170,7 @@ basic_stringstream_char* __thiscall basic_stringstream_char_vector_dtor(basic_io
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -12350,7 +12350,7 @@ basic_stringstream_wchar* __thiscall basic_stringstream_wchar_vector_dtor(basic_ ...@@ -12350,7 +12350,7 @@ basic_stringstream_wchar* __thiscall basic_stringstream_wchar_vector_dtor(basic_
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -12530,7 +12530,7 @@ strstreambuf* __thiscall strstreambuf_vector_dtor(strstreambuf *this, unsigned i ...@@ -12530,7 +12530,7 @@ strstreambuf* __thiscall strstreambuf_vector_dtor(strstreambuf *this, unsigned i
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
strstreambuf_dtor(this+i); strstreambuf_dtor(this+i);
......
dlls/msvcp90/locale.c
View file @ fef8a52f
...@@ -186,7 +186,7 @@ locale_facet* __thiscall locale_facet_vector_dtor(locale_facet *this, unsigned i ...@@ -186,7 +186,7 @@ locale_facet* __thiscall locale_facet_vector_dtor(locale_facet *this, unsigned i
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
locale_facet_dtor(this+i); locale_facet_dtor(this+i);
...@@ -790,7 +790,7 @@ collate* __thiscall collate_char_vector_dtor(collate *this, unsigned int flags) ...@@ -790,7 +790,7 @@ collate* __thiscall collate_char_vector_dtor(collate *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
collate_char_dtor(this+i); collate_char_dtor(this+i);
...@@ -1023,7 +1023,7 @@ collate* __thiscall collate_wchar_vector_dtor(collate *this, unsigned int flags) ...@@ -1023,7 +1023,7 @@ collate* __thiscall collate_wchar_vector_dtor(collate *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
collate_wchar_dtor(this+i); collate_wchar_dtor(this+i);
...@@ -1223,7 +1223,7 @@ ctype_base* __thiscall ctype_base_vector_dtor(ctype_base *this, unsigned int fla ...@@ -1223,7 +1223,7 @@ ctype_base* __thiscall ctype_base_vector_dtor(ctype_base *this, unsigned int fla
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
ctype_base_dtor(this+i); ctype_base_dtor(this+i);
...@@ -1349,7 +1349,7 @@ ctype_char* __thiscall ctype_char_vector_dtor(ctype_char *this, unsigned int fla ...@@ -1349,7 +1349,7 @@ ctype_char* __thiscall ctype_char_vector_dtor(ctype_char *this, unsigned int fla
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
ctype_char_dtor(this+i); ctype_char_dtor(this+i);
...@@ -1923,7 +1923,7 @@ ctype_wchar* __thiscall ctype_wchar_vector_dtor(ctype_wchar *this, unsigned int ...@@ -1923,7 +1923,7 @@ ctype_wchar* __thiscall ctype_wchar_vector_dtor(ctype_wchar *this, unsigned int
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
ctype_wchar_dtor(this+i); ctype_wchar_dtor(this+i);
...@@ -2606,7 +2606,7 @@ codecvt_base* __thiscall codecvt_base_vector_dtor(codecvt_base *this, unsigned i ...@@ -2606,7 +2606,7 @@ codecvt_base* __thiscall codecvt_base_vector_dtor(codecvt_base *this, unsigned i
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
codecvt_base_dtor(this+i); codecvt_base_dtor(this+i);
...@@ -2736,7 +2736,7 @@ codecvt_char* __thiscall codecvt_char_vector_dtor(codecvt_char *this, unsigned i ...@@ -2736,7 +2736,7 @@ codecvt_char* __thiscall codecvt_char_vector_dtor(codecvt_char *this, unsigned i
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
codecvt_char_dtor(this+i); codecvt_char_dtor(this+i);
...@@ -3030,7 +3030,7 @@ codecvt_wchar* __thiscall codecvt_wchar_vector_dtor(codecvt_wchar *this, unsigne ...@@ -3030,7 +3030,7 @@ codecvt_wchar* __thiscall codecvt_wchar_vector_dtor(codecvt_wchar *this, unsigne
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
codecvt_wchar_dtor(this+i); codecvt_wchar_dtor(this+i);
...@@ -3499,7 +3499,7 @@ numpunct_char* __thiscall numpunct_char_vector_dtor(numpunct_char *this, unsigne ...@@ -3499,7 +3499,7 @@ numpunct_char* __thiscall numpunct_char_vector_dtor(numpunct_char *this, unsigne
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
numpunct_char_dtor(this+i); numpunct_char_dtor(this+i);
...@@ -3852,7 +3852,7 @@ numpunct_wchar* __thiscall numpunct_wchar_vector_dtor(numpunct_wchar *this, unsi ...@@ -3852,7 +3852,7 @@ numpunct_wchar* __thiscall numpunct_wchar_vector_dtor(numpunct_wchar *this, unsi
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
numpunct_wchar_dtor(this+i); numpunct_wchar_dtor(this+i);
...@@ -4289,7 +4289,7 @@ num_get* __thiscall num_get_wchar_vector_dtor(num_get *this, unsigned int flags) ...@@ -4289,7 +4289,7 @@ num_get* __thiscall num_get_wchar_vector_dtor(num_get *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -5438,7 +5438,7 @@ num_get* __thiscall num_get_char_vector_dtor(num_get *this, unsigned int flags) ...@@ -5438,7 +5438,7 @@ num_get* __thiscall num_get_char_vector_dtor(num_get *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -6299,7 +6299,7 @@ num_put* __thiscall num_put_char_vector_dtor(num_put *this, unsigned int flags) ...@@ -6299,7 +6299,7 @@ num_put* __thiscall num_put_char_vector_dtor(num_put *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -6946,7 +6946,7 @@ num_put* __thiscall num_put_wchar_vector_dtor(num_put *this, unsigned int flags) ...@@ -6946,7 +6946,7 @@ num_put* __thiscall num_put_wchar_vector_dtor(num_put *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
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);
...@@ -7844,7 +7844,7 @@ locale__Locimp* __thiscall locale__Locimp_vector_dtor(locale__Locimp *this, unsi ...@@ -7844,7 +7844,7 @@ locale__Locimp* __thiscall locale__Locimp_vector_dtor(locale__Locimp *this, unsi
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
locale__Locimp_dtor(this+i); locale__Locimp_dtor(this+i);
...@@ -8345,7 +8345,7 @@ locale* __thiscall locale_vector_dtor(locale *this, unsigned int flags) ...@@ -8345,7 +8345,7 @@ locale* __thiscall locale_vector_dtor(locale *this, unsigned int flags)
TRACE("(%p %x)\n", this, flags); TRACE("(%p %x)\n", this, flags);
if(flags & 2) { if(flags & 2) {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)this-1; INT_PTR i, *ptr = (INT_PTR *)this-1;
for(i=*ptr-1; i>=0; i--) for(i=*ptr-1; i>=0; i--)
locale_dtor(this+i); locale_dtor(this+i);
......
dlls/msvcrt/cpp.c
View file @ fef8a52f
...@@ -244,7 +244,7 @@ void * __thiscall MSVCRT_exception_vector_dtor(exception * _this, unsigned int f ...@@ -244,7 +244,7 @@ void * __thiscall MSVCRT_exception_vector_dtor(exception * _this, unsigned int f
if (flags & 2) if (flags & 2)
{ {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)_this - 1; INT_PTR i, *ptr = (INT_PTR *)_this - 1;
for (i = *ptr - 1; i >= 0; i--) MSVCRT_exception_dtor(_this + i); for (i = *ptr - 1; i >= 0; i--) MSVCRT_exception_dtor(_this + i);
MSVCRT_operator_delete(ptr); MSVCRT_operator_delete(ptr);
...@@ -343,7 +343,7 @@ void * __thiscall MSVCRT_bad_typeid_vector_dtor(bad_typeid * _this, unsigned int ...@@ -343,7 +343,7 @@ void * __thiscall MSVCRT_bad_typeid_vector_dtor(bad_typeid * _this, unsigned int
if (flags & 2) if (flags & 2)
{ {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)_this - 1; INT_PTR i, *ptr = (INT_PTR *)_this - 1;
for (i = *ptr - 1; i >= 0; i--) MSVCRT_bad_typeid_dtor(_this + i); for (i = *ptr - 1; i >= 0; i--) MSVCRT_bad_typeid_dtor(_this + i);
MSVCRT_operator_delete(ptr); MSVCRT_operator_delete(ptr);
...@@ -426,7 +426,7 @@ void * __thiscall MSVCRT___non_rtti_object_vector_dtor(__non_rtti_object * _this ...@@ -426,7 +426,7 @@ void * __thiscall MSVCRT___non_rtti_object_vector_dtor(__non_rtti_object * _this
if (flags & 2) if (flags & 2)
{ {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)_this - 1; INT_PTR i, *ptr = (INT_PTR *)_this - 1;
for (i = *ptr - 1; i >= 0; i--) MSVCRT___non_rtti_object_dtor(_this + i); for (i = *ptr - 1; i >= 0; i--) MSVCRT___non_rtti_object_dtor(_this + i);
MSVCRT_operator_delete(ptr); MSVCRT_operator_delete(ptr);
...@@ -528,7 +528,7 @@ void * __thiscall MSVCRT_bad_cast_vector_dtor(bad_cast * _this, unsigned int fla ...@@ -528,7 +528,7 @@ void * __thiscall MSVCRT_bad_cast_vector_dtor(bad_cast * _this, unsigned int fla
if (flags & 2) if (flags & 2)
{ {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)_this - 1; INT_PTR i, *ptr = (INT_PTR *)_this - 1;
for (i = *ptr - 1; i >= 0; i--) MSVCRT_bad_cast_dtor(_this + i); for (i = *ptr - 1; i >= 0; i--) MSVCRT_bad_cast_dtor(_this + i);
MSVCRT_operator_delete(ptr); MSVCRT_operator_delete(ptr);
...@@ -648,7 +648,7 @@ void * __thiscall MSVCRT_type_info_vector_dtor(type_info * _this, unsigned int f ...@@ -648,7 +648,7 @@ void * __thiscall MSVCRT_type_info_vector_dtor(type_info * _this, unsigned int f
if (flags & 2) if (flags & 2)
{ {
/* we have an array, with the number of elements stored before the first object */ /* we have an array, with the number of elements stored before the first object */
int i, *ptr = (int *)_this - 1; INT_PTR i, *ptr = (INT_PTR *)_this - 1;
for (i = *ptr - 1; i >= 0; i--) MSVCRT_type_info_dtor(_this + i); for (i = *ptr - 1; i >= 0; i--) MSVCRT_type_info_dtor(_this + i);
MSVCRT_operator_delete(ptr); MSVCRT_operator_delete(ptr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment