Apple-2-Tools
/
AppleWin
mirror of https://github.com/AppleWin/AppleWin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix build errors from PR #1039

This commit is contained in:
tomcw 2022-02-16 20:14:40 +00:00
parent 7ae8907674
commit 43b9df253a
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/Disk.cpp
View File

@ -180,7 +180,7 @@ void Disk2InterfaceCard::LoadLastDiskImage(const int drive)
char pathname[MAX_PATH]; char pathname[MAX_PATH];
std::string& regSection = RegGetConfigSlotSection(m_slot); std::string regSection = RegGetConfigSlotSection(m_slot);
if (RegLoadString(regSection.c_str(), regKey.c_str(), TRUE, pathname, MAX_PATH, TEXT("")) && (pathname[0] != 0)) if (RegLoadString(regSection.c_str(), regKey.c_str(), TRUE, pathname, MAX_PATH, TEXT("")) && (pathname[0] != 0))
{ {
m_saveDiskImage = false; m_saveDiskImage = false;
@ -204,7 +204,7 @@ void Disk2InterfaceCard::SaveLastDiskImage(const int drive)
if (!m_saveDiskImage) if (!m_saveDiskImage)
return; return;
std::string& regSection = RegGetConfigSlotSection(m_slot); std::string regSection = RegGetConfigSlotSection(m_slot);
RegSaveValue(regSection.c_str(), REGVALUE_CARD_TYPE, TRUE, CT_Disk2); RegSaveValue(regSection.c_str(), REGVALUE_CARD_TYPE, TRUE, CT_Disk2);
const std::string regKey = (drive == DRIVE_1) const std::string regKey = (drive == DRIVE_1)

4
source/Harddisk.cpp
View File

@ -229,7 +229,7 @@ void HarddiskInterfaceCard::LoadLastDiskImage(const int drive)
char pathname[MAX_PATH]; char pathname[MAX_PATH];
std::string& regSection = RegGetConfigSlotSection(m_slot); std::string regSection = RegGetConfigSlotSection(m_slot);
if (RegLoadString(regSection.c_str(), regKey.c_str(), TRUE, pathname, MAX_PATH, TEXT("")) && (pathname[0] != 0)) if (RegLoadString(regSection.c_str(), regKey.c_str(), TRUE, pathname, MAX_PATH, TEXT("")) && (pathname[0] != 0))
{ {
m_saveDiskImage = false; m_saveDiskImage = false;
@ -253,7 +253,7 @@ void HarddiskInterfaceCard::SaveLastDiskImage(const int drive)
if (!m_saveDiskImage) if (!m_saveDiskImage)
return; return;
std::string& regSection = RegGetConfigSlotSection(m_slot); std::string regSection = RegGetConfigSlotSection(m_slot);
RegSaveValue(regSection.c_str(), REGVALUE_CARD_TYPE, TRUE, CT_GenericHDD); RegSaveValue(regSection.c_str(), REGVALUE_CARD_TYPE, TRUE, CT_GenericHDD);
const std::string regKey = (drive == HARDDISK_1) const std::string regKey = (drive == HARDDISK_1)

4
source/Registry.cpp
View File

@ -171,7 +171,7 @@ void RegDeleteConfigSlotSection(UINT slot)
if (!g_sConfigFile.empty()) if (!g_sConfigFile.empty())
{ {
std::string& section = RegGetConfigSlotSection(slot); std::string section = RegGetConfigSlotSection(slot);
return _ini::RegDeleteString(section.c_str(), peruser); return _ini::RegDeleteString(section.c_str(), peruser);
} }
@ -186,7 +186,7 @@ void RegDeleteConfigSlotSection(UINT slot)
&keyhandle); &keyhandle);
if (status == ERROR_SUCCESS) if (status == ERROR_SUCCESS)
{ {
std::string& section = RegGetSlotSection(slot); std::string section = RegGetSlotSection(slot);
LSTATUS status2 = RegDeleteKey(keyhandle, section.c_str()); LSTATUS status2 = RegDeleteKey(keyhandle, section.c_str());
if (status2 != ERROR_SUCCESS && status2 != ERROR_FILE_NOT_FOUND) if (status2 != ERROR_SUCCESS && status2 != ERROR_FILE_NOT_FOUND)
_ASSERT(0); _ASSERT(0);

4
source/SerialComms.cpp
View File

@ -92,7 +92,7 @@ CSuperSerialCard::CSuperSerialCard(UINT slot) :
// //
char serialPortName[CSuperSerialCard::SIZEOF_SERIALCHOICE_ITEM]; char serialPortName[CSuperSerialCard::SIZEOF_SERIALCHOICE_ITEM];
std::string& regSection = RegGetConfigSlotSection(m_slot); std::string regSection = RegGetConfigSlotSection(m_slot);
RegLoadString(regSection.c_str(), REGVALUE_SERIAL_PORT_NAME, TRUE, serialPortName, sizeof(serialPortName), TEXT("")); RegLoadString(regSection.c_str(), REGVALUE_SERIAL_PORT_NAME, TRUE, serialPortName, sizeof(serialPortName), TEXT(""));
SetSerialPortName(serialPortName); SetSerialPortName(serialPortName);
@ -1397,7 +1397,7 @@ void CSuperSerialCard::SetSerialPortName(const char* pSerialPortName)
void CSuperSerialCard::SetRegistrySerialPortName(void) void CSuperSerialCard::SetRegistrySerialPortName(void)
{ {
std::string& regSection = RegGetConfigSlotSection(m_slot); std::string regSection = RegGetConfigSlotSection(m_slot);
RegSaveString(regSection.c_str(), REGVALUE_SERIAL_PORT_NAME, TRUE, GetSerialPortName()); RegSaveString(regSection.c_str(), REGVALUE_SERIAL_PORT_NAME, TRUE, GetSerialPortName());
} }

2
source/Tfe/tfe.cpp
View File

@ -1454,7 +1454,7 @@ int get_tfe_enabled(void)
// Called by: tfe_LoadSnapshot() & ApplyNewConfig() // Called by: tfe_LoadSnapshot() & ApplyNewConfig()
void tfe_SetRegistryInterface(UINT slot, const std::string& name) void tfe_SetRegistryInterface(UINT slot, const std::string& name)
{ {
std::string& regSection = RegGetConfigSlotSection(slot); std::string regSection = RegGetConfigSlotSection(slot);
RegSaveString(regSection.c_str(), REGVALUE_UTHERNET_INTERFACE, 1, name); RegSaveString(regSection.c_str(), REGVALUE_UTHERNET_INTERFACE, 1, name);
} }

4
source/Utilities.cpp
View File

@ -249,7 +249,7 @@ void LoadConfiguration(bool loadImages)
for (UINT slot = SLOT0; slot <= SLOT7; slot++) for (UINT slot = SLOT0; slot <= SLOT7; slot++)
{ {
std::string& regSection = RegGetConfigSlotSection(slot); std::string regSection = RegGetConfigSlotSection(slot);
if (RegLoadValue(regSection.c_str(), REGVALUE_CARD_TYPE, TRUE, &dwTmp)) if (RegLoadValue(regSection.c_str(), REGVALUE_CARD_TYPE, TRUE, &dwTmp))
{ {
@ -261,7 +261,7 @@ void LoadConfiguration(bool loadImages)
if ((SS_CARDTYPE)dwTmp == CT_Uthernet) // TODO: move this to when UthernetCard object is instantiated if ((SS_CARDTYPE)dwTmp == CT_Uthernet) // TODO: move this to when UthernetCard object is instantiated
{ {
std::string& regSection = RegGetConfigSlotSection(slot); std::string regSection = RegGetConfigSlotSection(slot);
if (RegLoadString(regSection.c_str(), REGVALUE_UTHERNET_INTERFACE, TRUE, szFilename, MAX_PATH, TEXT(""))) if (RegLoadString(regSection.c_str(), REGVALUE_UTHERNET_INTERFACE, TRUE, szFilename, MAX_PATH, TEXT("")))
update_tfe_interface(szFilename); update_tfe_interface(szFilename);