Skip to content

W
wine-cw
Commit 86feb987 authored by Rein Klazes's avatar Rein Klazes Committed by Alexandre Julliard
Browse files
Options

Show desktop mode disabled if the Desktop registry value exists but

starts with N,n,F,f or 0. This agrees with the logic in x11drv.
parent 2e8bf70f
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 18 deletions
programs/winecfg/x11drvdlg.c
View file @ 86feb987
...@@ -49,8 +49,9 @@ static const char* D3D_VS_Modes[] = { ...@@ -49,8 +49,9 @@ static const char* D3D_VS_Modes[] = {
int updating_ui; int updating_ui;
static void update_gui_for_desktop_mode(HWND dialog) { static void update_gui_for_desktop_mode(HWND dialog) {
WINE_TRACE("\n"); int desktopenabled = FALSE;
WINE_TRACE("\n");
updating_ui = TRUE; updating_ui = TRUE;
/* do we have desktop mode enabled? */ /* do we have desktop mode enabled? */
...@@ -58,28 +59,32 @@ static void update_gui_for_desktop_mode(HWND dialog) { ...@@ -58,28 +59,32 @@ static void update_gui_for_desktop_mode(HWND dialog) {
{ {
char* buf, *bufindex; char* buf, *bufindex;
CheckDlgButton(dialog, IDC_ENABLE_DESKTOP, BST_CHECKED); CheckDlgButton(dialog, IDC_ENABLE_DESKTOP, BST_CHECKED);
enable(IDC_DESKTOP_WIDTH);
enable(IDC_DESKTOP_HEIGHT);
enable(IDC_DESKTOP_SIZE);
enable(IDC_DESKTOP_BY);
buf = get_reg_key(config_key, keypath("X11 Driver"), "Desktop", "640x480"); buf = get_reg_key(config_key, keypath("X11 Driver"), "Desktop", "640x480");
bufindex = strchr(buf, 'x'); /* note: this test must match the one in x11drv */
if (bufindex) { if( buf[0] != 'n' && buf[0] != 'N' && buf[0] != 'F' && buf[0] != 'f'
*bufindex = 0; && buf[0] != '0') {
++bufindex; desktopenabled = TRUE;
SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), buf); enable(IDC_DESKTOP_WIDTH);
SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), bufindex); enable(IDC_DESKTOP_HEIGHT);
} else { enable(IDC_DESKTOP_SIZE);
WINE_TRACE("Desktop registry entry is malformed"); enable(IDC_DESKTOP_BY);
SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), "640");
SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), "480"); bufindex = strchr(buf, 'x');
if (bufindex) {
*bufindex = 0;
++bufindex;
SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), buf);
SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), bufindex);
} else {
WINE_TRACE("Desktop registry entry is malformed");
SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), "640");
SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), "480");
}
} }
HeapFree(GetProcessHeap(), 0, buf); HeapFree(GetProcessHeap(), 0, buf);
} }
else if (!desktopenabled)
{ {
CheckDlgButton(dialog, IDC_ENABLE_DESKTOP, BST_UNCHECKED); CheckDlgButton(dialog, IDC_ENABLE_DESKTOP, BST_UNCHECKED);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment