empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rationalise location of some duplicate code.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2020-06-24 08:34:01 +01:00
parent 46f056f38e
commit 85b1f872f0
16 changed files with 428 additions and 424 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/CMakeLists.txt
View file

@ -24,6 +24,7 @@ add_library(appleii SHARED
NTSC_CharSet.cpp
CardManager.cpp
Disk2CardManager.cpp
SaveState.cpp # uses g_CardMgr in m_ConfigNew (reverse order)
linux/windows/memory.cpp
linux/windows/handles.cpp
@ -37,9 +38,7 @@ add_library(appleii SHARED
linux/windows/winbase.cpp
linux/windows/winuser.cpp
linux/data.cpp # defines g_CardMgr
linux/dummies.cpp
linux/state.cpp
linux/data.cpp
linux/benchmark.cpp
linux/paddle.cpp
linux/version.cpp
@ -52,9 +51,9 @@ add_library(appleii SHARED
linux/duplicates/Joystick.cpp
linux/duplicates/Frame.cpp
linux/duplicates/SerialComms.cpp
linux/duplicates/Applewin.cpp
SaveState.cpp # uses g_CardMgr in m_ConfigNew
linux/duplicates/Speaker.cpp
linux/duplicates/IPropertySheet.cpp
linux/duplicates/Applewin.cpp # defines g_CardMgr (reverse order)
Z80VICE/z80.cpp
Z80VICE/z80mem.cpp

308
source/linux/data.cpp
View file

@ -1,78 +1,11 @@
#include "StdAfx.h"
#include "Common.h"
#include "Memory.h"
#include "SerialComms.h"
#include "CardManager.h"
#include "MouseInterface.h"
#include "Speaker.h"
#include "Video.h"
#include "Configuration/IPropertySheet.h"
#include "SaveState_Structs_v1.h"
#include "Registry.h"
#include "Log.h"
#include "Applewin.h"
#include "CPU.h"
#include "Joystick.h"
#include "DiskImage.h"
#include "Disk.h"
#include "Harddisk.h"
#include "ParallelPrinter.h"
#include "SaveState.h"
#include "Applewin.h"
#include "Video.h"
DWORD g_dwSpeed = SPEED_NORMAL; // Affected by Config dialog's speed slider bar
double g_fCurrentCLK6502 = CLK_6502_NTSC; // Affected by Config dialog's speed slider bar
eApple2Type g_Apple2Type = A2TYPE_APPLE2EENHANCED;
int g_nMemoryClearType = MIP_FF_FF_00_00; // Note: -1 = random MIP in Memory.cpp MemReset()
DWORD g_dwCyclesThisFrame = 0;
// this is workaround to force Video to update h&v clock
// which should be done by NTSC_VideoUpdateCycles
// but it is not at the moment
bool g_bFullSpeed = true;
AppMode_e g_nAppMode = MODE_LOGO;
HANDLE g_hCustomRomF8 = INVALID_HANDLE_VALUE; // Cmd-line specified custom ROM at $F800..$FFFF
std::string g_sProgramDir; // Directory of where AppleWin executable resides
std::string g_sCurrentDir; // Also Starting Dir. Debugger uses this when load/save
std::string g_pAppTitle = TITLE_APPLE_2E_ENHANCED;
bool g_bRestart = false;
CardManager g_CardMgr;
const short SPKR_DATA_INIT = (short)0x8000;
short g_nSpeakerData = SPKR_DATA_INIT;
bool g_bQuieterSpeaker = false;
SoundType_e soundtype = SOUND_WAVE;
HINSTANCE g_hInstance = NULL;
HWND g_hFrameWindow = NULL;
static IPropertySheet * sg = NULL;
IPropertySheet& sg_PropertySheet = *sg;
static double g_fMHz = 1.0; // Affected by Config dialog's speed slider bar
void SetCurrentCLK6502(void)
{
static DWORD dwPrevSpeed = (DWORD) -1;
if(dwPrevSpeed == g_dwSpeed)
return;
dwPrevSpeed = g_dwSpeed;
// SPEED_MIN = 0 = 0.50 MHz
// SPEED_NORMAL = 10 = 1.00 MHz
// 20 = 2.00 MHz
// SPEED_MAX-1 = 39 = 3.90 MHz
// SPEED_MAX = 40 = ???? MHz (run full-speed, /g_fCurrentCLK6502/ is ignored)
if(g_dwSpeed < SPEED_NORMAL)
g_fMHz = 0.5 + (double)g_dwSpeed * 0.05;
else
g_fMHz = (double)g_dwSpeed / 10.0;
g_fCurrentCLK6502 = CLK_6502_NTSC * g_fMHz;
}
void SetWindowTitle()
{
@ -99,239 +32,6 @@ void SetWindowTitle()
g_pAppTitle += g_apVideoModeDesc[ g_eVideoType ];
}
void LoadConfiguration(void)
{
DWORD dwComputerType;
eApple2Type apple2Type = A2TYPE_APPLE2EENHANCED;
if (REGLOAD(TEXT(REGVALUE_APPLE2_TYPE), &dwComputerType))
{
const DWORD dwLoadedComputerType = dwComputerType;
if ( (dwComputerType >= A2TYPE_MAX) ||
(dwComputerType >= A2TYPE_UNDEFINED && dwComputerType < A2TYPE_CLONE) ||
(dwComputerType >= A2TYPE_CLONE_A2_MAX && dwComputerType < A2TYPE_CLONE_A2E) )
dwComputerType = A2TYPE_APPLE2EENHANCED;
// Remap the bad Pravets models (before AppleWin v1.26)
if (dwComputerType == A2TYPE_BAD_PRAVETS82) dwComputerType = A2TYPE_PRAVETS82;
if (dwComputerType == A2TYPE_BAD_PRAVETS8M) dwComputerType = A2TYPE_PRAVETS8M;
// Remap the bad Pravets models (at AppleWin v1.26) - GH#415
if (dwComputerType == A2TYPE_CLONE) dwComputerType = A2TYPE_PRAVETS82;
if (dwLoadedComputerType != dwComputerType)
{
char sText[ 100 ];
_snprintf( sText, sizeof(sText)-1, "Unsupported Apple2Type(%d). Changing to %d", dwLoadedComputerType, dwComputerType);
MessageBox(
GetDesktopWindow(), // NB. g_hFrameWindow is not yet valid
sText,
"Load Configuration",
MB_ICONSTOP | MB_SETFOREGROUND);
LogFileOutput("%s\n", sText);
REGSAVE(TEXT(REGVALUE_APPLE2_TYPE), dwComputerType);
}
apple2Type = (eApple2Type) dwComputerType;
}
else // Support older AppleWin registry entries
{
if (REGLOAD(TEXT(REGVALUE_OLD_APPLE2_TYPE), &dwComputerType))
{
switch (dwComputerType)
{
// NB. No A2TYPE_APPLE2E (this is correct)
case 0: apple2Type = A2TYPE_APPLE2; break;
case 1: apple2Type = A2TYPE_APPLE2PLUS; break;
case 2: apple2Type = A2TYPE_APPLE2EENHANCED; break;
default: apple2Type = A2TYPE_APPLE2EENHANCED;
}
}
}
SetApple2Type(apple2Type);
//
DWORD dwCpuType;
eCpuType cpu = CPU_65C02;
if (REGLOAD(TEXT(REGVALUE_CPU_TYPE), &dwCpuType))
{
if (dwCpuType != CPU_6502 && dwCpuType != CPU_65C02)
dwCpuType = CPU_65C02;
cpu = (eCpuType) dwCpuType;
}
SetMainCpu(cpu);
//
#if 0
DWORD dwJoyType;
if (REGLOAD(TEXT(REGVALUE_JOYSTICK0_EMU_TYPE), &dwJoyType))
JoySetJoyType(JN_JOYSTICK0, dwJoyType);
else
LoadConfigOldJoystick(JN_JOYSTICK0);
if (REGLOAD(TEXT(REGVALUE_JOYSTICK1_EMU_TYPE), &dwJoyType))
JoySetJoyType(JN_JOYSTICK1, dwJoyType);
else
LoadConfigOldJoystick(JN_JOYSTICK1);
DWORD dwSoundType;
if (REGLOAD(TEXT("Sound Emulation"), &dwSoundType))
{
switch (dwSoundType)
{
case REG_SOUNDTYPE_NONE:
case REG_SOUNDTYPE_DIRECT: // Not supported from 1.26
case REG_SOUNDTYPE_SMART: // Not supported from 1.26
default:
soundtype = SOUND_NONE;
break;
case REG_SOUNDTYPE_WAVE:
soundtype = SOUND_WAVE;
break;
}
}
char aySerialPortName[ CSuperSerialCard::SIZEOF_SERIALCHOICE_ITEM ];
if (RegLoadString( TEXT("Configuration"),
TEXT(REGVALUE_SERIAL_PORT_NAME),
TRUE,
aySerialPortName,
sizeof(aySerialPortName) ) )
{
sg_SSC.SetSerialPortName(aySerialPortName);
}
#endif
REGLOAD(TEXT(REGVALUE_EMULATION_SPEED) ,&g_dwSpeed);
DWORD dwEnhanceDisk;
REGLOAD_DEFAULT(TEXT(REGVALUE_ENHANCE_DISK_SPEED), &dwEnhanceDisk, 1);
g_CardMgr.GetDisk2CardMgr().SetEnhanceDisk(dwEnhanceDisk ? true : false);
Config_Load_Video();
#if 0
REGLOAD(TEXT("Uthernet Active"), &tfe_enabled);
#endif
SetCurrentCLK6502();
//
DWORD dwTmp;
#if 0
if(REGLOAD(TEXT(REGVALUE_THE_FREEZES_F8_ROM), &dwTmp))
sg_PropertySheet.SetTheFreezesF8Rom(dwTmp);
if(REGLOAD(TEXT(REGVALUE_SPKR_VOLUME), &dwTmp))
SpkrSetVolume(dwTmp, sg_PropertySheet.GetVolumeMax());
if(REGLOAD(TEXT(REGVALUE_MB_VOLUME), &dwTmp))
MB_SetVolume(dwTmp, sg_PropertySheet.GetVolumeMax());
if(REGLOAD(TEXT(REGVALUE_SAVE_STATE_ON_EXIT), &dwTmp))
g_bSaveStateOnExit = dwTmp ? true : false;
if(REGLOAD(TEXT(REGVALUE_DUMP_TO_PRINTER), &dwTmp))
g_bDumpToPrinter = dwTmp ? true : false;
if(REGLOAD(TEXT(REGVALUE_CONVERT_ENCODING), &dwTmp))
g_bConvertEncoding = dwTmp ? true : false;
if(REGLOAD(TEXT(REGVALUE_FILTER_UNPRINTABLE), &dwTmp))
g_bFilterUnprintable = dwTmp ? true : false;
if(REGLOAD(TEXT(REGVALUE_PRINTER_APPEND), &dwTmp))
g_bPrinterAppend = dwTmp ? true : false;
#endif
if(REGLOAD(TEXT(REGVALUE_HDD_ENABLED), &dwTmp))
HD_SetEnabled(dwTmp ? true : false);
#if 0
if(REGLOAD(TEXT(REGVALUE_PDL_XTRIM), &dwTmp))
JoySetTrim((short)dwTmp, true);
if(REGLOAD(TEXT(REGVALUE_PDL_YTRIM), &dwTmp))
JoySetTrim((short)dwTmp, false);
if(REGLOAD(TEXT(REGVALUE_SCROLLLOCK_TOGGLE), &dwTmp))
sg_PropertySheet.SetScrollLockToggle(dwTmp);
if(REGLOAD(TEXT(REGVALUE_CURSOR_CONTROL), &dwTmp))
sg_PropertySheet.SetJoystickCursorControl(dwTmp);
if(REGLOAD(TEXT(REGVALUE_AUTOFIRE), &dwTmp))
sg_PropertySheet.SetAutofire(dwTmp);
if(REGLOAD(TEXT(REGVALUE_CENTERING_CONTROL), &dwTmp))
sg_PropertySheet.SetJoystickCenteringControl(dwTmp);
if(REGLOAD(TEXT(REGVALUE_MOUSE_CROSSHAIR), &dwTmp))
sg_PropertySheet.SetMouseShowCrosshair(dwTmp);
if(REGLOAD(TEXT(REGVALUE_MOUSE_RESTRICT_TO_WINDOW), &dwTmp))
sg_PropertySheet.SetMouseRestrictToWindow(dwTmp);
#endif
if(REGLOAD(TEXT(REGVALUE_SLOT4), &dwTmp))
g_CardMgr.Insert(4, (SS_CARDTYPE)dwTmp);
if(REGLOAD(TEXT(REGVALUE_SLOT5), &dwTmp))
g_CardMgr.Insert(5, (SS_CARDTYPE)dwTmp);
//
char szFilename[MAX_PATH] = {0};
RegLoadString(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_HDV_START_DIR), 1, szFilename, MAX_PATH);
if (szFilename[0] == 0)
GetCurrentDirectory(sizeof(szFilename), szFilename);
SetCurrentImageDir(szFilename);
HD_LoadLastDiskImage(HARDDISK_1);
HD_LoadLastDiskImage(HARDDISK_2);
//
// Current/Starting Dir is the "root" of where the user keeps his disk images
RegLoadString(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_START_DIR), 1, szFilename, MAX_PATH);
if (szFilename[0] == 0)
GetCurrentDirectory(sizeof(szFilename), szFilename);
SetCurrentImageDir(szFilename);
g_CardMgr.GetDisk2CardMgr().LoadLastDiskImage();
//
szFilename[0] = 0;
RegLoadString(TEXT(REG_CONFIG),TEXT(REGVALUE_SAVESTATE_FILENAME),1,szFilename,sizeof(szFilename));
Snapshot_SetFilename(szFilename); // If not in Registry than default will be used (ie. g_sCurrentDir + default filename)
szFilename[0] = 0;
RegLoadString(TEXT(REG_CONFIG),TEXT(REGVALUE_PRINTER_FILENAME),1,szFilename,sizeof(szFilename));
Printer_SetFilename(szFilename); // If not in Registry than default will be used
dwTmp = 10;
REGLOAD(TEXT(REGVALUE_PRINTER_IDLE_LIMIT), &dwTmp);
Printer_SetIdleLimit(dwTmp);
#if 0
char szUthernetInt[MAX_PATH] = {0};
RegLoadString(TEXT(REG_CONFIG),TEXT("Uthernet Interface"),1,szUthernetInt,MAX_PATH);
update_tfe_interface(szUthernetInt,NULL);
if (REGLOAD(TEXT(REGVALUE_WINDOW_SCALE), &dwTmp))
SetViewportScale(dwTmp);
if (REGLOAD(TEXT(REGVALUE_CONFIRM_REBOOT), &dwTmp))
g_bConfirmReboot = dwTmp;
#endif
}
void CheckCpu()
{
const eApple2Type apple2Type = GetApple2Type();
@ -342,3 +42,7 @@ void CheckCpu()
LogFileOutput("Detected non standard CPU for Apple2 = %d: default = %d, actual = %d\n", apple2Type, defaultCpu, mainCpu);
}
}
void alarm_log_too_many_alarms()
{
}

