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

Bump to 1.26.0.4, fix #350 (50% Scan line checkbox wasn't working), tweaked History.txt

Browse Source
This commit is contained in:
tomcw 2016-09-20 21:47:43 +01:00
parent 1e9c08b065
commit 626965109a
4 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/History.txt
View File

@ -9,10 +9,10 @@ https://github.com/AppleWin/AppleWin/issues/new
Tom Charlesworth Tom Charlesworth
1.26.0.3 (beta) - 19 Sept 2016 1.26.0.4 (beta) - 20 Sept 2016
------------------------------ ------------------------------
Changes: Changes:
. [Bug #126,#157,#194] Beta NTSC support . [Bug #126,#157,#194] Beta NTSC and cycle-accurate video support
TV Color, TV B&W, Monitor Color, Monitor B&W TV Color, TV B&W, Monitor Color, Monitor B&W
. Full-screen native resolution (no longer 640x480 resolution) . Full-screen native resolution (no longer 640x480 resolution)
. [Bug #260] Save-state file v2: human readable (Yaml-based format) . [Bug #260] Save-state file v2: human readable (Yaml-based format)

8
resource/Applewin.rc
View File

@ -250,8 +250,8 @@ DISK_ICON ICON "DISK.ICO"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,26,0,3 FILEVERSION 1,26,0,4
PRODUCTVERSION 1,26,0,3 PRODUCTVERSION 1,26,0,4
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -269,12 +269,12 @@ BEGIN
VALUE "Comments", "https://github.com/AppleWin" VALUE "Comments", "https://github.com/AppleWin"
VALUE "CompanyName", "AppleWin" VALUE "CompanyName", "AppleWin"
VALUE "FileDescription", "Apple //e Emulator for Windows" VALUE "FileDescription", "Apple //e Emulator for Windows"
VALUE "FileVersion", "1, 26, 0, 3" VALUE "FileVersion", "1, 26, 0, 4"
VALUE "InternalName", "APPLEWIN" VALUE "InternalName", "APPLEWIN"
VALUE "LegalCopyright", " 1994-2016 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis" VALUE "LegalCopyright", " 1994-2016 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis"
VALUE "OriginalFilename", "APPLEWIN.EXE" VALUE "OriginalFilename", "APPLEWIN.EXE"
VALUE "ProductName", "Apple //e Emulator" VALUE "ProductName", "Apple //e Emulator"
VALUE "ProductVersion", "1, 26, 0, 3" VALUE "ProductVersion", "1, 26, 0, 4"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

20
source/Configuration/PageConfig.cpp
View File

@ -119,9 +119,11 @@ BOOL CPageConfig::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, LPARAM
case IDC_CHECK_CONFIRM_REBOOT: case IDC_CHECK_CONFIRM_REBOOT:
g_bConfirmReboot = IsDlgButtonChecked(hWnd, IDC_CHECK_CONFIRM_REBOOT) ? 1 : 0; g_bConfirmReboot = IsDlgButtonChecked(hWnd, IDC_CHECK_CONFIRM_REBOOT) ? 1 : 0;
break;
case IDC_CHECK_HALF_SCAN_LINES: case IDC_CHECK_HALF_SCAN_LINES:
g_uHalfScanLines = IsDlgButtonChecked(hWnd, IDC_CHECK_HALF_SCAN_LINES) ? 1 : 0; // Checked in DlgOK()
break;
case IDC_COMPUTER: case IDC_COMPUTER:
if(HIWORD(wparam) == CBN_SELCHANGE) if(HIWORD(wparam) == CBN_SELCHANGE)
@ -231,10 +233,26 @@ BOOL CPageConfig::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, LPARAM
void CPageConfig::DlgOK(HWND hWnd) void CPageConfig::DlgOK(HWND hWnd)
{ {
bool bVideoReinit = false;
const DWORD newvidtype = (DWORD) SendDlgItemMessage(hWnd, IDC_VIDEOTYPE, CB_GETCURSEL, 0, 0); const DWORD newvidtype = (DWORD) SendDlgItemMessage(hWnd, IDC_VIDEOTYPE, CB_GETCURSEL, 0, 0);
if (g_eVideoType != newvidtype) if (g_eVideoType != newvidtype)
{ {
g_eVideoType = newvidtype; g_eVideoType = newvidtype;
bVideoReinit = true;
}
const DWORD newHalfScanLines = IsDlgButtonChecked(hWnd, IDC_CHECK_HALF_SCAN_LINES) ? 1 : 0;
if (g_uHalfScanLines != newHalfScanLines)
{
g_uHalfScanLines = newHalfScanLines;
bVideoReinit = true;
}
if (bVideoReinit)
{
FrameRefreshStatus(DRAW_TITLE, false);
VideoReinitialize(); VideoReinitialize();
if ((g_nAppMode != MODE_LOGO) && (g_nAppMode != MODE_DEBUG)) if ((g_nAppMode != MODE_LOGO) && (g_nAppMode != MODE_DEBUG))
{ {

5
source/DiskImage.cpp
View File

@ -59,8 +59,9 @@ ImageError_e ImageOpen( LPCTSTR pszImageFilename,
ImageInfo* pImageInfo = (ImageInfo*) *hDiskImage; ImageInfo* pImageInfo = (ImageInfo*) *hDiskImage;
pImageInfo->bWriteProtected = *pWriteProtected; pImageInfo->bWriteProtected = *pWriteProtected;
ImageError_e Err = (!bIsHarddisk) ? sg_DiskImageHelper.Open(pszImageFilename, pImageInfo, bCreateIfNecessary, strFilenameInZip) ImageError_e Err = (!bIsHarddisk)
: sg_HardDiskImageHelper.Open(pszImageFilename, pImageInfo, bCreateIfNecessary, strFilenameInZip); ? sg_DiskImageHelper.Open(pszImageFilename, pImageInfo, bCreateIfNecessary, strFilenameInZip)
: sg_HardDiskImageHelper.Open(pszImageFilename, pImageInfo, bCreateIfNecessary, strFilenameInZip);
if (Err != eIMAGE_ERROR_NONE) if (Err != eIMAGE_ERROR_NONE)
{ {