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

Fixed a bug in image_open() that was causing CD-ROM image paths to get reduced to one character on init;

Browse Source 
Also made the code that prints floppy image file on load use %ls.
This commit is contained in:
OBattler
2017-10-14 09:19:17 +02:00
parent 1d3aa976ec
commit 6eb9404d04
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cdrom/cdrom_image.cc
View File

@@ -991,7 +991,7 @@ int image_open(uint8_t id, wchar_t *fn)
if (!cdrom_image[id].image_inited || cdrom_image[id].image_changed) if (!cdrom_image[id].image_inited || cdrom_image[id].image_changed)
{ {
swprintf(cdrom_image[id].image_path, sizeof(cdrom_image[id].image_path)/sizeof(wchar_t), L"%S", fn); swprintf(cdrom_image[id].image_path, sizeof(cdrom_image[id].image_path)/sizeof(wchar_t), L"%ls", fn);
} }
if (! wcscasecmp(get_extension_w(fn), L"ISO")) if (! wcscasecmp(get_extension_w(fn), L"ISO"))

2
src/floppy/floppy.c
View File

@@ -156,7 +156,7 @@ void floppy_load(int drive, wchar_t *fn)
} }
c++; c++;
} }
pclog("Couldn't load %S %s\n",fn,p); pclog("Couldn't load %ls %s\n",fn,p);
drive_empty[drive] = 1; drive_empty[drive] = 1;
fdd_set_head(real_drive(drive), 0); fdd_set_head(real_drive(drive), 0);
memset(floppyfns[drive], 0, sizeof(floppyfns[drive])); memset(floppyfns[drive], 0, sizeof(floppyfns[drive]));