Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-06-16 21:29:31 +00:00
Code Issues Projects Releases Wiki Activity

Bumped version to 1.19.2

Browse Source 
+ a few cosmetic code tweaks.
This commit is contained in:
tomch 2010-12-20 23:46:11 +00:00
parent 5a9bb611e9
commit 7a1110a6f7
6 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AppleWin/resource/Applewin.rc
View File

@ -253,8 +253,8 @@ DISK_ICON ICON "DISK.ICO"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,19,1,0
PRODUCTVERSION 1,19,1,0
FILEVERSION 1,19,2,0
PRODUCTVERSION 1,19,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -272,12 +272,12 @@ BEGIN
VALUE "Comments", "http://applewin.berlios.de"
VALUE "CompanyName", "AppleWin"
VALUE "FileDescription", "Apple //e Emulator for Windows"
VALUE "FileVersion", "1, 19, 1, 0"
VALUE "FileVersion", "1, 19, 2, 0"
VALUE "InternalName", "APPLEWIN"
VALUE "LegalCopyright", " 1994-2010 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis"
VALUE "OriginalFilename", "APPLEWIN.EXE"
VALUE "ProductName", "Apple //e Emulator"
VALUE "ProductVersion", "1, 19, 1, 0"
VALUE "ProductVersion", "1, 19, 2, 0"
END
END
BLOCK "VarFileInfo"

2
AppleWin/source/Disk.cpp
View File

