Cleanup of the logging options. Logging menu is now submenu of Tools.
Other minor changes and cleanups, as needed.
This commit is contained in:
waltje
@@ -8,7 +8,7 @@
|
||||
*
|
||||
* Application resource script for Windows.
|
||||
*
|
||||
* Version: @(#)VARCem.rc 1.0.11 2018/03/31
|
||||
* Version: @(#)VARCem.rc 1.0.12 2018/04/02
|
||||
*
|
||||
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
|
||||
* Miran Grca, <mgrca8@gmail.com>
|
||||
@@ -40,6 +40,7 @@
|
||||
#include "../emu.h"
|
||||
#include "../version.h"
|
||||
#include "../plat.h"
|
||||
#include "../ui.h"
|
||||
#undef IN_RESOURCE_H
|
||||
|
||||
#define APSTUDIO_READONLY_SYMBOLS
|
||||
@@ -67,7 +68,7 @@ BEGIN
|
||||
POPUP "&Action"
|
||||
BEGIN
|
||||
MENUITEM "&Hard Reset", IDM_ACTION_HRESET
|
||||
MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD
|
||||
MENUITEM "&Ctrl+Alt+Del", IDM_ACTION_RESET_CAD
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
|
||||
MENUITEM SEPARATOR
|
||||
@@ -138,51 +139,89 @@ BEGIN
|
||||
BEGIN
|
||||
MENUITEM "&Settings...", IDM_CONFIG
|
||||
MENUITEM SEPARATOR
|
||||
#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS)
|
||||
POPUP "&Logging"
|
||||
BEGIN
|
||||
|
||||
# ifdef ENABLE_PCI_LOG
|
||||
MENUITEM "Enable PCI bus logs\tCtrl+F1", IDM_LOG_PCI
|
||||
# endif
|
||||
# ifdef ENABLE_KEYBOARD_LOG
|
||||
MENUITEM "Enable keyboard logs\tCtrl+F2", IDM_LOG_KEYBOARD
|
||||
# endif
|
||||
# ifdef ENABLE_SERIAL_LOG
|
||||
MENUITEM "Enable Serial Port logs\tCtrl+F3", IDM_LOG_SERIAL
|
||||
# endif
|
||||
# ifdef ENABLE_FDC_LOG
|
||||
MENUITEM "Enable floppy controller logs\tCtrl+F4", IDM_LOG_FDC
|
||||
# endif
|
||||
# ifdef ENABLE_D86F_LOG
|
||||
MENUITEM "Enable floppy (86F) logs\tCtrl+F5", IDM_LOG_D86F
|
||||
# endif
|
||||
# ifdef ENABLE_HDC_LOG
|
||||
MENUITEM "Enable Hard Disk controller logs\tCtrl+F6", IDM_LOG_HDC
|
||||
# endif
|
||||
# ifdef ENABLE_HDD_LOG
|
||||
MENUITEM "Enable Hard Disk images logs\tCtrl+F7", IDM_LOG_HDD
|
||||
# endif
|
||||
# ifdef ENABLE_ZIP_LOG
|
||||
MENUITEM "Enable ZIP drive logs\tCtrl+F8", IDM_LOG_ZIP
|
||||
# endif
|
||||
# ifdef ENABLE_CDROM_LOG
|
||||
MENUITEM "Enable CD-ROM logs\tCtrl+F9", IDM_LOG_CDROM
|
||||
# endif
|
||||
# ifdef ENABLE_CDROM_IMAGE_LOG
|
||||
MENUITEM "Enable CD-ROM images logs\tCtrl+F10", IDM_LOG_CDROM_IMAGE
|
||||
# endif
|
||||
# ifdef ENABLE_CDROM_IOCTL_LOG
|
||||
MENUITEM "Enable CD-ROM ioctl logs\tCtrl+F11", IDM_LOG_CDROM_IOCTL
|
||||
# endif
|
||||
# ifdef ENABLE_NIC_LOG
|
||||
MENUITEM "Enable Network logs\tCtrl+F12", IDM_LOG_NIC
|
||||
# endif
|
||||
# ifdef ENABLE_SOUND_EMU8K_LOG
|
||||
MENUITEM "Enable sound EMU8K logs\tCtrl+Alt+F1", IDM_LOG_SOUND_EMU8K
|
||||
# endif
|
||||
# ifdef ENABLE_SOUND_MPU401_LOG
|
||||
MENUITEM "Enable sound MPU401 logs\tCtrl+Alt+F2", IDM_LOG_SOUND_MPU401
|
||||
# endif
|
||||
# ifdef ENABLE_SOUND_AUDIOPCI_LOG
|
||||
MENUITEM "Enable sound device logs\tCtrl+Alt+F3", IDM_LOG_SOUND_AUDIOPCI
|
||||
# endif
|
||||
# ifdef ENABLE_SCSI_BUS_LOG
|
||||
MENUITEM "Enable SCSI bus logs\tCtrl+Alt+F4", IDM_LOG_SCSI_BUS
|
||||
# endif
|
||||
# ifdef ENABLE_SCSI_DISK_LOG
|
||||
MENUITEM "Enable SCSI disk logs\tCtrl+Alt+F5", IDM_LOG_SCSI_DISK
|
||||
# endif
|
||||
# ifdef ENABLE_SCSI_DEV_LOG
|
||||
MENUITEM "Enable SCSI controller logs\tCtrl+Alt+F6", IDM_LOG_SCSI_DEV
|
||||
# endif
|
||||
# ifdef ENABLE_SCSI_X54X_LOG
|
||||
MENUITEM "Enable Adaptec/BusLogic command logs\tCtrl+Alt+F7", IDM_LOG_SCSI_X54X
|
||||
# endif
|
||||
# ifdef ENABLE_VOODOO_LOG
|
||||
MENUITEM "Enable Voodoo logs\tCtrl+Alt+F9", IDM_LOG_VOODOO
|
||||
# endif
|
||||
|
||||
# if defined(ENABLE_LOG_COMMANDS) && defined(ENABLE_LOG_TOGGLES)
|
||||
MENUITEM SEPARATOR
|
||||
# endif
|
||||
|
||||
# ifdef ENABLE_LOG_BREAKPOINT
|
||||
MENUITEM "&Log breakpoint\tCtrl+Insert", IDM_LOG_BREAKPOINT
|
||||
# endif
|
||||
MENUITEM SEPARATOR
|
||||
END
|
||||
#endif
|
||||
MENUITEM "S&tatus", IDM_STATUS
|
||||
MENUITEM "Take s&creenshot\tCtrl+F11", IDM_ACTION_SCREENSHOT
|
||||
MENUITEM "Take s&creenshot\tCtrl+Esc", IDM_ACTION_SCREENSHOT
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Update status bar icons", IDM_UPDATE_ICONS
|
||||
END
|
||||
#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS)
|
||||
POPUP "&Logging"
|
||||
BEGIN
|
||||
# ifdef ENABLE_BUSLOGIC_LOG
|
||||
MENUITEM "Enable BusLogic logs\tCtrl+F4", IDM_LOG_BUSLOGIC
|
||||
# endif
|
||||
# ifdef ENABLE_CDROM_LOG
|
||||
MENUITEM "Enable CD-ROM logs\tCtrl+F5", IDM_LOG_CDROM
|
||||
# endif
|
||||
# ifdef ENABLE_D86F_LOG
|
||||
MENUITEM "Enable floppy (86F) logs\tCtrl+F6", IDM_LOG_D86F
|
||||
# endif
|
||||
# ifdef ENABLE_FDC_LOG
|
||||
MENUITEM "Enable floppy controller logs\tCtrl+F7", IDM_LOG_FDC
|
||||
# endif
|
||||
# ifdef ENABLE_IDE_LOG
|
||||
MENUITEM "Enable IDE logs\tCtrl+F8", IDM_LOG_IDE
|
||||
# endif
|
||||
# ifdef ENABLE_SERIAL_LOG
|
||||
MENUITEM "Enable Serial Port logs\tCtrl+F3", IDM_LOG_SERIAL
|
||||
# endif
|
||||
# ifdef ENABLE_NIC_LOG
|
||||
MENUITEM "Enable Network logs\tCtrl+F9", IDM_LOG_NIC
|
||||
# endif
|
||||
# ifdef ENABLE_LOG_COMMANDS
|
||||
# ifdef ENABLE_LOG_TOGGLES
|
||||
MENUITEM SEPARATOR
|
||||
# endif
|
||||
# ifdef ENABLE_LOG_BREAKPOINT
|
||||
MENUITEM "&Log breakpoint\tCtrl+F10", IDM_LOG_BREAKPOINT
|
||||
# endif
|
||||
# ifdef ENABLE_VRAM_DUMP
|
||||
MENUITEM "Dump &video RAM\tCtrl+F1", IDM_DUMP_VRAM
|
||||
# endif
|
||||
# endif
|
||||
END
|
||||
#endif
|
||||
POPUP "&Help"
|
||||
BEGIN
|
||||
MENUITEM "&About VARCem...", IDM_ABOUT
|
||||
MENUITEM "&About VARCem...", IDM_ABOUT
|
||||
END
|
||||
END
|
||||
|
||||
@@ -199,37 +238,74 @@ END
|
||||
|
||||
MainAccel ACCELERATORS MOVEABLE PURE
|
||||
BEGIN
|
||||
#ifdef ENABLE_VRAM_DUMP
|
||||
VK_F1, IDM_DUMP_VRAM, CONTROL, VIRTKEY
|
||||
#ifdef ENABLE_PCI_LOG
|
||||
VK_F1, IDM_LOG_PCI, VIRTKEY, CONTROL
|
||||
#endif
|
||||
#ifdef ENABLE_KEYBOARD_LOG
|
||||
VK_F2, IDM_LOG_KEYBOARD, VIRTKEY, CONTROL
|
||||
#endif
|
||||
#ifdef ENABLE_SERIAL_LOG
|
||||
VK_F3, IDM_LOG_SERIAL, CONTROL, VIRTKEY
|
||||
#endif
|
||||
#ifdef ENABLE_BUSLOGIC_LOG
|
||||
VK_F4, IDM_LOG_BUSLOGIC, CONTROL, VIRTKEY
|
||||
#endif
|
||||
#ifdef ENABLE_CDROM_LOG
|
||||
VK_F5, IDM_LOG_CDROM, CONTROL, VIRTKEY
|
||||
#endif
|
||||
#ifdef ENABLE_D86F_LOG
|
||||
VK_F6, IDM_LOG_D86F, CONTROL, VIRTKEY
|
||||
VK_F3, IDM_LOG_SERIAL, VIRTKEY, CONTROL
|
||||
#endif
|
||||
#ifdef ENABLE_FDC_LOG
|
||||
VK_F7, IDM_LOG_FDC, CONTROL, VIRTKEY
|
||||
VK_F4, IDM_LOG_FDC, VIRTKEY, CONTROL
|
||||
#endif
|
||||
#ifdef ENABLE_IDE_LOG
|
||||
VK_F8, IDM_LOG_IDE, CONTROL, VIRTKEY
|
||||
#ifdef ENABLE_D86F_LOG
|
||||
VK_F5, IDM_LOG_D86F, VIRTKEY, CONTROL
|
||||
#endif
|
||||
#ifdef ENABLE_HDC_LOG
|
||||
VK_F6, IDM_LOG_HDC, VIRTKEY, CONTROL
|
||||
#endif
|
||||
#ifdef ENABLE_HDD_LOG
|
||||
VK_F7, IDM_LOG_HDD, VIRTKEY, CONTROL
|
||||
#endif
|
||||
#ifdef ENABLE_ZIP_LOG
|
||||
VK_F8, IDM_LOG_ZIP, VIRTKEY, CONTROL
|
||||
#endif
|
||||
#ifdef ENABLE_CDROM_LOG
|
||||
VK_F9, IDM_LOG_CDROM, VIRTKEY, CONTROL
|
||||
#endif
|
||||
#ifdef ENABLE_CDROM_IMAGE_LOG
|
||||
VK_F10, IDM_LOG_CDROM_IMAGE, VIRTKEY, CONTROL
|
||||
#endif
|
||||
#ifdef ENABLE_CDROM_IOCTL_LOG
|
||||
VK_F11, IDM_LOG_CDROM_IOCTL, VIRTKEY, CONTROL
|
||||
#endif
|
||||
#ifdef ENABLE_NIC_LOG
|
||||
VK_F9, IDM_LOG_NIC, CONTROL, VIRTKEY
|
||||
VK_F12, IDM_LOG_NIC, VIRTKEY, CONTROL
|
||||
#endif
|
||||
|
||||
# ifdef ENABLE_EMU8K_LOG
|
||||
VK_F1, IDM_LOG_SOUND_EMU8K, VIRTKEY, CONTROL, ALT
|
||||
# endif
|
||||
# ifdef ENABLE_MPU401_LOG
|
||||
VK_F2, IDM_LOG_SOUND_MPU401, VIRTKEY, CONTROL, ALT
|
||||
# endif
|
||||
# ifdef ENABLE_AUDIOPCI_LOG
|
||||
VK_F3, IDM_LOG_SOUND_AUDIOPCI, VIRTKEY, CONTROL, ALT
|
||||
# endif
|
||||
# ifdef ENABLE_SCSI_BUS_LOG
|
||||
VK_F4, IDM_LOG_SCSI_BUS, VIRTKEY, CONTROL, ALT
|
||||
# endif
|
||||
# ifdef ENABLE_SCSI_DISK_LOG
|
||||
VK_F5, IDM_LOG_SCSI_DISK, VIRTKEY, CONTROL, ALT
|
||||
# endif
|
||||
# ifdef ENABLE_SCSI_DEV_LOG
|
||||
VK_F6, IDM_LOG_SCSI_DEV, VIRTKEY, CONTROL, ALT
|
||||
# endif
|
||||
# ifdef ENABLE_X54X_LOG
|
||||
VK_F7, IDM_LOG_SCSI_X54X, VIRTKEY, CONTROL, ALT
|
||||
# endif
|
||||
# ifdef ENABLE_VOODOO_LOG
|
||||
VK_F9, IDM_LOG_VOODOO, VIRTKEY, CONTROL, ALT
|
||||
# endif
|
||||
|
||||
#ifdef ENABLE_LOG_BREAKPOINT
|
||||
VK_F10, IDM_LOG_BREAKPOINT, CONTROL, VIRTKEY
|
||||
VK_INSERT, IDM_LOG_BREAKPOINT, VIRTKEY, CONTROL
|
||||
#endif
|
||||
VK_PRIOR,IDM_VID_FULLSCREEN, VIRTKEY, CONTROL , ALT
|
||||
VK_F11, IDM_ACTION_SCREENSHOT, VIRTKEY, CONTROL
|
||||
VK_F12, IDM_ACTION_RESET_CAD, VIRTKEY, CONTROL
|
||||
VK_PAUSE,IDM_ACTION_PAUSE, VIRTKEY, CONTROL
|
||||
VK_PRIOR,IDM_VID_FULLSCREEN, VIRTKEY, CONTROL, ALT
|
||||
VK_HOME, IDM_ACTION_SCREENSHOT, VIRTKEY, CONTROL
|
||||
VK_PAUSE,IDM_ACTION_PAUSE, VIRTKEY, CONTROL
|
||||
END
|
||||
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
*
|
||||
* Windows resource defines.
|
||||
*
|
||||
* Version: @(#)resource.h 1.0.7 2018/03/31
|
||||
* Version: @(#)resource.h 1.0.8 2018/04/02
|
||||
*
|
||||
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
|
||||
* Miran Grca, <mgrca8@gmail.com>
|
||||
@@ -290,16 +290,29 @@
|
||||
#define IDM_VID_GRAY_WHITE 40094
|
||||
#define IDM_KBD_RCTRL_IS_LALT 40101
|
||||
|
||||
#define IDM_LOG_BREAKPOINT 51201
|
||||
#define IDM_DUMP_VRAM 51202 // should be an Action
|
||||
|
||||
#define IDM_LOG_SERIAL 51211
|
||||
#define IDM_LOG_D86F 51212
|
||||
#define IDM_LOG_FDC 51213
|
||||
#define IDM_LOG_IDE 51214
|
||||
#define IDM_LOG_CDROM 51215
|
||||
#define IDM_LOG_NIC 51216
|
||||
#define IDM_LOG_BUSLOGIC 51217
|
||||
#define IDM_LOGGING 51200
|
||||
#define IDM_LOG_BREAKPOINT (IDM_LOGGING + 0)
|
||||
#define IDM_LOG_PCI (IDM_LOGGING + 1)
|
||||
#define IDM_LOG_KEYBOARD (IDM_LOGGING + 2)
|
||||
#define IDM_LOG_SERIAL (IDM_LOGGING + 3)
|
||||
#define IDM_LOG_FDC (IDM_LOGGING + 4)
|
||||
#define IDM_LOG_D86F (IDM_LOGGING + 5)
|
||||
#define IDM_LOG_HDC (IDM_LOGGING + 6)
|
||||
#define IDM_LOG_HDD (IDM_LOGGING + 7)
|
||||
#define IDM_LOG_ZIP (IDM_LOGGING + 8)
|
||||
#define IDM_LOG_CDROM (IDM_LOGGING + 9)
|
||||
#define IDM_LOG_CDROM_IMAGE (IDM_LOGGING + 10)
|
||||
#define IDM_LOG_CDROM_IOCTL (IDM_LOGGING + 11)
|
||||
#define IDM_LOG_NIC (IDM_LOGGING + 12)
|
||||
#define IDM_LOG_SOUND_EMU8K (IDM_LOGGING + 13)
|
||||
#define IDM_LOG_SOUND_MPU401 (IDM_LOGGING + 14)
|
||||
#define IDM_LOG_SOUND_DEV (IDM_LOGGING + 15)
|
||||
#define IDM_LOG_SCSI_BUS (IDM_LOGGING + 16)
|
||||
#define IDM_LOG_SCSI_DISK (IDM_LOGGING + 17)
|
||||
#define IDM_LOG_SCSI_DEV (IDM_LOGGING + 18)
|
||||
#define IDM_LOG_SCSI_X54X (IDM_LOGGING + 19)
|
||||
#define IDM_LOG_VOODOO (IDM_LOGGING + 20)
|
||||
|
||||
|
||||
/*
|
||||
* We need 7 bits for CDROM (2 bits ID and 5 bits for host drive),
|
||||
|
||||
288
src/win/win_ui.c
288
src/win/win_ui.c
@@ -8,7 +8,7 @@
|
||||
*
|
||||
* Implement the user Interface module.
|
||||
*
|
||||
* Version: @(#)win_ui.c 1.0.8 2018/03/31
|
||||
* Version: @(#)win_ui.c 1.0.9 2018/04/02
|
||||
*
|
||||
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
|
||||
* Miran Grca, <mgrca8@gmail.com>
|
||||
@@ -142,6 +142,150 @@ video_toggle_option(HMENU h, int *val, int id)
|
||||
}
|
||||
|
||||
|
||||
#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS)
|
||||
/* Simplest way to handle all these, for now.. */
|
||||
static void
|
||||
SetLoggingItem(int idm, int val)
|
||||
{
|
||||
int *ptr = NULL;
|
||||
|
||||
switch(idm) {
|
||||
#ifdef ENABLE_PCI_LOG
|
||||
case IDM_LOG_PCI:
|
||||
ptr = &pci_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_KEYBOARD_LOG
|
||||
case IDM_LOG_KEYBOARD:
|
||||
ptr = &keyboard_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_SERIAL_LOG
|
||||
case IDM_LOG_SERIAL:
|
||||
ptr = &serial_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_FDC_LOG
|
||||
case IDM_LOG_FDC:
|
||||
ptr = &fdc_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_D86F_LOG
|
||||
case IDM_LOG_D86F:
|
||||
ptr = &d86f_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_HDC_LOG
|
||||
case IDM_LOG_HDC:
|
||||
ptr = &hdc_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_HDD_LOG
|
||||
case IDM_LOG_HDD:
|
||||
ptr = &hdd_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_ZIP_LOG
|
||||
case IDM_LOG_ZIP:
|
||||
ptr = &zip_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_CDROM_LOG
|
||||
case IDM_LOG_CDROM:
|
||||
ptr = &cdrom_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_CDROM_IMAGE_LOG
|
||||
case IDM_LOG_CDROM_IMAGE:
|
||||
ptr = &cdrom_image_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_CDROM_IOCTL_LOG
|
||||
case IDM_LOG_CDROM_IOCTL:
|
||||
ptr = &cdrom_ioctl_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_NIC_LOG
|
||||
case IDM_LOG_NIC:
|
||||
ptr = &nic_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_SOUND_EMU8K_LOG
|
||||
case IDM_LOG_SOUND_EMU8K:
|
||||
ptr = &sound_emu8k_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_SOUND_MPU401_LOG
|
||||
case IDM_LOG_SOUND_MPU401:
|
||||
ptr = &sound_mpu401_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_SOUND_DEV_LOG
|
||||
case IDM_LOG_SOUND_DEV:
|
||||
ptr = &sound_dev_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_SCSI_BUS_LOG
|
||||
case IDM_LOG_SCSI_BUS:
|
||||
ptr = &scsi_bus_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_SCSI_DISK_LOG
|
||||
case IDM_LOG_SCSI_DISK:
|
||||
ptr = &scsi_hd_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_SCSI_DEV_LOG
|
||||
case IDM_LOG_SCSI_DEV:
|
||||
ptr = &scsi_dev_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_SCSI_X54X_LOG
|
||||
case IDM_LOG_SCSI_X54X:
|
||||
ptr = &scsi_x54x_do_log;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_VOODOO_LOG
|
||||
case IDM_LOG_VOODOO:
|
||||
ptr = &voodoo_do_log;
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
|
||||
if (ptr != NULL) {
|
||||
/* Set the desired value. */
|
||||
if (val != 0xff) {
|
||||
/* Initialize the logging value. */
|
||||
if (val < 0) *ptr ^= 1;
|
||||
else *ptr = val;
|
||||
}
|
||||
|
||||
/* And update its menu entry. */
|
||||
CheckMenuItem(menuMain, idm, (*ptr) ? MF_CHECKED : MF_UNCHECKED);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
static void
|
||||
ResetAllMenus(void)
|
||||
{
|
||||
@@ -156,27 +300,26 @@ ResetAllMenus(void)
|
||||
CheckMenuItem(menuMain, IDM_UPDATE_ICONS, MF_UNCHECKED);
|
||||
|
||||
#ifdef ENABLE_LOG_TOGGLES
|
||||
# ifdef ENABLE_BUSLOGIC_LOG
|
||||
CheckMenuItem(menuMain, IDM_LOG_BUSLOGIC, MF_UNCHECKED);
|
||||
# endif
|
||||
# ifdef ENABLE_CDROM_LOG
|
||||
CheckMenuItem(menuMain, IDM_LOG_CDROM, MF_UNCHECKED);
|
||||
# endif
|
||||
# ifdef ENABLE_D86F_LOG
|
||||
CheckMenuItem(menuMain, IDM_LOG_D86F, MF_UNCHECKED);
|
||||
# endif
|
||||
# ifdef ENABLE_FDC_LOG
|
||||
CheckMenuItem(menuMain, IDM_LOG_FDC, MF_UNCHECKED);
|
||||
# endif
|
||||
# ifdef ENABLE_IDE_LOG
|
||||
CheckMenuItem(menuMain, IDM_LOG_IDE, MF_UNCHECKED);
|
||||
# endif
|
||||
# ifdef ENABLE_SERIAL_LOG
|
||||
CheckMenuItem(menuMain, IDM_LOG_SERIAL, MF_UNCHECKED);
|
||||
# endif
|
||||
# ifdef ENABLE_NIC_LOG
|
||||
CheckMenuItem(menuMain, IDM_LOG_NIC, MF_UNCHECKED);
|
||||
# endif
|
||||
SetLoggingItem(IDM_LOG_PCI, 0xff);
|
||||
SetLoggingItem(IDM_LOG_KEYBOARD, 0xff);
|
||||
SetLoggingItem(IDM_LOG_SERIAL, 0xff);
|
||||
SetLoggingItem(IDM_LOG_FDC, 0xff);
|
||||
SetLoggingItem(IDM_LOG_D86F, 0xff);
|
||||
SetLoggingItem(IDM_LOG_HDC, 0xff);
|
||||
SetLoggingItem(IDM_LOG_HDD, 0xff);
|
||||
SetLoggingItem(IDM_LOG_ZIP, 0xff);
|
||||
SetLoggingItem(IDM_LOG_CDROM, 0xff);
|
||||
SetLoggingItem(IDM_LOG_CDROM_IMAGE, 0xff);
|
||||
SetLoggingItem(IDM_LOG_CDROM_IOCTL, 0xff);
|
||||
SetLoggingItem(IDM_LOG_NIC, 0xff);
|
||||
SetLoggingItem(IDM_LOG_SOUND_EMU8K, 0xff);
|
||||
SetLoggingItem(IDM_LOG_SOUND_MPU401, 0xff);
|
||||
SetLoggingItem(IDM_LOG_SOUND_DEV, 0xff);
|
||||
SetLoggingItem(IDM_LOG_SCSI_BUS, 0xff);
|
||||
SetLoggingItem(IDM_LOG_SCSI_DISK, 0xff);
|
||||
SetLoggingItem(IDM_LOG_SCSI_DEV, 0xff);
|
||||
SetLoggingItem(IDM_LOG_SCSI_X54X, 0xff);
|
||||
SetLoggingItem(IDM_LOG_VOODOO, 0xff);
|
||||
#endif
|
||||
|
||||
CheckMenuItem(menuMain, IDM_VID_FORCE43, MF_UNCHECKED);
|
||||
@@ -217,30 +360,6 @@ ResetAllMenus(void)
|
||||
|
||||
CheckMenuItem(menuMain, IDM_UPDATE_ICONS, update_icons ? MF_CHECKED : MF_UNCHECKED);
|
||||
|
||||
#ifdef ENABLE_LOG_TOGGLES
|
||||
# ifdef ENABLE_BUSLOGIC_LOG
|
||||
CheckMenuItem(menuMain, IDM_LOG_BUSLOGIC, buslogic_do_log?MF_CHECKED:MF_UNCHECKED);
|
||||
# endif
|
||||
# ifdef ENABLE_CDROM_LOG
|
||||
CheckMenuItem(menuMain, IDM_LOG_CDROM, cdrom_do_log?MF_CHECKED:MF_UNCHECKED);
|
||||
# endif
|
||||
# ifdef ENABLE_D86F_LOG
|
||||
CheckMenuItem(menuMain, IDM_LOG_D86F, d86f_do_log?MF_CHECKED:MF_UNCHECKED);
|
||||
# endif
|
||||
# ifdef ENABLE_FDC_LOG
|
||||
CheckMenuItem(menuMain, IDM_LOG_FDC, fdc_do_log?MF_CHECKED:MF_UNCHECKED);
|
||||
# endif
|
||||
# ifdef ENABLE_IDE_LOG
|
||||
CheckMenuItem(menuMain, IDM_LOG_IDE, ide_do_log?MF_CHECKED:MF_UNCHECKED);
|
||||
# endif
|
||||
# ifdef ENABLE_SERIAL_LOG
|
||||
CheckMenuItem(menuMain, IDM_LOG_SERIAL, serial_do_log?MF_CHECKED:MF_UNCHECKED);
|
||||
# endif
|
||||
# ifdef ENABLE_NIC_LOG
|
||||
CheckMenuItem(menuMain, IDM_LOG_NIC, nic_do_log?MF_CHECKED:MF_UNCHECKED);
|
||||
# endif
|
||||
#endif
|
||||
|
||||
CheckMenuItem(menuMain, IDM_VID_FORCE43, force_43?MF_CHECKED:MF_UNCHECKED);
|
||||
CheckMenuItem(menuMain, IDM_VID_OVERSCAN, enable_overscan?MF_CHECKED:MF_UNCHECKED);
|
||||
CheckMenuItem(menuMain, IDM_VID_INVERT, invert_display ? MF_CHECKED : MF_UNCHECKED);
|
||||
@@ -510,69 +629,36 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
config_save();
|
||||
break;
|
||||
|
||||
#ifdef ENABLE_LOG_TOGGLES
|
||||
# ifdef ENABLE_BUSLOGIC_LOG
|
||||
case IDM_LOG_BUSLOGIC:
|
||||
buslogic_do_log ^= 1;
|
||||
CheckMenuItem(hmenu, IDM_LOG_BUSLOGIC, buslogic_do_log ? MF_CHECKED : MF_UNCHECKED);
|
||||
break;
|
||||
# endif
|
||||
|
||||
# ifdef ENABLE_CDROM_LOG
|
||||
case IDM_LOG_CDROM:
|
||||
cdrom_do_log ^= 1;
|
||||
CheckMenuItem(hmenu, IDM_LOG_CDROM, cdrom_do_log ? MF_CHECKED : MF_UNCHECKED);
|
||||
break;
|
||||
# endif
|
||||
|
||||
# ifdef ENABLE_D86F_LOG
|
||||
case IDM_LOG_D86F:
|
||||
d86f_do_log ^= 1;
|
||||
CheckMenuItem(hmenu, IDM_LOG_D86F, d86f_do_log ? MF_CHECKED : MF_UNCHECKED);
|
||||
break;
|
||||
# endif
|
||||
|
||||
# ifdef ENABLE_FDC_LOG
|
||||
case IDM_LOG_FDC:
|
||||
fdc_do_log ^= 1;
|
||||
CheckMenuItem(hmenu, IDM_LOG_FDC, fdc_do_log ? MF_CHECKED : MF_UNCHECKED);
|
||||
break;
|
||||
# endif
|
||||
|
||||
# ifdef ENABLE_IDE_LOG
|
||||
case IDM_LOG_IDE:
|
||||
ide_do_log ^= 1;
|
||||
CheckMenuItem(hmenu, IDM_LOG_IDE, ide_do_log ? MF_CHECKED : MF_UNCHECKED);
|
||||
break;
|
||||
# endif
|
||||
|
||||
# ifdef ENABLE_SERIAL_LOG
|
||||
case IDM_LOG_SERIAL:
|
||||
serial_do_log ^= 1;
|
||||
CheckMenuItem(hmenu, IDM_LOG_SERIAL, serial_do_log ? MF_CHECKED : MF_UNCHECKED);
|
||||
break;
|
||||
# endif
|
||||
|
||||
# ifdef ENABLE_NIC_LOG
|
||||
case IDM_LOG_NIC:
|
||||
nic_do_log ^= 1;
|
||||
CheckMenuItem(hmenu, IDM_LOG_NIC, nic_do_log ? MF_CHECKED : MF_UNCHECKED);
|
||||
break;
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_LOG_BREAKPOINT
|
||||
case IDM_LOG_BREAKPOINT:
|
||||
pclog("---- LOG BREAKPOINT ----\n");
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_VRAM_DUMP
|
||||
case IDM_DUMP_VRAM:
|
||||
svga_dump_vram();
|
||||
#ifdef ENABLE_LOG_TOGGLES
|
||||
case IDM_LOG_PCI:
|
||||
case IDM_LOG_KEYBOARD:
|
||||
case IDM_LOG_SERIAL:
|
||||
case IDM_LOG_FDC:
|
||||
case IDM_LOG_D86F:
|
||||
case IDM_LOG_HDC:
|
||||
case IDM_LOG_HDD:
|
||||
case IDM_LOG_ZIP:
|
||||
case IDM_LOG_CDROM:
|
||||
case IDM_LOG_CDROM_IMAGE:
|
||||
case IDM_LOG_CDROM_IOCTL:
|
||||
case IDM_LOG_NIC:
|
||||
case IDM_LOG_SOUND_EMU8K:
|
||||
case IDM_LOG_SOUND_MPU401:
|
||||
case IDM_LOG_SOUND_DEV:
|
||||
case IDM_LOG_SCSI_BUS:
|
||||
case IDM_LOG_SCSI_DISK:
|
||||
case IDM_LOG_SCSI_DEV:
|
||||
case IDM_LOG_SCSI_X54X:
|
||||
case IDM_LOG_VOODOO:
|
||||
SetLoggingItem(LOWORD(wParam), -1);
|
||||
break;
|
||||
#endif
|
||||
|
||||
case IDM_CONFIG_LOAD:
|
||||
plat_pause(1);
|
||||
if (! file_dlg_st(hwnd, IDS_2160, L"", 0) &&
|
||||
|
||||
Reference in New Issue
Block a user