80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fix up some more magic numbers

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-11-11 17:19:47 -05:00
parent 51aa132818
commit de4f70e3f8
3 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/include/86box/hdd.h
View File

@@ -18,6 +18,13 @@
#ifndef EMU_HDD_H #ifndef EMU_HDD_H
#define EMU_HDD_H #define EMU_HDD_H
#define IMG_FMT_RAW 0
#define IMG_FMT_HDI 1
#define IMG_FMT_HDX 2
#define IMG_FMT_VHD_FIXED 3
#define IMG_FMT_VHD_DYNAMIC 4
#define IMG_FMT_VHD_DIFF 5
#define HDD_NUM 88 /* total of 88 images supported */ #define HDD_NUM 88 /* total of 88 images supported */
/* Hard Disk bus types. */ /* Hard Disk bus types. */

24
src/qt/qt_harddiskdialog.cpp
View File

@@ -307,15 +307,15 @@ void HarddiskDialog::onCreateNewFile() {
auto fileName = ui->fileField->fileName(); auto fileName = ui->fileField->fileName();
QString expectedSuffix; QString expectedSuffix;
switch (img_format) { switch (img_format) {
case 1: case IMG_FMT_HDI:
expectedSuffix = "hdi"; expectedSuffix = "hdi";
break; break;
case 2: case IMG_FMT_HDX:
expectedSuffix = "hdx"; expectedSuffix = "hdx";
break; break;
case 3: case IMG_FMT_VHD_FIXED:
case 4: case IMG_FMT_VHD_DYNAMIC:
case 5: case IMG_FMT_VHD_DIFF:
expectedSuffix = "vhd"; expectedSuffix = "vhd";
break; break;
} }
@@ -333,7 +333,7 @@ void HarddiskDialog::onCreateNewFile() {
return; return;
} }
if (img_format == 1) { /* HDI file */ if (img_format == IMG_FMT_HDI) { /* HDI file */
QDataStream stream(&file); QDataStream stream(&file);
stream.setByteOrder(QDataStream::LittleEndian); stream.setByteOrder(QDataStream::LittleEndian);
if (size >= 0x100000000ll) { if (size >= 0x100000000ll) {
@@ -353,7 +353,7 @@ void HarddiskDialog::onCreateNewFile() {
for (int i = 0; i < 0x3f8; i++) { for (int i = 0; i < 0x3f8; i++) {
stream << zero; stream << zero;
} }
} else if (img_format == 2) { /* HDX file */ } else if (img_format == IMG_FMT_HDX) { /* HDX file */
QDataStream stream(&file); QDataStream stream(&file);
stream.setByteOrder(QDataStream::LittleEndian); stream.setByteOrder(QDataStream::LittleEndian);
quint64 signature = 0xD778A82044445459; quint64 signature = 0xD778A82044445459;
@@ -365,13 +365,13 @@ void HarddiskDialog::onCreateNewFile() {
stream << cylinders_; /* 0000001C: Cylinders */ stream << cylinders_; /* 0000001C: Cylinders */
stream << zero; /* 00000020: [Translation] Sectors per cylinder */ stream << zero; /* 00000020: [Translation] Sectors per cylinder */
stream << zero; /* 00000004: [Translation] Heads per cylinder */ stream << zero; /* 00000004: [Translation] Heads per cylinder */
} else if (img_format >= 3) { /* VHD file */ } else if (img_format >= IMG_FMT_VHD_FIXED) { /* VHD file */
file.close(); file.close();
MVHDGeom _86box_geometry{}; MVHDGeom _86box_geometry{};
int block_size = ui->comboBoxBlockSize->currentIndex() == 0 ? MVHD_BLOCK_LARGE : MVHD_BLOCK_SMALL; int block_size = ui->comboBoxBlockSize->currentIndex() == 0 ? MVHD_BLOCK_LARGE : MVHD_BLOCK_SMALL;
switch (img_format) { switch (img_format) {
case 3: case IMG_FMT_VHD_FIXED:
{ {
connect(this, &HarddiskDialog::fileProgress, this, [this] (int value) { ui->progressBar->setValue(value); QApplication::processEvents(); } ); connect(this, &HarddiskDialog::fileProgress, this, [this] (int value) { ui->progressBar->setValue(value); QApplication::processEvents(); } );
ui->progressBar->setVisible(true); ui->progressBar->setVisible(true);
@@ -380,10 +380,10 @@ void HarddiskDialog::onCreateNewFile() {
}(); }();
} }
break; break;
case 4: case IMG_FMT_VHD_DYNAMIC:
_86box_geometry = create_drive_vhd_dynamic(fileName, cylinders_, heads_, sectors_, block_size); _86box_geometry = create_drive_vhd_dynamic(fileName, cylinders_, heads_, sectors_, block_size);
break; break;
case 5: case IMG_FMT_VHD_DIFF:
QString vhdParent = QFileDialog::getOpenFileName( QString vhdParent = QFileDialog::getOpenFileName(
this, this,
tr("Select the parent VHD"), tr("Select the parent VHD"),
@@ -407,7 +407,7 @@ void HarddiskDialog::onCreateNewFile() {
QMessageBox::critical(this, tr("Unable to write file"), tr("Make sure the file is being saved to a writable directory.")); QMessageBox::critical(this, tr("Unable to write file"), tr("Make sure the file is being saved to a writable directory."));
return; return;
} }
else if (img_format != 5) { else if (img_format != IMG_FMT_VHD_DIFF) {
QMessageBox::information(this, tr("Disk image created"), tr("Remember to partition and format the newly-created drive.")); QMessageBox::information(this, tr("Disk image created"), tr("Remember to partition and format the newly-created drive."));
} }

20
src/win/win_settings.c
View File

@@ -2869,13 +2869,13 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM
} }
img_format = settings_get_cur_sel(hdlg, IDC_COMBO_HD_IMG_FORMAT); img_format = settings_get_cur_sel(hdlg, IDC_COMBO_HD_IMG_FORMAT);
if (img_format < 3) { if (img_format < IMG_FMT_VHD_FIXED) {
f = _wfopen(hd_file_name, L"wb"); f = _wfopen(hd_file_name, L"wb");
} else { } else {
f = (FILE *) 0; f = (FILE *) 0;
} }
if (img_format == 1) { /* HDI file */ if (img_format == IMG_FMT_HDI) { /* HDI file */
if (size >= 0x100000000ll) { if (size >= 0x100000000ll) {
fclose(f); fclose(f);
settings_msgbox_header(MBX_ERROR, (wchar_t *) IDS_4116, (wchar_t *) IDS_4104); settings_msgbox_header(MBX_ERROR, (wchar_t *) IDS_4116, (wchar_t *) IDS_4104);
@@ -2893,7 +2893,7 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM
for (i = 0; i < 0x3f8; i++) for (i = 0; i < 0x3f8; i++)
fwrite(&zero, 1, 4, f); fwrite(&zero, 1, 4, f);
} else if (img_format == 2) { /* HDX file */ } else if (img_format == IMG_FMT_HDX) { /* HDX file */
fwrite(&signature, 1, 8, f); /* 00000000: Signature */ fwrite(&signature, 1, 8, f); /* 00000000: Signature */
fwrite(&size, 1, 8, f); /* 00000008: Full size of the data (64-bit) */ fwrite(&size, 1, 8, f); /* 00000008: Full size of the data (64-bit) */
fwrite(&sector_size, 1, 4, f); /* 00000010: Sector size in bytes */ fwrite(&sector_size, 1, 4, f); /* 00000010: Sector size in bytes */
@@ -2902,18 +2902,18 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM
fwrite(&tracks, 1, 4, f); /* 0000001C: Cylinders */ fwrite(&tracks, 1, 4, f); /* 0000001C: Cylinders */
fwrite(&zero, 1, 4, f); /* 00000020: [Translation] Sectors per cylinder */ fwrite(&zero, 1, 4, f); /* 00000020: [Translation] Sectors per cylinder */
fwrite(&zero, 1, 4, f); /* 00000004: [Translation] Heads per cylinder */ fwrite(&zero, 1, 4, f); /* 00000004: [Translation] Heads per cylinder */
} else if (img_format >= 3) { /* VHD file */ } else if (img_format >= IMG_FMT_VHD_FIXED) { /* VHD file */
MVHDGeom _86box_geometry; MVHDGeom _86box_geometry;
block_size = settings_get_cur_sel(hdlg, IDC_COMBO_HD_BLOCK_SIZE) == 0 ? MVHD_BLOCK_LARGE : MVHD_BLOCK_SMALL; block_size = settings_get_cur_sel(hdlg, IDC_COMBO_HD_BLOCK_SIZE) == 0 ? MVHD_BLOCK_LARGE : MVHD_BLOCK_SMALL;
switch (img_format) { switch (img_format) {
case 3: case IMG_FMT_VHD_FIXED:
vhd_progress_hdlg = hdlg; vhd_progress_hdlg = hdlg;
_86box_geometry = create_drive_vhd_fixed(hd_file_name_multibyte, tracks, hpc, spt); _86box_geometry = create_drive_vhd_fixed(hd_file_name_multibyte, tracks, hpc, spt);
break; break;
case 4: case IMG_FMT_VHD_DYNAMIC:
_86box_geometry = create_drive_vhd_dynamic(hd_file_name_multibyte, tracks, hpc, spt, block_size); _86box_geometry = create_drive_vhd_dynamic(hd_file_name_multibyte, tracks, hpc, spt, block_size);
break; break;
case 5: case IMG_FMT_VHD_DIFF:
if (file_dlg_w(hdlg, plat_get_string(IDS_4130), L"", plat_get_string(IDS_4131), 0)) { if (file_dlg_w(hdlg, plat_get_string(IDS_4130), L"", plat_get_string(IDS_4131), 0)) {
return TRUE; return TRUE;
} }
@@ -2921,7 +2921,7 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM
break; break;
} }
if (img_format != 5) if (img_format != IMG_FMT_VHD_DIFF)
settings_msgbox_header(MBX_INFO, (wchar_t *) IDS_4113, (wchar_t *) IDS_4117); settings_msgbox_header(MBX_INFO, (wchar_t *) IDS_4113, (wchar_t *) IDS_4117);
hdd_ptr->tracks = _86box_geometry.cyl; hdd_ptr->tracks = _86box_geometry.cyl;
@@ -3366,7 +3366,7 @@ hdd_add_file_open_error:
img_format = settings_get_cur_sel(hdlg, IDC_COMBO_HD_IMG_FORMAT); img_format = settings_get_cur_sel(hdlg, IDC_COMBO_HD_IMG_FORMAT);
no_update = 1; no_update = 1;
if (img_format == 5) { /* They switched to a diff VHD; disable the geometry fields. */ if (img_format == IMG_FMT_VHD_DIFF) { /* They switched to a diff VHD; disable the geometry fields. */
settings_enable_window(hdlg, IDC_EDIT_HD_SPT, FALSE); settings_enable_window(hdlg, IDC_EDIT_HD_SPT, FALSE);
set_edit_box_text_contents(hdlg, IDC_EDIT_HD_SPT, L"(N/A)"); set_edit_box_text_contents(hdlg, IDC_EDIT_HD_SPT, L"(N/A)");
settings_enable_window(hdlg, IDC_EDIT_HD_HPC, FALSE); settings_enable_window(hdlg, IDC_EDIT_HD_HPC, FALSE);
@@ -3402,7 +3402,7 @@ hdd_add_file_open_error:
} }
no_update = 0; no_update = 0;
if (img_format == 4 || img_format == 5) { /* For dynamic and diff VHDs, show the block size dropdown. */ if (img_format == IMG_FMT_VHD_DYNAMIC || img_format == IMG_FMT_VHD_DIFF) { /* For dynamic and diff VHDs, show the block size dropdown. */
settings_show_window(hdlg, IDC_COMBO_HD_BLOCK_SIZE, TRUE); settings_show_window(hdlg, IDC_COMBO_HD_BLOCK_SIZE, TRUE);
settings_show_window(hdlg, IDT_BLOCK_SIZE, TRUE); settings_show_window(hdlg, IDT_BLOCK_SIZE, TRUE);
} else { /* Hide it otherwise. */ } else { /* Hide it otherwise. */