claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the fourth batch of problems.

Browse Source
This commit is contained in:
OBattler
2020-01-15 05:24:33 +01:00
parent 932ad5595a
commit e44e60c660
19 changed files with 91 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/floppy/fdd_86f.c
View File

@@ -3175,10 +3175,10 @@ d86f_writeback(int drive)
fatal("86F write_back(): Error reading header size\n");
if (fseek(dev->f, 8, SEEK_SET) == -1)
fatal("86F write_back(): Error seeking\n");
fatal("86F write_back(): Error seeking\n");
size = d86f_get_track_table_size(drive);
if (fwrite(dev->track_offset, 1, size, dev->f) != size)
fatal("86F write_back(): Error writing data\n");
fatal("86F write_back(): Error writing data\n");
d86f_write_tracks(drive, &dev->f, NULL);

4
src/floppy/fdd_fdi.c
View File

@@ -329,14 +329,14 @@ fdi_load(int drive, wchar_t *fn)
/* Allocate a drive block. */
dev = (fdi_t *)malloc(sizeof(fdi_t));
memset(dev, 0x00, sizeof(fdi_t));
if (dev == NULL) {
free(dev);
memset(floppyfns[drive], 0, sizeof(floppyfns[drive]));
return;
}
memset(dev, 0x00, sizeof(fdi_t));
d86f_unregister(drive);
dev->f = plat_fopen(fn, L"rb");

2
src/floppy/fdd_imd.c
View File

@@ -190,8 +190,8 @@ track_is_xdf(int drive, int side, int track)
dev->current_side_flags[side] = (dev->tracks[track][side].params[3] == 19) ? 0x08 : 0x28;
return((dev->tracks[track][side].params[3] == 19) ? 2 : 1);
}
return(0);
}
return(0);
} else {
if (dev->tracks[track][side].params[4] != 0xFF) return(0);

6
src/floppy/fdd_img.c
View File

@@ -490,8 +490,10 @@ img_seek(int drive, int track)
is_t0 = (track == 0) ? 1 : 0;
if (! dev->disk_at_once)
fseek(dev->f, dev->base + (track * dev->sectors * ssize * dev->sides), SEEK_SET);
if (! dev->disk_at_once) {
if (fseek(dev->f, dev->base + (track * dev->sectors * ssize * dev->sides), SEEK_SET) == -1)
fatal("img_seek(): Error seeking\n");
}
for (side = 0; side < dev->sides; side++) {
if (dev->disk_at_once) {

6
src/floppy/fdd_td0.c
View File

@@ -656,8 +656,10 @@ td0_initialize(int drive)
state_Decode(&disk_decode, dev->imagebuf, TD0_MAX_BUFSZ);
} else {
td0_log("TD0: File is uncompressed\n");
fseek(dev->f, 12, SEEK_SET);
fread(dev->imagebuf, 1, file_size - 12, dev->f);
if (fseek(dev->f, 12, SEEK_SET) == -1)
fatal("td0_initialize(): Error seeking to offet 12\n");
if (fread(dev->imagebuf, 1, file_size - 12, dev->f) != (file_size - 12))
fatal("td0_initialize(): Error reading image buffer\n");
}
if (header[7] & 0x80)