folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCP: Fix compile WIN32 MinGW warnings

Browse source
This commit is contained in:
Mark Pizzolato 2018-03-07 13:20:14 -08:00
parent d81ff1f17e
commit 669d07ba3e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sim_disk.c
View file

@ -2310,7 +2310,7 @@ if (!memcmp ("\\.\\", rawdevicename, 3)) {
Handle = CreateFileA (tmpname, DesiredAccess, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS|FILE_FLAG_WRITE_THROUGH, NULL); Handle = CreateFileA (tmpname, DesiredAccess, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS|FILE_FLAG_WRITE_THROUGH, NULL);
free (tmpname); free (tmpname);
if (Handle != INVALID_HANDLE_VALUE) { if (Handle != INVALID_HANDLE_VALUE) {
if ((sim_os_disk_info_raw (Handle, NULL, NULL, &is_cdrom)) || if ((sim_os_disk_info_raw ((FILE *)Handle, NULL, NULL, &is_cdrom)) ||
(DesiredAccess & GENERIC_WRITE) && is_cdrom) { (DesiredAccess & GENERIC_WRITE) && is_cdrom) {
CloseHandle (Handle); CloseHandle (Handle);
errno = EACCES; errno = EACCES;
@ -2324,7 +2324,7 @@ if (Handle == INVALID_HANDLE_VALUE) {
_set_errno_from_status (GetLastError ()); _set_errno_from_status (GetLastError ());
return NULL; return NULL;
} }
if ((sim_os_disk_info_raw (Handle, NULL, NULL, &is_cdrom)) || if ((sim_os_disk_info_raw ((FILE *)Handle, NULL, NULL, &is_cdrom)) ||
(DesiredAccess & GENERIC_WRITE) && is_cdrom) { (DesiredAccess & GENERIC_WRITE) && is_cdrom) {
CloseHandle (Handle); CloseHandle (Handle);
errno = EACCES; errno = EACCES;

2
sim_fio.c
View file

@ -390,7 +390,7 @@ dwStatus = FormatMessageA (FORMAT_MESSAGE_FROM_SYSTEM|
sizeof (szMsgBuffer) -1, // __in DWORD nSize, sizeof (szMsgBuffer) -1, // __in DWORD nSize,
NULL); // __in_opt va_list *Arguments NULL); // __in_opt va_list *Arguments
if (0 == dwStatus) if (0 == dwStatus)
snprintf(szMsgBuffer, sizeof(szMsgBuffer) - 1, "Error Code: 0x%lX", Error); snprintf(szMsgBuffer, sizeof(szMsgBuffer) - 1, "Error Code: 0x%X", Error);
while (sim_isspace (szMsgBuffer[strlen (szMsgBuffer)-1])) while (sim_isspace (szMsgBuffer[strlen (szMsgBuffer)-1]))
szMsgBuffer[strlen (szMsgBuffer) - 1] = '\0'; szMsgBuffer[strlen (szMsgBuffer) - 1] = '\0';
return szMsgBuffer; return szMsgBuffer;