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

Fixed an overrun in win/win_ui.c, a few newly introduced bugs, and a warning in the MPU-401 code.

Browse Source
This commit is contained in:
OBattler
2020-01-15 01:03:54 +01:00
parent 7d551af78b
commit 8928ef3f66
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/chipset/scat.c
View File

@@ -1341,10 +1341,14 @@ mem_write_scatb(uint32_t addr, uint8_t val, void *priv)
scat_t *dev; scat_t *dev;
uint32_t oldaddr = addr, chkaddr; uint32_t oldaddr = addr, chkaddr;
if (page == NULL)
dev = NULL;
else
dev = (scat_t *)page->scat;
if (dev == NULL) if (dev == NULL)
chkaddr = oldaddr; chkaddr = oldaddr;
else { else {
dev = (scat_t *)page->scat;
addr = get_addr(dev, addr, page); addr = get_addr(dev, addr, page);
chkaddr = addr; chkaddr = addr;
} }

2
src/plat.h
View File

@@ -58,7 +58,7 @@ GLOBAL int dopause, /* system is paused */
mouse_capture; /* mouse is captured in app */ mouse_capture; /* mouse is captured in app */
GLOBAL uint64_t timer_freq; GLOBAL uint64_t timer_freq;
GLOBAL int infocus; GLOBAL int infocus;
GLOBAL char emu_version[128]; /* version ID string */ GLOBAL char emu_version[200]; /* version ID string */
GLOBAL int rctrl_is_lalt; GLOBAL int rctrl_is_lalt;
GLOBAL int update_icons; GLOBAL int update_icons;

3
src/sound/snd_mpu401.c
View File

@@ -1337,7 +1337,7 @@ MPU401_InputMsg(void *p, uint8_t *msg)
uint8_t len = msg[3], key; uint8_t len = msg[3], key;
uint8_t recdata[2], recmsg[4]; uint8_t recdata[2], recmsg[4];
int send = 1, send_thru = 0; int send = 1, send_thru = 0;
int retrigger_thru = 0, midistatus = 0, chan, chrefnum; int retrigger_thru = 0, chan, chrefnum;
/* Abort if sysex transfer is in progress. */ /* Abort if sysex transfer is in progress. */
if (!mpu->state.sysex_in_finished) { if (!mpu->state.sysex_in_finished) {
@@ -1350,7 +1350,6 @@ MPU401_InputMsg(void *p, uint8_t *msg)
if (mpu->mode == M_INTELLIGENT) { if (mpu->mode == M_INTELLIGENT) {
if (msg[0] < 0x80) { if (msg[0] < 0x80) {
/* Expand running status */ /* Expand running status */
midistatus = 1;
msg[2] = msg[1]; msg[2] = msg[1];
msg[1] = msg[0]; msg[1] = msg[0];
msg[0] = old_msg; msg[0] = old_msg;

2
src/win/win_new_floppy.c
View File

@@ -551,7 +551,7 @@ NewFloppyDialogProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
switch (message) { switch (message) {
case WM_INITDIALOG: case WM_INITDIALOG:
plat_pause(1); plat_pause(1);
memset(fd_file_name, 0, 512 * sizeof(wchar_t)); memset(fd_file_name, 0, 1024 * sizeof(wchar_t));
h = GetDlgItem(hdlg, IDC_COMBO_DISK_SIZE); h = GetDlgItem(hdlg, IDC_COMBO_DISK_SIZE);
if (is_zip) { if (is_zip) {
zip_types = zip_drives[fdd_id].is_250 ? 2 : 1; zip_types = zip_drives[fdd_id].is_250 ? 2 : 1;

2
src/win/win_settings.c
View File

@@ -3463,7 +3463,7 @@ win_settings_floppy_drives_recalc_list(HWND hwndList)
{ {
LVITEM lvI; LVITEM lvI;
int i = 0; int i = 0;
char s[256], t; char s[256], *t;
WCHAR szText[256]; WCHAR szText[256];
lvI.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE; lvI.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;