mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed assertion failure in win32dialog when trying to set log options for a device

Browse Source
This commit is contained in:
Stanislav Shwartsman 2011-10-01 07:24:18 +00:00
parent 391b4d9eee
commit f66830d77f
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bochs/gui/win32dialog.cc
View File

@ -311,7 +311,7 @@ void SetStandardLogOptions(HWND hDlg)
int level, idx;
int defchoice[5];
for (level=0; level<5; level++) {
for (level=0; level<N_LOGLEV; level++) {
int mod = 0;
int first = SIM->get_log_action (mod, level);
BOOL consensus = true;
@ -328,11 +328,11 @@ void SetStandardLogOptions(HWND hDlg)
else
defchoice[level] = 4;
}
for (level=0; level<5; level++) {
for (level=0; level<N_LOGLEV; level++) {
idx = 0;
SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_RESETCONTENT, 0, 0);
for (int action=0; action<5; action++) {
if (((level > 1) && (action > 0)) || ((level < 2) && ((action < 2) || (action > 3)))) {
if ((level > 1 && action > 0) || (level < 2 && (action < 2 || action > 3))) {
SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_ADDSTRING, 0, (LPARAM)log_choices[action]);
SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_SETITEMDATA, idx, action);
if (action == defchoice[level]) {
@ -351,11 +351,11 @@ void SetAdvancedLogOptions(HWND hDlg)
idx = SendMessage(GetDlgItem(hDlg, IDDEVLIST), LB_GETCURSEL, 0, 0);
mod = SendMessage(GetDlgItem(hDlg, IDDEVLIST), LB_GETITEMDATA, idx, 0);
for (level=0; level<5; level++) {
for (level=0; level<N_LOGLEV; level++) {
idx = 0;
SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_RESETCONTENT, 0, 0);
for (int action=0; action<4; action++) {
if (((level > 1) && (action > 0)) || ((level < 2) && (action < 2))) {
if ((level > 1 && action > 0) || (level < 2 && action < 2)) {
SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_ADDSTRING, 0, (LPARAM)log_choices[action]);
SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_SETITEMDATA, idx, action);
if (action == SIM->get_log_action (mod, level)) {
@ -391,21 +391,21 @@ void ApplyLogOptions(HWND hDlg, BOOL advanced)
if (advanced) {
idx = SendMessage(GetDlgItem(hDlg, IDDEVLIST), LB_GETCURSEL, 0, 0);
mod = SendMessage(GetDlgItem(hDlg, IDDEVLIST), LB_GETITEMDATA, idx, 0);
for (level=0; level<5; level++) {
for (level=0; level<N_LOGLEV; level++) {
idx = SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_GETCURSEL, 0, 0);
value = SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_GETITEMDATA, idx, 0);
SIM->set_log_action (mod, level, value);
}
EnableWindow(GetDlgItem(hDlg, IDDEVLIST), TRUE);
} else {
for (level=0; level<5; level++) {
for (level=0; level<N_LOGLEV; level++) {
idx = SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_GETCURSEL, 0, 0);
value = SendMessage(GetDlgItem(hDlg, IDLOGEVT1+level), CB_GETITEMDATA, idx, 0);
if (value < 4) {
// set new default
SIM->set_default_log_action (level, value);
SIM->set_default_log_action(level, value);
// apply that action to all modules (devices)
SIM->set_log_action (-1, level, value);
SIM->set_log_action(-1, level, value);
}
}
}

3
bochs/win32res.rc
View File

@ -89,9 +89,6 @@ BEGIN
LTEXT "Panic events", IDLOGLBL4, 70, 87, 55, 14
COMBOBOX IDLOGEVT4, 155, 85, 65, 56, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP
LTEXT "Pass events", IDLOGLBL5, 70, 107, 55, 14
COMBOBOX IDLOGEVT5, 155, 105, 65, 56, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP
AUTOCHECKBOX "Specify log options per device", IDADVLOGOPT, 50, 135, 112, 14, BS_LEFTTEXT | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 35, 155, 50, 14
PUSHBUTTON "Cancel", IDCANCEL, 95, 155, 50, 14