Allow desktop=N in the [x11drv] section of .winerc, instead of

defaulting to desktop=640x480.

Allow desktop=N in the [x11drv] section of .winerc, instead of
3101315b · Jeremy White · Alexandre Julliard · 914406f8 · 3101315b
Commit 3101315b authored Nov 15, 2000 by Jeremy White Committed by Alexandre Julliard Nov 15, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

x11drv_main.c dlls/x11drv/x11drv_main.c +5 -1

No files found.
--- a/dlls/x11drv/x11drv_main.c
+++ b/dlls/x11drv/x11drv_main.c
@@ -125,7 +125,11 @@ static void setup_options(void)

 	count = sizeof(buffer);
        if (!RegQueryValueExA( hkey, "Desktop", 0, &type, buffer, &count ))
-            Options.desktopGeometry = strdup(buffer);
+            /* Imperfect validation:  If Desktop=N, then we don't turn on
+            ** the --desktop option.  We should really validate for a correct
+            ** sizing entry */
+            if (! IS_OPTION_FALSE(buffer[0]))
+                Options.desktopGeometry = strdup(buffer);
    }

    if (Options.managed)