Fixed two bugs reported by waltje.

This commit is contained in:
OBattler
2018-02-25 08:59:57 +01:00
parent e824c472cf
commit c7b99751d9
2 changed files with 4 additions and 5 deletions

View File

@@ -11,7 +11,7 @@
* series of SCSI Host Adapters made by Mylex. * series of SCSI Host Adapters made by Mylex.
* These controllers were designed for various buses. * These controllers were designed for various buses.
* *
* Version: @(#)scsi_x54x.c 1.0.15 2018/02/19 * Version: @(#)scsi_x54x.c 1.0.16 2018/02/23
* *
* Authors: TheCollector1995, <mariogplayer@gmail.com> * Authors: TheCollector1995, <mariogplayer@gmail.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -1386,12 +1386,11 @@ x54x_in(uint16_t port, void *priv)
ret = dev->Geometry; ret = dev->Geometry;
else { else {
switch(dev->Geometry) { switch(dev->Geometry) {
case 0: ret = 'A'; break; case 0: default: ret = 'A'; break;
case 1: ret = 'D'; break; case 1: ret = 'D'; break;
case 2: ret = 'A'; break; case 2: ret = 'A'; break;
case 3: ret = 'P'; break; case 3: ret = 'P'; break;
} }
ret ^= 1;
dev->Geometry++; dev->Geometry++;
if (dev->Geometry == 4) if (dev->Geometry == 4)
dev->Geometry = 0; dev->Geometry = 0;

View File

@@ -8,7 +8,7 @@
* *
* Windows device configuration dialog implementation. * Windows device configuration dialog implementation.
* *
* Version: @(#)win_devconf.c 1.0.12 2018/02/18 * Version: @(#)win_devconf.c 1.0.13 2018/02/23
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -83,7 +83,7 @@ deviceconfig_dlgproc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
val_int = config_get_int((char *) config_device->name, (char *) config->name, config->default_int); val_int = config_get_int((char *) config_device->name, (char *) config->name, config->default_int);
c = 0; c = 0;
while (selection->description[0]) while (selection->description && selection->description[0])
{ {
mbstowcs(lptsTemp, selection->description, strlen(selection->description) + 1); mbstowcs(lptsTemp, selection->description, strlen(selection->description) + 1);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)lptsTemp); SendMessage(h, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)lptsTemp);