3
source/linux/data.h
View file

@ -7,6 +7,3 @@ void SetWindowTitle();
void getScreenData(uint8_t * & data, int & width, int & height, int & sx, int & sy, int & sw, int & sh);
extern int g_nAltCharSetOffset; // alternate character set
void LogFileTimeUntilFirstKeyReadReset(void);
void LogFileTimeUntilFirstKeyRead(void);

72
source/linux/dummies.cpp
View file

@ -1,72 +0,0 @@
#include "StdAfx.h"
#include <iostream>
#include "Common.h"
#include "Configuration/IPropertySheet.h"
#include "CPU.h"
#include <unistd.h>
eApple2Type GetApple2Type(void)
{
return g_Apple2Type;
}
void SetApple2Type(eApple2Type type)
{
g_Apple2Type = type;
SetMainCpuDefault(type);
}
void DeleteCriticalSection(CRITICAL_SECTION * criticalSection)
{
}
void InitializeCriticalSection(CRITICAL_SECTION * criticalSection)
{
}
void EnterCriticalSection(CRITICAL_SECTION * criticalSection)
{
}
void LeaveCriticalSection(CRITICAL_SECTION * criticalSection)
{
}
bool SetCurrentImageDir(const std::string & dir ) {
if (chdir(dir.c_str()) == 0)
return true;
else
return false;
}
void OutputDebugString(const char * str)
{
std::cerr << str << std::endl;
}
UINT IPropertySheet::GetTheFreezesF8Rom(void)
{
return 0;
}
void IPropertySheet::ConfigSaveApple2Type(eApple2Type apple2Type)
{
}
HWND GetDesktopWindow()
{
return NULL;
}
void ExitProcess(int status)
{
exit(status);
}
void alarm_log_too_many_alarms()
{
}

