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 | 8 ++++++++ dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp_win/msvcp_win.spec | 2 +- 12 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index a04abccc306..0de45114c49 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -3844,7 +3844,7 @@ @ cdecl _Dtest(ptr) @ extern _Eps @ cdecl _Exp(ptr double long) -@ stub _FCosh +@ cdecl _FCosh(float float) @ extern _FDenorm @ stub _FDnorm @ cdecl _FDscale(ptr long) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 3543813acf4..867ea1492da 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3749,7 +3749,7 @@ @ stub _Dunscale @ extern _Eps @ cdecl _Exp(ptr double long) -@ stub _FCosh +@ cdecl _FCosh(float float) @ extern _FDenorm @ stub _FDint @ stub _FDnorm diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 8e4d62ba7ac..bc52f6e7f6e 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3690,7 +3690,7 @@ @ stub _Dunscale @ extern _Eps @ cdecl _Exp(ptr double long) -@ stub _FCosh +@ cdecl _FCosh(float float) @ extern _FDenorm @ stub _FDint @ stub _FDnorm diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 1a3eb317ab6..be57d7ba135 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3690,7 +3690,7 @@ @ stub _Dunscale @ extern _Eps msvcp120._Eps @ cdecl _Exp(ptr double long) msvcp120._Exp -@ stub _FCosh +@ cdecl _FCosh(float float) msvcp120._FCosh @ extern _FDenorm msvcp120._FDenorm @ stub _FDint @ stub _FDnorm diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 700384359a0..5ba5f4109ad 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3641,7 +3641,7 @@ @ cdecl _Dtest(ptr) @ cdecl _Equivalent(wstr wstr) _Equivalent @ cdecl _Exp(ptr double long) -@ stub _FCosh +@ cdecl _FCosh(float float) @ extern _FDenorm @ cdecl _FDtest(ptr) @ cdecl _FExp(ptr float long) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index c3b0a6e764c..750dd251314 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2574,7 +2574,7 @@ @ cdecl -arch=arm ?_Copy@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAAXI@Z(ptr long) basic_string_wchar__Copy @ 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 -@ stub ?_Cosh@?$_Ctr@M@std@@SAMMM@Z +@ cdecl ?_Cosh@?$_Ctr@M@std@@SAMMM@Z(float float) _FCosh @ stub ?_Cosh@?$_Ctr@N@std@@SANNN@Z @ stub ?_Cosh@?$_Ctr@O@std@@SAOOO@Z @ cdecl -arch=arm ?_Decref@facet@locale@std@@QAAPAV123@XZ(ptr) locale_facet__Decref @@ -5640,7 +5640,7 @@ @ cdecl _Dtest(ptr) @ extern _Eps _Eps @ cdecl _Exp(ptr double long) -@ stub _FCosh +@ cdecl _FCosh(float float) @ extern _FDenorm _FDenorm @ stub _FDnorm @ cdecl _FDscale(ptr long) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index e79ef0e4b5a..5899a29d291 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -2399,7 +2399,7 @@ @ stub -arch=i386 ?_Copy@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAEXII@Z @ 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 -@ stub ?_Cosh@?$_Ctraits@M@std@@SAMMM@Z +@ cdecl ?_Cosh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FCosh @ stub ?_Cosh@?$_Ctraits@N@std@@SANNN@Z @ stub ?_Cosh@?$_Ctraits@O@std@@SAOOO@Z @ cdecl -arch=arm ?_Decref@facet@locale@std@@QAAPAV123@XZ(ptr) locale_facet__Decref @@ -6923,7 +6923,7 @@ @ cdecl _Dtest(ptr) @ extern _Eps @ cdecl _Exp(ptr double long) -@ stub _FCosh +@ cdecl _FCosh(float float) @ extern _FDenorm @ stub _FDnorm @ cdecl _FDscale(ptr long) diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index efa92691061..9dd58d44687 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -2621,7 +2621,7 @@ @ cdecl -arch=arm ?_Copy@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@IAAXII@Z(ptr long long) basic_string_wchar__Copy @ 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 -@ stub ?_Cosh@?$_Ctraits@M@std@@SAMMM@Z +@ cdecl ?_Cosh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FCosh @ stub ?_Cosh@?$_Ctraits@N@std@@SANNN@Z @ stub ?_Cosh@?$_Ctraits@O@std@@SAOOO@Z @ cdecl -arch=arm ?_Decref@facet@locale@std@@QAAPAV123@XZ(ptr) locale_facet__Decref @@ -7044,7 +7044,7 @@ @ cdecl _Dtest(ptr) @ extern _Eps @ cdecl _Exp(ptr double long) -@ stub _FCosh +@ cdecl _FCosh(float float) @ extern _FDenorm @ stub _FDnorm @ cdecl _FDscale(ptr long) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 4171ce95f34..1f745017cdd 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2898,7 +2898,7 @@ @ cdecl -arch=win64 ?_Copy_s@?$char_traits@G@std@@SAPEAGPEAG_KPEBG1@Z(ptr long ptr long) MSVCP_char_traits_short__Copy_s @ 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 -@ stub ?_Cosh@?$_Ctraits@M@std@@SAMMM@Z +@ cdecl ?_Cosh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FCosh @ stub ?_Cosh@?$_Ctraits@N@std@@SANNN@Z @ 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 @@ -7838,7 +7838,7 @@ @ stub _Dunscale @ extern _Eps @ cdecl _Exp(ptr double long) -@ stub _FCosh +@ cdecl _FCosh(float float) @ extern _FDenorm @ stub _FDnorm @ cdecl _FDscale(ptr long) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 4460bf4967f..ee184d2b042 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -2363,6 +2363,14 @@ short __cdecl _FExp(float *x, float y, short scale) return dclass(*x); } + +/* ?_Cosh@?$_Ctr@M@std@@SAMMM@Z + ?_Cosh@?$_Ctraits@M@std@@SAMMM@Z*/ +float __cdecl _FCosh(float x, float y) +{ + return y * cosh(x); +} + /* ?_Sinh@?$_Ctr@N@std@@SANNN@Z ?_Sinh@?$_Ctraits@N@std@@SANNN@Z */ double __cdecl _Sinh(double x, double y) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 101709bb6dd..ba3b13c495d 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2903,7 +2903,7 @@ @ cdecl -arch=win64 ?_Copy_s@?$char_traits@G@std@@SAPEAGPEAG_KPEBG1@Z(ptr long ptr long) MSVCP_char_traits_short__Copy_s @ 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 -@ stub ?_Cosh@?$_Ctraits@M@std@@SAMMM@Z +@ cdecl ?_Cosh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FCosh @ stub ?_Cosh@?$_Ctraits@N@std@@SANNN@Z @ 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 @@ -7868,7 +7868,7 @@ @ cdecl _Dtest(ptr) @ extern _Eps @ cdecl _Exp(ptr double long) -@ stub _FCosh +@ cdecl _FCosh(float float) @ extern _FDenorm @ stub _FDnorm @ cdecl _FDscale(ptr long) diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index d401044e62f..27b30696371 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -3640,7 +3640,7 @@ @ cdecl _Dtest(ptr) msvcp140._Dtest @ cdecl _Equivalent(wstr wstr) msvcp140._Equivalent @ cdecl _Exp(ptr double long) msvcp140._Exp -@ stub _FCosh +@ cdecl _FCosh(float float) msvcp140._FCosh @ extern _FDenorm msvcp140._FDenorm @ cdecl _FDtest(ptr) msvcp140._FDtest @ cdecl _FExp(ptr float long) msvcp140._FExp -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10942