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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Andrea Odetti 2020-11-29 16:36:05 +00:00
commit 1b6127dbb6
3 changed files with 53 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
source/Utilities.cpp
View file

@ -455,3 +455,49 @@ void UnplugHardDiskControllerCard(void)
if (!res || dwTmp) if (!res || dwTmp)
REGSAVE(TEXT(REGVALUE_HDD_ENABLED), 0); // Config: HDD Disabled REGSAVE(TEXT(REGVALUE_HDD_ENABLED), 0); // Config: HDD Disabled
} }
void GetAppleWindowTitle()
{
switch (g_Apple2Type)
{
default:
case A2TYPE_APPLE2: g_pAppTitle = TITLE_APPLE_2; break;
case A2TYPE_APPLE2PLUS: g_pAppTitle = TITLE_APPLE_2_PLUS; break;
case A2TYPE_APPLE2JPLUS: g_pAppTitle = TITLE_APPLE_2_JPLUS; break;
case A2TYPE_APPLE2E: g_pAppTitle = TITLE_APPLE_2E; break;
case A2TYPE_APPLE2EENHANCED: g_pAppTitle = TITLE_APPLE_2E_ENHANCED; break;
case A2TYPE_PRAVETS82: g_pAppTitle = TITLE_PRAVETS_82; break;
case A2TYPE_PRAVETS8M: g_pAppTitle = TITLE_PRAVETS_8M; break;
case A2TYPE_PRAVETS8A: g_pAppTitle = TITLE_PRAVETS_8A; break;
case A2TYPE_TK30002E: g_pAppTitle = TITLE_TK3000_2E; break;
case A2TYPE_BASE64A: g_pAppTitle = TITLE_BASE64A; break;
}
#if _DEBUG
g_pAppTitle += " *DEBUG* ";
#endif
if (g_nAppMode == MODE_LOGO)
return;
g_pAppTitle += " - ";
if (IsVideoStyle(VS_HALF_SCANLINES))
g_pAppTitle += " 50% ";
g_pAppTitle += VideoGetAppWindowTitle();
if (GetCardMgr().GetDisk2CardMgr().IsAnyFirmware13Sector())
g_pAppTitle += " (S6-13) ";
if (g_hCustomRomF8 != INVALID_HANDLE_VALUE)
g_pAppTitle += TEXT(" (custom rom)");
else if (sg_PropertySheet.GetTheFreezesF8Rom() && IS_APPLE2)
g_pAppTitle += TEXT(" (The Freeze's non-autostart F8 rom)");
switch (g_nAppMode)
{
case MODE_PAUSED: g_pAppTitle += std::string(TEXT(" [")) + TITLE_PAUSED + TEXT("]"); break;
case MODE_STEPPING: g_pAppTitle += std::string(TEXT(" [")) + TITLE_STEPPING + TEXT("]"); break;
}
}

1
source/Utilities.h
View file

@ -10,3 +10,4 @@ bool DoHardDiskInsert(const int nDrive, LPCSTR szFileName);
void InsertFloppyDisks(const UINT slot, LPSTR szImageName_drive[NUM_DRIVES], bool& bBoot); void InsertFloppyDisks(const UINT slot, LPSTR szImageName_drive[NUM_DRIVES], bool& bBoot);
void InsertHardDisks(LPSTR szImageName_harddisk[NUM_HARDDISKS], bool& bBoot); void InsertHardDisks(LPSTR szImageName_harddisk[NUM_HARDDISKS], bool& bBoot);
void UnplugHardDiskControllerCard(void); void UnplugHardDiskControllerCard(void);
void GetAppleWindowTitle();

57
source/Windows/WinFrame.cpp
View file

