From: Bartosz Kosiorek <gang65@poczta.onet.pl> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59453 --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp60/msvcp60.spec | 4 ++-- dlls/msvcp70/msvcp70.spec | 4 ++-- dlls/msvcp71/msvcp71.spec | 4 ++-- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/math.c | 6 ++++++ dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp_win/msvcp_win.spec | 2 +- 12 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 0de45114c49..9c52471d9bb 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -3837,7 +3837,7 @@ @ cdecl -ret64 -arch=arm ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAA_JPB_W_J@Z(ptr wstr int64) basic_streambuf_wchar_xsputn @ thiscall -ret64 -arch=i386 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAE_JPB_W_J@Z(ptr wstr int64) basic_streambuf_wchar_xsputn @ cdecl -arch=win64 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAA_JPEB_W_J@Z(ptr wstr int64) basic_streambuf_wchar_xsputn -@ stub _Cosh +@ cdecl _Cosh(double double) @ extern _Denorm @ stub _Dnorm @ cdecl _Dscale(ptr long) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 867ea1492da..aba20f05008 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3738,7 +3738,7 @@ @ cdecl _Cnd_timedwait(ptr ptr ptr) @ cdecl _Cnd_unregister_at_thread_exit(ptr) @ cdecl _Cnd_wait(ptr ptr) -@ stub _Cosh +@ cdecl _Cosh(double double) @ extern _Denorm @ stub _Dint @ stub _Dnorm diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index bc52f6e7f6e..97e55d6d8e4 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3679,7 +3679,7 @@ @ cdecl _Cnd_timedwait(ptr ptr ptr) @ cdecl _Cnd_unregister_at_thread_exit(ptr) @ cdecl _Cnd_wait(ptr ptr) -@ stub _Cosh +@ cdecl _Cosh(double double) @ extern _Denorm @ stub _Dint @ stub _Dnorm diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index be57d7ba135..8f80ee05284 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3679,7 +3679,7 @@ @ cdecl _Cnd_timedwait(ptr ptr ptr) msvcp120._Cnd_timedwait @ cdecl _Cnd_unregister_at_thread_exit(ptr) msvcp120._Cnd_unregister_at_thread_exit @ cdecl _Cnd_wait(ptr ptr) msvcp120._Cnd_wait -@ stub _Cosh +@ cdecl _Cosh(double double) msvcp120._Cosh @ extern _Denorm msvcp120._Denorm @ stub _Dint @ stub _Dnorm diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 5ba5f4109ad..15e828b186d 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3634,7 +3634,7 @@ @ cdecl _Cnd_unregister_at_thread_exit(ptr) @ cdecl _Cnd_wait(ptr ptr) @ cdecl _Copy_file(wstr wstr) -@ stub _Cosh +@ cdecl _Cosh(double double) @ cdecl _Current_get(ptr) @ cdecl _Current_set(wstr) tr2_sys__Current_set_wchar @ extern _Denorm diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 750dd251314..a213c4d4257 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2575,7 +2575,7 @@ @ thiscall -arch=i386 ?_Copy@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAEXI@Z(ptr long) basic_string_wchar__Copy @ cdecl -arch=win64 ?_Copy@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAAX_K@Z(ptr long) basic_string_wchar__Copy @ cdecl ?_Cosh@?$_Ctr@M@std@@SAMMM@Z(float float) _FCosh -@ stub ?_Cosh@?$_Ctr@N@std@@SANNN@Z +@ cdecl ?_Cosh@?$_Ctr@N@std@@SANNN@Z(double double) _Cosh @ stub ?_Cosh@?$_Ctr@O@std@@SAOOO@Z @ cdecl -arch=arm ?_Decref@facet@locale@std@@QAAPAV123@XZ(ptr) locale_facet__Decref @ thiscall -arch=i386 ?_Decref@facet@locale@std@@QAEPAV123@XZ(ptr) locale_facet__Decref @@ -5633,7 +5633,7 @@ @ cdecl -arch=arm ?xsputn@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MAAHPBGH@Z(ptr ptr long) basic_streambuf_wchar_xsputn @ thiscall -arch=i386 ?xsputn@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MAEHPBGH@Z(ptr ptr long) basic_streambuf_wchar_xsputn @ cdecl -arch=win64 ?xsputn@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MEAA_JPEBG_J@Z(ptr ptr long) basic_streambuf_wchar_xsputn -@ stub _Cosh +@ cdecl _Cosh(double double) @ extern _Denorm _Denorm @ stub _Dnorm @ cdecl _Dscale(ptr long) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 5899a29d291..d49bc074cab 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -2400,7 +2400,7 @@ @ stub -arch=arm ?_Copy@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@AAAXII@Z @ stub -arch=i386 ?_Copy@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@AAEXII@Z @ cdecl ?_Cosh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FCosh -@ stub ?_Cosh@?$_Ctraits@N@std@@SANNN@Z +@ cdecl ?_Cosh@?$_Ctraits@N@std@@SANNN@Z(double double) _Cosh @ stub ?_Cosh@?$_Ctraits@O@std@@SAOOO@Z @ cdecl -arch=arm ?_Decref@facet@locale@std@@QAAPAV123@XZ(ptr) locale_facet__Decref @ thiscall -arch=i386 ?_Decref@facet@locale@std@@QAEPAV123@XZ(ptr) locale_facet__Decref @@ -6916,7 +6916,7 @@ @ thiscall -arch=i386 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAEHPB_WH@Z(ptr ptr long) basic_streambuf_wchar_xsputn @ cdecl -arch=win64 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAA_JPEB_W_J@Z(ptr ptr long) basic_streambuf_wchar_xsputn @ stub _Atexit -@ stub _Cosh +@ cdecl _Cosh(double double) @ extern _Denorm @ stub _Dnorm @ cdecl _Dscale(ptr long) diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 9dd58d44687..df0276cc5f9 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -2622,7 +2622,7 @@ @ thiscall -arch=i386 ?_Copy@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@IAEXII@Z(ptr long long) basic_string_wchar__Copy @ cdecl -arch=win64 ?_Copy@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@IEAAX_K0@Z(ptr long long) basic_string_wchar__Copy @ cdecl ?_Cosh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FCosh -@ stub ?_Cosh@?$_Ctraits@N@std@@SANNN@Z +@ cdecl ?_Cosh@?$_Ctraits@N@std@@SANNN@Z(double double) _Cosh @ stub ?_Cosh@?$_Ctraits@O@std@@SAOOO@Z @ cdecl -arch=arm ?_Decref@facet@locale@std@@QAAPAV123@XZ(ptr) locale_facet__Decref @ thiscall -arch=i386 ?_Decref@facet@locale@std@@QAEPAV123@XZ(ptr) locale_facet__Decref @@ -7037,7 +7037,7 @@ @ thiscall -arch=i386 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAEHPB_WH@Z(ptr ptr long) basic_streambuf_wchar_xsputn @ cdecl -arch=win64 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAA_JPEB_W_J@Z(ptr ptr long) basic_streambuf_wchar_xsputn @ stub _Atexit -@ stub _Cosh +@ cdecl _Cosh(double double) @ extern _Denorm @ stub _Dnorm @ cdecl _Dscale(ptr long) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 1f745017cdd..21b8c55a0ea 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2899,7 +2899,7 @@ @ cdecl -arch=win32 ?_Copy_s@?$char_traits@_W@std@@SAPA_WPA_WIPB_WI@Z(ptr long ptr long) MSVCP_char_traits_wchar__Copy_s @ cdecl -arch=win64 ?_Copy_s@?$char_traits@_W@std@@SAPEA_WPEA_W_KPEB_W1@Z(ptr long ptr long) MSVCP_char_traits_wchar__Copy_s @ cdecl ?_Cosh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FCosh -@ stub ?_Cosh@?$_Ctraits@N@std@@SANNN@Z +@ cdecl ?_Cosh@?$_Ctraits@N@std@@SANNN@Z(double double) _Cosh @ stub ?_Cosh@?$_Ctraits@O@std@@SAOOO@Z @ cdecl -arch=win32 ?_Cout_func@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@1@XZ() _Cout_func @ cdecl -arch=win64 ?_Cout_func@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@1@XZ() _Cout_func @@ -7829,7 +7829,7 @@ @ cdecl -arch=arm ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAAHPB_WH@Z(ptr ptr long) basic_streambuf_wchar_xsputn @ thiscall -arch=i386 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAEHPB_WH@Z(ptr ptr long) basic_streambuf_wchar_xsputn @ cdecl -arch=win64 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAA_JPEB_W_J@Z(ptr ptr long) basic_streambuf_wchar_xsputn -@ stub _Cosh +@ cdecl _Cosh(double double) @ extern _Denorm @ stub _Dnorm @ cdecl _Dscale(ptr long) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index ee184d2b042..101871740f4 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -2363,6 +2363,12 @@ short __cdecl _FExp(float *x, float y, short scale) return dclass(*x); } +/* ?_Cosh@?$_Ctr@N@std@@SANNN@Z + ?_Cosh@?$_Ctraits@N@std@@SANNN@Z*/ +double __cdecl _Cosh(double x, double y) +{ + return y * cosh(x); +} /* ?_Cosh@?$_Ctr@M@std@@SAMMM@Z ?_Cosh@?$_Ctraits@M@std@@SAMMM@Z*/ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index ba3b13c495d..7fe9ceede63 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2904,7 +2904,7 @@ @ cdecl -arch=win32 ?_Copy_s@?$char_traits@_W@std@@SAPA_WPA_WIPB_WI@Z(ptr long ptr long) MSVCP_char_traits_wchar__Copy_s @ cdecl -arch=win64 ?_Copy_s@?$char_traits@_W@std@@SAPEA_WPEA_W_KPEB_W1@Z(ptr long ptr long) MSVCP_char_traits_wchar__Copy_s @ cdecl ?_Cosh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FCosh -@ stub ?_Cosh@?$_Ctraits@N@std@@SANNN@Z +@ cdecl ?_Cosh@?$_Ctraits@N@std@@SANNN@Z(double double) _Cosh @ stub ?_Cosh@?$_Ctraits@O@std@@SAOOO@Z @ cdecl -arch=win32 ?_Cout_func@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@1@XZ() _Cout_func @ cdecl -arch=win64 ?_Cout_func@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@1@XZ() _Cout_func @@ -7861,7 +7861,7 @@ @ cdecl -arch=arm ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAAHPB_WH@Z(ptr ptr long) basic_streambuf_wchar_xsputn @ thiscall -arch=i386 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAEHPB_WH@Z(ptr ptr long) basic_streambuf_wchar_xsputn @ cdecl -arch=win64 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAA_JPEB_W_J@Z(ptr ptr long) basic_streambuf_wchar_xsputn -@ stub _Cosh +@ cdecl _Cosh(double double) @ extern _Denorm @ stub _Dnorm @ cdecl _Dscale(ptr long) diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index 27b30696371..7196ae4d24a 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -3633,7 +3633,7 @@ @ cdecl _Cnd_unregister_at_thread_exit(ptr) msvcp140._Cnd_unregister_at_thread_exit @ cdecl _Cnd_wait(ptr ptr) msvcp140._Cnd_wait @ cdecl _Copy_file(wstr wstr) msvcp140._Copy_file -@ stub _Cosh +@ cdecl _Cosh(double double) msvcp140._Cosh @ cdecl _Current_get(ptr) msvcp140._Current_get @ cdecl _Current_set(wstr) msvcp140._Current_set @ extern _Denorm msvcp140._Denorm -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10942