16
source/linux/dummies.h
View file

@ -1,16 +0,0 @@
#pragma once
#include <stdarg.h>
#define HD_LED 1
void DeleteCriticalSection(CRITICAL_SECTION * criticalSection);
void InitializeCriticalSection(CRITICAL_SECTION * criticalSection);
void EnterCriticalSection(CRITICAL_SECTION * criticalSection);
void LeaveCriticalSection(CRITICAL_SECTION * criticalSection);
void OutputDebugString(const char * str);
extern int g_nAltCharSetOffset; // alternate character set
HWND GetDesktopWindow();
void ExitProcess(int);

332
source/linux/duplicates/Applewin.cpp
View file

@ -1,8 +1,26 @@
#include "StdAfx.h"
#include "Memory.h"
#include "Log.h"
#include "Common.h"
#include "Memory.h"
#include "SerialComms.h"
#include "CardManager.h"
#include "MouseInterface.h"
#include "Speaker.h"
#include "Video.h"
#include "Configuration/IPropertySheet.h"
#include "SaveState_Structs_v1.h"
#include "Registry.h"
#include "Log.h"
#include "Applewin.h"
#include "CPU.h"
#include "Joystick.h"
#include "DiskImage.h"
#include "Disk.h"
#include "Harddisk.h"
#include "ParallelPrinter.h"
#include "SaveState.h"
#include <unistd.h>
static const UINT VERSIONSTRING_SIZE = 16;
TCHAR VERSIONSTRING[VERSIONSTRING_SIZE] = "xx.yy.zz.ww";
@ -12,6 +30,37 @@ HANDLE g_hCustomRom = INVALID_HANDLE_VALUE; // Cmd-line specified custom ROM at
static bool bLogKeyReadDone = false;
static DWORD dwLogKeyReadTickStart;
DWORD g_dwSpeed = SPEED_NORMAL; // Affected by Config dialog's speed slider bar
double g_fCurrentCLK6502 = CLK_6502_NTSC; // Affected by Config dialog's speed slider bar
eApple2Type g_Apple2Type = A2TYPE_APPLE2EENHANCED;
int g_nMemoryClearType = MIP_FF_FF_00_00; // Note: -1 = random MIP in Memory.cpp MemReset()
DWORD g_dwCyclesThisFrame = 0;
// this is workaround to force Video to update h&v clock
// which should be done by NTSC_VideoUpdateCycles
// but it is not at the moment
bool g_bFullSpeed = true;
AppMode_e g_nAppMode = MODE_LOGO;
HANDLE g_hCustomRomF8 = INVALID_HANDLE_VALUE; // Cmd-line specified custom ROM at $F800..$FFFF
std::string g_sProgramDir; // Directory of where AppleWin executable resides
std::string g_sCurrentDir; // Also Starting Dir. Debugger uses this when load/save
std::string g_pAppTitle = TITLE_APPLE_2E_ENHANCED;
bool g_bRestart = false;
CardManager g_CardMgr;
const short SPKR_DATA_INIT = (short)0x8000;
short g_nSpeakerData = SPKR_DATA_INIT;
bool g_bQuieterSpeaker = false;
SoundType_e soundtype = SOUND_WAVE;
HINSTANCE g_hInstance = NULL;
HWND g_hFrameWindow = NULL;
static IPropertySheet * sg = NULL;
IPropertySheet& sg_PropertySheet = *sg;
static double g_fMHz = 1.0; // Affected by Config dialog's speed slider bar
void LogFileTimeUntilFirstKeyReadReset(void)
{
if (!g_fh)
@ -43,3 +92,282 @@ void LogFileTimeUntilFirstKeyRead(void)
bLogKeyReadDone = true;
}
void SetLoadedSaveStateFlag(bool)
{
}
eApple2Type GetApple2Type(void)
{
return g_Apple2Type;
}
void SetApple2Type(eApple2Type type)
{
g_Apple2Type = type;
SetMainCpuDefault(type);
}
bool SetCurrentImageDir(const std::string & dir ) {
if (chdir(dir.c_str()) == 0)
return true;
else
return false;
}
void SetCurrentCLK6502(void)
{
static DWORD dwPrevSpeed = (DWORD) -1;
if(dwPrevSpeed == g_dwSpeed)
return;
dwPrevSpeed = g_dwSpeed;
// SPEED_MIN = 0 = 0.50 MHz
// SPEED_NORMAL = 10 = 1.00 MHz
// 20 = 2.00 MHz
// SPEED_MAX-1 = 39 = 3.90 MHz
// SPEED_MAX = 40 = ???? MHz (run full-speed, /g_fCurrentCLK6502/ is ignored)
if(g_dwSpeed < SPEED_NORMAL)
g_fMHz = 0.5 + (double)g_dwSpeed * 0.05;
else
g_fMHz = (double)g_dwSpeed / 10.0;
g_fCurrentCLK6502 = CLK_6502_NTSC * g_fMHz;
}
void LoadConfiguration(void)
{
DWORD dwComputerType;
eApple2Type apple2Type = A2TYPE_APPLE2EENHANCED;
if (REGLOAD(TEXT(REGVALUE_APPLE2_TYPE), &dwComputerType))
{
const DWORD dwLoadedComputerType = dwComputerType;
if ( (dwComputerType >= A2TYPE_MAX) ||
(dwComputerType >= A2TYPE_UNDEFINED && dwComputerType < A2TYPE_CLONE) ||
(dwComputerType >= A2TYPE_CLONE_A2_MAX && dwComputerType < A2TYPE_CLONE_A2E) )
dwComputerType = A2TYPE_APPLE2EENHANCED;
// Remap the bad Pravets models (before AppleWin v1.26)
if (dwComputerType == A2TYPE_BAD_PRAVETS82) dwComputerType = A2TYPE_PRAVETS82;
if (dwComputerType == A2TYPE_BAD_PRAVETS8M) dwComputerType = A2TYPE_PRAVETS8M;
// Remap the bad Pravets models (at AppleWin v1.26) - GH#415
if (dwComputerType == A2TYPE_CLONE) dwComputerType = A2TYPE_PRAVETS82;
if (dwLoadedComputerType != dwComputerType)
{
char sText[ 100 ];
_snprintf( sText, sizeof(sText)-1, "Unsupported Apple2Type(%d). Changing to %d", dwLoadedComputerType, dwComputerType);
MessageBox(
GetDesktopWindow(), // NB. g_hFrameWindow is not yet valid
sText,
"Load Configuration",
MB_ICONSTOP | MB_SETFOREGROUND);
LogFileOutput("%s\n", sText);
REGSAVE(TEXT(REGVALUE_APPLE2_TYPE), dwComputerType);
}
apple2Type = (eApple2Type) dwComputerType;
}
else // Support older AppleWin registry entries
{
if (REGLOAD(TEXT(REGVALUE_OLD_APPLE2_TYPE), &dwComputerType))
{
switch (dwComputerType)
{
// NB. No A2TYPE_APPLE2E (this is correct)
case 0: apple2Type = A2TYPE_APPLE2; break;
case 1: apple2Type = A2TYPE_APPLE2PLUS; break;
case 2: apple2Type = A2TYPE_APPLE2EENHANCED; break;
default: apple2Type = A2TYPE_APPLE2EENHANCED;
}
}
}
SetApple2Type(apple2Type);
//
DWORD dwCpuType;
eCpuType cpu = CPU_65C02;
if (REGLOAD(TEXT(REGVALUE_CPU_TYPE), &dwCpuType))
{
if (dwCpuType != CPU_6502 && dwCpuType != CPU_65C02)
dwCpuType = CPU_65C02;
cpu = (eCpuType) dwCpuType;
}
SetMainCpu(cpu);
//
#if 0
DWORD dwJoyType;
if (REGLOAD(TEXT(REGVALUE_JOYSTICK0_EMU_TYPE), &dwJoyType))
JoySetJoyType(JN_JOYSTICK0, dwJoyType);
else
LoadConfigOldJoystick(JN_JOYSTICK0);
if (REGLOAD(TEXT(REGVALUE_JOYSTICK1_EMU_TYPE), &dwJoyType))
JoySetJoyType(JN_JOYSTICK1, dwJoyType);
else
LoadConfigOldJoystick(JN_JOYSTICK1);
DWORD dwSoundType;
if (REGLOAD(TEXT("Sound Emulation"), &dwSoundType))
{
switch (dwSoundType)
{
case REG_SOUNDTYPE_NONE:
case REG_SOUNDTYPE_DIRECT: // Not supported from 1.26
case REG_SOUNDTYPE_SMART: // Not supported from 1.26
default:
soundtype = SOUND_NONE;
break;
case REG_SOUNDTYPE_WAVE:
soundtype = SOUND_WAVE;
break;
}
}
char aySerialPortName[ CSuperSerialCard::SIZEOF_SERIALCHOICE_ITEM ];
if (RegLoadString( TEXT("Configuration"),
TEXT(REGVALUE_SERIAL_PORT_NAME),
TRUE,
aySerialPortName,
sizeof(aySerialPortName) ) )
{
sg_SSC.SetSerialPortName(aySerialPortName);
}
#endif
REGLOAD(TEXT(REGVALUE_EMULATION_SPEED) ,&g_dwSpeed);
DWORD dwEnhanceDisk;
REGLOAD_DEFAULT(TEXT(REGVALUE_ENHANCE_DISK_SPEED), &dwEnhanceDisk, 1);
g_CardMgr.GetDisk2CardMgr().SetEnhanceDisk(dwEnhanceDisk ? true : false);
Config_Load_Video();
#if 0
REGLOAD(TEXT("Uthernet Active"), &tfe_enabled);
#endif
SetCurrentCLK6502();
//
DWORD dwTmp;
#if 0
if(REGLOAD(TEXT(REGVALUE_THE_FREEZES_F8_ROM), &dwTmp))
sg_PropertySheet.SetTheFreezesF8Rom(dwTmp);
if(REGLOAD(TEXT(REGVALUE_SPKR_VOLUME), &dwTmp))
SpkrSetVolume(dwTmp, sg_PropertySheet.GetVolumeMax());
if(REGLOAD(TEXT(REGVALUE_MB_VOLUME), &dwTmp))
MB_SetVolume(dwTmp, sg_PropertySheet.GetVolumeMax());
if(REGLOAD(TEXT(REGVALUE_SAVE_STATE_ON_EXIT), &dwTmp))
g_bSaveStateOnExit = dwTmp ? true : false;
if(REGLOAD(TEXT(REGVALUE_DUMP_TO_PRINTER), &dwTmp))
g_bDumpToPrinter = dwTmp ? true : false;
if(REGLOAD(TEXT(REGVALUE_CONVERT_ENCODING), &dwTmp))
g_bConvertEncoding = dwTmp ? true : false;
if(REGLOAD(TEXT(REGVALUE_FILTER_UNPRINTABLE), &dwTmp))
g_bFilterUnprintable = dwTmp ? true : false;
if(REGLOAD(TEXT(REGVALUE_PRINTER_APPEND), &dwTmp))
g_bPrinterAppend = dwTmp ? true : false;
#endif
if(REGLOAD(TEXT(REGVALUE_HDD_ENABLED), &dwTmp))
HD_SetEnabled(dwTmp ? true : false);
#if 0
if(REGLOAD(TEXT(REGVALUE_PDL_XTRIM), &dwTmp))
JoySetTrim((short)dwTmp, true);
if(REGLOAD(TEXT(REGVALUE_PDL_YTRIM), &dwTmp))
JoySetTrim((short)dwTmp, false);
if(REGLOAD(TEXT(REGVALUE_SCROLLLOCK_TOGGLE), &dwTmp))
sg_PropertySheet.SetScrollLockToggle(dwTmp);
if(REGLOAD(TEXT(REGVALUE_CURSOR_CONTROL), &dwTmp))
sg_PropertySheet.SetJoystickCursorControl(dwTmp);
if(REGLOAD(TEXT(REGVALUE_AUTOFIRE), &dwTmp))
sg_PropertySheet.SetAutofire(dwTmp);
if(REGLOAD(TEXT(REGVALUE_CENTERING_CONTROL), &dwTmp))
sg_PropertySheet.SetJoystickCenteringControl(dwTmp);
if(REGLOAD(TEXT(REGVALUE_MOUSE_CROSSHAIR), &dwTmp))
sg_PropertySheet.SetMouseShowCrosshair(dwTmp);
if(REGLOAD(TEXT(REGVALUE_MOUSE_RESTRICT_TO_WINDOW), &dwTmp))
sg_PropertySheet.SetMouseRestrictToWindow(dwTmp);
#endif
if(REGLOAD(TEXT(REGVALUE_SLOT4), &dwTmp))
g_CardMgr.Insert(4, (SS_CARDTYPE)dwTmp);
if(REGLOAD(TEXT(REGVALUE_SLOT5), &dwTmp))
g_CardMgr.Insert(5, (SS_CARDTYPE)dwTmp);
//
char szFilename[MAX_PATH] = {0};
RegLoadString(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_HDV_START_DIR), 1, szFilename, MAX_PATH);
if (szFilename[0] == 0)
GetCurrentDirectory(sizeof(szFilename), szFilename);
SetCurrentImageDir(szFilename);
HD_LoadLastDiskImage(HARDDISK_1);
HD_LoadLastDiskImage(HARDDISK_2);
//
// Current/Starting Dir is the "root" of where the user keeps his disk images
RegLoadString(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_START_DIR), 1, szFilename, MAX_PATH);
if (szFilename[0] == 0)
GetCurrentDirectory(sizeof(szFilename), szFilename);
SetCurrentImageDir(szFilename);
g_CardMgr.GetDisk2CardMgr().LoadLastDiskImage();
//
szFilename[0] = 0;
RegLoadString(TEXT(REG_CONFIG),TEXT(REGVALUE_SAVESTATE_FILENAME),1,szFilename,sizeof(szFilename));
Snapshot_SetFilename(szFilename); // If not in Registry than default will be used (ie. g_sCurrentDir + default filename)
szFilename[0] = 0;
RegLoadString(TEXT(REG_CONFIG),TEXT(REGVALUE_PRINTER_FILENAME),1,szFilename,sizeof(szFilename));
Printer_SetFilename(szFilename); // If not in Registry than default will be used
dwTmp = 10;
REGLOAD(TEXT(REGVALUE_PRINTER_IDLE_LIMIT), &dwTmp);
Printer_SetIdleLimit(dwTmp);
#if 0
char szUthernetInt[MAX_PATH] = {0};
RegLoadString(TEXT(REG_CONFIG),TEXT("Uthernet Interface"),1,szUthernetInt,MAX_PATH);
update_tfe_interface(szUthernetInt,NULL);
if (REGLOAD(TEXT(REGVALUE_WINDOW_SCALE), &dwTmp))
SetViewportScale(dwTmp);
if (REGLOAD(TEXT(REGVALUE_CONFIRM_REBOOT), &dwTmp))
g_bConfirmReboot = dwTmp;
#endif
}

