Re: [PATCH] winmm: Load winealsa if winepulse is found

[Austin English]

On Tue, Oct 16, 2012 at 5:10 AM, Maarten Lankhorst
<m.b.lankhorst(a)gmail.com> wrote:
> From: Maarten Lankhorst <maarten.lankhorst(a)canonical.com>
>
> Fixes midi on winepulse
> ---
>  dlls/winmm/lolvldrv.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c
> index f387323..3b1be27 100644
> --- a/dlls/winmm/lolvldrv.c
> +++ b/dlls/winmm/lolvldrv.c
> @@ -543,7 +543,10 @@ static void MMDRV_Init(void)
>      drvA = HeapAlloc(GetProcessHeap(), 0, size);
>      WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, drvA, size, NULL, NULL);
>
> -    MMDRV_Install(drvA, drvA, FALSE);
> +    if (!strcasecmp(drvA, "winepulse.drv"))
> +        MMDRV_Install("winealsa.drv", "winealsa.drv", 0);
> +    else
> +        MMDRV_Install(drvA, drvA, FALSE);
>
> HeapFree(GetProcessHeap(), 0, drvA);
>      PropVariantClear(&pv);
> --
> 1.7.11.3

Shouldn't this be part of the winepulse patch itself? It will never
get used in Wine, as is...

-- 
-Austin

[PATCH] winmm: Load winealsa if winepulse is found

[Maarten Lankhorst]

Op 17-10-12 20:59, Austin English schreef:
> On Tue, Oct 16, 2012 at 5:10 AM, Maarten Lankhorst
> <m.b.lankhorst(a)gmail.com> wrote:
> > From: Maarten Lankhorst <maarten.lankhorst(a)canonical.com>
> >
> > Fixes midi on winepulse
> > ---
> >  dlls/winmm/lolvldrv.c | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c
> > index f387323..3b1be27 100644
> > --- a/dlls/winmm/lolvldrv.c
> > +++ b/dlls/winmm/lolvldrv.c
> > @@ -543,7 +543,10 @@ static void MMDRV_Init(void)
> >      drvA = HeapAlloc(GetProcessHeap(), 0, size);
> >      WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, drvA, size, NULL, NULL);
> >
> > -    MMDRV_Install(drvA, drvA, FALSE);
> > +    if (!strcasecmp(drvA, "winepulse.drv"))
> > +        MMDRV_Install("winealsa.drv", "winealsa.drv", 0);
> > +    else
> > +        MMDRV_Install(drvA, drvA, FALSE);
> >
> > HeapFree(GetProcessHeap(), 0, drvA);
> >      PropVariantClear(&pv);
> > --
> > 1.7.11.3
> > Shouldn't this be part of the winepulse patch itself? It will never
> > get used in Wine, as is...

Eventually it will, regardless of what driver will be used for it. I intend not
to make that code go unused for too long. See it as a promise.

~Maarten