Module: wine Branch: master Commit: 96416c69ef18a4f563ffe64db9c27afa6a4047ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=96416c69ef18a4f563ffe64db9... Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 25 15:50:13 2012 +0200 msvcp90: Export clog object. --- dlls/msvcp90/ios.c | 16 ++++++++++++++++ dlls/msvcp90/msvcp90.spec | 6 +++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 3a3350f..e140d84 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -6475,6 +6475,16 @@ struct { /* ?_Ptr_cerr(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA */ basic_ostream_char *_Ptr_cerr = &cerr.obj; +static basic_filebuf_char filebuf_log; +/* ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ +struct { + basic_ostream_char obj; + basic_ios_char vbase; +} clog = { { 0 } }; +/* ?_Ptr_clog(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ +/* ?_Ptr_clog(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA */ +basic_ostream_char *_Ptr_clog = &clog.obj; + void init_io(void) { basic_filebuf_char_ctor_file(&filebuf_stdin, stdin); @@ -6485,6 +6495,9 @@ void init_io(void) basic_filebuf_char_ctor_file(&filebuf_stderr, stderr); basic_ostream_char_ctor(&cerr.obj, &filebuf_stderr.base, FALSE/*FIXME*/, TRUE); + + basic_filebuf_char_ctor_file(&filebuf_log, stderr); + basic_ostream_char_ctor(&clog.obj, &filebuf_log.base, FALSE/*FIXME*/, TRUE); } void free_io(void) @@ -6497,4 +6510,7 @@ void free_io(void) basic_ostream_char_dtor(&cerr.obj); basic_filebuf_char_dtor(&filebuf_stderr); + + basic_ostream_char_dtor(&clog.obj); + basic_filebuf_char_dtor(&filebuf_log); } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 60540bc..e2d31d7 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2698,8 +2698,8 @@ @ extern -arch=win64 ?_Ptr_cerr(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA _Ptr_cerr @ extern -arch=win32 ?_Ptr_cin(a)std@@3PAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)A _Ptr_cin @ extern -arch=win64 ?_Ptr_cin(a)std@@3PEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)EA _Ptr_cin -# extern -arch=win32 ?_Ptr_clog(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A -# extern -arch=win64 ?_Ptr_clog(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA +@ extern -arch=win32 ?_Ptr_clog(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A _Ptr_clog +@ extern -arch=win64 ?_Ptr_clog(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA _Ptr_clog @ extern -arch=win32 ?_Ptr_cout(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A _Ptr_cout @ extern -arch=win64 ?_Ptr_cout(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA _Ptr_cout # extern -arch=win32 ?_Ptr_wcerr(a)std@@3PAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A @@ -3083,7 +3083,7 @@ @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_clear_reraise @ thiscall -arch=win32 ?clear(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_clear_unsigned @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -# extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog @ thiscall -arch=win32 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_char_close @ cdecl -arch=win64 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)XZ(ptr) basic_filebuf_char_close @ stub -arch=win32 ?close@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)XZ