[PATCH v2] packager: Prefer native version

[André Hentschel]

From: Sebastian Lackner <sebastian(a)fds-team.de>

Signed-off-by: André Hentschel <nerv(a)dawncrow.de>
---
 dlls/packager/packager_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c
index c1d194e..af1ee22 100644
--- a/dlls/packager/packager_main.c
+++ b/dlls/packager/packager_main.c
@@ -675,6 +675,8 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
     TRACE("(%p, %u, %p)\n", instance, reason, reserved);
 
     switch(reason){
+        case DLL_WINE_PREATTACH:
+            return FALSE;  /* prefer native version */
         case DLL_PROCESS_ATTACH:
             g_instance = instance;
             DisableThreadLibraryCalls(instance);
-- 
2.7.4

[Alexandre Julliard]

André Hentschel <nerv(a)dawncrow.de> writes:
> From: Sebastian Lackner <sebastian(a)fds-team.de>
>
> Signed-off-by: André Hentschel <nerv(a)dawncrow.de>
> ---
>  dlls/packager/packager_main.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c
> index c1d194e..af1ee22 100644
> --- a/dlls/packager/packager_main.c
> +++ b/dlls/packager/packager_main.c
> @@ -675,6 +675,8 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
>      TRACE("(%p, %u, %p)\n", instance, reason, reserved);
>
> switch(reason){
> +        case DLL_WINE_PREATTACH:
> +            return FALSE;  /* prefer native version */

What is this needed for?

-- 
Alexandre Julliard
julliard(a)winehq.org

[André Hentschel]

Am 10.07.2018 um 19:35 schrieb Alexandre Julliard:
> André Hentschel <nerv(a)dawncrow.de> writes:
> > From: Sebastian Lackner <sebastian(a)fds-team.de>
> >
> > Signed-off-by: André Hentschel <nerv(a)dawncrow.de>
> > ---
> >  dlls/packager/packager_main.c | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c
> > index c1d194e..af1ee22 100644
> > --- a/dlls/packager/packager_main.c
> > +++ b/dlls/packager/packager_main.c
> > @@ -675,6 +675,8 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
> >      TRACE("(%p, %u, %p)\n", instance, reason, reserved);
> >
> > switch(reason){
> > +        case DLL_WINE_PREATTACH:
> > +            return FALSE;  /* prefer native version */
>
> What is this needed for?

It's for https://bugs.winehq.org/show_bug.cgi?id=43472

[Alexandre Julliard]

André Hentschel <nerv(a)dawncrow.de> writes:
> Am 10.07.2018 um 19:35 schrieb Alexandre Julliard:
> > André Hentschel <nerv(a)dawncrow.de> writes:
> > > From: Sebastian Lackner <sebastian(a)fds-team.de>
> > >
> > > Signed-off-by: André Hentschel <nerv(a)dawncrow.de>
> > > ---
> > >  dlls/packager/packager_main.c | 2 ++
> > >  1 file changed, 2 insertions(+)
> > >
> > > diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c
> > > index c1d194e..af1ee22 100644
> > > --- a/dlls/packager/packager_main.c
> > > +++ b/dlls/packager/packager_main.c
> > > @@ -675,6 +675,8 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
> > >      TRACE("(%p, %u, %p)\n", instance, reason, reserved);
> > >
> > > switch(reason){
> > > +        case DLL_WINE_PREATTACH:
> > > +            return FALSE;  /* prefer native version */
> >
> > What is this needed for?
>
> It's for https://bugs.winehq.org/show_bug.cgi?id=43472

I don't think that's the correct fix. This is not an issue of the
builtin being incomplete, it's a different dll.

-- 
Alexandre Julliard
julliard(a)winehq.org

[Nikolay Sivov]

On 7/10/2018 10:57 PM, Alexandre Julliard wrote:
> André Hentschel <nerv(a)dawncrow.de> writes:
> > Am 10.07.2018 um 19:35 schrieb Alexandre Julliard:
> > > André Hentschel <nerv(a)dawncrow.de> writes:
> > > > From: Sebastian Lackner <sebastian(a)fds-team.de>
> > > >
> > > > Signed-off-by: André Hentschel <nerv(a)dawncrow.de>
> > > > ---
> > > >  dlls/packager/packager_main.c | 2 ++
> > > >  1 file changed, 2 insertions(+)
> > > >
> > > > diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c
> > > > index c1d194e..af1ee22 100644
> > > > --- a/dlls/packager/packager_main.c
> > > > +++ b/dlls/packager/packager_main.c
> > > > @@ -675,6 +675,8 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
> > > >      TRACE("(%p, %u, %p)\n", instance, reason, reserved);
> > > >
> > > > switch(reason){
> > > > +        case DLL_WINE_PREATTACH:
> > > > +            return FALSE;  /* prefer native version */
> > >
> > > What is this needed for?
> >
> > It's for https://bugs.winehq.org/show_bug.cgi?id=43472
>
> I don't think that's the correct fix. This is not an issue of the
> builtin being incomplete, it's a different dll.

This sounds similar to riched20 issue with Office, when it's supposed to
load a module from application directory, but builtin is preferred instead.