Module: wine Branch: master Commit: 5833732b9ad66c70b586c8b5f83a90c85cc8782b URL: https://gitlab.winehq.org/wine/wine/-/commit/5833732b9ad66c70b586c8b5f83a90c...
Author: Piotr Caban piotr@codeweavers.com Date: Mon Sep 18 10:44:19 2023 +0200
msvcp110: Add _Winerror_map implementation.
Based on patch by Myah Caron.
---
dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/misc.c | 11 +++++++++-- 4 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 1a100676743..9c61f57a4de 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1827,8 +1827,8 @@ @ stub -arch=arm ?_W_Gettnames@_Locinfo@std@@QBA?AV_Timevec@2@XZ @ stub -arch=i386 ?_W_Gettnames@_Locinfo@std@@QBE?AV_Timevec@2@XZ @ stub -arch=win64 ?_W_Gettnames@_Locinfo@std@@QEBA?AV_Timevec@2@XZ -@ stub -arch=win32 ?_Winerror_map@std@@YAPBDH@Z -@ stub -arch=win64 ?_Winerror_map@std@@YAPEBDH@Z +@ cdecl -arch=win32 ?_Winerror_map@std@@YAPBDH@Z(long) _Winerror_map_str +@ cdecl -arch=win64 ?_Winerror_map@std@@YAPEBDH@Z(long) _Winerror_map_str @ cdecl ?_XLgamma@std@@YAMM@Z(float) std__XLgamma_float @ cdecl ?_XLgamma@std@@YANN@Z(double) std__XLgamma_double @ cdecl ?_XLgamma@std@@YAOO@Z(double) std__XLgamma_double diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index b95330179e5..835d37d3bf4 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1788,8 +1788,8 @@ @ stub -arch=arm ?_W_Gettnames@_Locinfo@std@@QBA?AV_Timevec@2@XZ @ stub -arch=i386 ?_W_Gettnames@_Locinfo@std@@QBE?AV_Timevec@2@XZ @ stub -arch=win64 ?_W_Gettnames@_Locinfo@std@@QEBA?AV_Timevec@2@XZ -@ stub -arch=win32 ?_Winerror_map@std@@YAPBDH@Z -@ stub -arch=win64 ?_Winerror_map@std@@YAPEBDH@Z +@ cdecl -arch=win32 ?_Winerror_map@std@@YAPBDH@Z(long) _Winerror_map_str +@ cdecl -arch=win64 ?_Winerror_map@std@@YAPEBDH@Z(long) _Winerror_map_str @ cdecl ?_XLgamma@std@@YAMM@Z(float) std__XLgamma_float @ cdecl ?_XLgamma@std@@YANN@Z(double) std__XLgamma_double @ cdecl ?_XLgamma@std@@YAOO@Z(double) std__XLgamma_double diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 9155a90e554..c6778841ffb 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1788,8 +1788,8 @@ @ stub -arch=arm ?_W_Gettnames@_Locinfo@std@@QBA?AV_Timevec@2@XZ @ stub -arch=i386 ?_W_Gettnames@_Locinfo@std@@QBE?AV_Timevec@2@XZ @ stub -arch=win64 ?_W_Gettnames@_Locinfo@std@@QEBA?AV_Timevec@2@XZ -@ stub -arch=win32 ?_Winerror_map@std@@YAPBDH@Z -@ stub -arch=win64 ?_Winerror_map@std@@YAPEBDH@Z +@ cdecl -arch=win32 ?_Winerror_map@std@@YAPBDH@Z(long) msvcp120.?_Winerror_map@std@@YAPBDH@Z +@ cdecl -arch=win64 ?_Winerror_map@std@@YAPEBDH@Z(long) msvcp120.?_Winerror_map@std@@YAPEBDH@Z @ cdecl ?_XLgamma@std@@YAMM@Z(float) msvcp120.?_XLgamma@std@@YAMM@Z @ cdecl ?_XLgamma@std@@YANN@Z(double) msvcp120.?_XLgamma@std@@YANN@Z @ cdecl ?_XLgamma@std@@YAOO@Z(double) msvcp120.?_XLgamma@std@@YAOO@Z diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index ada8ee967d8..f82456cbf4b 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -191,9 +191,7 @@ static const struct { {ETXTBSY, str_ETXTBSY}, {EWOULDBLOCK, str_EWOULDBLOCK}, }; -#endif
-#if _MSVCP_VER >= 140 static const struct { int winerr; int doserr; @@ -1691,7 +1689,9 @@ ULONG __cdecl _Winerror_message(ULONG err, char *buf, ULONG size) return FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err, 0, buf, size, NULL); } +#endif
+#if _MSVCP_VER >= 110 /* ?_Winerror_map@std@@YAHH@Z */ int __cdecl _Winerror_map(int err) { @@ -1711,6 +1711,13 @@ int __cdecl _Winerror_map(int err)
return 0; } + +/* ?_Winerror_map@std@@YAPBDH@Z */ +/* ?_Winerror_map@std@@YAPEBDH@Z */ +const char *_Winerror_map_str(int err) +{ + return _Syserror_map(_Winerror_map(err)); +} #endif
#if _MSVCP_VER >= 100