Module: wine Branch: master Commit: a73c69700c9e3a179f5492edb1e0e1b710993053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73c69700c9e3a179f5492edb1... Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 6 11:16:54 2013 +0200 msvcp60: Export basic_streambuf::pubseekoff function. --- dlls/msvcp60/ios.c | 14 ++++++++++++-- dlls/msvcp60/msvcp60.spec | 16 ++++++++-------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index a5f573d..7e87607 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -1277,7 +1277,12 @@ fpos_int* __thiscall basic_streambuf_char_seekoff(basic_streambuf_char *this, /* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JHH@Z */ /* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JHH@Z */ -static fpos_int* basic_streambuf_char_pubseekoff(basic_streambuf_char *this, +/* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z */ +/* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z */ +/* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z */ +/* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_streambuf_char_pubseekoff, 20) +fpos_int* __thiscall basic_streambuf_char_pubseekoff(basic_streambuf_char *this, fpos_int *ret, streamoff off, int way, int mode) { TRACE("(%p %ld %d %d)\n", this, off, way, mode); @@ -2006,7 +2011,12 @@ fpos_int* __thiscall basic_streambuf_wchar_seekoff(basic_streambuf_wchar *this, /* ?pubseekoff@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JHH@Z */ /* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JHH@Z */ /* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JHH@Z */ -static fpos_int* basic_streambuf_wchar_pubseekoff(basic_streambuf_wchar *this, +/* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z */ +/* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z */ +/* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z */ +/* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ioos_base(a)2@H(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar_pubseekoff, 20) +fpos_int* __thiscall basic_streambuf_wchar_pubseekoff(basic_streambuf_wchar *this, fpos_int *ret, streamoff off, int way, int mode) { TRACE("(%p %ld %d %d)\n", this, off, way, mode); diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index e15d43c..4e5a28e 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -3645,14 +3645,14 @@ @ cdecl -arch=win64 ?pubimbue@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AVlocale(a)2@AEBV32@@Z(ptr ptr ptr) basic_streambuf_char_pubimbue @ thiscall -arch=win32 ?pubimbue@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AVlocale(a)2@ABV32@@Z(ptr ptr ptr) basic_streambuf_wchar_pubimbue @ cdecl -arch=win64 ?pubimbue@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AVlocale(a)2@AEBV32@@Z(ptr ptr ptr) basic_streambuf_wchar_pubimbue -@ stub -arch=win32 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z -@ stub -arch=win64 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z -@ stub -arch=win32 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z -@ stub -arch=win64 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z -@ stub -arch=win32 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z -@ stub -arch=win64 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z -@ stub -arch=win32 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z -@ stub -arch=win64 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z +@ thiscall -arch=win32 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z(ptr ptr long long long) basic_streambuf_char_pubseekoff +@ cdecl -arch=win64 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z(ptr ptr long long long) basic_streambuf_char_pubseekoff +@ thiscall -arch=win32 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) basic_streambuf_char_pubseekoff +@ cdecl -arch=win64 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) basic_streambuf_char_pubseekoff +@ thiscall -arch=win32 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z(ptr ptr long long long) basic_streambuf_wchar_pubseekoff +@ cdecl -arch=win64 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z(ptr ptr long long long) basic_streambuf_wchar_pubseekoff +@ thiscall -arch=win32 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) basic_streambuf_wchar_pubseekoff +@ cdecl -arch=win64 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) basic_streambuf_wchar_pubseekoff @ stub -arch=win32 ?pubseekpos@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)V32@F(a)Z @ stub -arch=win64 ?pubseekpos@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)V32@F(a)Z @ thiscall -arch=win32 ?pubseekpos@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)V32@H(a)Z(ptr ptr long long int64 long long long) basic_streambuf_char_pubseekpos