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