From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/exception.c | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 6a63f546625..e5e965db3e8 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1707,8 +1707,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) __ExceptionPtrRethrow @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0(a)Z -@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPBX(a)Z -@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) __ExceptionPtrToBool +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) __ExceptionPtrToBool @ cdecl -arch=arm ?always_noconv(a)codecvt_base@std@@QBA_NXZ(ptr) codecvt_base_always_noconv @ thiscall -arch=i386 ?always_noconv(a)codecvt_base@std@@QBE_NXZ(ptr) codecvt_base_always_noconv @ cdecl -arch=win64 ?always_noconv(a)codecvt_base@std@@QEBA_NXZ(ptr) codecvt_base_always_noconv diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 6e0f0a8ba60..d47adaa8320 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -1216,6 +1216,15 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) return; } #endif + +/********************************************************************* + * ?__ExceptionPtrToBool@@YA_NPBX(a)Z + * ?__ExceptionPtrToBool@@YA_NPEBX(a)Z + */ +bool __cdecl __ExceptionPtrToBool(exception_ptr *ep) +{ + return !!ep->rec; +} #endif #if _MSVCP_VER >= 70 || defined(_MSVCIRT) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1034