[PATCH v2 3/3] msvcp140: Add MSVC 2015 C++ support DLL

Piotr Caban piotr.caban at gmail.com
Mon Nov 9 09:38:03 CST 2015


On 11/06/15 13:51, Martin Storsjo wrote:
>   static void init_cxx_funcs(void)
>   {
> @@ -77,6 +125,11 @@ static void init_cxx_funcs(void)
>
>       if (!hmod) FIXME( "%s not loaded\n", MSVCRT_NAME(_MSVCP_VER) );
>
> +#if _MSVCP_VER >= 140
> +    MSVCRT_operator_new = operator_new;
> +    MSVCRT_operator_delete = operator_delete;
> +    MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "_set_new_handler");
> +#else
>       if (sizeof(void *) > sizeof(int))  /* 64-bit has different names */
>       {
>           MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2 at YAPEAX_K@Z");
> @@ -113,6 +166,7 @@ static void init_cxx_funcs(void)
>   #endif
>   #endif /* _MSVCP_VER >= 110 */
>       }
> +#endif
>   }
Please also initialize critical_section related functions.

Thanks,
Piotr



More information about the wine-devel mailing list