Module: wine Branch: master Commit: e91be162836d2e6b54f6a16653d1c41047e78a35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e91be162836d2e6b54f6a1665...
Author: Piotr Caban piotr@codeweavers.com Date: Fri Mar 20 14:32:36 2020 +0100
msvcp140: Don't load __processing_throw dynamically.
Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msvcp90/exception.c | 3 ++- dlls/msvcp90/msvcp90.h | 4 ---- dlls/msvcp90/msvcp_main.c | 5 ----- 3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 74529e9019..e75b8cc729 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #define CLASS_HAS_VIRTUAL_BASE_CLASS 4
void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); +int* __cdecl __processing_throw(void);
#if _MSVCP_VER >= 70 || defined(_MSVCIRT) typedef const char **exception_name; @@ -947,7 +948,7 @@ MSVCP_bool __cdecl MSVCP__uncaught_exception(void) #if _MSVCP_VER >= 140 int __cdecl __uncaught_exceptions(void) { - return *UCRTBASE___processing_throw(); + return *__processing_throw(); }
typedef struct diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 497ca126e4..9a9390d699 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -49,10 +49,6 @@ extern void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); extern void (__cdecl *MSVCRT_operator_delete)(void*); extern void* (__cdecl *MSVCRT_set_new_handler)(void*);
-#if _MSVCP_VER >= 140 -extern int* (__cdecl *UCRTBASE___processing_throw)(void); -#endif - #if _MSVCP_VER >= 110 /* keep in sync with msvcrt/lock.c */ typedef struct cs_queue diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 82bbf84c25..816a95c29e 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -58,10 +58,6 @@ void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); void* (__cdecl *MSVCRT_set_new_handler)(void*);
-#if _MSVCP_VER >= 140 -int* (__cdecl *UCRTBASE___processing_throw)(void); -#endif - #if _MSVCP_VER >= 110 critical_section* (__thiscall *critical_section_ctor)(critical_section*); void (__thiscall *critical_section_dtor)(critical_section*); @@ -129,7 +125,6 @@ static void init_cxx_funcs(void) MSVCRT_operator_new = operator_new; MSVCRT_operator_delete = operator_delete; MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "_set_new_handler"); - UCRTBASE___processing_throw = (void*)GetProcAddress(hmod, "__processing_throw");
hcon = LoadLibraryA( CONCRT_NAME(_MSVCP_VER) ); if (!hcon) FIXME( "%s not loaded\n", CONCRT_NAME(_MSVCP_VER) );