@ -50,6 +50,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "SoundCore.h" #include "SoundCore.h"
#include "Speaker.h" #include "Speaker.h"
#include "Frame.h" #include "Frame.h"
#include "Utilities.h"
#ifdef USE_SPEECH_API #ifdef USE_SPEECH_API
#include "Speech.h" #include "Speech.h"
#endif #endif
@ -58,7 +59,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "../resource/resource.h" #include "../resource/resource.h"
#include "Configuration/PropertySheet.h" #include "Configuration/PropertySheet.h"
#include "Debugger/Debug.h" #include "Debugger/Debug.h"
#if _MSC_VER <= 1500 // VS2008 only (cl.exe v15.00) #if _MSC_VER < 1900 // VS2013 or before (cl.exe v18.x or before)
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
@ -215,54 +216,6 @@ UINT Get3DBorderHeight(void)
return IsFullScreen() ? 0 : VIEWPORTY; return IsFullScreen() ? 0 : VIEWPORTY;
} }
// ==========================================================================
static void GetAppleWindowTitle()
{
switch (g_Apple2Type)
{
default:
case A2TYPE_APPLE2: g_pAppTitle = TITLE_APPLE_2 ; break;
case A2TYPE_APPLE2PLUS: g_pAppTitle = TITLE_APPLE_2_PLUS ; break;
case A2TYPE_APPLE2JPLUS: g_pAppTitle = TITLE_APPLE_2_JPLUS ; break;
case A2TYPE_APPLE2E: g_pAppTitle = TITLE_APPLE_2E ; break;
case A2TYPE_APPLE2EENHANCED: g_pAppTitle = TITLE_APPLE_2E_ENHANCED; break;
case A2TYPE_PRAVETS82: g_pAppTitle = TITLE_PRAVETS_82 ; break;
case A2TYPE_PRAVETS8M: g_pAppTitle = TITLE_PRAVETS_8M ; break;
case A2TYPE_PRAVETS8A: g_pAppTitle = TITLE_PRAVETS_8A ; break;
case A2TYPE_TK30002E: g_pAppTitle = TITLE_TK3000_2E ; break;
case A2TYPE_BASE64A: g_pAppTitle = TITLE_BASE64A ; break;
}
#if _DEBUG
g_pAppTitle += " *DEBUG* ";
#endif
if (g_nAppMode == MODE_LOGO)
return;
g_pAppTitle += " - ";
if( IsVideoStyle(VS_HALF_SCANLINES) )
g_pAppTitle += " 50% ";
g_pAppTitle += VideoGetAppWindowTitle();
if (GetCardMgr().GetDisk2CardMgr().IsAnyFirmware13Sector())
g_pAppTitle += " (S6-13) ";
if (g_hCustomRomF8 != INVALID_HANDLE_VALUE)
g_pAppTitle += TEXT(" (custom rom)");
else if (sg_PropertySheet.GetTheFreezesF8Rom() && IS_APPLE2)
g_pAppTitle += TEXT(" (The Freeze's non-autostart F8 rom)");
switch (g_nAppMode)
{
case MODE_PAUSED : g_pAppTitle += std::string(TEXT(" [")) + TITLE_PAUSED + TEXT("]"); break;
case MODE_STEPPING: g_pAppTitle += std::string(TEXT(" [")) + TITLE_STEPPING + TEXT("]"); break;
}
}
//=========================================================================== //===========================================================================
static void FrameShowCursor(BOOL bShow) static void FrameShowCursor(BOOL bShow)
@ -2747,9 +2700,9 @@ void FrameRegisterClass () {
// TODO: FIXME: Util_TestFileExists() // TODO: FIXME: Util_TestFileExists()
static bool FileExists(std::string strFilename) static bool FileExists(std::string strFilename)
{ {
struct stat stFileInfo; struct _stat64 stFileInfo;
int intStat = stat(strFilename.c_str(),&stFileInfo); int intStat = _stat64(strFilename.c_str(), &stFileInfo);
return (intStat == 0) ? true : false; return (intStat == 0);
} }
//=========================================================================== //===========================================================================