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 2021-02-20 08:29:52 +00:00
commit 20092dccb9
5 changed files with 16 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
help/Troubleshooting.html
View file

@ -58,5 +58,15 @@
<li>Renegade: switches to 160x192 mode at the title screen and then B&W (at the title screen) after game play.</li>
<li>Apple's AppleColor card or Video7's RGB-SL7 card: corruption for titles/demos that accidentally switch to foreground/background hi-res mode, eg. French Touch DIGIDREAM demo.</li>
</ul>
Can't switch to 2x windowed mode:
<ul>
<li>If the resolution isn't high enough to support 2x windowed mode, then AppleWin will refuse to switch.</li>
<li>For different versions of Windows this is slightly different:</li>
<ul>
<li>Windows 7 requires: 1181 x 808</li>
<li>Windows 10 (1909) requires: 1181 x 818</li>
</ul>
</ul>
</body>
</html>

21
help/configuration.html
View file

@ -1,35 +1,20 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
<title>AppleWin Configuration</title>
</head>
<body style="background-color: rgb(255, 255, 255); font-family: verdana;" alink="#008000" link="#008000" vlink="#008000">
<h2 style="color: rgb(0, 128, 0);">AppleWin Configuration</h2>
<hr size="4">
<p>Select one of the following topics: </p>
<ul>
<li><a href="cfg-config.html">Configuration
Settings</a></li>
<li><a href="cfg-config.html">Configuration Settings</a></li>
<li><a href="cfg-input.html">Input Settings</a></li>
<li><a href="cfg-sound.html">Sound Settings</a></li>
<li><a href="cfg-savestate.html">Save-State Settings</a></li>
<li><a href="cfg-disk.html">Disk/Drive Settings</a></li>
<li><a href="cfg-disk.html">Disk Settings</a></li>
<li><a href="cfg-advanced.html">Advanced Settings</a></li>
</ul>
</body>
</html>

5
help/toc.html
View file

@ -11,9 +11,8 @@
<br>
Copyright © 1994-1996, Michael O'Brien<br>
Copyright © 2001, Oliver Schmidt<br>
Copyright © 2002-2005, Tom Charlesworth<BR>
Copyright © 2006-2020, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis
<br>
Copyright © 2002-2005, Tom Charlesworth<br>
Copyright © 2006-2021, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis<br>
<br>
<a href="applewin-team.html">AppleWin team</a>
<br>

2
resource/Applewin.rc
View file

@ -278,7 +278,7 @@ BEGIN
VALUE "FileDescription", "Apple //e Emulator for Windows"
VALUE "FileVersion", APPLEWIN_VERSION_STR
VALUE "InternalName", "APPLEWIN"
VALUE "LegalCopyright", " 1994-2020 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis"
VALUE "LegalCopyright", " 1994-2021 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis"
VALUE "OriginalFilename", "APPLEWIN.EXE"
VALUE "ProductName", "Apple //e Emulator"
VALUE "ProductVersion", APPLEWIN_VERSION_STR

60
source/Disk.cpp
View file

@ -1202,7 +1202,6 @@ void Disk2InterfaceCard::DataLatchReadWOZ(WORD pc, WORD addr, UINT bitCellRemain
if (dbgWOZ)
{
dbgWOZ = 0;
// DumpSectorWOZ(floppy);
DumpTrackWOZ(floppy); // Enable as necessary
}
#endif
@ -1360,65 +1359,6 @@ void Disk2InterfaceCard::DataShiftWriteWOZ(WORD pc, WORD addr, ULONG uExecutedCy
//===========================================================================
#ifdef _DEBUG
// Dump nibbles from current position until 0xDEAA (ie. data epilogue)
void Disk2InterfaceCard::DumpSectorWOZ(FloppyDisk floppy) // pass a copy of m_floppy
{
BYTE shiftReg = 0;
UINT32 lastNibbles = 0;
UINT zeroCount = 0;
UINT nibbleCount = 0;
while (1)
{
BYTE n = floppy.m_trackimage[floppy.m_byte];
BYTE outputBit = (n & floppy.m_bitMask) ? 1 : 0;
floppy.m_bitMask >>= 1;
if (!floppy.m_bitMask)
{
floppy.m_bitMask = 1 << 7;
floppy.m_byte++;
}
floppy.m_bitOffset++;
if (floppy.m_bitOffset == floppy.m_bitCount)
{
floppy.m_bitMask = 1 << 7;
floppy.m_bitOffset = 0;
floppy.m_byte = 0;
}
if (shiftReg == 0 && outputBit == 0)
{
zeroCount++;
continue;
}
shiftReg <<= 1;
shiftReg |= outputBit;
if ((shiftReg & 0x80) == 0)
continue;
nibbleCount++;
char str[10];
sprintf(str, "%02X ", shiftReg);
OutputDebugString(str);
if ((nibbleCount & 0xf) == 0)
OutputDebugString("\n");
lastNibbles <<= 8;
lastNibbles |= shiftReg;
if ((lastNibbles & 0xffff) == 0xDEAA)
break;
shiftReg = 0;
zeroCount = 0;
}
}
// Dump nibbles from current position bitstream wraps to same position
void Disk2InterfaceCard::DumpTrackWOZ(FloppyDisk floppy) // pass a copy of m_floppy
{