ROM loading typos fixed, MIDI typo fixed, some warnings fixed. Still messing with the ROM on some PS/2 models not working.

This commit is contained in:
waltje
2017-10-10 18:49:20 -04:00
parent c7e3adf446
commit 5be5a38db6
7 changed files with 36 additions and 23 deletions

View File

@@ -8,7 +8,7 @@
*
* Several dialogs for the application.
*
* Version: @(#)win_dialog.c 1.0.2 2017/10/09
* Version: @(#)win_dialog.c 1.0.3 2017/10/10
*
* Author: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
@@ -128,7 +128,13 @@ ui_msgbox(int flags, void *arg)
* higher than the numeric ID's. So, we guesswork
* that if the value of 'arg' is low, its an ID..
*/
#if defined(__gcc__) && defined(__x86_64__)
/* GCC, 64-bit mode. */
if (((int64_t)arg) < ((int64_t)65636))
#else
/* Assume 32-bit mode. */
if (((uint32_t)arg) < ((uint32_t)65636))
#endif
str = plat_get_string((int)arg);
}

View File

@@ -8,7 +8,7 @@
*
* Windows 86Box Settings dialog handler.
*
* Version: @(#)win_settings.c 1.0.19 2017/10/09
* Version: @(#)win_settings.c 1.0.20 2017/10/10
*
* Author: Miran Grca, <mgrca8@gmail.com>
*
@@ -1118,11 +1118,11 @@ static BOOL CALLBACK win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wPa
{
midi_dev = midi_device_getdevice(c);
if (!midi_dev)
if (midi_dev)
{
if (c == 0)
{
SendMessage(h, CB_ADDSTRING, 0, (LPARAM) plat_get_string(IDS_2152));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)plat_get_string(IDS_2152));
}
else
{