ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Rein Klazes 2005-10-18 10:35:41 +00:00 committed by Alexandre Julliard
parent 2e8bf70f9a
commit 86feb98739
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
programs/winecfg/x11drvdlg.c
View File

@ -49,8 +49,9 @@ static const char* D3D_VS_Modes[] = {
int updating_ui;
static void update_gui_for_desktop_mode(HWND dialog) {
WINE_TRACE("\n");
int desktopenabled = FALSE;
WINE_TRACE("\n");
updating_ui = TRUE;
/* do we have desktop mode enabled? */
@ -58,28 +59,32 @@ static void update_gui_for_desktop_mode(HWND dialog) {
{
char* buf, *bufindex;
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");
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");
}
/* note: this test must match the one in x11drv */
if( buf[0] != 'n' && buf[0] != 'N' && buf[0] != 'F' && buf[0] != 'f'
&& buf[0] != '0') {
desktopenabled = TRUE;
enable(IDC_DESKTOP_WIDTH);
enable(IDC_DESKTOP_HEIGHT);
enable(IDC_DESKTOP_SIZE);
enable(IDC_DESKTOP_BY);
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);
}
else
if (!desktopenabled)
{
CheckDlgButton(dialog, IDC_ENABLE_DESKTOP, BST_UNCHECKED);