4
source/linux/duplicates/Frame.cpp
View file

@ -40,3 +40,7 @@ UINT GetFrameBufferHeight(void)
{
return GetFrameBufferBorderlessHeight() + 2*GetFrameBufferBorderHeight();
}
void FrameUpdateApple2Type()
{
}

17
source/linux/duplicates/IPropertySheet.cpp Normal file
View file

@ -0,0 +1,17 @@
#include "StdAfx.h"
#include "Common.h"
#include "Configuration/IPropertySheet.h"
void IPropertySheet::ApplyNewConfig(CConfigNeedingRestart const&, CConfigNeedingRestart const&)
{
}
UINT IPropertySheet::GetTheFreezesF8Rom(void)
{
return 0;
}
void IPropertySheet::ConfigSaveApple2Type(eApple2Type apple2Type)
{
}

9
source/linux/duplicates/Joystick.cpp
View file

@ -1,7 +1,16 @@
#include "StdAfx.h"
#include "YamlHelper.h"
#include "Common.h"
void JoyportControl(const UINT uControl)
{
}
void JoySaveSnapshot(YamlSaveHelper&)
{
}
void JoyLoadSnapshot(YamlLoadHelper&)
{
}

1
source/linux/duplicates/Mockingboard.cpp
View file

@ -1,5 +1,6 @@
#include "StdAfx.h"
#include "YamlHelper.h"
#include "Common.h"
void MB_InitializeIO(LPBYTE pCxRomPeripheral, UINT uSlot4, UINT uSlot5)

