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

Merge from AppleWin-Tom @ r402:

Browse Source 
. BugID-014557: Fix for loading serial port from Registry (caused AppleWin to crash when booting Apple Pascal)
. Fixed FLASH rate (was too fast)
This commit is contained in:
tomch 2008-11-25 22:33:05 +00:00
parent 75261ffd21
commit 3299ba2657
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AppleWin/source/Applewin.cpp
View File

@ -422,17 +422,17 @@ void LoadConfiguration ()
LOAD(TEXT("Joystick 0 Emulation"),&joytype[0]);
LOAD(TEXT("Joystick 1 Emulation"),&joytype[1]);
LOAD(TEXT("Sound Emulation") ,&soundtype);
LOAD(TEXT("Sound Emulation") ,&soundtype);
DWORD dwSerialPort;
LOAD(TEXT("Serial Port") ,&dwSerialPort);
sg_SSC.SetSerialPort(dwSerialPort);
if (LOAD(TEXT("Serial Port"),&dwSerialPort))
sg_SSC.SetSerialPort(dwSerialPort);
LOAD(TEXT("Emulation Speed") ,&g_dwSpeed);
LOAD(TEXT("Enhance Disk Speed"),(DWORD *)&enhancedisk);
LOAD(TEXT("Video Emulation") ,&videotype);
LOAD(TEXT("Monochrome Color") ,&monochrome);
LOAD(TEXT("Uthernet Active") ,(DWORD *)&tfe_enabled);
LOAD(TEXT("Uthernet Active") ,(DWORD *)&tfe_enabled);
SetCurrentCLK6502();

2
AppleWin/source/Frame.cpp
View File

@ -767,7 +767,7 @@ LRESULT CALLBACK FrameWndProc (
VideoRedrawScreen();
g_bDebuggerViewingAppleOutput = true; // +PATCH
}
RegSaveValue(TEXT("Configuration"),TEXT("Video Emulation"),1,videotype);
SAVE(TEXT("Video Emulation"),videotype);
}
else if ((wparam == VK_F11) && (GetKeyState(VK_CONTROL) >= 0)) // Save state (F11)

4
AppleWin/source/PropertySheetPage.cpp
View File

@ -256,7 +256,7 @@ static eApple2Type GetApple2Type(DWORD NewCompType, DWORD NewCloneType)
static void ConfigDlg_OK(HWND window, UINT afterclose)
{
DWORD NewCompType = (DWORD) SendDlgItemMessage(window,IDC_COMPUTER,CB_GETCURSEL,0,0);
DWORD OldApple2Type = g_Apple2Type;//LOAD(TEXT(REGVALUE_APPLE2_TYPE),&OldApple2Type);
DWORD OldApple2Type = g_Apple2Type;
eApple2Type NewApple2Type = GetApple2Type(NewCompType, 0 );
DWORD newvidtype = (DWORD)SendDlgItemMessage(window,IDC_VIDEOTYPE,CB_GETCURSEL,0,0);
@ -446,7 +446,7 @@ static BOOL CALLBACK ConfigDlgProc (HWND window,
if (g_dwSpeed == SPEED_NORMAL)
{
custom = 0;
RegLoadValue(TEXT("Configuration"),TEXT("Custom Speed"),1,(DWORD *)&custom);
LOAD(TEXT("Custom Speed"),(DWORD *)&custom);
}
CheckRadioButton(window, IDC_AUTHENTIC_SPEED, IDC_CUSTOM_SPEED, custom ? IDC_CUSTOM_SPEED : IDC_AUTHENTIC_SPEED);
SetFocus(GetDlgItem(window, custom ? IDC_SLIDER_CPU_SPEED : IDC_AUTHENTIC_SPEED));

2
AppleWin/source/Video.cpp
View File

@ -1778,7 +1778,7 @@ void VideoChooseColor () {
VideoReinitialize();
if ((g_nAppMode != MODE_LOGO) && (g_nAppMode != MODE_DEBUG))
VideoRedrawScreen();
RegSaveValue(TEXT("Configuration"),TEXT("Monochrome Color"),1,monochrome);
SAVE(TEXT("Monochrome Color"),monochrome);
}
}