[PATCH 0/8] MR1223: msvcp90: add stream func implementation.
From: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=47304 --- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/ios.c | 7 +++++++ dlls/msvcp90/msvcp90.spec | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 020e8d26fc7..8cf90ea4d50 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2117,8 +2117,8 @@ @ cdecl -arch=win64 ?_Chassign@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@IEAAX_K0G(a)Z(ptr long long long) MSVCP_basic_string_wchar_Chassign @ thiscall -arch=win32 ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAEXII_W(a)Z(ptr long long long) MSVCP_basic_string_wchar_Chassign @ cdecl -arch=win64 ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IEAAX_K0_W(a)Z(ptr long long long) MSVCP_basic_string_wchar_Chassign -@ stub -arch=win32 ?_Cin_func(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ stub -arch=win64 ?_Cin_func(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Cin_func(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ() _Cin_func +@ cdecl -arch=win64 ?_Cin_func(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ() _Cin_func # extern -arch=win64 ?_Cl@?5???$log(a)M@std@@YA?AV?$complex(a)M@1(a)AEBV21@@Z(a)4MB # extern -arch=win32 ?_Cl@?5???$log(a)N@std@@YA?AV?$complex(a)N@1(a)ABV21@@Z(a)4NB # extern -arch=win64 ?_Cl@?5???$log(a)N@std@@YA?AV?$complex(a)N@1(a)AEBV21@@Z(a)4NB diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index d176dffa802..85a96d54230 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15959,3 +15959,10 @@ void free_io(void) basic_ostream_wchar_vbase_dtor(&wclog.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_log); } + +// ?_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 +basic_istream_char* __cdecl _Cin_func(void) +{ + return &cin.obj; +} \ No newline at end of file diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 1e79400e469..532c477294c 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2380,8 +2380,8 @@ @ cdecl -arch=win64 ?_Chassign@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@IEAAX_K0G(a)Z(ptr long long long) MSVCP_basic_string_wchar_Chassign @ thiscall -arch=win32 ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAEXII_W(a)Z(ptr long long long) MSVCP_basic_string_wchar_Chassign @ cdecl -arch=win64 ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IEAAX_K0_W(a)Z(ptr long long long) MSVCP_basic_string_wchar_Chassign -@ stub -arch=win32 ?_Cin_func(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ stub -arch=win64 ?_Cin_func(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Cin_func(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ() _Cin_func +@ cdecl -arch=win64 ?_Cin_func(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ() _Cin_func # extern -arch=win64 ?_Cl@?5???$log(a)M@std@@YA?AV?$complex(a)M@1(a)AEBV21@@Z(a)4MB # extern -arch=win32 ?_Cl@?5???$log(a)N@std@@YA?AV?$complex(a)N@1(a)ABV21@@Z(a)4NB # extern -arch=win64 ?_Cl@?5???$log(a)N@std@@YA?AV?$complex(a)N@1(a)AEBV21@@Z(a)4NB -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1223
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
From: Bartosz Kosiorek <gang65(a)poczta.onet.pl> --- dlls/msvcm80/msvcm80.spec | 4 ++-- dlls/msvcm90/msvcm90.spec | 4 ++-- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/ios.c | 7 +++++++ dlls/msvcp90/msvcp90.spec | 4 ++-- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/msvcm80/msvcm80.spec b/dlls/msvcm80/msvcm80.spec index 86e50bfb402..beee9c33c89 100644 --- a/dlls/msvcm80/msvcm80.spec +++ b/dlls/msvcm80/msvcm80.spec @@ -23,8 +23,8 @@ @ stub -arch=win32 ?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub -arch=win64 ?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub ?_Cosh@@YANNN(a)Z -@ stub -arch=win32 ?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ stub -arch=win64 ?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ cdecl -arch=win64 ?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub -arch=win32 ?_Debug_message(a)std@@YAXPBD0(a)Z @ stub -arch=win64 ?_Debug_message(a)std@@YAXPEBD0(a)Z @ stub -arch=win32 ?_Dnorm@@YAFPAG(a)Z diff --git a/dlls/msvcm90/msvcm90.spec b/dlls/msvcm90/msvcm90.spec index 9d57dc75c08..db023306c09 100644 --- a/dlls/msvcm90/msvcm90.spec +++ b/dlls/msvcm90/msvcm90.spec @@ -22,8 +22,8 @@ @ stub -arch=win64 ?_Clocptr_func(a)_Locimp@locale(a)std@@CAAEAPEAV123(a)XZ @ stub -arch=win32 ?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub -arch=win64 ?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ stub -arch=win32 ?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ stub -arch=win64 ?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ cdecl -arch=win64 ?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub -arch=win32 ?_Fiopen(a)std@@YAPAU_iobuf@@PBDHH(a)Z @ stub -arch=win64 ?_Fiopen(a)std@@YAPEAU_iobuf@@PEBDHH(a)Z @ stub -arch=win32 ?_Fiopen(a)std@@YAPAU_iobuf@@PBGHH(a)Z diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 3f7d7f65132..748c223670a 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2151,8 +2151,8 @@ @ stub ?_Cosh@?$_Ctraits(a)M@std@@SAMMM(a)Z @ stub ?_Cosh@?$_Ctraits(a)N@std@@SANNN(a)Z @ stub ?_Cosh@?$_Ctraits(a)O@std@@SAOOO(a)Z -@ stub -arch=win32 ?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ stub -arch=win64 ?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() _Cout_func +@ cdecl -arch=win64 ?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() _Cout_func @ stub -arch=win32 ?_Debug_message(a)std@@YAXPBD0(a)Z @ stub -arch=win64 ?_Debug_message(a)std@@YAXPEBD0(a)Z @ thiscall -arch=win32 ?_Decref(a)facet@locale(a)std@@QAEPAV123(a)XZ(ptr) locale_facet__Decref diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 8f322dd0186..120baefdb22 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15980,4 +15980,11 @@ basic_istream_wchar* __cdecl u_Wcin_func(void) basic_istream_wchar* __cdecl _Wcin_func(void) { return &wcin.obj; +} + +// ?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +// ?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +basic_ostream_char* __cdecl _Cout_func(void) +{ + return &cout.obj; } \ No newline at end of file diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 33c91011878..2f4806b9ff7 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2414,8 +2414,8 @@ @ stub ?_Cosh@?$_Ctraits(a)M@std@@SAMMM(a)Z @ stub ?_Cosh@?$_Ctraits(a)N@std@@SANNN(a)Z @ stub ?_Cosh@?$_Ctraits(a)O@std@@SAOOO(a)Z -@ stub -arch=win32 ?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ stub -arch=win64 ?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() _Cout_func +@ cdecl -arch=win64 ?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() _Cout_func @ stub -arch=win32 ?_Debug_message(a)std@@YAXPBD0(a)Z @ stub -arch=win64 ?_Debug_message(a)std@@YAXPEBD0(a)Z @ thiscall -arch=win32 ?_Decref(a)facet@locale(a)std@@QAEPAV123(a)XZ(ptr) locale_facet__Decref -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1223
From: Bartosz Kosiorek <gang65(a)poczta.onet.pl> --- dlls/msvcm80/msvcm80.spec | 4 ++-- dlls/msvcm90/msvcm90.spec | 4 ++-- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/ios.c | 7 +++++++ dlls/msvcp90/msvcp90.spec | 4 ++-- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/msvcm80/msvcm80.spec b/dlls/msvcm80/msvcm80.spec index beee9c33c89..228cd4f0298 100644 --- a/dlls/msvcm80/msvcm80.spec +++ b/dlls/msvcm80/msvcm80.spec @@ -20,8 +20,8 @@ @ stub -arch=win64 ?_Cin_func(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub -arch=win32 ?_Clocptr_func(a)_Locimp@locale(a)std@@CAAAPAV123(a)XZ @ stub -arch=win64 ?_Clocptr_func(a)_Locimp@locale(a)std@@CAAEAPEAV123(a)XZ -@ stub -arch=win32 ?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ stub -arch=win64 ?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ cdecl -arch=win64 ?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub ?_Cosh@@YANNN(a)Z @ cdecl -arch=win32 ?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ cdecl -arch=win64 ?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ diff --git a/dlls/msvcm90/msvcm90.spec b/dlls/msvcm90/msvcm90.spec index db023306c09..ada6dd54f53 100644 --- a/dlls/msvcm90/msvcm90.spec +++ b/dlls/msvcm90/msvcm90.spec @@ -20,8 +20,8 @@ @ stub -arch=win64 ?_Cin_func(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub -arch=win32 ?_Clocptr_func(a)_Locimp@locale(a)std@@CAAAPAV123(a)XZ @ stub -arch=win64 ?_Clocptr_func(a)_Locimp@locale(a)std@@CAAEAPEAV123(a)XZ -@ stub -arch=win32 ?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ stub -arch=win64 ?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ cdecl -arch=win64 ?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ cdecl -arch=win32 ?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ cdecl -arch=win64 ?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub -arch=win32 ?_Fiopen(a)std@@YAPAU_iobuf@@PBDHH(a)Z diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 748c223670a..71096681c4c 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2126,8 +2126,8 @@ @ extern -arch=win64 ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA locale__Locimp__Clocptr @ cdecl -arch=win32 ?_Clocptr_func(a)_Locimp@locale(a)std@@CAAAPAV123(a)XZ() locale__Locimp__Clocptr_func @ cdecl -arch=win64 ?_Clocptr_func(a)_Locimp@locale(a)std@@CAAEAPEAV123(a)XZ() locale__Locimp__Clocptr_func -@ stub -arch=win32 ?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ stub -arch=win64 ?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() _Clog_func +@ cdecl -arch=win64 ?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() _Clog_func @ stub -arch=win64 ?_Cm@?5???$log(a)M@std@@YA?AV?$complex(a)M@1(a)AEBV21@@Z(a)4MB @ stub -arch=win64 ?_Cm@?5???$log(a)N@std@@YA?AV?$complex(a)N@1(a)AEBV21@@Z(a)4NB @ thiscall -arch=win32 ?_Copy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAEXII(a)Z(ptr long long) basic_string_char__Copy diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 120baefdb22..fc506d1bef3 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15987,4 +15987,11 @@ basic_istream_wchar* __cdecl _Wcin_func(void) basic_ostream_char* __cdecl _Cout_func(void) { return &cout.obj; +} + +// ?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +// ?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +basic_ostream_char* __cdecl _Clog_func(void) +{ + return &MSVCP_clog.obj; } \ No newline at end of file diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 2f4806b9ff7..989e15d3e0d 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2389,8 +2389,8 @@ @ extern -arch=win64 ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA locale__Locimp__Clocptr @ cdecl -arch=win32 ?_Clocptr_func(a)_Locimp@locale(a)std@@CAAAPAV123(a)XZ() locale__Locimp__Clocptr_func @ cdecl -arch=win64 ?_Clocptr_func(a)_Locimp@locale(a)std@@CAAEAPEAV123(a)XZ() locale__Locimp__Clocptr_func -@ stub -arch=win32 ?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ stub -arch=win64 ?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() _Clog_func +@ cdecl -arch=win64 ?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() _Clog_func @ stub -arch=win64 ?_Cm@?5???$log(a)M@std@@YA?AV?$complex(a)M@1(a)AEBV21@@Z(a)4MB @ stub -arch=win64 ?_Cm@?5???$log(a)N@std@@YA?AV?$complex(a)N@1(a)AEBV21@@Z(a)4NB @ thiscall -arch=win32 ?_Copy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAEXII(a)Z(ptr long long) basic_string_char__Copy -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1223
From: Bartosz Kosiorek <gang65(a)poczta.onet.pl> --- dlls/msvcm80/msvcm80.spec | 8 ++++---- dlls/msvcm90/msvcm90.spec | 8 ++++---- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/ios.c | 7 +++++++ dlls/msvcp90/msvcp90.spec | 4 ++-- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/msvcm80/msvcm80.spec b/dlls/msvcm80/msvcm80.spec index 228cd4f0298..86e50bfb402 100644 --- a/dlls/msvcm80/msvcm80.spec +++ b/dlls/msvcm80/msvcm80.spec @@ -20,11 +20,11 @@ @ stub -arch=win64 ?_Cin_func(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub -arch=win32 ?_Clocptr_func(a)_Locimp@locale(a)std@@CAAAPAV123(a)XZ @ stub -arch=win64 ?_Clocptr_func(a)_Locimp@locale(a)std@@CAAEAPEAV123(a)XZ -@ cdecl -arch=win32 ?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ cdecl -arch=win64 ?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ stub -arch=win32 ?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ stub -arch=win64 ?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub ?_Cosh@@YANNN(a)Z -@ cdecl -arch=win32 ?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ cdecl -arch=win64 ?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ stub -arch=win32 ?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ stub -arch=win64 ?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub -arch=win32 ?_Debug_message(a)std@@YAXPBD0(a)Z @ stub -arch=win64 ?_Debug_message(a)std@@YAXPEBD0(a)Z @ stub -arch=win32 ?_Dnorm@@YAFPAG(a)Z diff --git a/dlls/msvcm90/msvcm90.spec b/dlls/msvcm90/msvcm90.spec index ada6dd54f53..9d57dc75c08 100644 --- a/dlls/msvcm90/msvcm90.spec +++ b/dlls/msvcm90/msvcm90.spec @@ -20,10 +20,10 @@ @ stub -arch=win64 ?_Cin_func(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub -arch=win32 ?_Clocptr_func(a)_Locimp@locale(a)std@@CAAAPAV123(a)XZ @ stub -arch=win64 ?_Clocptr_func(a)_Locimp@locale(a)std@@CAAEAPEAV123(a)XZ -@ cdecl -arch=win32 ?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ cdecl -arch=win64 ?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ cdecl -arch=win32 ?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ cdecl -arch=win64 ?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() msvcp90.?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ stub -arch=win32 ?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ stub -arch=win64 ?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ stub -arch=win32 ?_Cout_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ stub -arch=win64 ?_Cout_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub -arch=win32 ?_Fiopen(a)std@@YAPAU_iobuf@@PBDHH(a)Z @ stub -arch=win64 ?_Fiopen(a)std@@YAPEAU_iobuf@@PEBDHH(a)Z @ stub -arch=win32 ?_Fiopen(a)std@@YAPAU_iobuf@@PBGHH(a)Z diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 71096681c4c..6473f058d90 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2109,8 +2109,8 @@ @ cdecl -arch=win64 ?_BADOFF_func(a)std@@YAAEB_JXZ() std_BADOFF_func @ thiscall -arch=i386 ?_Callfns(a)ios_base@std@@AAEXW4event(a)12@@Z(ptr long) ios_base_Callfns @ cdecl -arch=win64 ?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z(ptr long) ios_base_Callfns -@ stub -arch=win32 ?_Cerr_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ stub -arch=win64 ?_Cerr_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Cerr_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() _Cerr_func +@ cdecl -arch=win64 ?_Cerr_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() _Cerr_func @ thiscall -arch=win32 ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAEXIID(a)Z(ptr long long long) MSVCP_basic_string_char_Chassign @ cdecl -arch=win64 ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IEAAX_K0D(a)Z(ptr long long long) MSVCP_basic_string_char_Chassign @ thiscall -arch=win32 ?_Chassign@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@IAEXIIG(a)Z(ptr long long long) MSVCP_basic_string_wchar_Chassign diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index fc506d1bef3..c74819359b6 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15994,4 +15994,11 @@ basic_ostream_char* __cdecl _Cout_func(void) basic_ostream_char* __cdecl _Clog_func(void) { return &MSVCP_clog.obj; +} + +// ?_Cerr_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +// ?_Cerr_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +basic_ostream_char* __cdecl _Cerr_func(void) +{ + return &cerr.obj; } \ No newline at end of file diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 989e15d3e0d..c44d5374184 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2372,8 +2372,8 @@ @ cdecl -arch=arm ?_Callfns(a)ios_base@std@@AAAXW4event(a)12@@Z(ptr long) ios_base_Callfns @ thiscall -arch=i386 ?_Callfns(a)ios_base@std@@AAEXW4event(a)12@@Z(ptr long) ios_base_Callfns @ cdecl -arch=win64 ?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z(ptr long) ios_base_Callfns -@ stub -arch=win32 ?_Cerr_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ stub -arch=win64 ?_Cerr_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Cerr_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() _Cerr_func +@ cdecl -arch=win64 ?_Cerr_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ() _Cerr_func @ thiscall -arch=win32 ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAEXIID(a)Z(ptr long long long) MSVCP_basic_string_char_Chassign @ cdecl -arch=win64 ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IEAAX_K0D(a)Z(ptr long long long) MSVCP_basic_string_char_Chassign @ thiscall -arch=win32 ?_Chassign@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@IAEXIIG(a)Z(ptr long long long) MSVCP_basic_string_wchar_Chassign -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1223
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 6473f058d90..f28209e9f5c 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2832,10 +2832,10 @@ @ 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 @ stub -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ -@ stub -arch=win32 ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ stub -arch=win64 ?_Wcout_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ stub -arch=win32 ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ -@ stub -arch=win64 ?_Wcout_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wcout_func +@ cdecl -arch=win64 ?_Wcout_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wcout_func +@ cdecl -arch=win32 ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcout_func +@ cdecl -arch=win64 ?_Wcout_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcout_func @ thiscall -arch=win32 ?_Widen_s@?$ctype(a)D@std@@QBEPBDPBD0PADI(a)Z(ptr ptr ptr ptr long) ctype_char__Widen_s @ cdecl -arch=win64 ?_Widen_s@?$ctype(a)D@std@@QEBAPEBDPEBD0PEAD_K(a)Z(ptr ptr ptr ptr long) ctype_char__Widen_s @ thiscall -arch=win32 ?_Widen_s@?$ctype(a)G@std@@QBEPBDPBD0PAGI(a)Z(ptr ptr ptr ptr long) ctype_wchar__Widen_s diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index c74819359b6..cf6158ff3ae 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15989,6 +15989,21 @@ basic_ostream_char* __cdecl _Cout_func(void) return &cout.obj; } +// ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ +// ?_Wcout_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ +basic_ostream_wchar* __cdecl u_Wcout_func(void) +{ + return &ucout.obj; +} + + +// ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +// ?_Wcout_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +basic_ostream_wchar* __cdecl _Wcout_func(void) +{ + return &wcout.obj; +} + // ?_Clog_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ // ?_Clog_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ basic_ostream_char* __cdecl _Clog_func(void) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index c44d5374184..6fa2409ea3c 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3175,10 +3175,10 @@ @ 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 @ stub -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ -@ stub -arch=win32 ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ stub -arch=win64 ?_Wcout_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ stub -arch=win32 ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ -@ stub -arch=win64 ?_Wcout_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wcout_func +@ cdecl -arch=win64 ?_Wcout_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wcout_func +@ cdecl -arch=win32 ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcout_func +@ cdecl -arch=win64 ?_Wcout_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcout_func @ thiscall -arch=win32 ?_Widen_s@?$ctype(a)D@std@@QBEPBDPBD0PADI(a)Z(ptr ptr ptr ptr long) ctype_char__Widen_s @ cdecl -arch=win64 ?_Widen_s@?$ctype(a)D@std@@QEBAPEBDPEBD0PEAD_K(a)Z(ptr ptr ptr ptr long) ctype_char__Widen_s @ thiscall -arch=win32 ?_Widen_s@?$ctype(a)G@std@@QBEPBDPBD0PAGI(a)Z(ptr ptr ptr ptr long) ctype_wchar__Widen_s -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1223
From: Bartosz Kosiorek <gang65(a)poczta.onet.pl> --- dlls/msvcp80/msvcp80.spec | 8 ++++---- dlls/msvcp90/ios.c | 14 ++++++++++++++ dlls/msvcp90/msvcp90.spec | 8 ++++---- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index f28209e9f5c..c954f55a8e9 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2828,10 +2828,10 @@ @ 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 -@ stub -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wclog_func +@ cdecl -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wclog_func +@ cdecl -arch=win32 ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wclog_func +@ cdecl -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wclog_func @ cdecl -arch=win32 ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wcout_func @ cdecl -arch=win64 ?_Wcout_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wcout_func @ cdecl -arch=win32 ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcout_func diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index cf6158ff3ae..05e4744e291 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -16011,6 +16011,20 @@ basic_ostream_char* __cdecl _Clog_func(void) return &MSVCP_clog.obj; } +// ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ +// ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ +basic_ostream_wchar* __cdecl u_Wclog_func(void) +{ + return &uclog.obj; +} + +// ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +// ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +basic_ostream_wchar* __cdecl _Wclog_func(void) +{ + return &wclog.obj; +} + // ?_Cerr_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ // ?_Cerr_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ basic_ostream_char* __cdecl _Cerr_func(void) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 6fa2409ea3c..c1694e7deba 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3171,10 +3171,10 @@ @ 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 -@ stub -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wclog_func +@ cdecl -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wclog_func +@ cdecl -arch=win32 ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wclog_func +@ cdecl -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wclog_func @ cdecl -arch=win32 ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wcout_func @ cdecl -arch=win64 ?_Wcout_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wcout_func @ cdecl -arch=win32 ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcout_func -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1223
From: Bartosz Kosiorek <gang65(a)poczta.onet.pl> --- dlls/msvcp80/msvcp80.spec | 8 ++++---- dlls/msvcp90/ios.c | 14 ++++++++++++++ dlls/msvcp90/msvcp90.spec | 8 ++++---- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index c954f55a8e9..b5e60af75e5 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2820,10 +2820,10 @@ @ cdecl -arch=win64 ?_Unlock@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXXZ(ptr) basic_streambuf_wchar__Unlock @ thiscall -arch=win32 ?_Unlock(a)_Mutex@std@@QAEXXZ(ptr) mutex_unlock @ cdecl -arch=win64 ?_Unlock(a)_Mutex@std@@QEAAXXZ(ptr) mutex_unlock -@ stub -arch=win32 ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ 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 +@ cdecl -arch=win32 ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wcerr_func +@ cdecl -arch=win64 ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wcerr_func +@ cdecl -arch=win32 ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcerr_func +@ cdecl -arch=win64 ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcerr_func @ 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 diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 05e4744e291..367ca503c41 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -16030,4 +16030,18 @@ basic_ostream_wchar* __cdecl _Wclog_func(void) basic_ostream_char* __cdecl _Cerr_func(void) { return &cerr.obj; +} + +// ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ +// ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ +basic_ostream_wchar* __cdecl u_Wcerr_func(void) +{ + return &ucerr.obj; +} + +// ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +// ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +basic_ostream_wchar* __cdecl _Wcerr_func(void) +{ + return &wcerr.obj; } \ No newline at end of file diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index c1694e7deba..9e39cd9af20 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3163,10 +3163,10 @@ @ cdecl -arch=win64 ?_Unlock@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXXZ(ptr) basic_streambuf_wchar__Unlock @ thiscall -arch=win32 ?_Unlock(a)_Mutex@std@@QAEXXZ(ptr) mutex_unlock @ cdecl -arch=win64 ?_Unlock(a)_Mutex@std@@QEAAXXZ(ptr) mutex_unlock -@ stub -arch=win32 ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ 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 +@ cdecl -arch=win32 ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wcerr_func +@ cdecl -arch=win64 ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() u_Wcerr_func +@ cdecl -arch=win32 ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcerr_func +@ cdecl -arch=win64 ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcerr_func @ 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 -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1223
participants (2)
-
Bartosz Kosiorek -
Bartosz Kosiorek (＠gang65)