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 08e4054aabd..c8e5ad11015 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -3854,7 +3854,7 @@ @ extern _FInf @ extern _FNan # extern _FRteps -@ stub _FSinh +@ cdecl _FSinh(float float) @ extern _FSnan # extern _FXbig @ stub _GetLocaleForCP diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 2bc7e0bbeec..da6efafea41 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3762,7 +3762,7 @@ @ extern _FInf @ extern _FNan # extern _FRteps -@ stub _FSinh +@ cdecl _FSinh(float float) @ extern _FSnan # extern _FXbig @ stub _FXp_addh diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 0a9f3ca47ee..a3ffad4a442 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3705,7 +3705,7 @@ @ stub _FPlsw @ stub _FPmsw # extern _FRteps -@ stub _FSinh +@ cdecl _FSinh(float float) @ extern _FSnan # extern _FXbig @ stub _FXp_addh diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 75651fabd1b..35fc915d08a 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3705,7 +3705,7 @@ @ stub _FPlsw @ stub _FPmsw # extern _FRteps -@ stub _FSinh +@ cdecl _FSinh(float float) msvcp120._FSinh @ extern _FSnan msvcp120._FSnan # extern _FXbig @ stub _FXp_addh diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 4faf71ae3f7..3534d3f2fc7 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3647,7 +3647,7 @@ @ cdecl _FExp(ptr float long) @ extern _FInf @ extern _FNan -@ stub _FSinh +@ cdecl _FSinh(float float) @ extern _FSnan @ cdecl _File_size(wstr) @ cdecl -norelay _Getcoll() diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index fabb9592be6..5424b06d32d 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -3003,7 +3003,7 @@ @ stub -arch=win64 ?_Rep@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@D_K@Z @ stub -arch=win32 ?_Rep@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@GI@Z @ stub -arch=win64 ?_Rep@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@G_K@Z -@ stub ?_Sinh@?$_Ctr@M@std@@SAMMM@Z +@ cdecl ?_Sinh@?$_Ctr@M@std@@SAMMM@Z(float float) _FSinh @ stub ?_Sinh@?$_Ctr@N@std@@SANNN@Z @ stub ?_Sinh@?$_Ctr@O@std@@SAOOO@Z @ cdecl -arch=arm ?_Split@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAAXXZ(ptr) basic_string_char__Split @@ -5650,7 +5650,7 @@ @ extern _FInf _FInf @ extern _FNan _FNan # extern _FRteps -@ stub _FSinh +@ cdecl _FSinh(float float) @ extern _FSnan _FSnan # extern _FXbig @ cdecl -norelay _Getcoll() diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 054755c40a5..952ba3b70f2 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -2951,7 +2951,7 @@ # extern -arch=win32 ?_Root2@?CA@??_Fabs@std@@YAMABV?$complex@M@2@PAH@Z@4MB # extern -arch=win32 ?_Root2@?CA@??_Fabs@std@@YANABV?$complex@N@2@PAH@Z@4NB # extern -arch=win32 ?_Root2@?CA@??_Fabs@std@@YAOABV?$complex@O@2@PAH@Z@4OB -@ stub ?_Sinh@?$_Ctraits@M@std@@SAMMM@Z +@ cdecl ?_Sinh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FSinh @ stub ?_Sinh@?$_Ctraits@N@std@@SANNN@Z @ stub ?_Sinh@?$_Ctraits@O@std@@SAOOO@Z @ extern -arch=arm ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAAXPAU_iobuf@@W4_Initfl@23@@Z@4HA basic_filebuf_char__Init__Stinit @@ -6933,7 +6933,7 @@ @ extern _FInf @ extern _FNan # extern _FRteps -@ stub _FSinh +@ cdecl _FSinh(float float) @ extern _FSnan # extern _FXbig # extern _FZero diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 97fa0bef160..3e5f3035e9f 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -3202,7 +3202,7 @@ # extern -arch=win64 ?_Root2@?CA@???$_Fabs@M@std@@YAMAEBV?$complex@M@1@PEAH@Z@4MB # extern -arch=win32 ?_Root2@?CA@???$_Fabs@N@std@@YANABV?$complex@N@1@PAH@Z@4NB # extern -arch=win64 ?_Root2@?CA@???$_Fabs@N@std@@YANAEBV?$complex@N@1@PEAH@Z@4NB -@ stub ?_Sinh@?$_Ctraits@M@std@@SAMMM@Z +@ cdecl ?_Sinh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FSinh @ stub ?_Sinh@?$_Ctraits@N@std@@SANNN@Z @ stub ?_Sinh@?$_Ctraits@O@std@@SAOOO@Z @ extern -arch=arm ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAAXPAU_iobuf@@W4_Initfl@23@@Z@4HA basic_filebuf_char__Init__Stinit @@ -7054,7 +7054,7 @@ @ extern _FInf @ extern _FNan # extern _FRteps -@ stub _FSinh +@ cdecl _FSinh(float float) @ extern _FSnan # extern _FXbig # extern _FZero diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 9b923fd9d50..0d8077a3136 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -3662,7 +3662,7 @@ @ cdecl -arch=arm ?_Sgetn_s@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@QAAHPA_WIH@Z(ptr ptr long long) basic_streambuf_wchar__Sgetn_s @ thiscall -arch=i386 ?_Sgetn_s@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@QAEHPA_WIH@Z(ptr ptr long long) basic_streambuf_wchar__Sgetn_s @ cdecl -arch=win64 ?_Sgetn_s@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@QEAA_JPEA_W_K_J@Z(ptr ptr long long) basic_streambuf_wchar__Sgetn_s -@ stub ?_Sinh@?$_Ctraits@M@std@@SAMMM@Z +@ cdecl ?_Sinh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FSinh @ stub ?_Sinh@?$_Ctraits@N@std@@SANNN@Z @ stub ?_Sinh@?$_Ctraits@O@std@@SAOOO@Z @ extern -arch=arm ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAAXPAU_iobuf@@W4_Initfl@23@@Z@4HA basic_filebuf_char__Init__Stinit @@ -7850,7 +7850,7 @@ @ extern _FInf @ extern _FNan # extern _FRteps -@ stub _FSinh +@ cdecl _FSinh(float float) @ extern _FSnan # extern _FXbig @ cdecl -norelay _Getcoll() diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index baf61a472f1..f1c7ce03370 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); } +/* /* ?_Sinh@?$_Ctr@M@std@@SAMMM@Z */ +float __cdecl _FSinh(float x, float y) +{ + return y * sinh(x); +} + /* ?_XLgamma@std@@YANN@Z */ double __cdecl std__XLgamma_double(double z) { diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 50fe6529e0f..13ddb5b404b 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3692,7 +3692,7 @@ @ cdecl -arch=arm ?_Sgetn_s@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@QAAHPA_WIH@Z(ptr ptr long long) basic_streambuf_wchar__Sgetn_s @ thiscall -arch=i386 ?_Sgetn_s@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@QAEHPA_WIH@Z(ptr ptr long long) basic_streambuf_wchar__Sgetn_s @ cdecl -arch=win64 ?_Sgetn_s@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@QEAA_JPEA_W_K_J@Z(ptr ptr long long) basic_streambuf_wchar__Sgetn_s -@ stub ?_Sinh@?$_Ctraits@M@std@@SAMMM@Z +@ cdecl ?_Sinh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FSinh @ stub ?_Sinh@?$_Ctraits@N@std@@SANNN@Z @ stub ?_Sinh@?$_Ctraits@O@std@@SAOOO@Z @ extern -arch=arm ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAAXPAU_iobuf@@W4_Initfl@23@@Z@4HA basic_filebuf_char__Init__Stinit @@ -7878,7 +7878,7 @@ @ extern _FInf @ extern _FNan # extern _FRteps -@ stub _FSinh +@ cdecl _FSinh(float float) @ extern _FSnan # extern _FXbig @ cdecl -norelay _Getcoll() diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index 69eb0a38040..71c7b43c368 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -3646,7 +3646,7 @@ @ cdecl _FExp(ptr float long) msvcp140._FExp @ extern _FInf msvcp140._FInf @ extern _FNan msvcp140._FNan -@ stub _FSinh +@ cdecl _FSinh(float float) msvcp140._FSinh @ extern _FSnan msvcp140._FSnan @ cdecl _File_size(wstr) msvcp140._File_size @ cdecl -norelay _Getcoll() msvcp140._Getcoll -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10942