14
source/linux/duplicates/SerialComms.cpp
View file

@ -20,3 +20,17 @@ void CSuperSerialCard::CommReset()
void CSuperSerialCard::CommInitialize(LPBYTE pCxRomPeripheral, UINT uSlot)
{
}
bool CSuperSerialCard::LoadSnapshot(YamlLoadHelper&, unsigned int, unsigned int)
{
return true;
}
void CSuperSerialCard::SaveSnapshot(YamlSaveHelper&)
{
}
std::string CSuperSerialCard::GetSnapshotCardName()
{
return "Super Serial Card";
}

4
source/linux/keyboard.cpp
View file

@ -80,3 +80,7 @@ void KeybLoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT version)
yamlLoadHelper.PopMap();
}
void KeybReset()
{
}

23
source/linux/state.cpp
View file

@ -1,23 +0,0 @@
#include "StdAfx.h"
#include "Applewin.h"
#include "SerialComms.h"
#include "Configuration/IPropertySheet.h"
#include "YamlHelper.h"
void SpkrLoadSnapshot(YamlLoadHelper&) { }
void KeybReset() { }
void JoySaveSnapshot(YamlSaveHelper&) { }
void JoyLoadSnapshot(YamlLoadHelper&) { }
void SetLoadedSaveStateFlag(bool) { }
void SpkrSaveSnapshot(YamlSaveHelper&) { }
bool CSuperSerialCard::LoadSnapshot(YamlLoadHelper&, unsigned int, unsigned int) { return true; }
void IPropertySheet::ApplyNewConfig(CConfigNeedingRestart const&, CConfigNeedingRestart const&) { }
void FrameUpdateApple2Type() { }
void CSuperSerialCard::SaveSnapshot(YamlSaveHelper&) { }
std::string CSuperSerialCard::GetSnapshotCardName()
{
return "Super Serial Card";
}

