Synch linux branch (PR #1432)

. Debug.cpp: fix compilation errors.
. Remove obsolete __attribute__((regparm(1))) & WATCOM.
. Support MINGW32.
. Replace sprintf with StrFormat().
---------
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea
2025-09-18 10:40:02 +01:00
committed by GitHub
parent 1d6a50e7c1
commit 11fcaa63d1
11 changed files with 54 additions and 58 deletions
+22 -12
View File
@@ -1717,25 +1717,35 @@ LRESULT Win32Frame::WndProc(
driveTooltip += "\n";
// hex sector
driveTooltip += "S$";
char sector[3] = "??";
if (g_nSector[slot][0] >= 0) sprintf_s(sector, "%02X", g_nSector[slot][0]);
driveTooltip += sector;
const char* unknown = "??";
if (g_nSector[slot][0] >= 0)
driveTooltip += StrFormat("%02X", g_nSector[slot][0]);
else
driveTooltip += unknown;
// dec sector
driveTooltip += " (S";
strcpy(sector, "??");
if (g_nSector[slot][0] >= 0) sprintf_s(sector, "%02d", g_nSector[slot][0]);
driveTooltip += sector;
if (g_nSector[slot][0] >= 0)
driveTooltip += StrFormat("%02d", g_nSector[slot][0]);
else
driveTooltip += unknown;
driveTooltip += ")";
// hex sector
driveTooltip += "\tS$";
strcpy(sector, "??");
if (g_nSector[slot][1] >= 0) sprintf_s(sector, "%02X", g_nSector[slot][1]);
driveTooltip += sector;
if (g_nSector[slot][1] >= 0)
driveTooltip += StrFormat("%02X", g_nSector[slot][1]);
else
driveTooltip += unknown;
// dec sector
driveTooltip += " (S";
strcpy(sector, "??");
if (g_nSector[slot][1] >= 0) sprintf_s(sector, "%02d", g_nSector[slot][1]);
driveTooltip += sector;
if (g_nSector[slot][1] >= 0)
driveTooltip += StrFormat("%02d", g_nSector[slot][1]);
else
driveTooltip += unknown;
driveTooltip += ")";
pInfo->lpszText = (LPTSTR)driveTooltip.c_str();