msvcp60: Merge more I/O stream code with msvcp90 to reduce the differences.
This commit is contained in:
parent
1c9d6e72e5
commit
a826c31f00
1285
dlls/msvcp60/ios.c
1285
dlls/msvcp60/ios.c
File diff suppressed because it is too large
Load Diff
|
@ -20,6 +20,8 @@
|
|||
#include "windef.h"
|
||||
#include "cxx.h"
|
||||
|
||||
#define ALIGNED_SIZE(size, alignment) (((size)+((alignment)-1))/(alignment)*(alignment))
|
||||
|
||||
typedef unsigned char MSVCP_bool;
|
||||
typedef SIZE_T MSVCP_size_t;
|
||||
typedef SSIZE_T streamoff;
|
||||
|
@ -110,6 +112,7 @@ typedef struct {
|
|||
} codecvt_char;
|
||||
|
||||
MSVCP_bool __thiscall codecvt_base_always_noconv(const codecvt_base*);
|
||||
int __thiscall codecvt_char_unshift(const codecvt_char*, int*, char*, char*, char**);
|
||||
int __thiscall codecvt_char_out(const codecvt_char*, int*, const char*,
|
||||
const char*, const char**, char*, char*, char**);
|
||||
int __thiscall codecvt_char_in(const codecvt_char*, int*, const char*,
|
||||
|
@ -127,6 +130,7 @@ typedef struct {
|
|||
_Cvtvec cvt;
|
||||
} codecvt_wchar;
|
||||
|
||||
int __thiscall codecvt_wchar_unshift(const codecvt_wchar*, int*, char*, char*, char**);
|
||||
int __thiscall codecvt_wchar_out(const codecvt_wchar*, int*, const wchar_t*,
|
||||
const wchar_t*, const wchar_t**, char*, char*, char**);
|
||||
int __thiscall codecvt_wchar_in(const codecvt_wchar*, int*, const char*,
|
||||
|
@ -172,6 +176,7 @@ void __thiscall locale_dtor(locale*);
|
|||
void free_locale(void);
|
||||
locale* __thiscall locale__Addfac(locale*, locale_facet*, MSVCP_size_t, MSVCP_size_t);
|
||||
codecvt_char* codecvt_char_use_facet(const locale*);
|
||||
codecvt_wchar* codecvt_wchar_use_facet(const locale*);
|
||||
codecvt_wchar* codecvt_short_use_facet(const locale*);
|
||||
ctype_char* ctype_char_use_facet(const locale*);
|
||||
ctype_wchar* ctype_wchar_use_facet(const locale*);
|
||||
|
@ -384,6 +389,7 @@ istreambuf_iterator_char *__thiscall num_get_char_get_uint64(const num_get*, ist
|
|||
istreambuf_iterator_char *__thiscall num_get_char_get_bool(const num_get*, istreambuf_iterator_char*,
|
||||
istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, MSVCP_bool*);
|
||||
|
||||
num_get* num_get_wchar_use_facet(const locale*);
|
||||
num_get* num_get_short_use_facet(const locale*);
|
||||
istreambuf_iterator_wchar* __thiscall num_get_wchar_get_long(const num_get*, istreambuf_iterator_wchar*,
|
||||
istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, LONG*);
|
||||
|
@ -433,6 +439,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_uint64(const num_put*, ost
|
|||
ostreambuf_iterator_char* __thiscall num_put_char_put_bool(const num_put*, ostreambuf_iterator_char*,
|
||||
ostreambuf_iterator_char, ios_base*, char, MSVCP_bool);
|
||||
|
||||
num_put* num_put_wchar_use_facet(const locale*);
|
||||
num_put* num_put_short_use_facet(const locale*);
|
||||
ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_long(const num_put*, ostreambuf_iterator_wchar*,
|
||||
ostreambuf_iterator_wchar, ios_base*, wchar_t, LONG);
|
||||
|
@ -455,3 +462,17 @@ void init_exception(void*);
|
|||
void init_locale(void*);
|
||||
void init_io(void*);
|
||||
void free_io(void);
|
||||
void init_misc(void*);
|
||||
|
||||
/* class complex<float> */
|
||||
typedef struct {
|
||||
float real;
|
||||
float imag;
|
||||
} complex_float;
|
||||
|
||||
/* class complex<double> */
|
||||
/* class complex<long double> */
|
||||
typedef struct {
|
||||
double real;
|
||||
double imag;
|
||||
} complex_double;
|
||||
|
|
|
@ -1503,7 +1503,7 @@
|
|||
@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable
|
||||
@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable
|
||||
# extern ??_7__non_rtti_object@std@@6B@
|
||||
# extern ??_7bad_cast@std@@6B@
|
||||
@ extern ??_7bad_cast@std@@6B@ MSVCP_bad_cast_vtable
|
||||
# extern ??_7bad_typeid@std@@6B@
|
||||
@ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable
|
||||
@ extern ??_7ctype_base@std@@6B@ MSVCP_ctype_base_vtable
|
||||
|
@ -1775,8 +1775,8 @@
|
|||
@ stub ?_Cosh@?$_Ctraits@O@std@@SAOOO@Z
|
||||
@ thiscall -arch=win32 ?_Decref@facet@locale@std@@QAEPAV123@XZ(ptr) locale_facet__Decref
|
||||
@ cdecl -arch=win64 ?_Decref@facet@locale@std@@QEAAPEAV123@XZ(ptr) locale_facet__Decref
|
||||
@ stub -arch=win32 ?_Doraise@bad_cast@std@@MBEXXZ
|
||||
@ stub -arch=win64 ?_Doraise@bad_cast@std@@MEBAXXZ
|
||||
@ thiscall -arch=win32 ?_Doraise@bad_cast@std@@MBEXXZ(ptr) MSVCP_exception__Doraise
|
||||
@ cdecl -arch=win64 ?_Doraise@bad_cast@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise
|
||||
@ stub -arch=win32 ?_Doraise@bad_typeid@std@@MBEXXZ
|
||||
@ stub -arch=win64 ?_Doraise@bad_typeid@std@@MEBAXXZ
|
||||
@ thiscall -arch=win32 ?_Endwrite@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAE_NXZ(ptr) basic_filebuf_char__Endwrite
|
||||
|
@ -1947,8 +1947,8 @@
|
|||
@ cdecl -arch=win64 ?_Gettnames@_Locinfo@std@@QEBA?AV_Timevec@2@XZ(ptr ptr) _Locinfo__Gettnames
|
||||
@ thiscall -arch=i386 ?_Gettrue@_Locinfo@std@@QBEPBDXZ(ptr) _Locinfo__Gettrue
|
||||
@ cdecl -arch=win64 ?_Gettrue@_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Gettrue
|
||||
# extern -arch=win32 ?_Global@_Locimp@locale@std@@0PAV123@A
|
||||
# extern -arch=win64 ?_Global@_Locimp@locale@std@@0PEAV123@EA
|
||||
@ extern -arch=win32 ?_Global@_Locimp@locale@std@@0PAV123@A global_locale
|
||||
@ extern -arch=win64 ?_Global@_Locimp@locale@std@@0PEAV123@EA global_locale
|
||||
@ thiscall -arch=i386 ?_Gndec@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IAEPADXZ(ptr) basic_streambuf_char__Gndec
|
||||
@ cdecl -arch=win64 ?_Gndec@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IEAAPEADXZ(ptr) basic_streambuf_char__Gndec
|
||||
@ thiscall -arch=i386 ?_Gndec@?$basic_streambuf@GU?$char_traits@G@std@@@std@@IAEPAGXZ(ptr) basic_streambuf_wchar__Gndec
|
||||
|
@ -2081,10 +2081,10 @@
|
|||
@ extern ?_Init_cnt@Init@ios_base@std@@0HA ios_base_Init__Init_cnt
|
||||
# extern ?_Init_cnt@_UShinit@std@@0HA
|
||||
@ extern ?_Init_cnt@_Winit@std@@0HA _Winit__Init_cnt
|
||||
@ stub -arch=win32 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXXZ
|
||||
@ stub -arch=win64 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXXZ
|
||||
@ stub -arch=win32 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXXZ
|
||||
@ stub -arch=win64 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXXZ
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXXZ(ptr) basic_filebuf_char__Initcvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXXZ(ptr) basic_filebuf_char__Initcvt
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXXZ(ptr) basic_filebuf_wchar__Initcvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXXZ(ptr) basic_filebuf_wchar__Initcvt
|
||||
@ stub -arch=win32 ?_Initcvt@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IAEXXZ
|
||||
@ stub -arch=win32 ?_Inside@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAE_NPBD@Z
|
||||
@ stub -arch=win32 ?_Inside@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAE_NPBG@Z
|
||||
|
|
|
@ -2273,12 +2273,12 @@
|
|||
@ extern ?_Init_cnt@Init@ios_base@std@@0HA ios_base_Init__Init_cnt
|
||||
# extern ?_Init_cnt@_UShinit@std@@0HA
|
||||
@ extern ?_Init_cnt@_Winit@std@@0HA _Winit__Init_cnt
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAV?$codecvt@DDH@2@@Z(ptr ptr) basic_filebuf_char__Initcvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXPEAV?$codecvt@DDH@2@@Z(ptr ptr) basic_filebuf_char__Initcvt
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXPAV?$codecvt@GDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXPEAV?$codecvt@GDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IAEXPAV?$codecvt@_WDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IEAAXPEAV?$codecvt@_WDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAV?$codecvt@DDH@2@@Z(ptr ptr) basic_filebuf_char__Initcvt_cvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXPEAV?$codecvt@DDH@2@@Z(ptr ptr) basic_filebuf_char__Initcvt_cvt
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXPAV?$codecvt@GDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt_cvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXPEAV?$codecvt@GDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt_cvt
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IAEXPAV?$codecvt@_WDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt_cvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IEAAXPEAV?$codecvt@_WDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt_cvt
|
||||
@ thiscall -arch=win32 ?_Inside@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@IAE_NPBD@Z(ptr str) basic_string_char_inside
|
||||
@ cdecl -arch=win64 ?_Inside@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@IEAA_NPEBD@Z(ptr str) basic_string_char_inside
|
||||
@ thiscall -arch=win32 ?_Inside@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@IAE_NPBG@Z(ptr ptr) basic_string_wchar_inside
|
||||
|
|
|
@ -2528,12 +2528,12 @@
|
|||
@ stub -arch=win64 ?_Init_locks_ctor@_Init_locks@std@@CAXPEAV12@@Z
|
||||
@ stub -arch=win32 ?_Init_locks_dtor@_Init_locks@std@@CAXPAV12@@Z
|
||||
@ stub -arch=win64 ?_Init_locks_dtor@_Init_locks@std@@CAXPEAV12@@Z
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAV?$codecvt@DDH@2@@Z(ptr ptr) basic_filebuf_char__Initcvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXPEAV?$codecvt@DDH@2@@Z(ptr ptr) basic_filebuf_char__Initcvt
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXPAV?$codecvt@GDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXPEAV?$codecvt@GDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IAEXPAV?$codecvt@_WDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IEAAXPEAV?$codecvt@_WDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAV?$codecvt@DDH@2@@Z(ptr ptr) basic_filebuf_char__Initcvt_cvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXPEAV?$codecvt@DDH@2@@Z(ptr ptr) basic_filebuf_char__Initcvt_cvt
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXPAV?$codecvt@GDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt_cvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXPEAV?$codecvt@GDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt_cvt
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IAEXPAV?$codecvt@_WDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt_cvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IEAAXPEAV?$codecvt@_WDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt_cvt
|
||||
@ thiscall -arch=win32 ?_Inside@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@IAE_NPBD@Z(ptr str) basic_string_char_inside
|
||||
@ cdecl -arch=win64 ?_Inside@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@IEAA_NPEBD@Z(ptr str) basic_string_char_inside
|
||||
@ thiscall -arch=win32 ?_Inside@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@IAE_NPBG@Z(ptr ptr) basic_string_wchar_inside
|
||||
|
|
|
@ -1009,7 +1009,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor_uninitialized(basic_s
|
|||
{
|
||||
TRACE("(%p %d)\n", this, uninitialized);
|
||||
this->vtable = &MSVCP_basic_streambuf_char_vtable;
|
||||
#if _MSVCP_VER <= 100
|
||||
#if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
|
||||
mutex_ctor(&this->lock);
|
||||
#endif
|
||||
return this;
|
||||
|
@ -1023,7 +1023,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor(basic_streambuf_char
|
|||
TRACE("(%p)\n", this);
|
||||
|
||||
this->vtable = &MSVCP_basic_streambuf_char_vtable;
|
||||
#if _MSVCP_VER <= 100
|
||||
#if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
|
||||
mutex_ctor(&this->lock);
|
||||
#endif
|
||||
#if _MSVCP_VER >= 70
|
||||
|
@ -1042,7 +1042,7 @@ void __thiscall basic_streambuf_char_dtor(basic_streambuf_char *this)
|
|||
{
|
||||
TRACE("(%p)\n", this);
|
||||
|
||||
#if _MSVCP_VER <= 100
|
||||
#if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
|
||||
mutex_dtor(&this->lock);
|
||||
#endif
|
||||
locale_dtor(IOS_LOCALE(this));
|
||||
|
@ -1138,7 +1138,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Lock, 4)
|
|||
void __thiscall basic_streambuf_char__Lock(basic_streambuf_char *this)
|
||||
{
|
||||
TRACE("(%p)\n", this);
|
||||
#if _MSVCP_VER <= 100
|
||||
#if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
|
||||
mutex_lock(&this->lock);
|
||||
#endif
|
||||
}
|
||||
|
@ -1266,7 +1266,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Unlock, 4)
|
|||
void __thiscall basic_streambuf_char__Unlock(basic_streambuf_char *this)
|
||||
{
|
||||
TRACE("(%p)\n", this);
|
||||
#if _MSVCP_VER <= 100
|
||||
#if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
|
||||
mutex_unlock(&this->lock);
|
||||
#endif
|
||||
}
|
||||
|
@ -1317,7 +1317,9 @@ void __thiscall basic_streambuf_char_gbump(basic_streambuf_char *this, int off)
|
|||
*this->prsize -= off;
|
||||
}
|
||||
|
||||
/* ?getloc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAE?AVlocale@2@XZ */
|
||||
/* ?getloc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QBE?AVlocale@2@XZ */
|
||||
/* ?getloc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAA?AVlocale@2@XZ */
|
||||
/* ?getloc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEBA?AVlocale@2@XZ */
|
||||
DEFINE_THISCALL_WRAPPER(basic_streambuf_char_getloc, 8)
|
||||
locale* __thiscall basic_streambuf_char_getloc(const basic_streambuf_char *this, locale *ret)
|
||||
|
@ -1846,7 +1848,7 @@ basic_streambuf_wchar* __thiscall basic_streambuf_wchar_ctor_uninitialized(basic
|
|||
{
|
||||
TRACE("(%p %d)\n", this, uninitialized);
|
||||
this->vtable = &MSVCP_basic_streambuf_wchar_vtable;
|
||||
#if _MSVCP_VER <= 100
|
||||
#if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
|
||||
mutex_ctor(&this->lock);
|
||||
#endif
|
||||
return this;
|
||||
|
@ -1871,7 +1873,7 @@ basic_streambuf_wchar* __thiscall basic_streambuf_wchar_ctor(basic_streambuf_wch
|
|||
TRACE("(%p)\n", this);
|
||||
|
||||
this->vtable = &MSVCP_basic_streambuf_wchar_vtable;
|
||||
#if _MSVCP_VER <= 100
|
||||
#if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
|
||||
mutex_ctor(&this->lock);
|
||||
#endif
|
||||
#if _MSVCP_VER >= 70
|
||||
|
@ -1903,7 +1905,7 @@ void __thiscall basic_streambuf_wchar_dtor(basic_streambuf_wchar *this)
|
|||
{
|
||||
TRACE("(%p)\n", this);
|
||||
|
||||
#if _MSVCP_VER <= 100
|
||||
#if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
|
||||
mutex_dtor(&this->lock);
|
||||
#endif
|
||||
locale_dtor(IOS_LOCALE(this));
|
||||
|
@ -2006,7 +2008,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar__Lock, 4)
|
|||
void __thiscall basic_streambuf_wchar__Lock(basic_streambuf_wchar *this)
|
||||
{
|
||||
TRACE("(%p)\n", this);
|
||||
#if _MSVCP_VER <= 100
|
||||
#if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
|
||||
mutex_lock(&this->lock);
|
||||
#endif
|
||||
}
|
||||
|
@ -2143,7 +2145,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar__Unlock, 4)
|
|||
void __thiscall basic_streambuf_wchar__Unlock(basic_streambuf_wchar *this)
|
||||
{
|
||||
TRACE("(%p)\n", this);
|
||||
#if _MSVCP_VER <= 100
|
||||
#if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
|
||||
mutex_unlock(&this->lock);
|
||||
#endif
|
||||
}
|
||||
|
@ -2757,8 +2759,8 @@ void __thiscall basic_filebuf_char__Init(basic_filebuf_char *this, FILE *file, b
|
|||
|
||||
/* ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAV?$codecvt@DDH@2@@Z */
|
||||
/* ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXPEAV?$codecvt@DDH@2@@Z */
|
||||
DEFINE_THISCALL_WRAPPER(basic_filebuf_char__Initcvt, 8)
|
||||
void __thiscall basic_filebuf_char__Initcvt(basic_filebuf_char *this, codecvt_char *cvt)
|
||||
DEFINE_THISCALL_WRAPPER(basic_filebuf_char__Initcvt_cvt, 8)
|
||||
void __thiscall basic_filebuf_char__Initcvt_cvt(basic_filebuf_char *this, codecvt_char *cvt)
|
||||
{
|
||||
TRACE("(%p %p)\n", this, cvt);
|
||||
|
||||
|
@ -2770,6 +2772,15 @@ void __thiscall basic_filebuf_char__Initcvt(basic_filebuf_char *this, codecvt_ch
|
|||
}
|
||||
}
|
||||
|
||||
/* ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXXZ */
|
||||
/* ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXXZ */
|
||||
DEFINE_THISCALL_WRAPPER(basic_filebuf_char__Initcvt, 4)
|
||||
void __thiscall basic_filebuf_char__Initcvt(basic_filebuf_char *this)
|
||||
{
|
||||
codecvt_char *cvt = codecvt_char_use_facet(IOS_LOCALE(&this->base));
|
||||
basic_filebuf_char__Initcvt_cvt( this, cvt );
|
||||
}
|
||||
|
||||
/* ?_Endwrite@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAE_NXZ */
|
||||
/* ?_Endwrite@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAA_NXZ */
|
||||
DEFINE_THISCALL_WRAPPER(basic_filebuf_char__Endwrite, 4)
|
||||
|
@ -2982,6 +2993,14 @@ FILE* __cdecl _Fiopen(const char *name, int mode, int prot)
|
|||
return _Fiopen_wchar(nameW, mode, prot);
|
||||
}
|
||||
|
||||
/* ?__Fiopen@std@@YAPAU_iobuf@@PBDH@Z */
|
||||
/* ?__Fiopen@std@@YAPEAU_iobuf@@PEBDH@Z */
|
||||
FILE* __cdecl ___Fiopen(const char *name, int mode)
|
||||
{
|
||||
TRACE("(%p %d)\n", name, mode);
|
||||
return _Fiopen(name, mode, _SH_DENYNO);
|
||||
}
|
||||
|
||||
/* ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAEPAV12@PB_WHH@Z */
|
||||
/* ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QEAAPEAV12@PEB_WHH@Z */
|
||||
/* ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAEPAV12@PBGHH@Z */
|
||||
|
@ -3000,7 +3019,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_open_wchar(basic_filebuf_char
|
|||
return NULL;
|
||||
|
||||
basic_filebuf_char__Init(this, f, INITFL_open);
|
||||
basic_filebuf_char__Initcvt(this, codecvt_char_use_facet(IOS_LOCALE(&this->base)));
|
||||
basic_filebuf_char__Initcvt_cvt(this, codecvt_char_use_facet(IOS_LOCALE(&this->base)));
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -3028,6 +3047,17 @@ basic_filebuf_char* __thiscall basic_filebuf_char_open(basic_filebuf_char *this,
|
|||
return basic_filebuf_char_open_wchar(this, nameW, mode, prot);
|
||||
}
|
||||
|
||||
/* ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAEPAV12@PBDF@Z */
|
||||
/* ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QEAAPEAV12@PEBDF@Z */
|
||||
DEFINE_THISCALL_WRAPPER(basic_filebuf_char_open_mode_old, 12)
|
||||
basic_filebuf_char* __thiscall basic_filebuf_char_open_mode_old(basic_filebuf_char *this, const char *name, short mode)
|
||||
{
|
||||
TRACE("(%p %p %d)\n", this, name, mode);
|
||||
return basic_filebuf_char_open(this, name, mode, SH_DENYNO);
|
||||
}
|
||||
|
||||
/* ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAEPAV12@PBDH@Z */
|
||||
/* ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QEAAPEAV12@PEBDH@Z */
|
||||
/* ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAEPAV12@PBDI@Z */
|
||||
/* ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QEAAPEAV12@PEBDI@Z */
|
||||
DEFINE_THISCALL_WRAPPER(basic_filebuf_char_open_mode, 12)
|
||||
|
@ -3293,7 +3323,7 @@ DEFINE_THISCALL_WRAPPER(basic_filebuf_char_imbue, 8)
|
|||
void __thiscall basic_filebuf_char_imbue(basic_filebuf_char *this, const locale *loc)
|
||||
{
|
||||
TRACE("(%p %p)\n", this, loc);
|
||||
basic_filebuf_char__Initcvt(this, codecvt_char_use_facet(loc));
|
||||
basic_filebuf_char__Initcvt_cvt(this, codecvt_char_use_facet(loc));
|
||||
}
|
||||
|
||||
/* ?_Stinit@?1??_Init@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@23@@Z@4HA */
|
||||
|
@ -3340,8 +3370,8 @@ void __thiscall basic_filebuf_short__Init(basic_filebuf_wchar *this, FILE *file,
|
|||
/* ?_Initcvt@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IEAAXPEAV?$codecvt@_WDH@2@@Z */
|
||||
/* ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXPAV?$codecvt@GDH@2@@Z */
|
||||
/* ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXPEAV?$codecvt@GDH@2@@Z */
|
||||
DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar__Initcvt, 8)
|
||||
void __thiscall basic_filebuf_wchar__Initcvt(basic_filebuf_wchar *this, codecvt_wchar *cvt)
|
||||
DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar__Initcvt_cvt, 8)
|
||||
void __thiscall basic_filebuf_wchar__Initcvt_cvt(basic_filebuf_wchar *this, codecvt_wchar *cvt)
|
||||
{
|
||||
TRACE("(%p %p)\n", this, cvt);
|
||||
|
||||
|
@ -3353,6 +3383,15 @@ void __thiscall basic_filebuf_wchar__Initcvt(basic_filebuf_wchar *this, codecvt_
|
|||
}
|
||||
}
|
||||
|
||||
/* ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXXZ */
|
||||
/* ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXXZ */
|
||||
DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar__Initcvt, 4)
|
||||
void __thiscall basic_filebuf_wchar__Initcvt(basic_filebuf_wchar *this)
|
||||
{
|
||||
codecvt_wchar *cvt = codecvt_wchar_use_facet(IOS_LOCALE(&this->base));
|
||||
basic_filebuf_wchar__Initcvt_cvt( this, cvt );
|
||||
}
|
||||
|
||||
/* ?_Endwrite@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IAE_NXZ */
|
||||
/* ?_Endwrite@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IEAA_NXZ */
|
||||
/* ?_Endwrite@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAE_NXZ */
|
||||
|
@ -3550,7 +3589,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_open_wchar(basic_filebuf_wch
|
|||
return NULL;
|
||||
|
||||
basic_filebuf_wchar__Init(this, f, INITFL_open);
|
||||
basic_filebuf_wchar__Initcvt(this, codecvt_wchar_use_facet(IOS_LOCALE(&this->base)));
|
||||
basic_filebuf_wchar__Initcvt_cvt(this, codecvt_wchar_use_facet(IOS_LOCALE(&this->base)));
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -3572,7 +3611,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_short_open_wchar(basic_filebuf_wch
|
|||
return NULL;
|
||||
|
||||
basic_filebuf_short__Init(this, f, INITFL_open);
|
||||
basic_filebuf_wchar__Initcvt(this, codecvt_short_use_facet(IOS_LOCALE(&this->base)));
|
||||
basic_filebuf_wchar__Initcvt_cvt(this, codecvt_short_use_facet(IOS_LOCALE(&this->base)));
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -3624,6 +3663,17 @@ basic_filebuf_wchar* __thiscall basic_filebuf_short_open(basic_filebuf_wchar *th
|
|||
return basic_filebuf_short_open_wchar(this, nameW, mode, prot);
|
||||
}
|
||||
|
||||
/* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@PBDF@Z */
|
||||
/* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAAPEAV12@PEBDF@Z */
|
||||
DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_open_mode_old, 12)
|
||||
basic_filebuf_wchar* __thiscall basic_filebuf_wchar_open_mode_old(basic_filebuf_wchar *this, const char *name, short mode)
|
||||
{
|
||||
TRACE("(%p %p %d)\n", this, name, mode);
|
||||
return basic_filebuf_wchar_open(this, name, mode, SH_DENYNO);
|
||||
}
|
||||
|
||||
/* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@PBDH@Z */
|
||||
/* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAAPEAV12@PEBDH@Z */
|
||||
/* ?open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QAEPAV12@PBDI@Z */
|
||||
/* ?open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QEAAPEAV12@PEBDI@Z */
|
||||
DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_open_mode, 12)
|
||||
|
@ -3949,7 +3999,7 @@ DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_imbue, 8)
|
|||
void __thiscall basic_filebuf_wchar_imbue(basic_filebuf_wchar *this, const locale *loc)
|
||||
{
|
||||
TRACE("(%p %p)\n", this, loc);
|
||||
basic_filebuf_wchar__Initcvt(this, codecvt_wchar_use_facet(loc));
|
||||
basic_filebuf_wchar__Initcvt_cvt(this, codecvt_wchar_use_facet(loc));
|
||||
}
|
||||
|
||||
/* ?imbue@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEXABVlocale@2@@Z */
|
||||
|
@ -3958,7 +4008,7 @@ DEFINE_THISCALL_WRAPPER(basic_filebuf_short_imbue, 8)
|
|||
void __thiscall basic_filebuf_short_imbue(basic_filebuf_wchar *this, const locale *loc)
|
||||
{
|
||||
TRACE("(%p %p)\n", this, loc);
|
||||
basic_filebuf_wchar__Initcvt(this, codecvt_short_use_facet(loc));
|
||||
basic_filebuf_wchar__Initcvt_cvt(this, codecvt_short_use_facet(loc));
|
||||
}
|
||||
|
||||
/* ?_Getstate@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEHH@Z */
|
||||
|
|
|
@ -2846,12 +2846,12 @@
|
|||
@ stub -arch=win64 ?_Init_locks_ctor@_Init_locks@std@@CAXPEAV12@@Z
|
||||
@ stub -arch=win32 ?_Init_locks_dtor@_Init_locks@std@@CAXPAV12@@Z
|
||||
@ stub -arch=win64 ?_Init_locks_dtor@_Init_locks@std@@CAXPEAV12@@Z
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAV?$codecvt@DDH@2@@Z(ptr ptr) basic_filebuf_char__Initcvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXPEAV?$codecvt@DDH@2@@Z(ptr ptr) basic_filebuf_char__Initcvt
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXPAV?$codecvt@GDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXPEAV?$codecvt@GDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IAEXPAV?$codecvt@_WDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IEAAXPEAV?$codecvt@_WDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAV?$codecvt@DDH@2@@Z(ptr ptr) basic_filebuf_char__Initcvt_cvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXPEAV?$codecvt@DDH@2@@Z(ptr ptr) basic_filebuf_char__Initcvt_cvt
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXPAV?$codecvt@GDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt_cvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXPEAV?$codecvt@GDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt_cvt
|
||||
@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IAEXPAV?$codecvt@_WDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt_cvt
|
||||
@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IEAAXPEAV?$codecvt@_WDH@2@@Z(ptr ptr) basic_filebuf_wchar__Initcvt_cvt
|
||||
@ thiscall -arch=win32 ?_Inside@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@IAE_NPBD@Z(ptr str) basic_string_char_inside
|
||||
@ cdecl -arch=win64 ?_Inside@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@IEAA_NPEBD@Z(ptr str) basic_string_char_inside
|
||||
@ thiscall -arch=win32 ?_Inside@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@IAE_NPBG@Z(ptr ptr) basic_string_wchar_inside
|
||||
|
|
Loading…
Reference in New Issue