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 | 4 +++- dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp_win/msvcp_win.spec | 2 +- 12 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 6234d3d8ffb..2d1ae1e7b70 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) _Sinh @ extern _LSnan # extern _LXbig @ extern _LZero diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 410fdc26b61..f3a21952ac6 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) _Sinh @ extern _LSnan # extern _LXbig @ stub _LXp_addh diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 92ca365539a..88636418a81 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) _Sinh @ extern _LSnan # extern _LXbig @ stub _LXp_addh diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 95ad844ee89..6ec6d390d26 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._Sinh @ extern _LSnan msvcp120._LSnan # extern _LXbig @ stub _LXp_addh diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 19420c8fb71..cd6c89e22e7 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) _Sinh @ 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 b1b18de4d6c..bdffa3fdf25 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) _Sinh @ 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) _Sinh @ 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 e3ff56b0e53..0ba16f5bd03 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) _Sinh @ 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) _Sinh @ extern _LSnan # extern _LXbig @ extern _LZero diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index feead7c705f..809ec0ea09b 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) _Sinh @ 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) _Sinh @ extern _LSnan # extern _LXbig @ extern _LZero diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 3784320c6f4..f653bc06664 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) _Sinh @ 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) _Sinh @ extern _LSnan # extern _LXbig @ extern _LZero diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 1b4fa4cdb6d..f413baf5b30 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -2380,7 +2380,9 @@ float __cdecl _FCosh(float x, float y) } /* ?_Sinh@?$_Ctr@N@std@@SANNN@Z - ?_Sinh@?$_Ctraits@N@std@@SANNN@Z */ + ?_Sinh@?$_Ctraits@N@std@@SANNN@Z + ?_Sinh@?$_Ctr@O@std@@SAOOO@Z + ?_Sinh@?$_Ctraits@O@std@@SAOOO@Z */ double __cdecl _Sinh(double x, double y) { return y * sinh(x); diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index c4cb557bb26..9eae0f8f8c4 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) _Sinh @ 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) _Sinh @ extern _LSnan # extern _LXbig @ extern _LZero diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index ca43361ea66..5f510741aec 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._Sinh @ 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