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