[MSVCRT_SHARED] Fix up for use with ucrtbase

dll/win32/msvcrt/CMakeLists.txt

···
     ${msvcrt_shared_asm}
 )
 
-target_compile_definitions(msvcrt_shared PRIVATE _MSVCR_VER=0)
+target_compile_definitions(msvcrt_shared PRIVATE _MSVCR_VER=0 __UCRTSUPPORT__)
 add_dependencies(msvcrt_shared psdk asm)
 
 ###############################################################################

dll/win32/msvcrt/cpp.c

···
     _CxxThrowException(&e, &exception_exception_type);
 }
 
+#ifndef __UCRTSUPPORT__
 /******************************************************************
  *		?set_terminate@@YAP6AXXZP6AXXZ@Z (MSVCRT.@)
  *
···
     TRACE("returning %p\n", data->terminate_handler);
     return data->terminate_handler;
 }
+#endif /* !__UCRTSUPPORT__ */
 
 /******************************************************************
  *		?set_unexpected@@YAP6AXXZP6AXXZ@Z (MSVCRT.@)
···
     return previous;
 }
 
+#ifndef __UCRTSUPPORT__
 /******************************************************************
  *		?terminate@@YAXXZ (MSVCRT.@)
  *
···
     if (data->unexpected_handler) data->unexpected_handler();
     terminate();
 }
+#endif /* !__UCRTSUPPORT__ */
 
 
 /******************************************************************
···
     for (;;) RaiseException( CXX_EXCEPTION, EXCEPTION_NONCONTINUABLE, CXX_EXCEPTION_PARAMS, args );
 }
 
-#if _MSVCR_VER >= 80
+#if _MSVCR_VER >= 80 || defined(__UCRTSUPPORT__)
 
 /*********************************************************************
  * ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z
···
 
 #endif
 
-#if _MSVCR_VER >= 140
+#if _MSVCR_VER >= 140 || defined(__UCRTSUPPORT__)
 
 typedef struct
 {

dll/win32/msvcrt/except.c

···
     return ret;
 }
 
+#ifndef __UCRTSUPPORT__
 /*********************************************************************
  *              __pxcptinfoptrs (MSVCRT.@)
  */
···
 {
     return (void**)&msvcrt_get_thread_data()->xcptinfo;
 }
+#endif /* !__UCRTSUPPORT__ */
 
 typedef void (CDECL *float_handler)(int, int);
 
···
     SetConsoleCtrlHandler(msvcrt_console_handler, FALSE);
 }
 
+#ifndef __UCRTSUPPORT__
 /*********************************************************************
  *		signal (MSVCRT.@)
  * Some signals may never be generated except through an explicit call to
···
     }
     return 0;
 }
+#endif /* !__UCRTSUPPORT__ */
 
 /*********************************************************************
  *		_XcptFilter (MSVCRT.@)
···
     char dofree;
 };
 
-#if _MSVCR_VER>=140
+#if _MSVCR_VER>=140 || defined(__UCRTSUPPORT__)
 
 /*********************************************************************
  *  __std_exception_copy (UCRTBASE.@)

dll/win32/msvcrt/msvc_fwd_decl.h

···
 void __thiscall type_info_dtor(type_info* _this);
 const char* __thiscall type_info_name(type_info* _this);
 const char* __thiscall type_info_raw_name(type_info* _this);
+struct __type_info_node;
+const char * __thiscall type_info_name_internal_method(type_info * _this, struct __type_info_node *node);
 
 #undef bad_cast
 #undef bad_typeid