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

Made the mismatched differencing VHD more generic

Browse Source
This commit is contained in:
David Hrdlička
2020-11-20 03:15:51 +01:00
parent 35519d4637
commit 637495fda1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/win/86Box.rc
View File

@@ -1041,8 +1041,8 @@ BEGIN
IDS_4099 "MFM/RLL or ESDI CD-ROM drives never existed"
IDS_4100 "Custom..."
IDS_4101 "Custom (large)..."
IDS_4102 "Add new hard disk"
IDS_4103 "Add existing hard disk"
IDS_4102 "Add New Hard Disk"
IDS_4103 "Add Existing Hard Disk"
IDS_4104 "HDI disk images cannot be larger than 4 GB."
IDS_4105 "Disk images cannot be larger than 127 GB."
IDS_4106 "Hard disk images (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0All files (*.*)\0*.*\0"
@@ -1071,8 +1071,8 @@ BEGIN
IDS_4129 "Small blocks (512 KB)"
IDS_4130 "VHD files (*.VHD)\0*.VHD\0All files (*.*)\0*.*\0"
IDS_4131 "Select the parent VHD"
IDS_4132 "WARNING: VHD PARENT/CHILD TIMESTAMPS DO NOT MATCH!\n\nThis could indicate that the parent image was modified after this VHD was created.\n\nThis could also happen if the VHD files were moved/copied, or the differencing VHD was created with DiskPart.\n\nDo you wish to fix this error after a file copy or DiskPart creation?"
IDS_4133 "VHD Timestamp Mismatch"
IDS_4132 "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
IDS_4133 "Parent and child disk timestamps do not match"
IDS_4134 "Could not fix VHD timestamp."
IDS_4352 "MFM/RLL"

2
src/win/win_settings.c
View File

@@ -2931,7 +2931,7 @@ hdd_add_file_open_error:
settings_msgbox_header(MBX_ERROR, (existing & 1) ? (wchar_t *) IDS_4114 : (wchar_t *) IDS_4115, (existing & 1) ? (wchar_t *) IDS_4107 : (wchar_t *) IDS_4108);
return TRUE;
} else if (vhd_error == MVHD_ERR_TIMESTAMP) {
if (settings_msgbox_ex(MBX_QUESTION_YN, plat_get_string(IDS_4133), plat_get_string(IDS_4132), NULL, NULL, NULL) != 0) {
if (settings_msgbox_ex(MBX_QUESTIONYN | MBX_WARNING, plat_get_string(IDS_4133), plat_get_string(IDS_4132), NULL, NULL, NULL) != 0) {
int ts_res = mvhd_diff_update_par_timestamp(vhd, &vhd_error);
if (ts_res != 0) {
settings_msgbox_header(MBX_ERROR, plat_get_string(IDS_2049), plat_get_string(IDS_4134));