[PATCH v7 2/2] ntdll: Prevent loading Wine system dependencies in place of identically named application DLLs.

[Alexandre Julliard]

Zebediah Figura <zfigura at codeweavers.com> writes:

> @@ -3027,6 +3035,12 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC
>          break;
>      }
>  
> +    /* mark the DLL as system only if it was loaded from a system path and is
> +     * not builtin. note that builtins can appear to be loaded from a system
> +     * path during prefix bootstrap */
> +    if (!((*pwm)->ldr.Flags & LDR_WINE_INTERNAL))
> +        (*pwm)->system = system;

I think that even during bootstrap we need to find builtins if they
already exist. Most likely you should bypass the bootstrap fallback
during system dll search.

-- 
Alexandre Julliard
julliard at winehq.org