Large changes to configuration files again (the old ones might break, be careful);
Applied the mainline PCem slight CPU emulation speedup commit; Added emulation of removable SCSI hard disks; CD-ROM image handler now uses C FILE's (with the 64-bit size calls) instead of C++ iostreams, ISO images bigger than 2 GB should work properly again; Split RLL/ESDI and XT IDE disks to their own bus types; Turned status bar pane meaning and hard disks and CD-ROM BUS numbers to #define's; Other miscellaneous cleanups.
This commit is contained in:
OBattler
@@ -117,19 +117,6 @@
|
||||
#define IDM_ABOUT 40001
|
||||
#define IDC_ABOUT_ICON 65535
|
||||
|
||||
#define IDM_DISC_1 40000
|
||||
#define IDM_DISC_2 40001
|
||||
#define IDM_DISC_3 40002
|
||||
#define IDM_DISC_4 40003
|
||||
#define IDM_DISC_1_WP 40004
|
||||
#define IDM_DISC_2_WP 40005
|
||||
#define IDM_DISC_3_WP 40006
|
||||
#define IDM_DISC_4_WP 40007
|
||||
#define IDM_EJECT_1 40008
|
||||
#define IDM_EJECT_2 40009
|
||||
#define IDM_EJECT_3 40010
|
||||
#define IDM_EJECT_4 40011
|
||||
|
||||
#define IDM_FILE_RESET 40015
|
||||
#define IDM_FILE_HRESET 40016
|
||||
#define IDM_FILE_EXIT 40017
|
||||
@@ -159,92 +146,6 @@
|
||||
#define IDM_VID_SCREENSHOT 40078
|
||||
#define IDM_VID_INVERT 40079
|
||||
|
||||
#define IDM_CDROM_1_MUTE 40128
|
||||
#define IDM_CDROM_1_IMAGE 40144
|
||||
#define IDM_CDROM_1_RELOAD 40160
|
||||
#define IDM_CDROM_1_EMPTY 40176
|
||||
#define IDM_CDROM_1_REAL 40192
|
||||
#define IDM_CDROM_2_MUTE 40129
|
||||
#define IDM_CDROM_2_IMAGE 40145
|
||||
#define IDM_CDROM_2_RELOAD 40161
|
||||
#define IDM_CDROM_2_EMPTY 40177
|
||||
#define IDM_CDROM_2_REAL 40193
|
||||
#define IDM_CDROM_3_MUTE 40130
|
||||
#define IDM_CDROM_3_IMAGE 40146
|
||||
#define IDM_CDROM_3_RELOAD 40162
|
||||
#define IDM_CDROM_3_EMPTY 40178
|
||||
#define IDM_CDROM_3_REAL 40194
|
||||
#define IDM_CDROM_4_MUTE 40131
|
||||
#define IDM_CDROM_4_IMAGE 40147
|
||||
#define IDM_CDROM_4_RELOAD 40163
|
||||
#define IDM_CDROM_4_EMPTY 40179
|
||||
#define IDM_CDROM_4_REAL 40195
|
||||
|
||||
#define IDM_RDISK_01_IMAGE 3200
|
||||
#define IDM_RDISK_01_EIMAGE 3216
|
||||
#define IDM_RDISK_01_RELOAD 3232
|
||||
#define IDM_RDISK_01_EMPTY 3248
|
||||
#define IDM_RDISK_02_IMAGE 3201
|
||||
#define IDM_RDISK_02_EIMAGE 3217
|
||||
#define IDM_RDISK_02_RELOAD 3233
|
||||
#define IDM_RDISK_02_EMPTY 3249
|
||||
#define IDM_RDISK_03_IMAGE 3202
|
||||
#define IDM_RDISK_03_EIMAGE 3218
|
||||
#define IDM_RDISK_03_RELOAD 3234
|
||||
#define IDM_RDISK_03_EMPTY 3250
|
||||
#define IDM_RDISK_04_IMAGE 3203
|
||||
#define IDM_RDISK_04_EIMAGE 3219
|
||||
#define IDM_RDISK_04_RELOAD 3235
|
||||
#define IDM_RDISK_04_EMPTY 3251
|
||||
#define IDM_RDISK_05_IMAGE 3204
|
||||
#define IDM_RDISK_05_EIMAGE 3220
|
||||
#define IDM_RDISK_05_RELOAD 3236
|
||||
#define IDM_RDISK_05_EMPTY 3252
|
||||
#define IDM_RDISK_06_IMAGE 3205
|
||||
#define IDM_RDISK_06_EIMAGE 3221
|
||||
#define IDM_RDISK_06_RELOAD 3237
|
||||
#define IDM_RDISK_06_EMPTY 3253
|
||||
#define IDM_RDISK_07_IMAGE 3206
|
||||
#define IDM_RDISK_07_EIMAGE 3222
|
||||
#define IDM_RDISK_07_RELOAD 3238
|
||||
#define IDM_RDISK_07_EMPTY 3254
|
||||
#define IDM_RDISK_08_IMAGE 3207
|
||||
#define IDM_RDISK_08_EIMAGE 3223
|
||||
#define IDM_RDISK_08_RELOAD 3239
|
||||
#define IDM_RDISK_08_EMPTY 3255
|
||||
#define IDM_RDISK_09_IMAGE 3208
|
||||
#define IDM_RDISK_09_EIMAGE 3224
|
||||
#define IDM_RDISK_09_RELOAD 3240
|
||||
#define IDM_RDISK_09_EMPTY 3256
|
||||
#define IDM_RDISK_10_IMAGE 3209
|
||||
#define IDM_RDISK_10_EIMAGE 3225
|
||||
#define IDM_RDISK_10_RELOAD 3241
|
||||
#define IDM_RDISK_10_EMPTY 3257
|
||||
#define IDM_RDISK_11_IMAGE 3210
|
||||
#define IDM_RDISK_11_EIMAGE 3226
|
||||
#define IDM_RDISK_11_RELOAD 3242
|
||||
#define IDM_RDISK_11_EMPTY 3258
|
||||
#define IDM_RDISK_12_IMAGE 3211
|
||||
#define IDM_RDISK_12_EIMAGE 3227
|
||||
#define IDM_RDISK_12_RELOAD 3243
|
||||
#define IDM_RDISK_12_EMPTY 3259
|
||||
#define IDM_RDISK_13_IMAGE 3212
|
||||
#define IDM_RDISK_13_EIMAGE 3228
|
||||
#define IDM_RDISK_13_RELOAD 3244
|
||||
#define IDM_RDISK_13_EMPTY 3260
|
||||
#define IDM_RDISK_14_IMAGE 3213
|
||||
#define IDM_RDISK_14_EIMAGE 3229
|
||||
#define IDM_RDISK_14_RELOAD 3245
|
||||
#define IDM_RDISK_14_EMPTY 3261
|
||||
#define IDM_RDISK_15_IMAGE 3214
|
||||
#define IDM_RDISK_15_EIMAGE 3230
|
||||
#define IDM_RDISK_15_RELOAD 3246
|
||||
#define IDM_RDISK_15_EMPTY 3262
|
||||
#define IDM_RDISK_16_IMAGE 3215
|
||||
#define IDM_RDISK_16_EIMAGE 3231
|
||||
#define IDM_RDISK_16_RELOAD 3247
|
||||
#define IDM_RDISK_16_EMPTY 3263
|
||||
|
||||
#define IDM_IDE_TER_ENABLED 44000
|
||||
#define IDM_IDE_TER_IRQ9 44009
|
||||
#define IDM_IDE_TER_IRQ10 44010
|
||||
@@ -326,85 +227,7 @@
|
||||
#define IDC_EDIT6 1035
|
||||
#define IDC_COMBOHDT 1036
|
||||
|
||||
#define IDC_EJECTC 1040
|
||||
#define IDC_EDITC 1050
|
||||
#define IDC_CFILE 1060
|
||||
#define IDC_CNEW 1070
|
||||
#define IDC_EDIT_C_SPT 1200
|
||||
#define IDC_EDIT_C_HPC 1210
|
||||
#define IDC_EDIT_C_CYL 1220
|
||||
#define IDC_EDIT_C_FN 1230
|
||||
#define IDC_TEXT_C_SIZE 1240
|
||||
|
||||
#define IDC_EJECTD 1041
|
||||
#define IDC_EDITD 1051
|
||||
#define IDC_DFILE 1061
|
||||
#define IDC_DNEW 1071
|
||||
#define IDC_EDIT_D_SPT 1201
|
||||
#define IDC_EDIT_D_HPC 1211
|
||||
#define IDC_EDIT_D_CYL 1221
|
||||
#define IDC_EDIT_D_FN 1231
|
||||
#define IDC_TEXT_D_SIZE 1241
|
||||
|
||||
#define IDC_EJECTE 1042
|
||||
#define IDC_EDITE 1052
|
||||
#define IDC_EFILE 1062
|
||||
#define IDC_ENEW 1072
|
||||
#define IDC_EDIT_E_SPT 1202
|
||||
#define IDC_EDIT_E_HPC 1212
|
||||
#define IDC_EDIT_E_CYL 1222
|
||||
#define IDC_EDIT_E_FN 1232
|
||||
#define IDC_TEXT_E_SIZE 1242
|
||||
|
||||
#define IDC_EJECTF 1043
|
||||
#define IDC_EDITF 1053
|
||||
#define IDC_FFILE 1063
|
||||
#define IDC_FNEW 1073
|
||||
#define IDC_EDIT_F_SPT 1203
|
||||
#define IDC_EDIT_F_HPC 1213
|
||||
#define IDC_EDIT_F_CYL 1223
|
||||
#define IDC_EDIT_F_FN 1233
|
||||
#define IDC_TEXT_F_SIZE 1243
|
||||
|
||||
#define IDC_EJECTG 1044
|
||||
#define IDC_EDITG 1054
|
||||
#define IDC_GFILE 1064
|
||||
#define IDC_GNEW 1074
|
||||
#define IDC_EDIT_G_SPT 1204
|
||||
#define IDC_EDIT_G_HPC 1214
|
||||
#define IDC_EDIT_G_CYL 1224
|
||||
#define IDC_EDIT_G_FN 1234
|
||||
#define IDC_TEXT_G_SIZE 1244
|
||||
|
||||
#define IDC_EJECTH 1045
|
||||
#define IDC_EDITH 1055
|
||||
#define IDC_HFILE 1065
|
||||
#define IDC_HNEW 1075
|
||||
#define IDC_EDIT_H_SPT 1205
|
||||
#define IDC_EDIT_H_HPC 1215
|
||||
#define IDC_EDIT_H_CYL 1225
|
||||
#define IDC_EDIT_H_FN 1235
|
||||
#define IDC_TEXT_H_SIZE 1245
|
||||
|
||||
#define IDC_EJECTI 1046
|
||||
#define IDC_EDITI 1056
|
||||
#define IDC_IFILE 1066
|
||||
#define IDC_INEW 1076
|
||||
#define IDC_EDIT_I_SPT 1206
|
||||
#define IDC_EDIT_I_HPC 1216
|
||||
#define IDC_EDIT_I_CYL 1226
|
||||
#define IDC_EDIT_I_FN 1236
|
||||
#define IDC_TEXT_I_SIZE 1246
|
||||
|
||||
#define IDC_EJECTJ 1047
|
||||
#define IDC_EDITJ 1057
|
||||
#define IDC_JFILE 1067
|
||||
#define IDC_JNEW 1077
|
||||
#define IDC_EDIT_J_SPT 1207
|
||||
#define IDC_EDIT_J_HPC 1217
|
||||
#define IDC_EDIT_J_CYL 1227
|
||||
#define IDC_EDIT_J_FN 1237
|
||||
#define IDC_TEXT_J_SIZE 1247
|
||||
|
||||
#define IDC_HDTYPE 1280
|
||||
|
||||
@@ -441,47 +264,26 @@
|
||||
|
||||
#define IDC_CONFIG_BASE 1200
|
||||
|
||||
#define WM_RESETD3D WM_USER
|
||||
#define WM_LEAVEFULLSCREEN WM_USER + 1
|
||||
/* 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 C_BASE 6
|
||||
#define D_BASE 44
|
||||
#define E_BASE 82
|
||||
#define F_BASE 120
|
||||
#define G_BASE 158
|
||||
#define H_BASE 196
|
||||
#define I_BASE 234
|
||||
#define J_BASE 272
|
||||
#define CMD_BASE 314
|
||||
#define DLG_HEIGHT 346
|
||||
#define IDM_FLOPPY_IMAGE_NEW 0x1200
|
||||
#define IDM_FLOPPY_IMAGE_EXISTING 0x1300
|
||||
#define IDM_FLOPPY_IMAGE_EXISTING_WP 0x1400
|
||||
#define IDM_FLOPPY_DUMP_86F 0x1500
|
||||
#define IDM_FLOPPY_EJECT 0x1600
|
||||
|
||||
#define IDC_CHECK_CDROM_1_ENABLED 1536
|
||||
#define IDC_COMBO_CDROM_1_BUS 1544
|
||||
#define IDC_COMBO_CDROM_1_CHANNEL 1552
|
||||
#define IDC_CHECK_CDROM_1_DMA_ENABLED 1560
|
||||
#define IDC_COMBO_CDROM_1_SCSI_ID 1568
|
||||
#define IDC_COMBO_CDROM_1_SCSI_LUN 1576
|
||||
#define IDM_CDROM_MUTE 0x2200
|
||||
#define IDM_CDROM_EMPTY 0x2300
|
||||
#define IDM_CDROM_RELOAD 0x2400
|
||||
#define IDM_CDROM_IMAGE 0x2500
|
||||
#define IDM_CDROM_HOST_DRIVE 0x2600
|
||||
|
||||
#define IDC_CHECK_CDROM_2_ENABLED 1537
|
||||
#define IDC_COMBO_CDROM_2_BUS 1545
|
||||
#define IDC_COMBO_CDROM_2_CHANNEL 1553
|
||||
#define IDC_CHECK_CDROM_2_DMA_ENABLED 1561
|
||||
#define IDC_COMBO_CDROM_2_SCSI_ID 1569
|
||||
#define IDC_COMBO_CDROM_2_SCSI_LUN 1577
|
||||
|
||||
#define IDC_CHECK_CDROM_3_ENABLED 1538
|
||||
#define IDC_COMBO_CDROM_3_BUS 1546
|
||||
#define IDC_COMBO_CDROM_3_CHANNEL 1554
|
||||
#define IDC_CHECK_CDROM_3_DMA_ENABLED 1562
|
||||
#define IDC_COMBO_CDROM_3_SCSI_ID 1570
|
||||
#define IDC_COMBO_CDROM_3_SCSI_LUN 1578
|
||||
|
||||
#define IDC_CHECK_CDROM_4_ENABLED 1539
|
||||
#define IDC_COMBO_CDROM_4_BUS 1547
|
||||
#define IDC_COMBO_CDROM_4_CHANNEL 1555
|
||||
#define IDC_CHECK_CDROM_4_DMA_ENABLED 1563
|
||||
#define IDC_COMBO_CDROM_4_SCSI_ID 1571
|
||||
#define IDC_COMBO_CDROM_4_SCSI_LUN 1579
|
||||
#define IDM_RDISK_EJECT 0x3200
|
||||
#define IDM_RDISK_RELOAD 0x3300
|
||||
#define IDM_RDISK_SEND_CHANGE 0x3400
|
||||
#define IDM_RDISK_IMAGE 0x3500
|
||||
#define IDM_RDISK_IMAGE_WP 0x3600
|
||||
|
||||
#define IDC_STATIC 1792
|
||||
|
||||
@@ -495,3 +297,5 @@
|
||||
# define _APS_NEXT_SYMED_VALUE 101
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#define STRINGS_NUM 174
|
||||
|
||||
Reference in New Issue
Block a user