Piotr Caban : msvcp60: Add missing exports.
Module: wine Branch: master Commit: 98032eeab5fe02de7802f79ef18ab0a5e93f91fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=98032eeab5fe02de7802f79ef... Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 14:17:59 2022 +0100 msvcp60: Add missing exports. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 9 +++++---- dlls/msvcp60/msvcp60.spec | 36 ++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 4db279d2cfe..e91de638827 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -4114,11 +4114,12 @@ bool __thiscall ios_base_operator_bool(const ios_base *this) return (this->state & (IOSTATE_failbit|IOSTATE_badbit)) == 0; } -/* ?_Addstd(a)ios_base@std@@SAXPAV12@@Z */ -/* ?_Addstd(a)ios_base@std@@SAXPEAV12@@Z */ -void __cdecl ios_base_Addstd(ios_base *add) +/* ?_Addstd(a)ios_base@std@@IAEXXZ */ +/* ?_Addstd(a)ios_base@std@@IEAAXXZ */ +DEFINE_THISCALL_WRAPPER(ios_base_Addstd, 4) +void __thiscall ios_base_Addstd(ios_base *this) { - FIXME("(%p) stub\n", add); + FIXME("(%p) stub\n", this); } /* ?_Index_func(a)ios_base@std@@CAAAHXZ */ diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 092ccf1a1d3..1cea4d6f189 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2001,8 +2001,8 @@ @ cdecl -arch=win64 ?_Addcats(a)_Locinfo@std@@QEAAAEAV12(a)HPEBD@Z(ptr long str) _Locinfo__Addcats @ thiscall -arch=win32 ?_Addfac(a)locale@std@@QAEAAV12(a)PAVfacet@12(a)II@Z(ptr ptr long long) locale__Addfac @ cdecl -arch=win64 ?_Addfac(a)locale@std@@QEAAAEAV12(a)PEAVfacet@12(a)_K1@Z(ptr ptr long long) locale__Addfac -@ stub -arch=win32 ?_Addstd(a)ios_base@std@@IAEXXZ -@ stub -arch=win64 ?_Addstd(a)ios_base@std@@IEAAXXZ +@ thiscall -arch=win32 ?_Addstd(a)ios_base@std@@IAEXXZ(ptr) ios_base_Addstd +@ cdecl -arch=win64 ?_Addstd(a)ios_base@std@@IEAAXXZ(ptr) ios_base_Addstd @ extern -arch=win32 ?_C@?1??_Nullstr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@CAPBDXZ(a)4DB basic_string_char_nullbyte @ extern -arch=win64 ?_C@?1??_Nullstr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@CAPEBDXZ(a)4DB basic_string_char_nullbyte @ extern -arch=win32 ?_C@?1??_Nullstr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@CAPBGXZ(a)4GB basic_string_wchar_nullbyte @@ -2503,16 +2503,16 @@ @ cdecl -arch=win64 ?classic(a)locale@std@@SAAEBV12(a)XZ() locale_classic @ cdecl -arch=win32 ?classic_table@?$ctype(a)D@std@@KAPBFXZ() ctype_char_classic_table @ cdecl -arch=win64 ?classic_table@?$ctype(a)D@std@@KAPEBFXZ() ctype_char_classic_table -@ stub -arch=win32 ?clear@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXF(a)Z -@ stub -arch=win64 ?clear@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXF(a)Z +@ thiscall -arch=win32 ?clear@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXF(a)Z(ptr long) basic_ios_char_clear +@ cdecl -arch=win64 ?clear@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXF(a)Z(ptr long) basic_ios_char_clear @ thiscall -arch=win32 ?clear@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXH_N(a)Z(ptr long long) basic_ios_char_clear_reraise @ cdecl -arch=win64 ?clear@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXH_N(a)Z(ptr long long) basic_ios_char_clear_reraise -@ stub -arch=win32 ?clear@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXF(a)Z -@ stub -arch=win64 ?clear@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXF(a)Z +@ thiscall -arch=win32 ?clear@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXF(a)Z(ptr long) basic_ios_short_clear +@ cdecl -arch=win64 ?clear@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXF(a)Z(ptr long) basic_ios_short_clear @ thiscall -arch=win32 ?clear@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXH_N(a)Z(ptr long long) basic_ios_short_clear_reraise @ cdecl -arch=win64 ?clear@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXH_N(a)Z(ptr long long) basic_ios_short_clear_reraise -@ stub -arch=win32 ?clear(a)ios_base@std@@QAEXF(a)Z -@ stub -arch=win64 ?clear(a)ios_base@std@@QEAAXF(a)Z +@ thiscall -arch=win32 ?clear(a)ios_base@std@@QAEXF(a)Z(ptr long) ios_base_clear +@ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXF(a)Z(ptr long) ios_base_clear @ thiscall -arch=win32 ?clear(a)ios_base@std@@QAEXH_N(a)Z(ptr long long) ios_base_clear_reraise @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_clear_reraise @ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @@ -3930,14 +3930,14 @@ @ cdecl -arch=win64 ?seekoff@?$basic_stringbuf(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@MEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) basic_stringbuf_short_seekoff @ thiscall -arch=win32 ?seekoff(a)strstreambuf@std@@MAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) strstreambuf_seekoff @ cdecl -arch=win64 ?seekoff(a)strstreambuf@std@@MEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) strstreambuf_seekoff -@ stub -arch=win32 ?seekp@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z +@ thiscall -arch=win32 ?seekp@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z(ptr long long) basic_ostream_char_seekp @ cdecl -arch=win64 ?seekp@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)V?$fpos(a)H@2@@Z(ptr ptr) basic_ostream_char_seekp_fpos @ thiscall -arch=win32 ?seekp@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z(ptr long long int64 long long) basic_ostream_char_seekp_fpos -@ stub -arch=win64 ?seekp@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z -@ stub -arch=win32 ?seekp@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z +@ cdecl -arch=win64 ?seekp@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z(ptr long long) basic_ostream_char_seekp +@ thiscall -arch=win32 ?seekp@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z(ptr long long) basic_ostream_short_seekp @ cdecl -arch=win64 ?seekp@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)V?$fpos(a)H@2@@Z(ptr ptr) basic_ostream_short_seekp_fpos @ thiscall -arch=win32 ?seekp@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z(ptr long long int64 long long) basic_ostream_short_seekp_fpos -@ stub -arch=win64 ?seekp@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z +@ cdecl -arch=win64 ?seekp@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z(ptr long long) basic_ostream_short_seekp @ thiscall -arch=win32 ?seekpos@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAE?AV?$fpos(a)H@2(a)V32@H(a)Z(ptr ptr long long int64 long long long) basic_filebuf_char_seekpos @ cdecl -arch=win64 ?seekpos@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAA?AV?$fpos(a)H@2(a)V32@H(a)Z(ptr ptr ptr long) basic_filebuf_char_seekpos @ thiscall -arch=win32 ?seekpos@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAE?AV?$fpos(a)H@2(a)V32@H(a)Z(ptr ptr long long int64 long long long) basic_filebuf_short_seekpos @@ -3980,16 +3980,16 @@ @ cdecl -arch=win64 ?setp@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEAAXPEAG0(a)Z(ptr ptr ptr) basic_streambuf_wchar_setp @ cdecl -arch=win32 ?setprecision(a)std@@YA?AU?$_Smanip(a)H@1(a)H@Z(ptr long) setprecision @ cdecl -arch=win64 ?setprecision(a)std@@YA?AU?$_Smanip(a)_J@1(a)_J@Z(ptr long) setprecision -@ stub -arch=win32 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXF(a)Z -@ stub -arch=win64 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXF(a)Z +@ thiscall -arch=win32 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXF(a)Z(ptr long) basic_ios_char_setstate +@ cdecl -arch=win64 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXF(a)Z(ptr long) basic_ios_char_setstate @ thiscall -arch=win32 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXH_N(a)Z(ptr long long) basic_ios_char_setstate_reraise @ cdecl -arch=win64 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXH_N(a)Z(ptr long long) basic_ios_char_setstate_reraise -@ stub -arch=win32 ?setstate@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXF(a)Z -@ stub -arch=win64 ?setstate@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXF(a)Z +@ thiscall -arch=win32 ?setstate@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXF(a)Z(ptr long) basic_ios_short_setstate +@ cdecl -arch=win64 ?setstate@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXF(a)Z(ptr long) basic_ios_short_setstate @ thiscall -arch=win32 ?setstate@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXH_N(a)Z(ptr long long) basic_ios_short_setstate_reraise @ cdecl -arch=win64 ?setstate@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXH_N(a)Z(ptr long long) basic_ios_short_setstate_reraise -@ stub -arch=win32 ?setstate(a)ios_base@std@@QAEXF(a)Z -@ stub -arch=win64 ?setstate(a)ios_base@std@@QEAAXF(a)Z +@ thiscall -arch=win32 ?setstate(a)ios_base@std@@QAEXF(a)Z(ptr long) ios_base_setstate +@ cdecl -arch=win64 ?setstate(a)ios_base@std@@QEAAXF(a)Z(ptr long) ios_base_setstate @ thiscall -arch=win32 ?setstate(a)ios_base@std@@QAEXH_N(a)Z(ptr long long) ios_base_setstate_reraise @ cdecl -arch=win64 ?setstate(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_setstate_reraise @ cdecl -arch=win32 ?setw(a)std@@YA?AU?$_Smanip(a)H@1(a)H@Z(ptr long) setw
participants (1)
-
Alexandre Julliard