27
source/linux/windows/winbase.cpp
View file

@ -1,8 +1,35 @@
#include "linux/windows/winbase.h"
#include <errno.h>
#include <iostream>
DWORD WINAPI GetLastError(void)
{
return errno;
}
void DeleteCriticalSection(CRITICAL_SECTION * criticalSection)
{
}
void InitializeCriticalSection(CRITICAL_SECTION * criticalSection)
{
}
void EnterCriticalSection(CRITICAL_SECTION * criticalSection)
{
}
void LeaveCriticalSection(CRITICAL_SECTION * criticalSection)
{
}
void OutputDebugString(const char * str)
{
std::cerr << str << std::endl;
}
void ExitProcess(int status)
{
exit(status);
}

6
source/linux/windows/winbase.h
View file

@ -1,5 +1,11 @@
#pragma once
#include "linux/windows/wincompat.h"
#include "linux/windows/handles.h"
DWORD WINAPI GetLastError(void);
void DeleteCriticalSection(CRITICAL_SECTION * criticalSection);
void InitializeCriticalSection(CRITICAL_SECTION * criticalSection);
void EnterCriticalSection(CRITICAL_SECTION * criticalSection);
void LeaveCriticalSection(CRITICAL_SECTION * criticalSection);
void OutputDebugString(const char * str);

5
source/linux/windows/winuser.cpp
View file

@ -9,3 +9,8 @@ HCURSOR SetCursor(HCURSOR hCursor)
{
return nullptr;
}
HWND GetDesktopWindow()
{
return NULL;
}