@ -460,7 +460,7 @@ LPCTSTR DiskGetBaseName(const int iDrive)
}
//===========================================================================
void DiskGetLightStatus(int *pDisk1Status_, int *pDisk2Status_)
void DiskGetLightStatus(Disk_Status_e *pDisk1Status_, Disk_Status_e *pDisk2Status_)
{
// *drive1 = g_aFloppyDisk[0].spinning ? g_aFloppyDisk[0].writelight ? 2 : 1 : 0;
// *drive2 = g_aFloppyDisk[1].spinning ? g_aFloppyDisk[1].writelight ? 2 : 1 : 0;

3
AppleWin/source/Disk.h
View File

@ -52,8 +52,7 @@ LPCTSTR DiskGetFullName(const int iDrive);
LPCTSTR DiskGetFullDiskFilename(const int iDrive);
LPCTSTR DiskGetBaseName(const int iDrive);
// returns Disk_Status_e
void DiskGetLightStatus (int *pDisk1Status_,int *pDisk2Status_);
void DiskGetLightStatus (Disk_Status_e *pDisk1Status_, Disk_Status_e *pDisk2Status_);
ImageError_e DiskInsert(const int iDrive, LPCTSTR pszImageFilename, const bool bForceWriteProtected, const bool bCreateIfNecessary);
BOOL DiskIsSpinning(void);

40
AppleWin/source/Frame.cpp
View File

@ -470,17 +470,17 @@ static void DrawStatusArea (HDC passdc, int drawflags)
HDC dc = (passdc ? passdc : GetDC(g_hFrameWindow));
int x = buttonx;
int y = buttony+BUTTONS*BUTTONCY+1;
int iDrive1Status = DISK_STATUS_OFF;
int iDrive2Status = DISK_STATUS_OFF;
bool bCaps = KeybGetCapsStatus();
bool bP8Caps = KeybGetP8CapsStatus(); // TODO: FIXME: Not used ?! Should show the LED status ...
const bool bCaps = KeybGetCapsStatus();
//const bool bP8Caps = KeybGetP8CapsStatus(); // TODO: FIXME: Not used ?! Should show the LED status ...
DiskGetLightStatus(&iDrive1Status,&iDrive2Status);
Disk_Status_e eDrive1Status = DISK_STATUS_OFF;
Disk_Status_e eDrive2Status = DISK_STATUS_OFF;
DiskGetLightStatus(&eDrive1Status, &eDrive2Status);
#if HD_LED
// 1.19.0.0 Hard Disk Status/Indicator Light
int iHardDriveStatus = DISK_STATUS_OFF;
HD_GetLightStatus(&iHardDriveStatus);
Disk_Status_e eHardDriveStatus = DISK_STATUS_OFF;
HD_GetLightStatus(&eHardDriveStatus);
#endif
if (g_bIsFullScreen)
@ -490,14 +490,14 @@ static void DrawStatusArea (HDC passdc, int drawflags)
SetBkColor(dc,RGB(0,0,0));
SetTextAlign(dc,TA_LEFT | TA_TOP);
SetTextColor(dc, g_aDiskFullScreenColorsLED[ iDrive1Status ] );
SetTextColor(dc, g_aDiskFullScreenColorsLED[ eDrive1Status ] );
TextOut(dc,x+ 3,y+2,TEXT("1"),1);
SetTextColor(dc, g_aDiskFullScreenColorsLED[ iDrive2Status ] );
SetTextColor(dc, g_aDiskFullScreenColorsLED[ eDrive2Status ] );
TextOut(dc,x+13,y+2,TEXT("2"),1);
#if HD_LED
SetTextColor(dc, g_aDiskFullScreenColorsLED[ iHardDriveStatus ] );
SetTextColor(dc, g_aDiskFullScreenColorsLED[ eHardDriveStatus ] );
TextOut(dc,x+23,y+2,TEXT("H"),1);
#endif
@ -508,11 +508,11 @@ static void DrawStatusArea (HDC passdc, int drawflags)
// Note: Made redundant with above code
// RECT rect = {0,0,8,8};
// CONST int DriveLedY = 12; // 8 in windowed mode
// DrawBitmapRect(dc,x+12,y+DriveLedY,&rect,g_hDiskFullScreenLED[ iDrive1Status ]);
// DrawBitmapRect(dc,x+30,y+DriveLedY,&rect,g_hDiskFullScreenLED[ iDrive2Status ]);
// SetTextColor(dc, g_aDiskFullScreenColors[ iDrive1Status ] );
// DrawBitmapRect(dc,x+12,y+DriveLedY,&rect,g_hDiskFullScreenLED[ eDrive1Status ]);
// DrawBitmapRect(dc,x+30,y+DriveLedY,&rect,g_hDiskFullScreenLED[ eDrive2Status ]);
// SetTextColor(dc, g_aDiskFullScreenColors[ eDrive1Status ] );
// TextOut(dc,x+ 10,y+2,TEXT("*"),1);
// SetTextColor(dc, g_aDiskFullScreenColors[ iDrive2Status ] );
// SetTextColor(dc, g_aDiskFullScreenColors[ eDrive2Status ] );
// TextOut(dc,x+ 20,y+2,TEXT("*"),1);
if (!IS_APPLE2)
@ -559,8 +559,8 @@ static void DrawStatusArea (HDC passdc, int drawflags)
{
RECT rDiskLed = {0,0,8,8};
DrawBitmapRect(dc,x+12,y+6,&rDiskLed,g_hDiskWindowedLED[iDrive1Status]);
DrawBitmapRect(dc,x+31,y+6,&rDiskLed,g_hDiskWindowedLED[iDrive2Status]);
DrawBitmapRect(dc,x+12,y+6,&rDiskLed,g_hDiskWindowedLED[eDrive1Status]);
DrawBitmapRect(dc,x+31,y+6,&rDiskLed,g_hDiskWindowedLED[eDrive2Status]);
if (!IS_APPLE2)
{
@ -595,14 +595,14 @@ static void DrawStatusArea (HDC passdc, int drawflags)
#if HD_LED
// 1.19.0.0 Hard Disk Status/Indicator Light
DrawBitmapRect(dc,x+12,y+18,&rDiskLed,g_hDiskWindowedLED[iHardDriveStatus]);
DrawBitmapRect(dc,x+12,y+18,&rDiskLed,g_hDiskWindowedLED[eHardDriveStatus]);
#endif
/*
if (g_Apple2Type == A2TYPE_PRAVETS8A)
DrawBitmapRect(dc,x+7,y+19,&rect,cyrbitmap[bCaps != 0]);
else
DrawBitmapRect(dc,x+7,y+19,&rect,g_hCapsLockBitmap[bCaps != 0]);
DrawBitmapRect(dc,x+7,y+19,&rect,cyrbitmap[bCaps != 0]);
else
DrawBitmapRect(dc,x+7,y+19,&rect,g_hCapsLockBitmap[bCaps != 0]);
*/
}
}

11
AppleWin/source/Harddisk.cpp
View File

@ -419,9 +419,6 @@ static BYTE __stdcall HD_IO_EMUL(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG
HDD* pHDD = &g_HardDisk[g_nHD_UnitNum >> 7]; // bit7 = drive select
bool bRes = 0;
bool bAppendBlocks = 0;
if (bWrite == 0) // read
{
#if HD_LED
@ -467,11 +464,12 @@ static BYTE __stdcall HD_IO_EMUL(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG
}
break;
case 0x02: //write
{
#if HD_LED
pHDD->hd_status_next = DISK_STATUS_WRITE;
#endif
bRes = true;
bAppendBlocks = (pHDD->hd_diskblock * HD_BLOCK_SIZE) >= pHDD->Info.uImageSize;
bool bRes = true;
const bool bAppendBlocks = (pHDD->hd_diskblock * HD_BLOCK_SIZE) >= pHDD->Info.uImageSize;
if (bAppendBlocks)
{
@ -503,6 +501,7 @@ static BYTE __stdcall HD_IO_EMUL(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG
pHDD->hd_error = 1;
r = DEVICE_IO_ERROR;
}
}
break;
case 0x03: //format
#if HD_LED
@ -604,7 +603,7 @@ static BYTE __stdcall HD_IO_EMUL(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG
}
// 1.19.0.0 Hard Disk Status/Indicator Light
void HD_GetLightStatus (int *pDisk1Status_)
void HD_GetLightStatus (Disk_Status_e *pDisk1Status_)
{
#if HD_LED
if ( HD_CardIsEnabled() )

2
AppleWin/source/Harddisk.h
View File

@ -42,4 +42,4 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
bool HD_IsDriveUnplugged(const int iDrive);
// 1.19.0.0 Hard Disk Status/Indicator Light
void HD_GetLightStatus (int *pDisk1Status_);
void HD_GetLightStatus (Disk_Status_e *pDisk1Status_);