[PATCH 0/6] MR10942: msvcp90: Add _Sinh _FSinh _LSinh _Cosh _FCosh _LCosh implementation
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
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 | 9 ++++++++- dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp_win/msvcp_win.spec | 2 +- 12 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index c8e5ad11015..a04abccc306 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -3889,7 +3889,7 @@ @ stub _Once @ stub _Poly # extern _Rteps -@ stub _Sinh +@ cdecl _Sinh(double double) @ extern _Snan @ cdecl _Stod(ptr ptr long) @ cdecl _Stodx(ptr ptr long ptr) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index da6efafea41..3543813acf4 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3835,7 +3835,7 @@ @ stub _Once @ stub _Poly # extern _Rteps -@ stub _Sinh +@ cdecl _Sinh(double double) @ extern _Snan @ cdecl _Stod(ptr ptr long) @ cdecl _Stodx(ptr ptr long ptr) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index a3ffad4a442..8e4d62ba7ac 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3782,7 +3782,7 @@ @ stub _Pmsw @ stub _Poly # extern _Rteps -@ stub _Sinh +@ cdecl _Sinh(double double) @ extern _Snan @ cdecl _Stod(ptr ptr long) @ cdecl _Stodx(ptr ptr long ptr) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 35fc915d08a..1a3eb317ab6 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3782,7 +3782,7 @@ @ stub _Pmsw @ stub _Poly # extern _Rteps -@ stub _Sinh +@ cdecl _Sinh(double double) msvcp120._Sinh @ extern _Snan msvcp120._Snan @ cdecl _Stod(ptr ptr long) msvcp120._Stod @ cdecl _Stodx(ptr ptr long ptr) msvcp120._Stodx diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 3534d3f2fc7..700384359a0 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3698,7 +3698,7 @@ @ cdecl _Rename(wstr wstr) tr2_sys__Rename_wchar @ cdecl _Resize(wstr int64) @ cdecl _Set_last_write_time(wstr int64) -@ stub _Sinh +@ cdecl _Sinh(double double) @ extern _Snan @ cdecl _Stat(wstr ptr) @ stub _Statvfs diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 5424b06d32d..c3b0a6e764c 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -3004,7 +3004,7 @@ @ 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 @ cdecl ?_Sinh@?$_Ctr@M@std@@SAMMM@Z(float float) _FSinh -@ stub ?_Sinh@?$_Ctr@N@std@@SANNN@Z +@ cdecl ?_Sinh@?$_Ctr@N@std@@SANNN@Z(double double) _Sinh @ 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 @ thiscall -arch=i386 ?_Split@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEXXZ(ptr) basic_string_char__Split @@ -5675,7 +5675,7 @@ @ extern _Nan _Nan @ stub _Poly # extern _Rteps -@ stub _Sinh +@ cdecl _Sinh(double double) @ extern _Snan _Snan @ cdecl _Stod(ptr ptr long) @ cdecl _Stof(ptr ptr long) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 952ba3b70f2..e79ef0e4b5a 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -2952,7 +2952,7 @@ # 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 @ cdecl ?_Sinh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FSinh -@ stub ?_Sinh@?$_Ctraits@N@std@@SANNN@Z +@ cdecl ?_Sinh@?$_Ctraits@N@std@@SANNN@Z(double double) _Sinh @ 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 @ extern -arch=i386 ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@23@@Z@4HA basic_filebuf_char__Init__Stinit @@ -6962,7 +6962,7 @@ @ extern _Nan @ stub _Poly # extern _Rteps -@ stub _Sinh +@ cdecl _Sinh(double double) @ extern _Snan @ cdecl _Stod(ptr ptr long) @ cdecl _Stof(ptr ptr long) diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 3e5f3035e9f..efa92691061 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -3203,7 +3203,7 @@ # 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 @ cdecl ?_Sinh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FSinh -@ stub ?_Sinh@?$_Ctraits@N@std@@SANNN@Z +@ cdecl ?_Sinh@?$_Ctraits@N@std@@SANNN@Z(double double) _Sinh @ 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 @ extern -arch=i386 ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@23@@Z@4HA basic_filebuf_char__Init__Stinit @@ -7083,7 +7083,7 @@ @ extern _Nan @ stub _Poly # extern _Rteps -@ stub _Sinh +@ cdecl _Sinh(double double) @ extern _Snan @ cdecl _Stod(ptr ptr long) @ cdecl _Stof(ptr ptr long) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 0d8077a3136..4171ce95f34 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -3663,7 +3663,7 @@ @ 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 @ cdecl ?_Sinh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FSinh -@ stub ?_Sinh@?$_Ctraits@N@std@@SANNN@Z +@ cdecl ?_Sinh@?$_Ctraits@N@std@@SANNN@Z(double double) _Sinh @ 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 @ extern -arch=i386 ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@23@@Z@4HA basic_filebuf_char__Init__Stinit @@ -7886,7 +7886,7 @@ @ stub _Once @ stub _Poly # extern _Rteps -@ stub _Sinh +@ cdecl _Sinh(double double) @ extern _Snan @ cdecl _Stod(ptr ptr long) @ cdecl _Stodx(ptr ptr long ptr) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index f1c7ce03370..b10f76e3e81 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -2363,7 +2363,14 @@ short __cdecl _FExp(float *x, float y, short scale) return dclass(*x); } -/* /* ?_Sinh@?$_Ctr@M@std@@SAMMM@Z */ +/* ?_Sinh@?$_Ctr@N@std@@SANNN@Z + ?_Sinh@?$_Ctraits@N@std@@SANNN@Z */ +double __cdecl _Sinh(double x, double y) +{ + return y * sinh(x); +} + +/* ?_Sinh@?$_Ctr@M@std@@SAMMM@Z */ float __cdecl _FSinh(float x, float y) { return y * sinh(x); diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 13ddb5b404b..101709bb6dd 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3693,7 +3693,7 @@ @ 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 @ cdecl ?_Sinh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FSinh -@ stub ?_Sinh@?$_Ctraits@N@std@@SANNN@Z +@ cdecl ?_Sinh@?$_Ctraits@N@std@@SANNN@Z(double double) _Sinh @ 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 @ extern -arch=i386 ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@23@@Z@4HA basic_filebuf_char__Init__Stinit @@ -7912,7 +7912,7 @@ @ stub _Once @ stub _Poly # extern _Rteps -@ stub _Sinh +@ cdecl _Sinh(double double) @ extern _Snan @ cdecl _Stod(ptr ptr long) @ cdecl _Stodx(ptr ptr long ptr) diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index 71c7b43c368..d401044e62f 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -3697,7 +3697,7 @@ @ cdecl _Rename(wstr wstr) msvcp140._Rename @ cdecl _Resize(wstr int64) msvcp140._Resize @ cdecl _Set_last_write_time(wstr int64) msvcp140._Set_last_write_time -@ stub _Sinh +@ cdecl _Sinh(double double) msvcp140._Sinh @ extern _Snan msvcp140._Snan @ cdecl _Stat(wstr ptr) msvcp140._Stat @ stub _Statvfs -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10942
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 b10f76e3e81..172daec4563 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
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 172daec4563..272f2013084 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
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 | 7 +++++++ dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp_win/msvcp_win.spec | 2 +- 12 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 9c52471d9bb..a2a4e2f73e1 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -3866,7 +3866,7 @@ @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval @ extern _Inf -@ stub _LCosh +@ cdecl _LCosh(double double) @ extern _LDenorm @ cdecl _LDscale(ptr long) _Dscale @ cdecl _LDtest(ptr) _Dtest diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index aba20f05008..676543d2165 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3786,7 +3786,7 @@ @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval @ extern _Inf -@ stub _LCosh +@ cdecl _LCosh(double double) @ extern _LDenorm @ stub _LDint @ cdecl _LDscale(ptr long) _Dscale diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 97e55d6d8e4..a1d3002d001 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3729,7 +3729,7 @@ @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval @ extern _Inf -@ stub _LCosh +@ cdecl _LCosh(double double) @ extern _LDenorm @ stub _LDint @ cdecl _LDscale(ptr long) _Dscale diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 8f80ee05284..a534a614dd1 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3729,7 +3729,7 @@ @ cdecl _Getwctypes(ptr ptr ptr ptr) msvcp120._Getwctypes @ extern _Hugeval msvcp120._Hugeval @ extern _Inf msvcp120._Inf -@ stub _LCosh +@ cdecl _LCosh(double double) msvcp120._LCosh @ extern _LDenorm msvcp120._LDenorm @ stub _LDint @ cdecl _LDscale(ptr long) msvcp120._LDscale diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 15e828b186d..559e1e9edb8 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3659,7 +3659,7 @@ @ stub _Hard_links @ extern _Hugeval @ extern _Inf -@ stub _LCosh +@ cdecl _LCosh(double double) @ extern _LDenorm @ cdecl _LDtest(ptr) _Dtest @ stub _LExp diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index a213c4d4257..c4f5a939e34 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2576,7 +2576,7 @@ @ 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 @ cdecl ?_Cosh@?$_Ctr@N@std@@SANNN@Z(double double) _Cosh -@ stub ?_Cosh@?$_Ctr@O@std@@SAOOO@Z +@ cdecl ?_Cosh@?$_Ctr@O@std@@SAOOO@Z(double double) _LCosh @ 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 @ cdecl -arch=win64 ?_Decref@facet@locale@std@@QEAAPEAV123@XZ(ptr) locale_facet__Decref @@ -5658,7 +5658,7 @@ @ cdecl -norelay _Getcvt() @ extern _Hugeval _Hugeval @ extern _Inf _Inf -@ stub _LCosh +@ cdecl _LCosh(double double) @ extern _LDenorm _LDenorm @ cdecl _LDscale(ptr long) _Dscale @ cdecl _LDtest(ptr) _Dtest diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index d49bc074cab..b10bb2b23f7 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -2401,7 +2401,7 @@ @ 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 @ cdecl ?_Cosh@?$_Ctraits@N@std@@SANNN@Z(double double) _Cosh -@ stub ?_Cosh@?$_Ctraits@O@std@@SAOOO@Z +@ cdecl ?_Cosh@?$_Ctraits@O@std@@SAOOO@Z(double double) _LCosh @ 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 @ cdecl -arch=win64 ?_Decref@facet@locale@std@@QEAAPEAV123@XZ(ptr) locale_facet__Decref @@ -6944,7 +6944,7 @@ @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval @ extern _Inf -@ stub _LCosh +@ cdecl _LCosh(double double) @ extern _LDenorm @ cdecl _LDscale(ptr long) _Dscale @ cdecl _LDtest(ptr) _Dtest diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index df0276cc5f9..81ec66797bc 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -2623,7 +2623,7 @@ @ 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 @ cdecl ?_Cosh@?$_Ctraits@N@std@@SANNN@Z(double double) _Cosh -@ stub ?_Cosh@?$_Ctraits@O@std@@SAOOO@Z +@ cdecl ?_Cosh@?$_Ctraits@O@std@@SAOOO@Z(double double) _LCosh @ 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 @ cdecl -arch=win64 ?_Decref@facet@locale@std@@QEAAPEAV123@XZ(ptr) locale_facet__Decref @@ -7065,7 +7065,7 @@ @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval @ extern _Inf -@ stub _LCosh +@ cdecl _LCosh(double double) @ extern _LDenorm @ cdecl _LDscale(ptr long) _Dscale @ cdecl _LDtest(ptr) _Dtest diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 21b8c55a0ea..380fced815e 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2900,7 +2900,7 @@ @ 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 @ cdecl ?_Cosh@?$_Ctraits@N@std@@SANNN@Z(double double) _Cosh -@ stub ?_Cosh@?$_Ctraits@O@std@@SAOOO@Z +@ cdecl ?_Cosh@?$_Ctraits@O@std@@SAOOO@Z(double double) _LCosh @ 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 @ stub -arch=win32 ?_Debug_message@std@@YAXPBD0@Z @@ -7861,7 +7861,7 @@ @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval @ extern _Inf -@ stub _LCosh +@ cdecl _LCosh(double double) @ extern _LDenorm @ cdecl _LDscale(ptr long) _Dscale @ stub _LDtentox diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 272f2013084..2252b4971e3 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -2377,6 +2377,13 @@ float __cdecl _FCosh(float x, float y) return y * cosh(x); } +/* ?_Cosh@?$_Ctr@O@std@@SAOOO@Z + ?_Cosh@?$_Ctraits@O@std@@SAOOO@Z*/ +double __cdecl _LCosh(double x, double 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 7fe9ceede63..54b81e6cad6 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2905,7 +2905,7 @@ @ 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 @ cdecl ?_Cosh@?$_Ctraits@N@std@@SANNN@Z(double double) _Cosh -@ stub ?_Cosh@?$_Ctraits@O@std@@SAOOO@Z +@ cdecl ?_Cosh@?$_Ctraits@O@std@@SAOOO@Z(double double) _Cosh @ 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 @ stub -arch=win32 ?_Debug_message@std@@YAXPBD0@Z @@ -7889,7 +7889,7 @@ @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval @ extern _Inf -@ stub _LCosh +@ cdecl _LCosh(double double) @ extern _LDenorm @ cdecl _LDscale(ptr long) _Dscale @ cdecl _LDtest(ptr) _Dtest diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index 7196ae4d24a..6621a302c5f 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -3658,7 +3658,7 @@ @ stub _Hard_links @ extern _Hugeval msvcp140._Hugeval @ extern _Inf msvcp140._Inf -@ stub _LCosh +@ cdecl _LCosh(double double) msvcp140._LCosh @ extern _LDenorm msvcp140._LDenorm @ cdecl _LDtest(ptr) msvcp140._LDtest @ stub _LExp -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10942
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 | 10 +++++++++- dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp_win/msvcp_win.spec | 2 +- 12 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index a2a4e2f73e1..04d61ade2c5 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -3876,7 +3876,7 @@ @ extern _LNan @ stub _LPoly # extern _LRteps -@ stub _LSinh +@ cdecl _LSinh(double double) @ extern _LSnan # extern _LXbig @ extern _LZero diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 676543d2165..c85b34dd555 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3799,7 +3799,7 @@ @ extern _LNan @ stub _LPoly # extern _LRteps -@ stub _LSinh +@ cdecl _LSinh(double double) @ extern _LSnan # extern _LXbig @ stub _LXp_addh diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index a1d3002d001..9141a64576d 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3744,7 +3744,7 @@ @ stub _LPmsw @ stub _LPoly # extern _LRteps -@ stub _LSinh +@ cdecl _LSinh(double double) @ extern _LSnan # extern _LXbig @ stub _LXp_addh diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index a534a614dd1..081de4a492b 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3744,7 +3744,7 @@ @ stub _LPmsw @ stub _LPoly # extern _LRteps -@ stub _LSinh +@ cdecl _LSinh(double double) msvcp120._LSinh @ extern _LSnan msvcp120._LSnan # extern _LXbig @ stub _LXp_addh diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 559e1e9edb8..ea493c11069 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3665,7 +3665,7 @@ @ stub _LExp @ extern _LInf @ extern _LNan -@ stub _LSinh +@ cdecl _LSinh(double double) @ extern _LSnan @ cdecl _Last_write_time(int64) @ cdecl _Link(wstr wstr) tr2_sys__Link_wchar diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index c4f5a939e34..75a30e6a7f1 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -3005,7 +3005,7 @@ @ 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 @ cdecl ?_Sinh@?$_Ctr@M@std@@SAMMM@Z(float float) _FSinh @ cdecl ?_Sinh@?$_Ctr@N@std@@SANNN@Z(double double) _Sinh -@ stub ?_Sinh@?$_Ctr@O@std@@SAOOO@Z +@ cdecl ?_Sinh@?$_Ctr@O@std@@SAOOO@Z(double double) _LSinh @ cdecl -arch=arm ?_Split@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAAXXZ(ptr) basic_string_char__Split @ thiscall -arch=i386 ?_Split@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEXXZ(ptr) basic_string_char__Split @ cdecl -arch=win64 ?_Split@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAAXXZ(ptr) basic_string_char__Split @@ -5668,7 +5668,7 @@ @ extern _LNan _LNan @ stub _LPoly # extern _LRteps -@ stub _LSinh +@ cdecl _LSinh(double double) @ extern _LSnan _LSnan # extern _LXbig @ cdecl _Mbrtowc(ptr ptr long ptr ptr) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index b10bb2b23f7..1df56cc5531 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -2953,7 +2953,7 @@ # extern -arch=win32 ?_Root2@?CA@??_Fabs@std@@YAOABV?$complex@O@2@PAH@Z@4OB @ cdecl ?_Sinh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FSinh @ cdecl ?_Sinh@?$_Ctraits@N@std@@SANNN@Z(double double) _Sinh -@ stub ?_Sinh@?$_Ctraits@O@std@@SAOOO@Z +@ cdecl ?_Sinh@?$_Ctraits@O@std@@SAOOO@Z(double double) _LSinh @ 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 @ extern -arch=i386 ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@23@@Z@4HA basic_filebuf_char__Init__Stinit @ extern -arch=win64 ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXPEAU_iobuf@@W4_Initfl@23@@Z@4HA basic_filebuf_char__Init__Stinit @@ -6954,7 +6954,7 @@ @ extern _LNan @ stub _LPoly # extern _LRteps -@ stub _LSinh +@ cdecl _LSinh(double double) @ extern _LSnan # extern _LXbig @ extern _LZero diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 81ec66797bc..125a1e5e904 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -3204,7 +3204,7 @@ # extern -arch=win64 ?_Root2@?CA@???$_Fabs@N@std@@YANAEBV?$complex@N@1@PEAH@Z@4NB @ cdecl ?_Sinh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FSinh @ cdecl ?_Sinh@?$_Ctraits@N@std@@SANNN@Z(double double) _Sinh -@ stub ?_Sinh@?$_Ctraits@O@std@@SAOOO@Z +@ cdecl ?_Sinh@?$_Ctraits@O@std@@SAOOO@Z(double double) _LSinh @ 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 @ extern -arch=i386 ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@23@@Z@4HA basic_filebuf_char__Init__Stinit @ extern -arch=win64 ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXPEAU_iobuf@@W4_Initfl@23@@Z@4HA basic_filebuf_char__Init__Stinit @@ -7075,7 +7075,7 @@ @ extern _LNan @ stub _LPoly # extern _LRteps -@ stub _LSinh +@ cdecl _LSinh(double double) @ extern _LSnan # extern _LXbig @ extern _LZero diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 380fced815e..a1e4044a899 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -3664,7 +3664,7 @@ @ 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 @ cdecl ?_Sinh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FSinh @ cdecl ?_Sinh@?$_Ctraits@N@std@@SANNN@Z(double double) _Sinh -@ stub ?_Sinh@?$_Ctraits@O@std@@SAOOO@Z +@ cdecl ?_Sinh@?$_Ctraits@O@std@@SAOOO@Z(double double) _LSinh @ 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 @ extern -arch=i386 ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@23@@Z@4HA basic_filebuf_char__Init__Stinit @ extern -arch=win64 ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXPEAU_iobuf@@W4_Initfl@23@@Z@4HA basic_filebuf_char__Init__Stinit @@ -7873,7 +7873,7 @@ @ extern _LNan @ stub _LPoly # extern _LRteps -@ stub _LSinh +@ cdecl _LSinh(double double) @ extern _LSnan # extern _LXbig @ extern _LZero diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 2252b4971e3..7fa2bfc8cd5 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -2391,12 +2391,20 @@ double __cdecl _Sinh(double x, double y) return y * sinh(x); } -/* ?_Sinh@?$_Ctr@M@std@@SAMMM@Z */ +/* ?_Sinh@?$_Ctr@M@std@@SAMMM@Z + ?_Sinh@?$_Ctraits@M@std@@SAMMM@Z*/ float __cdecl _FSinh(float x, float y) { return y * sinh(x); } +/* ?_LSinh@?$_Ctr@M@std@@SAMMM@Z + ?_LSinh@?$_Ctraits@M@std@@SAMMM@Z */ +double __cdecl _LSinh(double x, double 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 54b81e6cad6..df526664980 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3694,7 +3694,7 @@ @ 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 @ cdecl ?_Sinh@?$_Ctraits@M@std@@SAMMM@Z(float float) _FSinh @ cdecl ?_Sinh@?$_Ctraits@N@std@@SANNN@Z(double double) _Sinh -@ stub ?_Sinh@?$_Ctraits@O@std@@SAOOO@Z +@ cdecl ?_Sinh@?$_Ctraits@O@std@@SAOOO@Z(double double) _LSinh @ 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 @ extern -arch=i386 ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@23@@Z@4HA basic_filebuf_char__Init__Stinit @ extern -arch=win64 ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXPEAU_iobuf@@W4_Initfl@23@@Z@4HA basic_filebuf_char__Init__Stinit @@ -7899,7 +7899,7 @@ @ extern _LNan @ stub _LPoly # extern _LRteps -@ stub _LSinh +@ cdecl _LSinh(double double) @ extern _LSnan # extern _LXbig @ extern _LZero diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index 6621a302c5f..ae07b64ec93 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -3664,7 +3664,7 @@ @ stub _LExp @ extern _LInf msvcp140._LInf @ extern _LNan msvcp140._LNan -@ stub _LSinh +@ cdecl _LSinh(double double) msvcp140._LSinh @ extern _LSnan msvcp140._LSnan @ cdecl _Last_write_time(int64) msvcp140._Last_write_time @ cdecl _Link(wstr wstr) msvcp140._Link -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10942
participants (2)
-
Bartosz Kosiorek -
Bartosz Kosiorek (＠gang65)