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