diff --git a/src/86box.h b/src/86box.h index 9af4e6e55..516356138 100644 --- a/src/86box.h +++ b/src/86box.h @@ -8,7 +8,7 @@ * * Main emulator include file. * - * Version: @(#)86box.h 1.0.1 2017/06/03 + * Version: @(#)86box.h 1.0.2 2017/06/04 * * Author: Miran Grca, * Copyright 2016-2017 Miran Grca. @@ -26,6 +26,9 @@ # define ENABLE_LOG_TOGGLES 1 #endif +#if defined(ENABLE_LOG_BREAKPOINT) || defined(ENABLE_VRAM_DUMP) +# define ENABLE_LOG_COMMANDS 1 +#endif #define EMU_VERSION "2.00" #define EMU_VERSION_W L"2.00" diff --git a/src/WIN/86Box.rc b/src/WIN/86Box.rc index 66d42bb21..e5b19e765 100644 --- a/src/WIN/86Box.rc +++ b/src/WIN/86Box.rc @@ -8,14 +8,17 @@ * * Windows resource script. * - * Version: @(#)86Box.rc 1.0.1 2017/06/03 + * Version: @(#)86Box.rc 1.0.2 2017/06/04 * * Authors: Miran Grca, * Fred N. van Kempen, * Copyright 2016-2017 Miran Grca. */ #include +#define IN_RESOURCE_H #include "resource.h" +#include "../86box.h" +#undef IN_RESOURCE_H #define APSTUDIO_READONLY_SYMBOLS #define APSTUDIO_HIDDEN_SYMBOLS @@ -41,12 +44,12 @@ MAINMENU MENU DISCARDABLE BEGIN POPUP "&Action" BEGIN - MENUITEM "Take s&creenshot\tCtrl+F11", IDM_VID_SCREENSHOT + MENUITEM "Take s&creenshot\tCtrl+F11", IDM_ACTION_SCREENSHOT MENUITEM SEPARATOR - MENUITEM "&Hard Reset", IDM_FILE_HRESET - MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_FILE_RESET_CAD + MENUITEM "&Hard Reset", IDM_ACTION_HRESET + MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_FILE_EXIT + MENUITEM "E&xit", IDM_ACTION_EXIT END POPUP "&Tools" BEGIN @@ -85,44 +88,44 @@ BEGIN MENUITEM "E&GA/(S)VGA overscan", IDM_VID_OVERSCAN MENUITEM "Change contrast for &monochrome display", IDM_VID_CGACON - MENUITEM SEPARATOR - MENUITEM "Take s&creenshot\tCtrl+F11", IDM_VID_SCREENSHOT END MENUITEM "S&tatus", IDM_STATUS END -#ifdef ENABLE_LOG_TOGGLES +#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS) POPUP "&Logging" BEGIN -#ifdef ENABLE_BUSLOGIC_LOG +# ifdef ENABLE_BUSLOGIC_LOG MENUITEM "Enable BusLogic logs\tCtrl+F4", IDM_LOG_BUSLOGIC -#endif -#ifdef ENABLE_CDROM_LOG +# endif +# ifdef ENABLE_CDROM_LOG MENUITEM "Enable CD-ROM logs\tCtrl+F5", IDM_LOG_CDROM -#endif -#ifdef ENABLE_D86F_LOG +# endif +# ifdef ENABLE_D86F_LOG MENUITEM "Enable floppy (86F) logs\tCtrl+F6", IDM_LOG_D86F -#endif -#ifdef ENABLE_FDC_LOG +# endif +# ifdef ENABLE_FDC_LOG MENUITEM "Enable floppy controller logs\tCtrl+F7", IDM_LOG_FDC -#endif -#ifdef ENABLE_IDE_LOG +# endif +# ifdef ENABLE_IDE_LOG MENUITEM "Enable IDE logs\tCtrl+F8", IDM_LOG_IDE -#endif -#ifdef ENABLE_SERIAL_LOG +# endif +# ifdef ENABLE_SERIAL_LOG MENUITEM "Enable Serial Port logs\tCtrl+F3", IDM_LOG_SERIAL -#endif -#ifdef ENABLE_NIC_LOG +# endif +# ifdef ENABLE_NIC_LOG MENUITEM "Enable Network logs\tCtrl+F9", IDM_LOG_NIC -#endif -#if defined(ENABLE_LOG_BREAKPOINT) || defined(ENABLE_VRAM_DUMP) +# endif +# ifdef ENABLE_LOG_COMMANDS +# ifdef ENABLE_LOG_TOGGLES MENUITEM SEPARATOR -# ifdef ENABLE_LOG_BREAKPOINT +# endif +# ifdef ENABLE_LOG_BREAKPOINT MENUITEM "&Log breakpoint\tCtrl+F10", IDM_LOG_BREAKPOINT -# endif -# ifdef ENABLE_VRAM_DUMP +# endif +# ifdef ENABLE_VRAM_DUMP MENUITEM "Dump &video RAM\tCtrl+F1", IDM_DUMP_VRAM +# endif # endif -#endif END #endif POPUP "&Help" @@ -140,37 +143,35 @@ END MAINACCEL ACCELERATORS MOVEABLE PURE BEGIN #ifdef ENABLE_VRAM_DUMP - VK_F1, IDM_DUMP_VRAM, CONTROL, VIRTKEY + VK_F1, IDM_DUMP_VRAM, CONTROL, VIRTKEY #endif -#ifdef ENABLE_LOG_TOGGLES -# 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 -# endif -# ifdef ENABLE_FDC_LOG - VK_F7, IDM_LOG_FDC, CONTROL, VIRTKEY -# endif -# ifdef ENABLE_IDE_LOG - VK_F8, IDM_LOG_IDE, CONTROL, VIRTKEY -# endif -# ifdef ENABLE_NIC_LOG - VK_F9, IDM_LOG_NIC, CONTROL, VIRTKEY -# 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 +#endif +#ifdef ENABLE_FDC_LOG + VK_F7, IDM_LOG_FDC, CONTROL, VIRTKEY +#endif +#ifdef ENABLE_IDE_LOG + VK_F8, IDM_LOG_IDE, CONTROL, VIRTKEY +#endif +#ifdef ENABLE_NIC_LOG + VK_F9, IDM_LOG_NIC, CONTROL, VIRTKEY #endif #ifdef ENABLE_LOG_BREAKPOINT - VK_F10, IDM_LOG_BREAKPOINT, CONTROL, VIRTKEY + VK_F10, IDM_LOG_BREAKPOINT, CONTROL, VIRTKEY #endif - VK_PRIOR, IDM_VID_FULLSCREEN, VIRTKEY, CONTROL , ALT - VK_F11, IDM_VID_SCREENSHOT, VIRTKEY, CONTROL - VK_F12, IDM_FILE_RESET_CAD, VIRTKEY, CONTROL + VK_PRIOR,IDM_VID_FULLSCREEN, VIRTKEY, CONTROL , ALT + VK_F11, IDM_ACTION_SCREENSHOT, VIRTKEY, CONTROL + VK_F12, IDM_ACTION_RESET_CAD, VIRTKEY, CONTROL END @@ -196,12 +197,11 @@ STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Status" FONT 9, "Segoe UI" BEGIN - LTEXT "1",IDC_STEXT_DEVICE,16,16,180,1000 - LTEXT "1",IDC_STEXT1,16,186,180,1000 + LTEXT "1",IDT_SDEVICE,16,16,180,1000 + LTEXT "1",IDT_STEXT,16,186,180,1000 END - -DLG_CFG_MAIN DIALOG DISCARDABLE 0, 0, 366, 241 +DLG_CONFIG DIALOG DISCARDABLE 0, 0, 366, 241 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "86Box Settings" FONT 9, "Segoe UI" @@ -211,7 +211,7 @@ BEGIN CONTROL "List2",IDC_SETTINGSCATLIST,"SysListView32",LVS_LIST | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,7,90,197 CONTROL "",-1,"Static",SS_BLACKFRAME | SS_SUNKEN,1,211,363,1 - LTEXT "Language:",IDS_LANG_ENUS,7,222,41,10 + LTEXT "Language:",IDT_1700,7,222,41,10 COMBOBOX IDC_COMBO_LANG,48,221,108,120,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP END @@ -222,17 +222,17 @@ FONT 9, "Segoe UI" BEGIN COMBOBOX IDC_COMBO_MACHINE,71,7,138,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Machine:",1794,7,8,60,10 + LTEXT "Machine:",IDT_1701,7,8,60,10 PUSHBUTTON "Configure",IDC_CONFIGURE_MACHINE,214,7,46,12 COMBOBOX IDC_COMBO_CPU_TYPE,71,25,45,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "CPU type:",1796,7,26,59,10 + LTEXT "CPU type:",IDT_1702,7,26,59,10 COMBOBOX IDC_COMBO_WS,71,44,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Wait states:",1798,7,45,60,10 + LTEXT "Wait states:",IDT_1703,7,45,60,10 COMBOBOX IDC_COMBO_CPU,145,25,115,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "CPU:",1797,124,26,18,10 + LTEXT "CPU:",IDT_1704,124,26,18,10 CONTROL "Dynamic Recompiler",IDC_CHECK_DYNAREC,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,80,94,10 CONTROL "Enable FPU",IDC_CHECK_FPU,"Button",BS_AUTOCHECKBOX | @@ -241,8 +241,8 @@ BEGIN CONTROL "",IDC_MEMSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS,113,63, 12,12 - LTEXT "MB",IDC_TEXT_MB,123,64,10,10 - LTEXT "Memory:",1802,7,64,30,10 + LTEXT "MB",IDT_1705,123,64,10,10 + LTEXT "Memory:",IDT_1706,7,64,30,10 CONTROL "Enable time sync",IDC_CHECK_SYNC,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,95,102,10 END @@ -251,31 +251,31 @@ DLG_CFG_VIDEO DIALOG DISCARDABLE 97, 0, 267, 63 STYLE DS_CONTROL | WS_CHILD FONT 9, "Segoe UI" BEGIN + LTEXT "Video:",IDT_1707,7,8,55,10 COMBOBOX IDC_COMBO_VIDEO,71,7,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Video:",1795,7,8,55,10 + PUSHBUTTON "Configure",IDC_CONFIGURE_VID,214,7,46,12 COMBOBOX IDC_COMBO_VIDEO_SPEED,71,25,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Video speed:",1800,7,26,58,10 + LTEXT "Video speed:",IDT_1708,7,26,58,10 CONTROL "Voodoo Graphics",IDC_CHECK_VOODOO,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,45,199,10 - PUSHBUTTON "Configure",IDC_CONFIGURE_VOODOO,214,44,46,12 - PUSHBUTTON "Configure",IDC_CONFIGUREVID,214,7,46,12 + PUSHBUTTON "Configure",IDC_BUTTON_VOODOO,214,44,46,12 END DLG_CFG_INPUT DIALOG DISCARDABLE 97, 0, 267, 65 STYLE DS_CONTROL | WS_CHILD FONT 9, "Segoe UI" BEGIN - LTEXT "Mouse :",IDC_STATIC,7,8,57,10 + LTEXT "Mouse :",IDT_1709,7,8,57,10 COMBOBOX IDC_COMBO_MOUSE,71,7,189,120,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - LTEXT "Joystick :",1793,7,26,58,10 + LTEXT "Joystick :",IDT_1710,7,26,58,10 COMBOBOX IDC_COMBO_JOYSTICK,71,25,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Joystick 1...",IDC_JOY1,7,44,50,14 + PUSHBUTTON "Joystick 1...",IDC_JOY1,7,44,50,14 PUSHBUTTON "Joystick 2...",IDC_JOY2,74,44,50,14 - DEFPUSHBUTTON "Joystick 3...",IDC_JOY3,141,44,50,14 + PUSHBUTTON "Joystick 3...",IDC_JOY3,141,44,50,14 PUSHBUTTON "Joystick 4...",IDC_JOY4,209,44,50,14 END @@ -283,26 +283,26 @@ DLG_CFG_SOUND DIALOG DISCARDABLE 97, 0, 267, 98 STYLE DS_CONTROL | WS_CHILD FONT 9, "Segoe UI" BEGIN - COMBOBOX IDC_COMBOSND,71,7,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_SOUND,71,7,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Sound card:",1800,7,8,59,10 - PUSHBUTTON "Configure",IDC_CONFIGURESND,214,7,46,12 + LTEXT "Sound card:",IDT_1711,7,8,59,10 + PUSHBUTTON "Configure",IDC_CONFIGURE_SND,214,7,46,12 COMBOBOX IDC_COMBO_MIDI,71,25,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "MIDI Out Device:",1801,7,26,59,10 + LTEXT "MIDI Out Device:",IDT_1712,7,26,59,10 CONTROL "Standalone MPU-401",IDC_CHECK_MPU401,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,45,199,10 PUSHBUTTON "Configure",IDC_CONFIGURE_MPU401,214,44,46,12 - CONTROL "Innovation SSI-2001",IDC_CHECKSSI,"Button", + CONTROL "Innovation SSI-2001",IDC_CHECK_SSI,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,63,94,10 - CONTROL "CMS / Game Blaster",IDC_CHECKCMS,"Button", + CONTROL "CMS / Game Blaster",IDC_CHECK_CMS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,147,63,94,10 - CONTROL "Gravis Ultrasound",IDC_CHECKGUS,"Button", + CONTROL "Gravis Ultrasound",IDC_CHECK_GUS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,81,94,10 - CONTROL "Use Nuked OPL",IDC_CHECKNUKEDOPL,"Button", + CONTROL "Use Nuked OPL",IDC_CHECK_NUKEDOPL,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,147,81,94,10 END @@ -310,49 +310,49 @@ DLG_CFG_NETWORK DIALOG DISCARDABLE 97, 0, 267, 63 STYLE DS_CONTROL | WS_CHILD FONT 9, "Segoe UI" BEGIN - LTEXT "Network type:",1800,7,8,59,10 - COMBOBOX IDC_COMBONETTYPE,71,7,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | + LTEXT "Network type:",IDT_1713,7,8,59,10 + COMBOBOX IDC_COMBO_NET_TYPE,71,7,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "PCap device:",1801,7,26,59,10 - COMBOBOX IDC_COMBOPCAP,71,25,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | + LTEXT "PCap device:",IDT_1714,7,26,59,10 + COMBOBOX IDC_COMBO_PCAP,71,25,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Network adapter:",1802,7,44,59,10 - COMBOBOX IDC_COMBONET,71,43,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | + LTEXT "Network adapter:",IDT_1715,7,44,59,10 + COMBOBOX IDC_COMBO_NET,71,43,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Configure",IDC_CONFIGURENET,214,43,46,12 + PUSHBUTTON "Configure",IDC_CONFIGURE_NET,214,43,46,12 END DLG_CFG_PERIPHERALS DIALOG DISCARDABLE 97, 0, 267, 115 STYLE DS_CONTROL | WS_CHILD FONT 9, "Segoe UI" BEGIN - LTEXT "SCSI Controller:",1804,7,8,59,10 + LTEXT "SCSI Controller:",IDT_1716,7,8,59,10 COMBOBOX IDC_COMBO_SCSI,71,7,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Configure",IDC_CONFIGURE_SCSI,214,7,46,12 - LTEXT "HD Controller:",1799,7,26,61,10 + LTEXT "HD Controller:",IDT_1717,7,26,61,10 COMBOBOX IDC_COMBO_HDC,71,25,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Tertiary IDE:",1802,7,44,61,10 + LTEXT "Tertiary IDE:",IDT_1718,7,44,61,10 COMBOBOX IDC_COMBO_IDE_TER,71,43,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Quaternary IDE:",1803,7,62,61,10 + LTEXT "Quaternary IDE:",IDT_1719,7,62,61,10 COMBOBOX IDC_COMBO_IDE_QUA,71,61,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Serial port 1",IDC_CHECKSERIAL1,"Button", + CONTROL "Serial port 1",IDC_CHECK_SERIAL1,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,80,94,10 - CONTROL "Serial port 2",IDC_CHECKSERIAL2,"Button", + CONTROL "Serial port 2",IDC_CHECK_SERIAL2,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,147,80,94,10 - CONTROL "Parallel port",IDC_CHECKPARALLEL,"Button", + CONTROL "Parallel port",IDC_CHECK_PARALLEL,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,98,94,10 - CONTROL "ISABugger device",IDC_CHECKBUGGER,"Button", + CONTROL "ISABugger device",IDC_CHECK_BUGGER,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,147,98,94,10 END @@ -363,25 +363,25 @@ BEGIN CONTROL "List1",IDC_LIST_HARD_DISKS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,18,253,92 - LTEXT "Hard disks:",-1,7,7,34,8 + LTEXT "Hard disks:",IDT_1720,7,7,34,8 PUSHBUTTON "&New...",IDC_BUTTON_HDD_ADD_NEW,60,137,62,10 PUSHBUTTON "&Existing...",IDC_BUTTON_HDD_ADD,129,137,62,10 PUSHBUTTON "&Remove",IDC_BUTTON_HDD_REMOVE,198,137,62,10 COMBOBOX IDC_COMBO_HD_BUS,33,117,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Bus:",1798,7,118,24,8 + LTEXT "Bus:",IDT_1721,7,118,24,8 COMBOBOX IDC_COMBO_HD_CHANNEL,170,117,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Channel:",1799,131,118,38,8 + LTEXT "Channel:",IDT_1722,131,118,38,8 COMBOBOX IDC_COMBO_HD_ID,170,117,22,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "ID:",1800,131,118,38,8 + LTEXT "ID:",IDT_1723,131,118,38,8 COMBOBOX IDC_COMBO_HD_LUN,239,117,22,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "LUN:",1801,200,118,38,8 + LTEXT "LUN:",IDT_1724,200,118,38,8 COMBOBOX IDC_COMBO_HD_CHANNEL_IDE,170,117,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Channel:",1802,131,118,38,8 + LTEXT "Channel:",IDT_1725,131,118,38,8 END DLG_CFG_HARD_DISKS_ADD DIALOG DISCARDABLE 0, 0, 219, 111 @@ -399,29 +399,75 @@ BEGIN EDITTEXT IDC_EDIT_HD_SIZE,42,52,28,12 COMBOBOX IDC_COMBO_HD_TYPE,113,52,98,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Sectors:",IDC_STATIC,154,35,27,10 - LTEXT "Heads:",1793,81,35,29,8 - LTEXT "Cylinders:",1794,7,35,32,12 - LTEXT "Size (MB):",1795,7,54,33,8 - LTEXT "Type:",1797,86,54,24,8 - LTEXT "File name:",-1,7,7,204,9 + LTEXT "Sectors:",IDT_1726,154,35,27,10 + LTEXT "Heads:",IDT_1727,81,35,29,8 + LTEXT "Cylinders:",IDT_1728,7,35,32,12 + LTEXT "Size (MB):",IDT_1729,7,54,33,8 + LTEXT "Type:",IDT_1730,86,54,24,8 + LTEXT "File name:",IDT_1731,7,7,204,9 COMBOBOX IDC_COMBO_HD_BUS,33,71,58,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Bus:",1798,7,72,24,8 + LTEXT "Bus:",IDT_1732,7,72,24,8 COMBOBOX IDC_COMBO_HD_CHANNEL,134,71,77,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Channel:",1799,99,72,34,8 + LTEXT "Channel:",IDT_1733,99,72,34,8 COMBOBOX IDC_COMBO_HD_ID,133,71,26,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "ID:",1800,117,72,15,8 + LTEXT "ID:",IDT_1734,117,72,15,8 COMBOBOX IDC_COMBO_HD_LUN,185,71,26,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "LUN:",1801,168,72,15,8 + LTEXT "LUN:",IDT_1735,168,72,15,8 COMBOBOX IDC_COMBO_HD_CHANNEL_IDE,134,71,77,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Channel:",1802,99,72,34,8 + LTEXT "Channel:",IDT_1736,99,72,34,8 END +/* Static text label IDs. */ +#define IDT_1700 1700 // Language: +#define IDT_1701 1701 // Machine: +#define IDT_1702 1702 // CPU type: +#define IDT_1703 1703 // Wait states: +#define IDT_1704 1704 // CPU: +#define IDT_1705 1705 // MB == IDC_TEXT_MB +#define IDT_1706 1706 // Memory: +#define IDT_1707 1707 // Video: +#define IDT_1708 1708 // Video speed: +#define IDT_1709 1709 // Mouse: +#define IDT_1710 1710 // Joystick: +#define IDT_1711 1711 // Sound card: +#define IDT_1712 1712 // MIDI Out Device: +#define IDT_1713 1713 // Network type: +#define IDT_1714 1714 // PCap device: +#define IDT_1715 1715 // Network adapter: +#define IDT_1716 1716 // SCSI Controller: +#define IDT_1717 1717 // HD Controller: +#define IDT_1718 1718 // Tertiary IDE: +#define IDT_1719 1719 // Quaternary IDE: +#define IDT_1720 1720 // Hard disks: +#define IDT_1721 1721 // Bus: +#define IDT_1722 1722 // Channel: +#define IDT_1723 1723 // ID: +#define IDT_1724 1724 // LUN: +#define IDT_1725 1725 // Channel: +#define IDT_1726 1726 // Sectors: +#define IDT_1727 1727 // Heads: +#define IDT_1728 1728 // Cylinders: +#define IDT_1729 1729 // Size (MB): +#define IDT_1730 1730 // Type: +#define IDT_1731 1731 // File name: +#define IDT_1732 1732 // Bus: +#define IDT_1733 1733 // Channel: +#define IDT_1734 1734 // ID: +#define IDT_1735 1735 // LUN: +#define IDT_1736 1736 // Channel: +#define IDT_1737 1737 // Floppy drives: +#define IDT_1738 1738 // Type: +#define IDT_1739 1739 // CD-ROM drives: +#define IDT_1740 1740 // Bus: +#define IDT_1741 1741 // ID: +#define IDT_1742 1742 // LUN: +#define IDT_1743 1743 // Channel: + DLG_CFG_REMOVABLE_DEVICES DIALOG DISCARDABLE 97, 0, 267, 202 STYLE DS_CONTROL | WS_CHILD FONT 9, "Segoe UI" @@ -429,28 +475,28 @@ BEGIN CONTROL "List1",IDC_LIST_FLOPPY_DRIVES,"SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,18,253,60 - LTEXT "Floppy drives:",-1,7,7,43,8 + LTEXT "Floppy drives:",IDT_1737,7,7,43,8 COMBOBOX IDC_COMBO_FD_TYPE,33,85,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Type:",1803,7,86,24,8 + LTEXT "Type:",IDT_1738,7,86,24,8 CONTROL "Turbo timings (no accuracy)",IDC_CHECKTURBO,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,131,86,129,10 CONTROL "List1",IDC_LIST_CDROM_DRIVES,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,116,253,60 - LTEXT "CD-ROM drives:",-1,7,106,50,8 + LTEXT "CD-ROM drives:",IDT_1739,7,106,50,8 COMBOBOX IDC_COMBO_CD_BUS,33,183,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Bus:",1798,7,184,24,8 + LTEXT "Bus:",IDT_1740,7,184,24,8 COMBOBOX IDC_COMBO_CD_ID,170,183,22,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "ID:",1800,131,184,38,8 + LTEXT "ID:",IDT_1741,131,184,38,8 COMBOBOX IDC_COMBO_CD_LUN,239,183,22,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "LUN:",1801,200,184,38,8 + LTEXT "LUN:",IDT_1742,200,184,38,8 COMBOBOX IDC_COMBO_CD_CHANNEL_IDE,170,183,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Channel:",1802,131,184,38,8 + LTEXT "Channel:",IDT_1743,131,184,38,8 END diff --git a/src/WIN/resource.h b/src/WIN/resource.h index 3dcf6b3be..47c92c31c 100644 --- a/src/WIN/resource.h +++ b/src/WIN/resource.h @@ -8,9 +8,9 @@ * * Windows resource defines. * - * NOTE: Strings 2176 and 2193 are same. + * NOTE: FIXME: Strings 2176 and 2193 are same. * - * Version: @(#)resource.h 1.0.2 2017/06/03 + * Version: @(#)resource.h 1.0.3 2017/06/04 * * Authors: Sarah Walker, * Miran Grca, @@ -22,93 +22,180 @@ # define WIN_RESOURCE_H -/* {{NO_DEPENDENCIES}} - Microsoft Developer Studio generated include file. - Used by 86Box.rc -*/ +/* Dialog IDs. */ +#define DLG_ABOUT 101 /* top-level dialog */ +#define DLG_STATUS 102 /* top-level dialog */ +#define DLG_CONFIG 110 /* top-level dialog */ +#define DLG_CFG_MACHINE 111 /* sub-dialog of config */ +#define DLG_CFG_VIDEO 112 /* sub-dialog of config */ +#define DLG_CFG_INPUT 113 /* sub-dialog of config */ +#define DLG_CFG_SOUND 114 /* sub-dialog of config */ +#define DLG_CFG_NETWORK 115 /* sub-dialog of config */ +#define DLG_CFG_PERIPHERALS 116 /* sub-dialog of config */ +#define DLG_CFG_HARD_DISKS 117 /* sub-dialog of config */ +#define DLG_CFG_HARD_DISKS_ADD 118 /* sub-dialog of config */ +#define DLG_CFG_REMOVABLE_DEVICES 119 /* sub-dialog of config */ -#define DLG_ABOUT 101 -#define DLG_STATUS 102 -#define DLG_CFG_MAIN 110 -#define DLG_CFG_MACHINE 111 -#define DLG_CFG_VIDEO 112 -#define DLG_CFG_INPUT 113 -#define DLG_CFG_SOUND 114 -#define DLG_CFG_NETWORK 115 -#define DLG_CFG_PERIPHERALS 116 -#define DLG_CFG_HARD_DISKS 117 -#define DLG_CFG_HARD_DISKS_ADD 118 -#define DLG_CFG_REMOVABLE_DEVICES 119 +/* Static text label IDs. */ +#define IDT_1700 1700 // Language: +#define IDT_1701 1701 // Machine: +#define IDT_1702 1702 // CPU type: +#define IDT_1703 1703 // Wait states: +#define IDT_1704 1704 // CPU: +#define IDT_1705 1705 // MB == IDC_TEXT_MB +#define IDT_1706 1706 // Memory: +#define IDT_1707 1707 // Video: +#define IDT_1708 1708 // Video speed: +#define IDT_1709 1709 // Mouse: +#define IDT_1710 1710 // Joystick: +#define IDT_1711 1711 // Sound card: +#define IDT_1712 1712 // MIDI Out Device: +#define IDT_1713 1713 // Network type: +#define IDT_1714 1714 // PCap device: +#define IDT_1715 1715 // Network adapter: +#define IDT_1716 1716 // SCSI Controller: +#define IDT_1717 1717 // HD Controller: +#define IDT_1718 1718 // Tertiary IDE: +#define IDT_1719 1719 // Quaternary IDE: +#define IDT_1720 1720 // Hard disks: +#define IDT_1721 1721 // Bus: +#define IDT_1722 1722 // Channel: +#define IDT_1723 1723 // ID: +#define IDT_1724 1724 // LUN: +#define IDT_1725 1725 // Channel: +#define IDT_1726 1726 // Sectors: +#define IDT_1727 1727 // Heads: +#define IDT_1728 1728 // Cylinders: +#define IDT_1729 1729 // Size (MB): +#define IDT_1730 1730 // Type: +#define IDT_1731 1731 // File name: +#define IDT_1732 1732 // Bus: +#define IDT_1733 1733 // Channel: +#define IDT_1734 1734 // ID: +#define IDT_1735 1735 // LUN: +#define IDT_1736 1736 // Channel: +#define IDT_1737 1737 // Floppy drives: +#define IDT_1738 1738 // Type: +#define IDT_1739 1739 // CD-ROM drives: +#define IDT_1740 1740 // Bus: +#define IDT_1741 1741 // ID: +#define IDT_1742 1742 // LUN: +#define IDT_1743 1743 // Channel: +#define IDT_STEXT 1744 // text in status window +#define IDT_SDEVICE 1745 // text in status window -#define IDC_SETTINGSCATLIST 1004 -#define IDC_LIST_HARD_DISKS 1005 -#define IDC_COMBO_MACHINE 1006 -#define IDC_COMBO_CPU_TYPE 1007 -#define IDC_COMBO_CPU 1008 -#define IDC_COMBO_WS 1009 -#define IDC_CHECK_DYNAREC 1010 -#define IDC_CHECK_FPU 1011 -#define IDC_COMBO_SCSI 1012 -#define IDC_CONFIGURE_SCSI 1013 -#define IDC_COMBO_VIDEO 1014 -#define IDC_COMBO_VIDEO_SPEED 1015 -#define IDC_CHECK_VOODOO 1016 -#define IDC_CHECKCMS 1016 -#define IDC_CONFIGURE_VOODOO 1017 -#define IDC_CHECKNUKEDOPL 1018 -#define IDC_COMBO_JOYSTICK 1018 -#define IDC_CHECK_SYNC 1019 -#define IDC_CHECK_MPU401 1019 -#define IDC_LIST_FLOPPY_DRIVES 1020 -#define IDC_CONFIGURE_MPU401 1020 -#define IDC_LIST_CDROM_DRIVES 1021 -#define IDC_CONFIGURE_MACHINE 1022 -#define IDC_COMBO_LANG 1023 -#define IDC_BUTTON_FDD_ADD 1024 -#define IDC_BUTTON_FDD_EDIT 1025 -#define IDC_BUTTON_FDD_REMOVE 1026 -#define IDC_BUTTON_CDROM_ADD 1027 -#define IDC_BUTTON_HDD_ADD_NEW 1027 -#define IDC_BUTTON_CDROM_EDIT 1028 -#define IDC_BUTTON_HDD_ADD 1028 -#define IDC_BUTTON_CDROM_REMOVE 1029 -#define IDC_BUTTON_HDD_REMOVE 1029 -#define IDC_CHECKTURBO 1030 -#define IDC_HDIMAGE_NEW 1035 -#define IDC_HD_BUS 1036 -#define IDC_HDIMAGE_EXISTING 1037 -#define IDC_COMBO_HD_BUS 1038 -#define IDC_EDIT_HD_FILE_NAME 1039 -#define IDC_EDIT_HD_CYL 1040 -#define IDC_EDIT_HD_HPC 1041 -#define IDC_EDIT_HD_SPT 1042 -#define IDC_EDIT_HD_SIZE 1043 -#define IDC_COMBO_HD_TYPE 1044 -#define IDC_COMBO_HD_LOCATION 1045 -#define IDC_CHECKGUS 1046 -#define IDC_COMBO_HD_CHANNEL 1047 -#define IDC_COMBO_HD_CHANNEL_IDE 1048 -#define IDC_COMBO_HD_ID 1050 -#define IDC_COMBO_HD_LUN 1051 -#define IDC_CHECKBUGGER 1052 -#define IDC_CHECKSERIAL1 1053 -#define IDC_CHECKPARALLEL 1054 -#define IDC_CHECKSERIAL2 1055 -#define IDC_COMBO_HDC 1068 -#define IDC_COMBO_MOUSE 1069 -#define IDC_COMBO_IDE_TER 1069 -#define IDC_COMBO_IDE_QUA 1070 -#define IDC_COMBO_FD_TYPE 1071 -#define IDC_COMBO_CD_BUS 1072 -#define IDC_COMBO_CD_CHANNEL_IDE 1073 -#define IDC_COMBO_CD_ID 1074 -#define IDC_COMBO_CD_LUN 1075 -#define IDC_COMBO_MIDI 1076 -#define IDC_CHECK_CDROM_1_AUDIO_ENABLED 1584 -#define IDC_CHECK_CDROM_2_AUDIO_ENABLED 1585 -#define IDC_CHECK_CDROM_3_AUDIO_ENABLED 1586 -#define IDC_CHECK_CDROM_4_AUDIO_ENABLED 1587 +/* + * To try to keep these organized, we now group the + * constants per dialog, as this allows easy adding + * and deleting items. + */ +#define IDC_SETTINGSCATLIST 1001 /* generic config */ +#define IDC_CFILE 1002 /* Select File dialog */ +#define IDC_CHECK_SYNC 1008 +#define IDC_COMBO_LANG 1009 + +#define IDC_COMBO_MACHINE 1010 /* machine/cpu config */ +#define IDC_CONFIGURE_MACHINE 1011 +#define IDC_COMBO_CPU_TYPE 1012 +#define IDC_COMBO_CPU 1013 +#define IDC_CHECK_FPU 1014 +#define IDC_COMBO_WS 1015 +#define IDC_CHECK_DYNAREC 1016 +#define IDC_MEMTEXT 1017 +#define IDC_MEMSPIN 1018 +#define IDC_TEXT_MB IDT_1705 + +#define IDC_VIDEO 1030 /* video config */ +#define IDC_COMBO_VIDEO 1031 +#define IDC_COMBO_VIDEO_SPEED 1032 +#define IDC_CHECK_VOODOO 1033 +#define IDC_BUTTON_VOODOO 1034 + +#define IDC_INPUT 1050 /* input config */ +#define IDC_COMBO_MOUSE 1051 +#define IDC_COMBO_JOYSTICK 1052 +#define IDC_COMBO_JOY 1053 + +#define IDC_SOUND 1070 /* sound config */ +#define IDC_COMBO_SOUND 1071 +#define IDC_CHECK_SSI 1072 +#define IDC_CHECK_CMS 1073 +#define IDC_CHECK_GUS 1074 +#define IDC_CHECK_NUKEDOPL 1075 +#define IDC_COMBO_MIDI 1076 +#define IDC_CHECK_MPU401 1077 +#define IDC_CONFIGURE_MPU401 1078 + +#define IDC_COMBO_NET_TYPE 1090 /* network config */ +#define IDC_COMBO_PCAP 1091 +#define IDC_COMBO_NET 1092 + +#define IDC_OTHER_PERIPH 1110 /* other periph config */ +#define IDC_COMBO_SCSI 1111 +#define IDC_CONFIGURE_SCSI 1112 +#define IDC_COMBO_HDC 1113 +#define IDC_COMBO_IDE_TER 1114 +#define IDC_COMBO_IDE_QUA 1115 +#define IDC_CHECK_SERIAL1 1116 +#define IDC_CHECK_SERIAL2 1117 +#define IDC_CHECK_PARALLEL 1118 +#define IDC_CHECK_BUGGER 1119 + +#define IDC_HARD_DISKS 1130 /* hard disk config */ +#define IDC_LIST_HARD_DISKS 1131 +#define IDC_BUTTON_HDD_ADD_NEW 1132 +#define IDC_BUTTON_HDD_ADD 1133 +#define IDC_BUTTON_HDD_REMOVE 1134 +#define IDC_COMBO_HD_BUS 1135 +#define IDC_COMBO_HD_CHANNEL 1136 +#define IDC_COMBO_HD_ID 1137 +#define IDC_COMBO_HD_LUN 1138 +#define IDC_COMBO_HD_CHANNEL_IDE 1139 +#define IDC_EDIT_HD_FILE_NAME 1140 +#define IDC_EDIT_HD_SPT 1141 +#define IDC_EDIT_HD_HPC 1142 +#define IDC_EDIT_HD_CYL 1143 +#define IDC_EDIT_HD_SIZE 1144 +#define IDC_COMBO_HD_TYPE 1145 + +#define IDC_REMOV_DEVICES 1150 /* removable dev config */ +#define IDC_LIST_FLOPPY_DRIVES 1151 +#define IDC_COMBO_FD_TYPE 1152 +#define IDC_CHECKTURBO 1153 +#define IDC_BUTTON_FDD_ADD 1154 // status bar menu +#define IDC_BUTTON_FDD_EDIT 1155 // status bar menu +#define IDC_BUTTON_FDD_REMOVE 1156 // status bar menu +#define IDC_LIST_CDROM_DRIVES 1157 +#define IDC_COMBO_CD_BUS 1158 +#define IDC_COMBO_CD_ID 1159 +#define IDC_COMBO_CD_LUN 1160 +#define IDC_COMBO_CD_CHANNEL_IDE 1161 +#define IDC_BUTTON_CDROM_ADD 1162 // status bar menu +#define IDC_BUTTON_CDROM_EDIT 1163 // status bar menu +#define IDC_BUTTON_CDROM_REMOVE 1164 // status bar menu + + +/* For the DeviceConfig code, re-do later. */ +#define IDC_CONFIG_BASE 1200 +#define IDC_CONFIGURE_VID 1200 +#define IDC_CONFIGURE_SND 1201 +#define IDC_CONFIGURE_VOODOO 1202 +#define IDC_CONFIGURE_MOD 1203 +#define IDC_CONFIGURE_NET_TYPE 1204 +#define IDC_CONFIGURE_BUSLOGIC 1205 +#define IDC_CONFIGURE_PCAP 1206 +#define IDC_CONFIGURE_NET 1207 +#define IDC_JOY1 1210 +#define IDC_JOY2 1211 +#define IDC_JOY3 1212 +#define IDC_JOY4 1213 +#define IDC_HDTYPE 1280 +#define IDC_RENDER 1281 +#define IDC_STATUS 1282 + + +/* String IDs. */ #define IDS_STRINGS 2048 // "86Box" #define IDS_2049 2049 // "86Box Error" #define IDS_2050 2050 // "86Box Fatal Error" @@ -289,162 +376,53 @@ #define IDS_2225 2225 // "English (United States)" #define IDS_LANG_ENUS IDS_2225 +#define STRINGS_NUM 178 -#define IDM_ABOUT 40001 -#define IDC_ABOUT_ICON 65535 -#define IDM_FILE_RESET 40015 -#define IDM_FILE_HRESET 40016 -#define IDM_FILE_EXIT 40017 -#define IDM_FILE_RESET_CAD 40018 -#define IDM_HDCONF 40019 -#define IDM_CONFIG 40020 -#define IDM_CONFIG_LOAD 40021 -#define IDM_CONFIG_SAVE 40022 -#define IDM_USE_NUKEDOPL 40023 -#define IDM_STATUS 40030 -#define IDM_VID_RESIZE 40050 -#define IDM_VID_REMEMBER 40051 -#define IDM_VID_DDRAW 40060 -#define IDM_VID_D3D 40061 -#define IDM_VID_SCALE_1X 40064 -#define IDM_VID_SCALE_2X 40065 -#define IDM_VID_SCALE_3X 40066 -#define IDM_VID_SCALE_4X 40067 -#define IDM_VID_FULLSCREEN 40070 -#define IDM_VID_FS_FULL 40071 -#define IDM_VID_FS_43 40072 -#define IDM_VID_FS_SQ 40073 -#define IDM_VID_FS_INT 40074 -#define IDM_VID_FORCE43 40075 -#define IDM_VID_OVERSCAN 40076 -#define IDM_VID_FLASH 40077 -#define IDM_VID_SCREENSHOT 40078 -#define IDM_VID_INVERT 40079 -#define IDM_VID_CGACON 40080 +#define IDM_ABOUT 40001 +#define IDC_ABOUT_ICON 65535 +#define IDM_ACTION_SCREENSHOT 40011 +#define IDM_ACTION_HRESET 40012 +#define IDM_ACTION_RESET_CAD 40013 +#define IDM_ACTION_EXIT 40014 +#define IDM_CONFIG 40020 +#define IDM_CONFIG_LOAD 40021 +#define IDM_CONFIG_SAVE 40022 +#define IDM_STATUS 40030 +#define IDM_VID_RESIZE 40050 +#define IDM_VID_REMEMBER 40051 +#define IDM_VID_DDRAW 40060 +#define IDM_VID_D3D 40061 +#define IDM_VID_SCALE_1X 40064 +#define IDM_VID_SCALE_2X 40065 +#define IDM_VID_SCALE_3X 40066 +#define IDM_VID_SCALE_4X 40067 +#define IDM_VID_FULLSCREEN 40070 +#define IDM_VID_FS_FULL 40071 +#define IDM_VID_FS_43 40072 +#define IDM_VID_FS_SQ 40073 +#define IDM_VID_FS_INT 40074 +#define IDM_VID_FORCE43 40075 +#define IDM_VID_OVERSCAN 40076 +#define IDM_VID_INVERT 40079 +#define IDM_VID_CGACON 40080 -#define IDM_IDE_TER_ENABLED 44000 -#define IDM_IDE_TER_IRQ9 44009 -#define IDM_IDE_TER_IRQ10 44010 -#define IDM_IDE_TER_IRQ11 44011 -#define IDM_IDE_TER_IRQ12 44012 -#define IDM_IDE_TER_IRQ14 44014 -#define IDM_IDE_TER_IRQ15 44015 -#define IDM_IDE_QUA_ENABLED 44020 -#define IDM_IDE_QUA_IRQ9 44029 -#define IDM_IDE_QUA_IRQ10 44030 -#define IDM_IDE_QUA_IRQ11 44031 -#define IDM_IDE_QUA_IRQ12 44032 -#define IDM_IDE_QUA_IRQ14 44033 -#define IDM_IDE_QUA_IRQ15 44035 +#define IDM_LOG_BREAKPOINT 51201 +#define IDM_DUMP_VRAM 51202 // should be an Action -#ifdef ENABLE_BUSLOGIC_LOG -# define IDM_LOG_BUSLOGIC 51200 -#endif -#ifdef ENABLE_CDROM_LOG -# define IDM_LOG_CDROM 51201 -#endif -#ifdef ENABLE_D86F_LOG -# define IDM_LOG_D86F 51202 -#endif -#ifdef ENABLE_FDC_LOG -# define IDM_LOG_FDC 51203 -#endif -#ifdef ENABLE_IDE_LOG -# define IDM_LOG_IDE 51204 -#endif -#ifdef ENABLE_NIC_LOG -# define IDM_LOG_NIC 51205 -#endif -#ifdef ENABLE_SERIAL_LOG -# define IDM_LOG_SERIAL 51208 -#endif -#ifdef ENABLE_LOG_BREAKPOINT -# define IDM_LOG_BREAKPOINT 51206 -#endif -#ifdef ENABLE_VRAM_DUMP -# define IDM_DUMP_VRAM 51207 -#endif - -#define IDC_COMBO1 1000 -#define IDC_COMBOVID 1001 -#define IDC_COMBO3 1002 -#define IDC_COMBO4 1003 -#define IDC_COMBO5 1004 -#define IDC_COMBO386 1005 -#define IDC_COMBO486 1006 -#define IDC_COMBOSND 1007 -#define IDC_COMBONETTYPE 1008 -#define IDC_COMBOPCAP 1009 -#define IDC_COMBONET 1010 /*FIXME*/ -#define IDC_CHECK1 1010 /*FIXME*/ -#define IDC_CHECK2 1011 -#define IDC_CHECK3 1012 -#define IDC_CHECKSSI 1014 -#define IDC_CHECKVOODOO 1015 -#define IDC_CHECKDYNAREC 1016 -#define IDC_CHECKBUSLOGIC 1017 -#define IDC_CHECKSYNC 1024 -#define IDC_CHECKXTIDE 1025 -#define IDC_CHECKFPU 1026 -#define IDC_EDIT1 1030 -#define IDC_EDIT2 1031 -#define IDC_EDIT3 1032 -#define IDC_EDIT4 1033 -#define IDC_EDIT5 1034 -#define IDC_EDIT6 1035 -#define IDC_COMBOHDT 1036 -#define IDC_COMBOCPUM 1060 -#define IDC_COMBOSPD 1061 -#define IDC_COMBODR1 1062 -#define IDC_COMBODR2 1063 -#define IDC_COMBODR3 1064 -#define IDC_COMBODR4 1065 -#define IDC_COMBOJOY 1066 -#define IDC_COMBOWS 1067 -#define IDC_COMBOMOUSE 1068 -#define IDC_COMBOHDD 1069 - -#define IDC_CFILE 1060 - -#define IDC_HDTYPE 1280 - -#define IDC_RENDER 1281 -#define IDC_STATUS 1282 - -#define IDC_MEMSPIN 1100 -#define IDC_MEMTEXT 1101 -#define IDC_STEXT1 1102 -#define IDC_STEXT2 1103 -#define IDC_STEXT3 1104 -#define IDC_STEXT4 1105 -#define IDC_STEXT5 1106 -#define IDC_STEXT6 1107 -#define IDC_STEXT7 1108 -#define IDC_STEXT8 1109 -#define IDC_STEXT_DEVICE 1110 -#define IDC_TEXT_MB 1111 -#define IDC_TEXT1 1115 -#define IDC_TEXT2 1116 - -#define IDC_CONFIGUREVID 1200 -#define IDC_CONFIGURESND 1201 -#define IDC_CONFIGUREVOODOO 1202 -#define IDC_CONFIGUREMOD 1203 -#define IDC_CONFIGURENETTYPE 1204 -#define IDC_CONFIGUREBUSLOGIC 1205 -#define IDC_CONFIGUREPCAP 1206 -#define IDC_CONFIGURENET 1207 -#define IDC_JOY1 1210 -#define IDC_JOY2 1211 -#define IDC_JOY3 1212 -#define IDC_JOY4 1213 - -#define IDC_CONFIG_BASE 1200 - -/* The biggest amount of low bits needed for CD-ROMS (2 bits for ID and 5 bits for host drive, so 7 bits), - and removable disks (5 bits for ID), so we choose an 256-entry spacing for convenience. */ +#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 +/* + * We need 7 bits for CDROM (2 bits ID and 5 bits for host drive), + * and 5 bits for Removable Disks (5 bits for ID), so we use an + * 8bit (256 entries) space for these devices. + */ #define IDM_FLOPPY_IMAGE_NEW 0x1200 #define IDM_FLOPPY_IMAGE_EXISTING 0x1300 #define IDM_FLOPPY_IMAGE_EXISTING_WP 0x1400 @@ -463,20 +441,17 @@ #define IDM_RDISK_IMAGE 0x3500 #define IDM_RDISK_IMAGE_WP 0x3600 -#define IDC_STATIC 1792 /* Next default values for new objects */ #ifdef APSTUDIO_INVOKED # ifndef APSTUDIO_READONLY_SYMBOLS # define _APS_NO_MFC 1 -# define _APS_NEXT_RESOURCE_VALUE 111 -# define _APS_NEXT_COMMAND_VALUE 40002 -# define _APS_NEXT_CONTROL_VALUE 1055 -# define _APS_NEXT_SYMED_VALUE 101 +# define _APS_NEXT_RESOURCE_VALUE 1400 +# define _APS_NEXT_COMMAND_VALUE 55000 +# define _APS_NEXT_CONTROL_VALUE 1800 +# define _APS_NEXT_SYMED_VALUE 200 # endif #endif -#define STRINGS_NUM 178 - #endif /*WIN_RESOURCE_H*/ diff --git a/src/WIN/win.c b/src/WIN/win.c index 410774cf8..975aaf0c9 100644 --- a/src/WIN/win.c +++ b/src/WIN/win.c @@ -1806,15 +1806,19 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM hmenu=GetMenu(hwnd); switch (LOWORD(wParam)) { - case IDM_FILE_HRESET: + case IDM_ACTION_SCREENSHOT: + take_screenshot(); + break; + + case IDM_ACTION_HRESET: win_pc_reset(1); break; - case IDM_FILE_RESET_CAD: + case IDM_ACTION_RESET_CAD: win_pc_reset(0); break; - case IDM_FILE_EXIT: + case IDM_ACTION_EXIT: PostQuitMessage (0); /* send a WM_QUIT to the message queue */ break; @@ -1939,10 +1943,6 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM video_toggle_option(hmenu, &enable_overscan, IDM_VID_OVERSCAN); break; - case IDM_VID_SCREENSHOT: - take_screenshot(); - break; - case IDM_VID_CGACON: vid_cga_contrast = !vid_cga_contrast; CheckMenuItem(menu, IDM_VID_CGACON, vid_cga_contrast ? MF_CHECKED : MF_UNCHECKED); diff --git a/src/WIN/win_settings.c b/src/WIN/win_settings.c index 6dc8ef98f..702b8b5d5 100644 --- a/src/WIN/win_settings.c +++ b/src/WIN/win_settings.c @@ -8,7 +8,7 @@ * * Windows 86Box Settings dialog handler. * - * Version: @(#)win_settings.c 1.0.1 2017/06/03 + * Version: @(#)win_settings.c 1.0.2 2017/06/04 * * Author: Miran Grca, * Copyright 2016-2017 Miran Grca. @@ -491,13 +491,13 @@ static void win_settings_machine_recalc_model(HWND hdlg) { SendMessage(h, UDM_SETPOS, 0, temp_mem_size); h = GetDlgItem(hdlg, IDC_TEXT_MB); - SendMessage(h, WM_SETTEXT, 0, (LPARAM) win_language_get_string_from_id(2094)); + SendMessage(h, WM_SETTEXT, 0, (LPARAM) win_language_get_string_from_id(IDS_2094)); } else { SendMessage(h, UDM_SETPOS, 0, temp_mem_size / 1024); h = GetDlgItem(hdlg, IDC_TEXT_MB); - SendMessage(h, WM_SETTEXT, 0, (LPARAM) win_language_get_string_from_id(2087)); + SendMessage(h, WM_SETTEXT, 0, (LPARAM) win_language_get_string_from_id(IDS_2087)); } free(lptsTemp); @@ -541,7 +541,7 @@ static BOOL CALLBACK win_settings_machine_proc(HWND hdlg, UINT message, WPARAM w SendMessage(h, CB_SETCURSEL, modeltolist[temp_model], 0); h = GetDlgItem(hdlg, IDC_COMBO_WS); - SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(2131)); + SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(IDS_2131)); for (c = 0; c < 8; c++) { @@ -693,7 +693,7 @@ static void recalc_vid_list(HWND hdlg) h = GetDlgItem(hdlg, IDC_CHECK_VOODOO); EnableWindow(h, (models[model].flags & MODEL_PCI) ? TRUE : FALSE); - h = GetDlgItem(hdlg, IDC_CONFIGURE_VOODOO); + h = GetDlgItem(hdlg, IDC_BUTTON_VOODOO); EnableWindow(h, ((models[model].flags & MODEL_PCI) && temp_voodoo) ? TRUE : FALSE); } @@ -714,12 +714,12 @@ static BOOL CALLBACK win_settings_video_proc(HWND hdlg, UINT message, WPARAM wPa recalc_vid_list(hdlg); h = GetDlgItem(hdlg, IDC_COMBO_VIDEO_SPEED); - SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(2133)); - SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(2134)); - SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(2135)); - SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(2136)); - SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(2137)); - SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(2138)); + SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(IDS_2133)); + SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(IDS_2134)); + SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(IDS_2135)); + SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(IDS_2136)); + SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(IDS_2137)); + SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(IDS_2138)); SendMessage(h, CB_SETCURSEL, temp_video_speed, 0); h=GetDlgItem(hdlg, IDC_CHECK_VOODOO); @@ -730,7 +730,7 @@ static BOOL CALLBACK win_settings_video_proc(HWND hdlg, UINT message, WPARAM wPa wcstombs(stransi, lptsTemp, (wcslen(lptsTemp) * 2) + 2); gfx = video_card_getid(stransi); - h = GetDlgItem(hdlg, IDC_CONFIGUREVID); + h = GetDlgItem(hdlg, IDC_CONFIGURE_VID); if (video_card_has_config(gfx)) { EnableWindow(h, TRUE); @@ -758,7 +758,7 @@ static BOOL CALLBACK win_settings_video_proc(HWND hdlg, UINT message, WPARAM wPa gfx = video_card_getid(stransi); temp_gfxcard = video_new_to_old(gfx); - h = GetDlgItem(hdlg, IDC_CONFIGUREVID); + h = GetDlgItem(hdlg, IDC_CONFIGURE_VID); if (video_card_has_config(gfx)) { EnableWindow(h, TRUE); @@ -776,15 +776,15 @@ static BOOL CALLBACK win_settings_video_proc(HWND hdlg, UINT message, WPARAM wPa h = GetDlgItem(hdlg, IDC_CHECK_VOODOO); temp_voodoo = SendMessage(h, BM_GETCHECK, 0, 0); - h = GetDlgItem(hdlg, IDC_CONFIGURE_VOODOO); + h = GetDlgItem(hdlg, IDC_BUTTON_VOODOO); EnableWindow(h, temp_voodoo ? TRUE : FALSE); break; - case IDC_CONFIGURE_VOODOO: + case IDC_BUTTON_VOODOO: deviceconfig_open(hdlg, (void *)&voodoo_device); break; - case IDC_CONFIGUREVID: + case IDC_CONFIGURE_VID: lptsTemp = (LPTSTR) malloc(512); stransi = (char *) malloc(512); @@ -866,28 +866,28 @@ static BOOL CALLBACK win_settings_input_proc(HWND hdlg, UINT message, WPARAM wPa { case 0: /* MS Serial */ default: - str_id = 2139; + str_id = IDS_2139; break; case 1: /* PS2 2b */ - str_id = 2141; + str_id = IDS_2141; break; case 2: /* PS2 intelli 3b */ - str_id = 2142; + str_id = IDS_2142; break; case 3: /* MS/logi bus 2b */ - str_id = 2143; + str_id = IDS_2143; break; case 4: /* Amstrad */ - str_id = 2162; + str_id = IDS_2162; break; case 5: /* Olivetti M24 */ - str_id = 2177; + str_id = IDS_2177; break; case 6: /* MouseSystems */ - str_id = 2140; + str_id = IDS_2140; break; case 7: /* Genius Bus */ - str_id = 2161; + str_id = IDS_2161; break; } @@ -942,25 +942,25 @@ static BOOL CALLBACK win_settings_input_proc(HWND hdlg, UINT message, WPARAM wPa break; case IDC_JOY1: - h = GetDlgItem(hdlg, IDC_COMBOJOY); + h = GetDlgItem(hdlg, IDC_COMBO_JOY); temp_joystick = SendMessage(h, CB_GETCURSEL, 0, 0); joystickconfig_open(hdlg, 0, temp_joystick); break; case IDC_JOY2: - h = GetDlgItem(hdlg, IDC_COMBOJOY); + h = GetDlgItem(hdlg, IDC_COMBO_JOY); temp_joystick = SendMessage(h, CB_GETCURSEL, 0, 0); joystickconfig_open(hdlg, 1, temp_joystick); break; case IDC_JOY3: - h = GetDlgItem(hdlg, IDC_COMBOJOY); + h = GetDlgItem(hdlg, IDC_COMBO_JOY); temp_joystick = SendMessage(h, CB_GETCURSEL, 0, 0); joystickconfig_open(hdlg, 2, temp_joystick); break; case IDC_JOY4: - h = GetDlgItem(hdlg, IDC_COMBOJOY); + h = GetDlgItem(hdlg, IDC_COMBO_JOY); temp_joystick = SendMessage(h, CB_GETCURSEL, 0, 0); joystickconfig_open(hdlg, 3, temp_joystick); break; @@ -1001,7 +1001,7 @@ static void recalc_hdd_list(HWND hdlg, int model, int use_selected_hdd) hdc_ignore = 1; SendMessage(h, CB_RESETCONTENT, 0, 0); - SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(2154)); + SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(IDS_2154)); EnableWindow(h, FALSE); SendMessage(h, CB_SETCURSEL, 0, 0); } @@ -1156,7 +1156,7 @@ static BOOL CALLBACK win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wPa case WM_INITDIALOG: lptsTemp = (LPTSTR) malloc(512); - h = GetDlgItem(hdlg, IDC_COMBOSND); + h = GetDlgItem(hdlg, IDC_COMBO_SOUND); c = d = 0; while (1) { @@ -1177,7 +1177,7 @@ static BOOL CALLBACK win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wPa { if (c == 0) { - SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(2152)); + SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(IDS_2152)); } else { @@ -1193,7 +1193,7 @@ static BOOL CALLBACK win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wPa } SendMessage(h, CB_SETCURSEL, settings_sound_to_list[temp_sound_card], 0); - h = GetDlgItem(hdlg, IDC_CONFIGURESND); + h = GetDlgItem(hdlg, IDC_CONFIGURE_SND); if (sound_card_has_config(temp_sound_card)) { EnableWindow(h, TRUE); @@ -1223,16 +1223,16 @@ static BOOL CALLBACK win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wPa h = GetDlgItem(hdlg, IDC_CONFIGURE_MPU401); EnableWindow(h, (mpu401_standalone_allow() && temp_mpu401) ? TRUE : FALSE); - h=GetDlgItem(hdlg, IDC_CHECKCMS); + h=GetDlgItem(hdlg, IDC_CHECK_CMS); SendMessage(h, BM_SETCHECK, temp_GAMEBLASTER, 0); - h=GetDlgItem(hdlg, IDC_CHECKGUS); + h=GetDlgItem(hdlg, IDC_CHECK_GUS); SendMessage(h, BM_SETCHECK, temp_GUS, 0); - h=GetDlgItem(hdlg, IDC_CHECKSSI); + h=GetDlgItem(hdlg, IDC_CHECK_SSI); SendMessage(h, BM_SETCHECK, temp_SSI2001, 0); - h=GetDlgItem(hdlg, IDC_CHECKNUKEDOPL); + h=GetDlgItem(hdlg, IDC_CHECK_NUKEDOPL); SendMessage(h, BM_SETCHECK, temp_opl3_type, 0); free(lptsTemp); @@ -1242,18 +1242,18 @@ static BOOL CALLBACK win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wPa case WM_COMMAND: switch (LOWORD(wParam)) { - case IDC_CONFIGURESND: - h = GetDlgItem(hdlg, IDC_COMBOSND); + case IDC_CONFIGURE_SND: + h = GetDlgItem(hdlg, IDC_COMBO_SOUND); temp_sound_card = settings_list_to_sound[SendMessage(h, CB_GETCURSEL, 0, 0)]; deviceconfig_open(hdlg, (void *)sound_card_getdevice(temp_sound_card)); break; - case IDC_COMBOSND: - h = GetDlgItem(hdlg, IDC_COMBOSND); + case IDC_COMBO_SOUND: + h = GetDlgItem(hdlg, IDC_COMBO_SOUND); temp_sound_card = settings_list_to_sound[SendMessage(h, CB_GETCURSEL, 0, 0)]; - h = GetDlgItem(hdlg, IDC_CONFIGURESND); + h = GetDlgItem(hdlg, IDC_CONFIGURE_SND); if (sound_card_has_config(temp_sound_card)) { EnableWindow(h, TRUE); @@ -1285,7 +1285,7 @@ static BOOL CALLBACK win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wPa return FALSE; case WM_SAVESETTINGS: - h = GetDlgItem(hdlg, IDC_COMBOSND); + h = GetDlgItem(hdlg, IDC_COMBO_SOUND); temp_sound_card = settings_list_to_sound[SendMessage(h, CB_GETCURSEL, 0, 0)]; h = GetDlgItem(hdlg, IDC_COMBO_MIDI); @@ -1294,16 +1294,16 @@ static BOOL CALLBACK win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wPa h = GetDlgItem(hdlg, IDC_CHECK_MPU401); temp_mpu401 = SendMessage(h, BM_GETCHECK, 0, 0); - h = GetDlgItem(hdlg, IDC_CHECKCMS); + h = GetDlgItem(hdlg, IDC_CHECK_CMS); temp_GAMEBLASTER = SendMessage(h, BM_GETCHECK, 0, 0); - h = GetDlgItem(hdlg, IDC_CHECKGUS); + h = GetDlgItem(hdlg, IDC_CHECK_GUS); temp_GUS = SendMessage(h, BM_GETCHECK, 0, 0); - h = GetDlgItem(hdlg, IDC_CHECKSSI); + h = GetDlgItem(hdlg, IDC_CHECK_SSI); temp_SSI2001 = SendMessage(h, BM_GETCHECK, 0, 0); - h = GetDlgItem(hdlg, IDC_CHECKNUKEDOPL); + h = GetDlgItem(hdlg, IDC_CHECK_NUKEDOPL); temp_opl3_type = SendMessage(h, BM_GETCHECK, 0, 0); default: @@ -1348,7 +1348,7 @@ static BOOL CALLBACK win_settings_peripherals_proc(HWND hdlg, UINT message, WPAR { if (c == 0) { - SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(2152)); + SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(IDS_2152)); } else { @@ -1381,7 +1381,7 @@ static BOOL CALLBACK win_settings_peripherals_proc(HWND hdlg, UINT message, WPAR for (c = 0; c < 11; c++) { - wsprintf(lptsTemp, win_language_get_string_from_id(2155), valid_ide_irqs[c]); + wsprintf(lptsTemp, win_language_get_string_from_id(IDS_2155), valid_ide_irqs[c]); SendMessage(h, CB_ADDSTRING, 0, (LPARAM) lptsTemp); } @@ -1395,11 +1395,11 @@ static BOOL CALLBACK win_settings_peripherals_proc(HWND hdlg, UINT message, WPAR } h=GetDlgItem(hdlg, IDC_COMBO_IDE_QUA); - SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(2151)); + SendMessage(h, CB_ADDSTRING, 0, (LPARAM) win_language_get_string_from_id(IDS_2151)); for (c = 0; c < 11; c++) { - wsprintf(lptsTemp, win_language_get_string_from_id(2155), valid_ide_irqs[c]); + wsprintf(lptsTemp, win_language_get_string_from_id(IDS_2155), valid_ide_irqs[c]); SendMessage(h, CB_ADDSTRING, 0, (LPARAM) lptsTemp); } @@ -1412,16 +1412,16 @@ static BOOL CALLBACK win_settings_peripherals_proc(HWND hdlg, UINT message, WPAR SendMessage(h, CB_SETCURSEL, 0, 0); } - h=GetDlgItem(hdlg, IDC_CHECKSERIAL1); + h=GetDlgItem(hdlg, IDC_CHECK_SERIAL1); SendMessage(h, BM_SETCHECK, temp_serial[0], 0); - h=GetDlgItem(hdlg, IDC_CHECKSERIAL2); + h=GetDlgItem(hdlg, IDC_CHECK_SERIAL2); SendMessage(h, BM_SETCHECK, temp_serial[1], 0); - h=GetDlgItem(hdlg, IDC_CHECKPARALLEL); + h=GetDlgItem(hdlg, IDC_CHECK_PARALLEL); SendMessage(h, BM_SETCHECK, temp_lpt, 0); - h=GetDlgItem(hdlg, IDC_CHECKBUGGER); + h=GetDlgItem(hdlg, IDC_CHECK_BUGGER); SendMessage(h, BM_SETCHECK, temp_bugger, 0); free(lptsTemp); @@ -1493,16 +1493,16 @@ static BOOL CALLBACK win_settings_peripherals_proc(HWND hdlg, UINT message, WPAR temp_ide_qua = 1; } - h = GetDlgItem(hdlg, IDC_CHECKSERIAL1); + h = GetDlgItem(hdlg, IDC_CHECK_SERIAL1); temp_serial[0] = SendMessage(h, BM_GETCHECK, 0, 0); - h = GetDlgItem(hdlg, IDC_CHECKSERIAL2); + h = GetDlgItem(hdlg, IDC_CHECK_SERIAL2); temp_serial[1] = SendMessage(h, BM_GETCHECK, 0, 0); - h = GetDlgItem(hdlg, IDC_CHECKPARALLEL); + h = GetDlgItem(hdlg, IDC_CHECK_PARALLEL); temp_lpt = SendMessage(h, BM_GETCHECK, 0, 0); - h = GetDlgItem(hdlg, IDC_CHECKBUGGER); + h = GetDlgItem(hdlg, IDC_CHECK_BUGGER); temp_bugger = SendMessage(h, BM_GETCHECK, 0, 0); default: @@ -1520,7 +1520,7 @@ static void network_recalc_combos(HWND hdlg) net_ignore_message = 1; - h = GetDlgItem(hdlg, IDC_COMBOPCAP); + h = GetDlgItem(hdlg, IDC_COMBO_PCAP); if (temp_net_type == NET_TYPE_PCAP) { EnableWindow(h, TRUE); @@ -1530,7 +1530,7 @@ static void network_recalc_combos(HWND hdlg) EnableWindow(h, FALSE); } - h = GetDlgItem(hdlg, IDC_COMBONET); + h = GetDlgItem(hdlg, IDC_COMBO_NET); if (temp_net_type == NET_TYPE_SLIRP) { EnableWindow(h, TRUE); @@ -1545,7 +1545,7 @@ static void network_recalc_combos(HWND hdlg) EnableWindow(h, FALSE); } - h = GetDlgItem(hdlg, IDC_CONFIGURENET); + h = GetDlgItem(hdlg, IDC_CONFIGURE_NET); if (network_card_has_config(temp_net_card) && (temp_net_type == NET_TYPE_SLIRP)) { @@ -1577,13 +1577,13 @@ static BOOL CALLBACK win_settings_network_proc(HWND hdlg, UINT message, WPARAM w case WM_INITDIALOG: lptsTemp = (LPTSTR) malloc(512); - h = GetDlgItem(hdlg, IDC_COMBONETTYPE); + h = GetDlgItem(hdlg, IDC_COMBO_NET_TYPE); SendMessage(h, CB_ADDSTRING, 0, (LPARAM) L"None"); SendMessage(h, CB_ADDSTRING, 0, (LPARAM) L"PCap"); SendMessage(h, CB_ADDSTRING, 0, (LPARAM) L"SLiRP"); SendMessage(h, CB_SETCURSEL, temp_net_type, 0); - h = GetDlgItem(hdlg, IDC_COMBOPCAP); + h = GetDlgItem(hdlg, IDC_COMBO_PCAP); if (temp_net_type == NET_TYPE_PCAP) { EnableWindow(h, TRUE); @@ -1593,7 +1593,7 @@ static BOOL CALLBACK win_settings_network_proc(HWND hdlg, UINT message, WPARAM w EnableWindow(h, FALSE); } - h = GetDlgItem(hdlg, IDC_COMBOPCAP); + h = GetDlgItem(hdlg, IDC_COMBO_PCAP); for (c = 0; c < network_ndev; c++) { mbstowcs(lptsTemp, network_devs[c].description, strlen(network_devs[c].description) + 1); @@ -1602,7 +1602,7 @@ static BOOL CALLBACK win_settings_network_proc(HWND hdlg, UINT message, WPARAM w SendMessage(h, CB_SETCURSEL, network_dev_to_id(temp_pcap_dev), 0); /*NIC config*/ - h = GetDlgItem(hdlg, IDC_COMBONET); + h = GetDlgItem(hdlg, IDC_COMBO_NET); c = d = 0; while (1) { @@ -1643,50 +1643,50 @@ static BOOL CALLBACK win_settings_network_proc(HWND hdlg, UINT message, WPARAM w case WM_COMMAND: switch (LOWORD(wParam)) { - case IDC_COMBONETTYPE: + case IDC_COMBO_NET_TYPE: if (net_ignore_message) { return FALSE; } - h = GetDlgItem(hdlg, IDC_COMBONETTYPE); + h = GetDlgItem(hdlg, IDC_COMBO_NET_TYPE); temp_net_type = SendMessage(h, CB_GETCURSEL, 0, 0); network_recalc_combos(hdlg); break; - case IDC_COMBOPCAP: + case IDC_COMBO_PCAP: if (net_ignore_message) { return FALSE; } - h = GetDlgItem(hdlg, IDC_COMBOPCAP); + h = GetDlgItem(hdlg, IDC_COMBO_PCAP); memset(temp_pcap_dev, '\0', sizeof(temp_pcap_dev)); strcpy(temp_pcap_dev, network_devs[SendMessage(h, CB_GETCURSEL, 0, 0)].device); network_recalc_combos(hdlg); break; - case IDC_COMBONET: + case IDC_COMBO_NET: if (net_ignore_message) { return FALSE; } - h = GetDlgItem(hdlg, IDC_COMBONET); + h = GetDlgItem(hdlg, IDC_COMBO_NET); temp_net_card = settings_list_to_network[SendMessage(h, CB_GETCURSEL, 0, 0)]; network_recalc_combos(hdlg); break; - case IDC_CONFIGURENET: + case IDC_CONFIGURE_NET: if (net_ignore_message) { return FALSE; } - h = GetDlgItem(hdlg, IDC_COMBONET); + h = GetDlgItem(hdlg, IDC_COMBO_NET); temp_net_card = settings_list_to_network[SendMessage(h, CB_GETCURSEL, 0, 0)]; deviceconfig_open(hdlg, (void *)network_card_getdevice(temp_net_card)); @@ -1695,14 +1695,14 @@ static BOOL CALLBACK win_settings_network_proc(HWND hdlg, UINT message, WPARAM w return FALSE; case WM_SAVESETTINGS: - h = GetDlgItem(hdlg, IDC_COMBONETTYPE); + h = GetDlgItem(hdlg, IDC_COMBO_NET_TYPE); temp_net_type = SendMessage(h, CB_GETCURSEL, 0, 0); - h = GetDlgItem(hdlg, IDC_COMBOPCAP); + h = GetDlgItem(hdlg, IDC_COMBO_PCAP); memset(temp_pcap_dev, '\0', sizeof(temp_pcap_dev)); strcpy(temp_pcap_dev, network_devs[SendMessage(h, CB_GETCURSEL, 0, 0)].device); - h = GetDlgItem(hdlg, IDC_COMBONET); + h = GetDlgItem(hdlg, IDC_COMBO_NET); temp_net_card = settings_list_to_network[SendMessage(h, CB_GETCURSEL, 0, 0)]; default: @@ -4244,5 +4244,5 @@ static BOOL CALLBACK win_settings_main_proc(HWND hdlg, UINT message, WPARAM wPar void win_settings_open(HWND hwnd) { - DialogBox(hinstance, (LPCWSTR)DLG_CFG_MAIN, hwnd, win_settings_main_proc); + DialogBox(hinstance, (LPCWSTR)DLG_CONFIG, hwnd, win_settings_main_proc); } diff --git a/src/WIN/win_status.c b/src/WIN/win_status.c index fbc1949ad..0a0fc659c 100644 --- a/src/WIN/win_status.c +++ b/src/WIN/win_status.c @@ -64,11 +64,11 @@ static BOOL CALLBACK status_dlgproc(HWND hdlg, UINT message, WPARAM wParam, LPAR ((double)cpu_recomp_ins_latched / 1000000.0) / ((double)main_time / timer_freq) ); main_time = 0; - SendDlgItemMessage(hdlg, IDC_STEXT_DEVICE, WM_SETTEXT, (WPARAM)NULL, (LPARAM)device_s); + SendDlgItemMessage(hdlg, IDT_SDEVICE, WM_SETTEXT, (WPARAM)NULL, (LPARAM)device_s); device_s[0] = 0; device_add_status_info(device_s, 4096); - SendDlgItemMessage(hdlg, IDC_STEXT1, WM_SETTEXT, (WPARAM)NULL, (LPARAM)device_s); + SendDlgItemMessage(hdlg, IDT_STEXT, WM_SETTEXT, (WPARAM)NULL, (LPARAM)device_s); } return TRUE;