msvcp90: Prefer native version.

Piotr Caban piotr.caban at gmail.com
Fri May 17 03:18:54 CDT 2013


On 05/17/13 08:01, Dmitry Timoshkov wrote:
> Just like msvcp60,msvcp70,msvcp71,msvcp80,msvcp100,msvcp110 do.
> ---
>   dlls/msvcp90/msvcp90_main.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c
> index 7a7aafe..ce56c14 100644
> --- a/dlls/msvcp90/msvcp90_main.c
> +++ b/dlls/msvcp90/msvcp90_main.c
> @@ -80,10 +80,13 @@ static void init_cxx_funcs(void)
>
>   BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
>   {
> -    TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
> +    TRACE("(%p,%u,%p)\n", hinstDLL, fdwReason, lpvReserved);
>
>       switch (fdwReason)
>       {
> +        case DLL_WINE_PREATTACH:
> +            return FALSE;  /* prefer native version */
> +
>           case DLL_PROCESS_ATTACH:
>               init_cxx_funcs();
>               init_lockit();
>
msvcp90 has some wine specific exports. This patch breaks other msvcpXX 
dlls when native msvcp90 is installed.



More information about the wine-devel mailing list