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

Moved DIMouse::DirectInputInit() from WM_CREATE to main init-loop (just before msg-pump)

Browse source 
. Only call DIMouse::DirectInputInit() if there's a mousecard in slot-4
Extended logging: output cmd line & any unsupported args
Fixes for SCREENSHOT_280x192:
. B#18928: correction for left edge loss of scaled scanline (Bill Buckel)
. Start on odd scanline (otherwise for 50% scanline mode get an all black image!)
This commit is contained in:
tomch 2013-03-28 22:28:42 +00:00
parent a99df90c25
commit 6728c75357
4 changed files with 173 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

310
AppleWin/source/Applewin.cpp
View file

@ -116,7 +116,7 @@ ULONGLONG g_nPerfFreq = 0;
static bool g_bPriorityNormal = true; static bool g_bPriorityNormal = true;
// Make APPLEWIN process higher priority // Make APPLEWIN process higher priority
void SetPriorityAboveNormal() void SetPriorityAboveNormal(void)
{ {
if (!g_bPriorityNormal) if (!g_bPriorityNormal)
return; return;
@ -129,7 +129,7 @@ void SetPriorityAboveNormal()
} }
// Make APPLEWIN process normal priority // Make APPLEWIN process normal priority
void SetPriorityNormal() void SetPriorityNormal(void)
{ {
if (g_bPriorityNormal) if (g_bPriorityNormal)
return; return;
@ -143,7 +143,7 @@ void SetPriorityNormal()
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void ContinueExecution() void ContinueExecution(void)
{ {
static BOOL pageflipping = 0; //? static BOOL pageflipping = 0; //?
@ -167,7 +167,7 @@ void ContinueExecution()
bScrollLock_FullSpeed || bScrollLock_FullSpeed ||
(DiskIsSpinning() && enhancedisk && !Spkr_IsActive() && !MB_IsActive()) ); (DiskIsSpinning() && enhancedisk && !Spkr_IsActive() && !MB_IsActive()) );
if(g_bFullSpeed) if (g_bFullSpeed)
{ {
// Don't call Spkr_Mute() - will get speaker clicks // Don't call Spkr_Mute() - will get speaker clicks
MB_Mute(); MB_Mute();
@ -195,7 +195,7 @@ void ContinueExecution()
// //
int nCyclesToExecute = (int) fExecutionPeriodClks + g_nCpuCyclesFeedback; int nCyclesToExecute = (int) fExecutionPeriodClks + g_nCpuCyclesFeedback;
if(nCyclesToExecute < 0) if (nCyclesToExecute < 0)
nCyclesToExecute = 0; nCyclesToExecute = 0;
DWORD dwExecutedCycles = CpuExecute(nCyclesToExecute); DWORD dwExecutedCycles = CpuExecute(nCyclesToExecute);
@ -217,7 +217,7 @@ void ContinueExecution()
const DWORD CLKS_PER_MS = (DWORD)g_fCurrentCLK6502 / 1000; const DWORD CLKS_PER_MS = (DWORD)g_fCurrentCLK6502 / 1000;
emulmsec_frac += dwExecutedCycles; emulmsec_frac += dwExecutedCycles;
if(emulmsec_frac > CLKS_PER_MS) if (emulmsec_frac > CLKS_PER_MS)
{ {
emulmsec += emulmsec_frac / CLKS_PER_MS; emulmsec += emulmsec_frac / CLKS_PER_MS;
emulmsec_frac %= CLKS_PER_MS; emulmsec_frac %= CLKS_PER_MS;
@ -230,16 +230,16 @@ void ContinueExecution()
BOOL screenupdated = VideoHasRefreshed(); BOOL screenupdated = VideoHasRefreshed();
BOOL systemidle = 0; //(KeybGetNumQueries() > (clockgran << 2)); // && (!ranfinegrain); // TO DO BOOL systemidle = 0; //(KeybGetNumQueries() > (clockgran << 2)); // && (!ranfinegrain); // TO DO
if(screenupdated) if (screenupdated)
pageflipping = 3; pageflipping = 3;
// //
if(g_dwCyclesThisFrame >= dwClksPerFrame) if (g_dwCyclesThisFrame >= dwClksPerFrame)
{ {
g_dwCyclesThisFrame -= dwClksPerFrame; g_dwCyclesThisFrame -= dwClksPerFrame;
if(g_nAppMode != MODE_LOGO) if (g_nAppMode != MODE_LOGO)
{ {
VideoUpdateFlash(); VideoUpdateFlash();
@ -279,12 +279,12 @@ void ContinueExecution()
// //
if(!g_bFullSpeed) if (!g_bFullSpeed)
{ {
SysClk_WaitTimer(); SysClk_WaitTimer();
#if DBG_CALC_FREQ #if DBG_CALC_FREQ
if(g_nPerfFreq) if (g_nPerfFreq)
{ {
QueryPerformanceCounter((LARGE_INTEGER*)&nTime1); QueryPerformanceCounter((LARGE_INTEGER*)&nTime1);
LONGLONG nTimeDiff = nTime1 - nTime0; LONGLONG nTimeDiff = nTime1 - nTime0;
@ -304,7 +304,7 @@ void ContinueExecution()
//=========================================================================== //===========================================================================
void SetCurrentCLK6502() void SetCurrentCLK6502(void)
{ {
static DWORD dwPrevSpeed = (DWORD) -1; static DWORD dwPrevSpeed = (DWORD) -1;
@ -335,7 +335,7 @@ void SetCurrentCLK6502()
} }
//=========================================================================== //===========================================================================
void EnterMessageLoop () void EnterMessageLoop(void)
{ {
MSG message; MSG message;
@ -384,21 +384,25 @@ void EnterMessageLoop ()
} }
//=========================================================================== //===========================================================================
void GetProgramDirectory () { void GetProgramDirectory(void)
GetModuleFileName((HINSTANCE)0,g_sProgramDir,MAX_PATH); {
g_sProgramDir[MAX_PATH-1] = 0; GetModuleFileName((HINSTANCE)0, g_sProgramDir, MAX_PATH);
int loop = _tcslen(g_sProgramDir); g_sProgramDir[MAX_PATH-1] = 0;
while (loop--)
if ((g_sProgramDir[loop] == TEXT('\\')) || int loop = _tcslen(g_sProgramDir);
(g_sProgramDir[loop] == TEXT(':'))) { while (loop--)
g_sProgramDir[loop+1] = 0; {
break; if ((g_sProgramDir[loop] == TEXT('\\')) || (g_sProgramDir[loop] == TEXT(':')))
} {
g_sProgramDir[loop+1] = 0;
break;
}
}
} }
//=========================================================================== //===========================================================================
//Reads configuration from the registry entries //Reads configuration from the registry entries
void LoadConfiguration() void LoadConfiguration(void)
{ {
DWORD dwComputerType; DWORD dwComputerType;
@ -434,80 +438,80 @@ void LoadConfiguration()
} }
REGLOAD(TEXT("Joystick 0 Emulation"),&joytype[0]); REGLOAD(TEXT("Joystick 0 Emulation"),&joytype[0]);
REGLOAD(TEXT("Joystick 1 Emulation"),&joytype[1]); REGLOAD(TEXT("Joystick 1 Emulation"),&joytype[1]);
REGLOAD(TEXT("Sound Emulation") ,&soundtype); REGLOAD(TEXT("Sound Emulation") ,&soundtype);
char aySerialPortName[ CSuperSerialCard::SIZEOF_SERIALCHOICE_ITEM ]; char aySerialPortName[ CSuperSerialCard::SIZEOF_SERIALCHOICE_ITEM ];
if (RegLoadString( TEXT("Configuration"), if (RegLoadString( TEXT("Configuration"),
TEXT(REGVALUE_SERIAL_PORT_NAME), TEXT(REGVALUE_SERIAL_PORT_NAME),
TRUE, TRUE,
aySerialPortName, aySerialPortName,
sizeof(aySerialPortName) ) ) sizeof(aySerialPortName) ) )
{ {
sg_SSC.SetSerialPortName(aySerialPortName); sg_SSC.SetSerialPortName(aySerialPortName);
} }
REGLOAD(TEXT(REGVALUE_EMULATION_SPEED) ,&g_dwSpeed); REGLOAD(TEXT(REGVALUE_EMULATION_SPEED) ,&g_dwSpeed);
REGLOAD(TEXT(REGVALUE_ENHANCE_DISK_SPEED),(DWORD *)&enhancedisk); REGLOAD(TEXT(REGVALUE_ENHANCE_DISK_SPEED),(DWORD *)&enhancedisk);
Config_Load_Video(); Config_Load_Video();
REGLOAD(TEXT("Uthernet Active") ,(DWORD *)&tfe_enabled); REGLOAD(TEXT("Uthernet Active") ,(DWORD *)&tfe_enabled);
SetCurrentCLK6502(); SetCurrentCLK6502();
// //
DWORD dwTmp; DWORD dwTmp;
if(REGLOAD(TEXT(REGVALUE_THE_FREEZES_F8_ROM), &dwTmp)) if(REGLOAD(TEXT(REGVALUE_THE_FREEZES_F8_ROM), &dwTmp))
sg_PropertySheet.SetTheFreezesF8Rom(dwTmp); sg_PropertySheet.SetTheFreezesF8Rom(dwTmp);
if(REGLOAD(TEXT(REGVALUE_SPKR_VOLUME), &dwTmp)) if(REGLOAD(TEXT(REGVALUE_SPKR_VOLUME), &dwTmp))
SpkrSetVolume(dwTmp, sg_PropertySheet.GetVolumeMax()); SpkrSetVolume(dwTmp, sg_PropertySheet.GetVolumeMax());
if(REGLOAD(TEXT(REGVALUE_MB_VOLUME), &dwTmp)) if(REGLOAD(TEXT(REGVALUE_MB_VOLUME), &dwTmp))
MB_SetVolume(dwTmp, sg_PropertySheet.GetVolumeMax()); MB_SetVolume(dwTmp, sg_PropertySheet.GetVolumeMax());
if(REGLOAD(TEXT(REGVALUE_SAVE_STATE_ON_EXIT), &dwTmp)) if(REGLOAD(TEXT(REGVALUE_SAVE_STATE_ON_EXIT), &dwTmp))
g_bSaveStateOnExit = dwTmp ? true : false; g_bSaveStateOnExit = dwTmp ? true : false;
if(REGLOAD(TEXT(REGVALUE_DUMP_TO_PRINTER), &dwTmp)) if(REGLOAD(TEXT(REGVALUE_DUMP_TO_PRINTER), &dwTmp))
g_bDumpToPrinter = dwTmp ? true : false; g_bDumpToPrinter = dwTmp ? true : false;
if(REGLOAD(TEXT(REGVALUE_CONVERT_ENCODING), &dwTmp)) if(REGLOAD(TEXT(REGVALUE_CONVERT_ENCODING), &dwTmp))
g_bConvertEncoding = dwTmp ? true : false; g_bConvertEncoding = dwTmp ? true : false;
if(REGLOAD(TEXT(REGVALUE_FILTER_UNPRINTABLE), &dwTmp)) if(REGLOAD(TEXT(REGVALUE_FILTER_UNPRINTABLE), &dwTmp))
g_bFilterUnprintable = dwTmp ? true : false; g_bFilterUnprintable = dwTmp ? true : false;
if(REGLOAD(TEXT(REGVALUE_PRINTER_APPEND), &dwTmp)) if(REGLOAD(TEXT(REGVALUE_PRINTER_APPEND), &dwTmp))
g_bPrinterAppend = dwTmp ? true : false; g_bPrinterAppend = dwTmp ? true : false;
if(REGLOAD(TEXT(REGVALUE_HDD_ENABLED), &dwTmp)) if(REGLOAD(TEXT(REGVALUE_HDD_ENABLED), &dwTmp))
HD_SetEnabled(dwTmp ? true : false); HD_SetEnabled(dwTmp ? true : false);
char szHDVPathname[MAX_PATH] = {0}; char szHDVPathname[MAX_PATH] = {0};
if(RegLoadString(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_LAST_HARDDISK_1), 1, szHDVPathname, sizeof(szHDVPathname))) if(RegLoadString(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_LAST_HARDDISK_1), 1, szHDVPathname, sizeof(szHDVPathname)))
HD_InsertDisk(HARDDISK_1, szHDVPathname); HD_InsertDisk(HARDDISK_1, szHDVPathname);
if(RegLoadString(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_LAST_HARDDISK_2), 1, szHDVPathname, sizeof(szHDVPathname))) if(RegLoadString(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_LAST_HARDDISK_2), 1, szHDVPathname, sizeof(szHDVPathname)))
HD_InsertDisk(HARDDISK_2, szHDVPathname); HD_InsertDisk(HARDDISK_2, szHDVPathname);
if(REGLOAD(TEXT(REGVALUE_PDL_XTRIM), &dwTmp)) if(REGLOAD(TEXT(REGVALUE_PDL_XTRIM), &dwTmp))
JoySetTrim((short)dwTmp, true); JoySetTrim((short)dwTmp, true);
if(REGLOAD(TEXT(REGVALUE_PDL_YTRIM), &dwTmp)) if(REGLOAD(TEXT(REGVALUE_PDL_YTRIM), &dwTmp))
JoySetTrim((short)dwTmp, false); JoySetTrim((short)dwTmp, false);
if(REGLOAD(TEXT(REGVALUE_SCROLLLOCK_TOGGLE), &dwTmp)) if(REGLOAD(TEXT(REGVALUE_SCROLLLOCK_TOGGLE), &dwTmp))
sg_PropertySheet.SetScrollLockToggle(dwTmp); sg_PropertySheet.SetScrollLockToggle(dwTmp);
if(REGLOAD(TEXT(REGVALUE_MOUSE_CROSSHAIR), &dwTmp)) if(REGLOAD(TEXT(REGVALUE_MOUSE_CROSSHAIR), &dwTmp))
sg_PropertySheet.SetMouseShowCrosshair(dwTmp); sg_PropertySheet.SetMouseShowCrosshair(dwTmp);
if(REGLOAD(TEXT(REGVALUE_MOUSE_RESTRICT_TO_WINDOW), &dwTmp)) if(REGLOAD(TEXT(REGVALUE_MOUSE_RESTRICT_TO_WINDOW), &dwTmp))
sg_PropertySheet.SetMouseRestrictToWindow(dwTmp); sg_PropertySheet.SetMouseRestrictToWindow(dwTmp);
if(REGLOAD(TEXT(REGVALUE_SLOT4), &dwTmp)) if(REGLOAD(TEXT(REGVALUE_SLOT4), &dwTmp))
g_Slot4 = (SS_CARDTYPE) dwTmp; g_Slot4 = (SS_CARDTYPE) dwTmp;
@ -550,7 +554,7 @@ void LoadConfiguration()
//=========================================================================== //===========================================================================
void SetCurrentImageDir() void SetCurrentImageDir(void)
{ {
SetCurrentDirectory(g_sCurrentDir); SetCurrentDirectory(g_sCurrentDir);
} }
@ -558,15 +562,15 @@ void SetCurrentImageDir()
//=========================================================================== //===========================================================================
// TODO: Added dialog option of which file extensions to registry // TODO: Added dialog option of which file extensions to registry
bool g_bRegisterFileTypes = true; static bool g_bRegisterFileTypes = true;
//bool g_bRegistryFileBin = false; //static bool g_bRegistryFileBin = false;
bool g_bRegistryFileDo = true; static bool g_bRegistryFileDo = true;
bool g_bRegistryFileDsk = true; static bool g_bRegistryFileDsk = true;
bool g_bRegistryFileNib = true; static bool g_bRegistryFileNib = true;
bool g_bRegistryFilePo = true; static bool g_bRegistryFilePo = true;
void RegisterExtensions() void RegisterExtensions(void)
{ {
TCHAR szCommandTmp[MAX_PATH]; TCHAR szCommandTmp[MAX_PATH];
GetModuleFileName((HMODULE)0,szCommandTmp,MAX_PATH); GetModuleFileName((HMODULE)0,szCommandTmp,MAX_PATH);
@ -632,7 +636,7 @@ void RegisterExtensions()
} }
//=========================================================================== //===========================================================================
void AppleWin_RegisterHotKeys() void AppleWin_RegisterHotKeys(void)
{ {
BOOL bStatus = true; BOOL bStatus = true;
@ -723,38 +727,19 @@ static int DoDiskInsert(const int nDrive, LPCSTR szFileName)
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
int APIENTRY WinMain (HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int) int APIENTRY WinMain(HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
{ {
bool bSetFullScreen = false; bool bSetFullScreen = false;
bool bBoot = false; bool bBoot = false;
LPSTR szImageName_drive1 = NULL; LPSTR szImageName_drive1 = NULL;
LPSTR szImageName_drive2 = NULL; LPSTR szImageName_drive2 = NULL;
const std::string strCmdLine(lpCmdLine); // Keep a copy for log ouput
while(*lpCmdLine) while (*lpCmdLine)
{ {
LPSTR lpNextArg = GetNextArg(lpCmdLine); LPSTR lpNextArg = GetNextArg(lpCmdLine);
if(strcmp(lpCmdLine, "-noreg") == 0) if (((strcmp(lpCmdLine, "-l") == 0) || (strcmp(lpCmdLine, "-log") == 0)) && (g_fh == NULL))
{
g_bRegisterFileTypes = false;
}
else if(strcmp(lpCmdLine, "-d1") == 0)
{
lpCmdLine = GetCurrArg(lpNextArg);
lpNextArg = GetNextArg(lpNextArg);
szImageName_drive1 = lpCmdLine;
}
else if(strcmp(lpCmdLine, "-d2") == 0)
{
lpCmdLine = GetCurrArg(lpNextArg);
lpNextArg = GetNextArg(lpNextArg);
szImageName_drive2 = lpCmdLine;
}
else if(strcmp(lpCmdLine, "-f") == 0)
{
bSetFullScreen = true;
}
else if(((strcmp(lpCmdLine, "-l") == 0) || (strcmp(lpCmdLine, "-log") == 0)) && (g_fh == NULL))
{ {
g_fh = fopen("AppleWin.log", "a+t"); // Open log file (append & text mode) g_fh = fopen("AppleWin.log", "a+t"); // Open log file (append & text mode)
setvbuf(g_fh, NULL, _IONBF, 0); // No buffering (so implicit fflush after every fprintf) setvbuf(g_fh, NULL, _IONBF, 0); // No buffering (so implicit fflush after every fprintf)
@ -763,20 +748,40 @@ int APIENTRY WinMain (HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
GetTimeFormat(LOCALE_SYSTEM_DEFAULT, 0, NULL, NULL, (LPTSTR)aTimeStr, sizeof(aTimeStr)); GetTimeFormat(LOCALE_SYSTEM_DEFAULT, 0, NULL, NULL, (LPTSTR)aTimeStr, sizeof(aTimeStr));
fprintf(g_fh, "*** Logging started: %s %s\n", aDateStr, aTimeStr); fprintf(g_fh, "*** Logging started: %s %s\n", aDateStr, aTimeStr);
} }
else if(strcmp(lpCmdLine, "-no-di") == 0) else if (strcmp(lpCmdLine, "-noreg") == 0)
{
g_bRegisterFileTypes = false;
}
else if (strcmp(lpCmdLine, "-d1") == 0)
{
lpCmdLine = GetCurrArg(lpNextArg);
lpNextArg = GetNextArg(lpNextArg);
szImageName_drive1 = lpCmdLine;
}
else if (strcmp(lpCmdLine, "-d2") == 0)
{
lpCmdLine = GetCurrArg(lpNextArg);
lpNextArg = GetNextArg(lpNextArg);
szImageName_drive2 = lpCmdLine;
}
else if (strcmp(lpCmdLine, "-f") == 0)
{
bSetFullScreen = true;
}
else if (strcmp(lpCmdLine, "-no-di") == 0)
{ {
g_bDisableDirectInput = true; g_bDisableDirectInput = true;
} }
else if(strcmp(lpCmdLine, "-m") == 0) else if (strcmp(lpCmdLine, "-m") == 0)
{ {
g_bDisableDirectSound = true; g_bDisableDirectSound = true;
} }
else if(strcmp(lpCmdLine, "-no-mb") == 0) else if (strcmp(lpCmdLine, "-no-mb") == 0)
{ {
g_bDisableDirectSoundMockingboard = true; g_bDisableDirectSoundMockingboard = true;
} }
#ifdef RAMWORKS #ifdef RAMWORKS
else if(strcmp(lpCmdLine, "-r") == 0) // RamWorks size [1..127] else if (strcmp(lpCmdLine, "-r") == 0) // RamWorks size [1..127]
{ {
lpCmdLine = GetCurrArg(lpNextArg); lpCmdLine = GetCurrArg(lpNextArg);
lpNextArg = GetNextArg(lpNextArg); lpNextArg = GetNextArg(lpNextArg);
@ -787,7 +792,7 @@ int APIENTRY WinMain (HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
g_uMaxExPages = 1; g_uMaxExPages = 1;
} }
#endif #endif
else if(strcmp(lpCmdLine, "-f8rom") == 0) // Use custom 2K ROM at [$F800..$FFFF] else if (strcmp(lpCmdLine, "-f8rom") == 0) // Use custom 2K ROM at [$F800..$FFFF]
{ {
lpCmdLine = GetCurrArg(lpNextArg); lpCmdLine = GetCurrArg(lpNextArg);
lpNextArg = GetNextArg(lpNextArg); lpNextArg = GetNextArg(lpNextArg);
@ -795,39 +800,46 @@ int APIENTRY WinMain (HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
if ((g_hCustomRomF8 == INVALID_HANDLE_VALUE) || (GetFileSize(g_hCustomRomF8, NULL) != 0x800)) if ((g_hCustomRomF8 == INVALID_HANDLE_VALUE) || (GetFileSize(g_hCustomRomF8, NULL) != 0x800))
g_bCustomRomF8Failed = true; g_bCustomRomF8Failed = true;
} }
else if(strcmp(lpCmdLine, "-printscreen") == 0) // Turn on display of the last filename print screen was saved to else if (strcmp(lpCmdLine, "-printscreen") == 0) // Turn on display of the last filename print screen was saved to
{ {
g_bDisplayPrintScreenFileName = true; g_bDisplayPrintScreenFileName = true;
} }
else if(strcmp(lpCmdLine, "-spkr-inc") == 0) else if (strcmp(lpCmdLine, "-spkr-inc") == 0)
{ {
lpCmdLine = GetCurrArg(lpNextArg); lpCmdLine = GetCurrArg(lpNextArg);
lpNextArg = GetNextArg(lpNextArg); lpNextArg = GetNextArg(lpNextArg);
const int nErrorInc = atoi(lpCmdLine); const int nErrorInc = atoi(lpCmdLine);
SoundCore_SetErrorInc( nErrorInc ); SoundCore_SetErrorInc( nErrorInc );
} }
else if(strcmp(lpCmdLine, "-spkr-max") == 0) else if (strcmp(lpCmdLine, "-spkr-max") == 0)
{ {
lpCmdLine = GetCurrArg(lpNextArg); lpCmdLine = GetCurrArg(lpNextArg);
lpNextArg = GetNextArg(lpNextArg); lpNextArg = GetNextArg(lpNextArg);
const int nErrorMax = atoi(lpCmdLine); const int nErrorMax = atoi(lpCmdLine);
SoundCore_SetErrorMax( nErrorMax ); SoundCore_SetErrorMax( nErrorMax );
} }
else if(strcmp(lpCmdLine, "-use-real-printer") == 0) // Enable control in Advanced config to allow dumping to a real printer else if (strcmp(lpCmdLine, "-use-real-printer") == 0) // Enable control in Advanced config to allow dumping to a real printer
{ {
g_bEnableDumpToRealPrinter = true; g_bEnableDumpToRealPrinter = true;
} }
else if(strcmp(lpCmdLine, "-speech") == 0) else if (strcmp(lpCmdLine, "-speech") == 0)
{ {
g_bEnableSpeech = true; g_bEnableSpeech = true;
} }
else if(strcmp(lpCmdLine,"-multimon") == 0) else if (strcmp(lpCmdLine, "-multimon") == 0)
{ {
g_bMultiMon = true; g_bMultiMon = true;
} }
else // unsupported
{
LogFileOutput("Unsupported arg: %s\n", lpCmdLine);
}
lpCmdLine = lpNextArg; lpCmdLine = lpNextArg;
} }
LogFileOutput("CmdLine: %s\n", strCmdLine.c_str());
#if 0 #if 0
#ifdef RIFF_SPKR #ifdef RIFF_SPKR
RiffInitWriteFile("Spkr.wav", SPKR_SAMPLE_RATE, 1); RiffInitWriteFile("Spkr.wav", SPKR_SAMPLE_RATE, 1);
@ -841,7 +853,7 @@ int APIENTRY WinMain (HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
char szPath[_MAX_PATH]; char szPath[_MAX_PATH];
if(0 == GetModuleFileName(NULL, szPath, sizeof(szPath))) if (0 == GetModuleFileName(NULL, szPath, sizeof(szPath)))
{ {
strcpy(szPath, __argv[0]); strcpy(szPath, __argv[0]);
} }
@ -851,11 +863,11 @@ int APIENTRY WinMain (HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
dwVerInfoSize = GetFileVersionInfoSize(szPath, &dwHandle); dwVerInfoSize = GetFileVersionInfoSize(szPath, &dwHandle);
if(dwVerInfoSize > 0) if (dwVerInfoSize > 0)
{ {
char* pVerInfoBlock = new char[dwVerInfoSize]; char* pVerInfoBlock = new char[dwVerInfoSize];
if(GetFileVersionInfo(szPath, NULL, dwVerInfoSize, pVerInfoBlock)) if (GetFileVersionInfo(szPath, NULL, dwVerInfoSize, pVerInfoBlock))
{ {
VS_FIXEDFILEINFO* pFixedFileInfo; VS_FIXEDFILEINFO* pFixedFileInfo;
UINT pFixedFileInfoLen; UINT pFixedFileInfoLen;
@ -905,7 +917,7 @@ int APIENTRY WinMain (HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
GetProgramDirectory(); GetProgramDirectory();
LogFileOutput("Init: GetProgramDirectory()\n"); LogFileOutput("Init: GetProgramDirectory()\n");
if( g_bRegisterFileTypes ) if (g_bRegisterFileTypes)
{ {
RegisterExtensions(); RegisterExtensions();
LogFileOutput("Init: RegisterExtensions()\n"); LogFileOutput("Init: RegisterExtensions()\n");
@ -924,14 +936,14 @@ int APIENTRY WinMain (HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
LogFileOutput("Init: CreateColorMixMap()\n"); LogFileOutput("Init: CreateColorMixMap()\n");
int nError = 0; // TODO: Show error MsgBox if we get a DiskInsert error int nError = 0; // TODO: Show error MsgBox if we get a DiskInsert error
if(szImageName_drive1) if (szImageName_drive1)
{ {
nError = DoDiskInsert(DRIVE_1, szImageName_drive1); nError = DoDiskInsert(DRIVE_1, szImageName_drive1);
LogFileOutput("Init: DoDiskInsert(D1), res=%d\n", nError); LogFileOutput("Init: DoDiskInsert(D1), res=%d\n", nError);
FrameRefreshStatus(DRAW_LEDS | DRAW_BUTTON_DRIVES); FrameRefreshStatus(DRAW_LEDS | DRAW_BUTTON_DRIVES);
bBoot = true; bBoot = true;
} }
if(szImageName_drive2) if (szImageName_drive2)
{ {
nError |= DoDiskInsert(DRIVE_2, szImageName_drive2); nError |= DoDiskInsert(DRIVE_2, szImageName_drive2);
LogFileOutput("Init: DoDiskInsert(D2), res=%d\n", nError); LogFileOutput("Init: DoDiskInsert(D2), res=%d\n", nError);
@ -946,31 +958,31 @@ int APIENTRY WinMain (HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
g_nAppMode = MODE_LOGO; g_nAppMode = MODE_LOGO;
LoadConfiguration(); LoadConfiguration();
LogFileOutput("Init: LoadConfiguration()\n"); LogFileOutput("Main: LoadConfiguration()\n");
DebugInitialize(); DebugInitialize();
LogFileOutput("Init: DebugInitialize()\n"); LogFileOutput("Main: DebugInitialize()\n");
JoyInitialize(); JoyInitialize();
LogFileOutput("Init: JoyInitialize()\n"); LogFileOutput("Main: JoyInitialize()\n");
MemInitialize(); MemInitialize();
LogFileOutput("Init: MemInitialize()\n"); LogFileOutput("Main: MemInitialize()\n");
VideoInitialize(); // g_pFramebufferinfo been created now VideoInitialize(); // g_pFramebufferinfo been created now
LogFileOutput("Init: VideoInitialize()\n"); LogFileOutput("Main: VideoInitialize()\n");
LogFileOutput("Init: FrameCreateWindow() - pre\n"); LogFileOutput("Main: FrameCreateWindow() - pre\n");
FrameCreateWindow(); FrameCreateWindow();
LogFileOutput("Init: FrameCreateWindow() - post\n"); LogFileOutput("Main: FrameCreateWindow() - post\n");
// PrintScrn support // PrintScrn support
AppleWin_RegisterHotKeys(); // needs valid g_hFrameWindow AppleWin_RegisterHotKeys(); // needs valid g_hFrameWindow
LogFileOutput("Init: AppleWin_RegisterHotKeys()\n"); LogFileOutput("Main: AppleWin_RegisterHotKeys()\n");
// Need to test if it's safe to call ResetMachineState(). In the meantime, just call DiskReset(): // Need to test if it's safe to call ResetMachineState(). In the meantime, just call DiskReset():
DiskReset(); // Switch from a booting A][+ to a non-autostart A][, so need to turn off floppy motor DiskReset(); // Switch from a booting A][+ to a non-autostart A][, so need to turn off floppy motor
LogFileOutput("Init: DiskReset()\n"); LogFileOutput("Main: DiskReset()\n");
if (!bSysClkOK) if (!bSysClkOK)
{ {
@ -985,36 +997,42 @@ int APIENTRY WinMain (HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
} }
tfe_init(); tfe_init();
LogFileOutput("Init: tfe_init()\n"); LogFileOutput("Main: tfe_init()\n");
if (g_Slot4 == CT_MouseInterface) // TODO: Check all slots for MouseInterface card
{
DIMouse::DirectInputInit(g_hFrameWindow);
LogFileOutput("Main: DIMouse::DirectInputInit()\n");
}
Snapshot_Startup(); // Do this after everything has been init'ed Snapshot_Startup(); // Do this after everything has been init'ed
LogFileOutput("Init: Snapshot_Startup()\n"); LogFileOutput("Main: Snapshot_Startup()\n");
if(bSetFullScreen) if (bSetFullScreen)
{ {
PostMessage(g_hFrameWindow, WM_USER_FULLSCREEN, 0, 0); PostMessage(g_hFrameWindow, WM_USER_FULLSCREEN, 0, 0);
bSetFullScreen = false; bSetFullScreen = false;
} }
if(bBoot) if (bBoot)
{ {
PostMessage(g_hFrameWindow, WM_USER_BOOT, 0, 0); PostMessage(g_hFrameWindow, WM_USER_BOOT, 0, 0);
bBoot = false; bBoot = false;
} }
// ENTER THE MAIN MESSAGE LOOP // ENTER THE MAIN MESSAGE LOOP
LogFileOutput("Init: EnterMessageLoop()\n"); LogFileOutput("Main: EnterMessageLoop()\n");
EnterMessageLoop(); EnterMessageLoop();
LogFileOutput("Init: LeaveMessageLoop()\n"); LogFileOutput("Main: LeaveMessageLoop()\n");
MB_Reset(); MB_Reset();
LogFileOutput("Init: MB_Reset()\n"); LogFileOutput("Main: MB_Reset()\n");
sg_Mouse.Uninitialize(); // Maybe restarting due to switching slot-4 card from mouse to MB sg_Mouse.Uninitialize(); // Maybe restarting due to switching slot-4 card from MouseCard to Mockingboard
LogFileOutput("Init: sg_Mouse.Uninitialize()\n"); LogFileOutput("Main: sg_Mouse.Uninitialize()\n");
} }
while (restart); while (restart);
// Release COM // Release COM
DSUninit(); DSUninit();
LogFileOutput("Exit: DSUninit()\n"); LogFileOutput("Exit: DSUninit()\n");
@ -1024,10 +1042,10 @@ int APIENTRY WinMain (HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
CoUninitialize(); CoUninitialize();
LogFileOutput("Exit: CoUninitialize()\n"); LogFileOutput("Exit: CoUninitialize()\n");
tfe_shutdown(); tfe_shutdown();
LogFileOutput("Exit: tfe_shutdown()\n"); LogFileOutput("Exit: tfe_shutdown()\n");
if (g_fh) if (g_fh)
{ {
fprintf(g_fh,"*** Logging ended\n\n"); fprintf(g_fh,"*** Logging ended\n\n");

2
AppleWin/source/Configuration/PropertySheetHelper.cpp
View file

@ -41,7 +41,7 @@ Input
Sound Sound
. MB/Phasor/None WM_USER_RESTART . MB/Phasor/None WM_USER_RESTART
Disk Disk
. Enhanced disk speed WM_USER_RESTART Why? . Enhanced disk speed WM_USER_RESTART Why? (used to patch Disk][ f/w - but not anymore)
. HDD enable WM_USER_RESTART . HDD enable WM_USER_RESTART
Advanced Advanced
. Save State WM_USER_SAVESTATE . Save State WM_USER_SAVESTATE

9
AppleWin/source/Frame.cpp
View file

@ -742,7 +742,7 @@ LRESULT CALLBACK FrameWndProc (
case WM_CREATE: case WM_CREATE:
LogFileOutput("WM_CREATE\n"); LogFileOutput("WM_CREATE\n");
g_hFrameWindow = window; g_hFrameWindow = window; // NB. g_hFrameWindow by CreateWindow()
CreateGdiObjects(); CreateGdiObjects();
LogFileOutput("WM_CREATE: CreateGdiObjects()\n"); LogFileOutput("WM_CREATE: CreateGdiObjects()\n");
@ -750,8 +750,8 @@ LRESULT CALLBACK FrameWndProc (
DSInit(); DSInit();
LogFileOutput("WM_CREATE: DSInit()\n"); LogFileOutput("WM_CREATE: DSInit()\n");
DIMouse::DirectInputInit(window); // DIMouse::DirectInputInit(window);
LogFileOutput("WM_CREATE: DIMouse::DirectInputInit()\n"); // LogFileOutput("WM_CREATE: DIMouse::DirectInputInit()\n");
MB_Initialize(); MB_Initialize();
LogFileOutput("WM_CREATE: MB_Initialize()\n"); LogFileOutput("WM_CREATE: MB_Initialize()\n");
@ -816,7 +816,7 @@ LRESULT CALLBACK FrameWndProc (
VideoDestroy(); VideoDestroy();
MB_Destroy(); MB_Destroy();
DeleteGdiObjects(); DeleteGdiObjects();
DIMouse::DirectInputUninit(window); DIMouse::DirectInputUninit(window); // NB. do before window is destroyed
PostQuitMessage(0); // Post WM_QUIT message to the thread's message queue PostQuitMessage(0); // Post WM_QUIT message to the thread's message queue
LogFileOutput("WM_DESTROY (done)\n"); LogFileOutput("WM_DESTROY (done)\n");
break; break;
@ -2043,6 +2043,7 @@ void FrameCreateWindow(void)
GetAppleWindowTitle(); GetAppleWindowTitle();
// NB. g_hFrameWindow also set by WM_CREATE - NB. CreateWindow() must synchronously send WM_CREATE
g_hFrameWindow = CreateWindow( g_hFrameWindow = CreateWindow(
TEXT("APPLE2FRAME"), TEXT("APPLE2FRAME"),
g_pAppTitle, // SetWindowText() // WindowTitle g_pAppTitle, // SetWindowText() // WindowTitle

4
AppleWin/source/Video.cpp
View file

@ -4056,6 +4056,8 @@ void Video_MakeScreenShot(FILE *pFile)
if( g_iScreenshotType == SCREENSHOT_280x192 ) if( g_iScreenshotType == SCREENSHOT_280x192 )
{ {
pSrc += FRAMEBUFFER_W; // Start on odd scanline (otherwise for 50% scanline mode get an all black image!)
u8 aScanLine[ 280 ]; u8 aScanLine[ 280 ];
u8 *pDst; u8 *pDst;
@ -4067,7 +4069,7 @@ void Video_MakeScreenShot(FILE *pFile)
pDst = aScanLine; pDst = aScanLine;
for( int x = 0; x < FRAMEBUFFER_W/2; x++ ) for( int x = 0; x < FRAMEBUFFER_W/2; x++ )
{ {
*pDst++ = *pSrc; *pDst++ = pSrc[1]; // correction for left edge loss of scaled scanline [Bill Buckel, B#18928]
pSrc += 2; // skip odd pixels pSrc += 2; // skip odd pixels
} }
fwrite( aScanLine, FRAMEBUFFER_W/2, 1, pFile ); fwrite( aScanLine, FRAMEBUFFER_W/2, 1, pFile );