Re: Fallback to ttydrv (third attempt)

[Alexandre Julliard]

Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> writes:
> Index: wine/dlls/user/user_main.c
> ===================================================================
> RCS file: /home/wine/wine/dlls/user/user_main.c,v
> retrieving revision 1.50
> diff -u -r1.50 user_main.c
> --- wine/dlls/user/user_main.c	3 Dec 2002 23:34:54 -0000	1.50
> +++ wine/dlls/user/user_main.c	15 Apr 2003 11:05:08 -0000
>      {
>          count = sizeof(buffer);
>          RegQueryValueExA( hkey, "GraphicsDriver", 0, &type, buffer, &count );
> +        count = sizeof(buffer2);
> +        RegQueryValueExA( hkey, "TTYdrvFallback", 0, &type, buffer2, &count );
>          RegCloseKey( hkey );
>      }
> +
> +    if (!strcasecmp("x11drv",buffer) && 
> +	(GetEnvironmentVariableA("DISPLAY",buffer1,MAX_PATH-1) == 0) && 
> +	!strcasecmp("y",buffer2))

USER has no business checking the DISPLAY variable, that's an X11
thing. The right way to do this would be to make x11drv fail its
initialization in that case, and have USER check for that.

-- 
Alexandre Julliard
julliard(a)winehq.com

Fallback to ttydrv (third attempt)

[Uwe Bonnes]

> > > > > "Alexandre" == Alexandre Julliard <julliard(a)winehq.com> writes:

Alexandre> USER has no business checking the DISPLAY variable, that's an
    Alexandre> X11 thing. The right way to do this would be to make x11drv
    Alexandre> fail its initialization in that case, and have USER check for
    Alexandre> that.

If somebody with a deeper understanding of the interaction between user/gdi
and x11drv could come up with a clean solution, I'd appreciate. At the
moment this task look beyond my capabilities.

Bye
-- 
Uwe Bonnes                bon(a)elektron.ikp.physik.tu-darmstadt.de

Institut fuer Kernphysik  Schlossgartenstrasse 9  64289 Darmstadt
--------- Tel. [phone] -------- Fax. [phone] ----------