From: Bartosz Kosiorek <gang65(a)poczta.onet.pl> --- dlls/msvcp80/msvcp80.spec | 8 ++++---- dlls/msvcp90/ios.c | 15 +++++++++++++++ dlls/msvcp90/msvcp90.spec | 8 ++++---- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 8cf90ea4d50..3f7d7f65132 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2824,10 +2824,10 @@ @ stub -arch=win64 ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ @ stub -arch=win32 ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ @ stub -arch=win64 ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ -@ stub -arch=win32 ?_Wcin_func(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ stub -arch=win64 ?_Wcin_func(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ stub -arch=win32 ?_Wcin_func(a)std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ -@ stub -arch=win64 ?_Wcin_func(a)std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Wcin_func(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wcin_func +@ cdecl -arch=win64 ?_Wcin_func(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wcin_func +@ cdecl -arch=win32 ?_Wcin_func(a)std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcin_func +@ cdecl -arch=win64 ?_Wcin_func(a)std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcin_func @ stub -arch=win32 ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ @ stub -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ @ stub -arch=win32 ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 85a96d54230..8f322dd0186 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15962,7 +15962,22 @@ void free_io(void) // ?_Cin_func(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ // ?_Cin_func(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ +// class std::basic_istream<char,struct std::char_traits<char> > & __cdecl std::_Cin_func(void) basic_istream_char* __cdecl _Cin_func(void) { return &cin.obj; +} + +// ?_Wcin_func(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)XZ +// ?_Wcin_func(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)XZ +basic_istream_wchar* __cdecl u_Wcin_func(void) +{ + return &ucin.obj; +} + +// ?_Wcin_func(a)std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +// ?_Wcin_func(a)std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +basic_istream_wchar* __cdecl _Wcin_func(void) +{ + return &wcin.obj; } \ No newline at end of file diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 532c477294c..33c91011878 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3167,10 +3167,10 @@ @ stub -arch=win64 ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ @ stub -arch=win32 ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ @ stub -arch=win64 ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ -@ stub -arch=win32 ?_Wcin_func(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ stub -arch=win64 ?_Wcin_func(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ stub -arch=win32 ?_Wcin_func(a)std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ -@ stub -arch=win64 ?_Wcin_func(a)std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Wcin_func(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wcin_func +@ cdecl -arch=win64 ?_Wcin_func(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wcin_func +@ cdecl -arch=win32 ?_Wcin_func(a)std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcin_func +@ cdecl -arch=win64 ?_Wcin_func(a)std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcin_func @ stub -arch=win32 ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ @ stub -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ @ stub -arch=win32 ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1223