More demos

README.md

@@ -34,10 +34,10 @@ Some pre-configured machines are shown below, ready to run BASIC, DOS, Windows,
 
 ![IBM PC running VisiCalc](/apps/pc/1981/visicalc/thumbnail.jpg "link:/apps/pc/1981/visicalc/:200:120")
 ![IBM PC running DONKEY.BAS](/devices/pc/machine/5150/cga/64kb/donkey/thumbnail.jpg "link:/devices/pc/machine/5150/cga/64kb/donkey/:200:120")
-![IBM PC XT w/CGA, 10Mb Hard Drive](/devices/pc/machine/5160/cga/256kb/demo/thumbnail.jpg "link:/devices/pc/machine/5160/cga/256kb/demo/:200:120")
 ![IBM PC AT w/EGA, OS/2 1.0](/disks/pc/os2/ibm/1.0/thumbnail.jpg "link:/disks/pc/os2/ibm/1.0/:200:120")
 ![IBM PC XT w/CGA, Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/thumbnail.jpg "link:/devices/pc/machine/5160/cga/256kb/win101/:200:120")
 ![IBM PC XT w/EGA, Windows 1.01](/disks/pc/windows/1.01/thumbnail.jpg "link:/disks/pc/windows/1.01/:200:120")
+![COMPAQ DeskPro 386, Windows/386](/disks/pc/windows/2.0x/thumbnail.jpg "link:/disks/pc/windows/2.0x/:200:120")
 ![IBM PC AT w/EGA, Windows 3.00](/disks/pc/windows/3.00/thumbnail.jpg "link:/disks/pc/windows/3.00/:200:120")
 ![IBM PC AT w/VGA, Windows 3.10](/disks/pc/windows/3.10/thumbnail.jpg "link:/disks/pc/windows/3.10/:200:120")
 ![COMPAQ DeskPro 386, Windows 95](/disks/pc/windows/win95/4.00.950/thumbnail.jpg "link:/disks/pc/windows/win95/4.00.950/:200:120")

_posts/2016-03-06-touching-windows.md

@@ -6,12 +6,13 @@ permalink: /blog/2016/03/06/
 ---
 
 Yesterday, I fired up [Windows 3.1](/disks/pc/windows/3.10/) and played a complete game of
-[Windows Solitaire](https://en.wikipedia.org/wiki/Microsoft_Solitaire) on my iPad.  And I won!
+[Windows Solitaire](https://en.wikipedia.org/wiki/Microsoft_Solitaire) on my iPad.  It was a bit, um, touchy,
+but it worked.
 
 {% comment %}[<img src="/blog/images/ipad-solitaire-small.jpg" alt="Windows Solitaire on iPad"/>](/blog/images/ipad-solitaire.jpg){% endcomment %}
 {% include screenshot.html src="/blog/images/ipad-solitaire-small.jpg" title="iPad running Solitaire on Windows 3.10" link="/blog/images/ipad-solitaire.jpg" %}
 
-Converting touch events to mouse events can be a bit, um, touchy.  The basic touch events are:
+The basic touch events are:
 
  - `touchstart`
  - `touchmove`

_posts/2016-03-12-more-demos.md

@@ -0,0 +1,33 @@
+---
+layout: post
+title: More Demos
+date: 2016-03-12 14:00:00
+permalink: /blog/2016/03/12/
+---
+
+I recently added some more demos to the PCjs Project, to showcase its ability to run old 80286-based and
+80386-based software, such as [Windows/386](/disks/pc/windows/2.0x/), [Windows 3.0](/disks/pc/windows/3.00/), and
+[Windows 3.1](/disks/pc/windows/3.10/).
+
+{% include screenshot.html src="/disks/pc/windows/2.0x/thumbnail.jpg" width="200" height="120" title="COMPAQ DeskPro 386, Windows/386 2.01" link="/disks/pc/windows/2.0x/" %}
+{% include screenshot.html src="/disks/pc/windows/3.00/thumbnail.jpg" width="200" height="120" title="IBM PC AT w/EGA, Windows 3.00" link="/disks/pc/windows/3.00/" %}
+{% include screenshot.html src="/disks/pc/windows/3.10/thumbnail.jpg" width="200" height="120" title="IBM PC AT w/VGA, Windows 3.10" link="/disks/pc/windows/3.10/" %}
+
+As the [OS/2 Museum](http://www.os2museum.com/wp/windows386-2-01/) points out, [Windows/386 2.01](/disks/pc/windows/2.0x/)
+was the first Microsoft product to specifically target the 80386.  However, not only was it *not* a 32-bit operating
+system, it didn't even run Windows applications in protected-mode.  Windows apps ran in V86-mode, and even then, *only*
+if you started Windows by running `WIN386.EXE`.
+
+There may have been some incidental protection advantages to running Windows in V86-mode instead of real-mode,
+but the primary advantages were the ability to simulate expanded memory (EMS) using the 80386's paging capabilities,
+and the ability to run multiple DOS applications simultaneously.
+
+Alternatively, you could start Windows/386 with `WIN86.COM`, which reverted to the older Windows 1.x memory model,
+where all Windows applications ran in real-mode and only one DOS application could be run at a time. 
+
+Strangely, unlike all previous and subsequent versions of Windows, there was no `WIN` command in Windows/386.
+
+At least there was no `LOSE` command.
+
+*[@jeffpar](http://twitter.com/jeffpar)*  
+*March 12, 2016*

devices/pc/machine/compaq/deskpro386/vga/2048kb/debugger/machine.xml

@@ -3,7 +3,7 @@
 <machine id="deskpro386" class="pc" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">COMPAQ DeskPro 386, 2Mb RAM, IBM VGA, 20Mb Hard Disk</name>
 	<computer id="deskpro386-vga-2048k" name="COMPAQ DeskPro 386" buswidth="32"/>
-	<cpu id="cpu386" model="80386" autostart="true"/>
+	<cpu id="cpu386" model="80386"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramCPQ" addr="0xfa0000" size="0x60000" comment="COMPAQ memory at 0xFA0000"/>
 	<ram id="ramExt" addr="0x100000" size="0x100000" comment="Extended memory at 0x100000"/>

devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml

@@ -3,7 +3,7 @@
 <machine id="deskpro386" class="pc" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">COMPAQ DeskPro 386, 2Mb RAM, IBM VGA, 20Mb Hard Disk</name>
 	<computer id="deskpro386-vga-2048k" name="COMPAQ DeskPro 386" buswidth="32"/>
-	<cpu id="cpu386" model="80386" autostart="true"/>
+	<cpu id="cpu386" model="80386"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramCPQ" addr="0xfa0000" size="0x60000" comment="COMPAQ memory at 0xFA0000"/>
 	<ram id="ramExt" addr="0x100000" size="0x100000" comment="Extended memory at 0x100000"/>

disks/pc/README.md

@@ -84,9 +84,9 @@ that automatically run the software.
 * [Microsoft Windows 2.03](/disks/pc/windows/2.03/)
 * [Microsoft Windows/386 2.01](/disks/pc/windows/2.0x/)
 * [Microsoft Windows/386 2.03](/disks/pc/windows/2.0x/#microsoft-windows386-203)
-* [Microsoft Windows/286 2.10](/disks/pc/windows/2.10/#microsoft-windows286-210)
+* [Microsoft Windows/286 2.10](/disks/pc/windows/2.10/)
 * [Microsoft Windows/386 2.10](/disks/pc/windows/2.10/#microsoft-windows386-210)
-* [Microsoft Windows/286 2.11](/disks/pc/windows/2.11/#microsoft-windows286-211)
+* [Microsoft Windows/286 2.11](/disks/pc/windows/2.11/)
 * [Microsoft Windows/386 2.11](/disks/pc/windows/2.11/#microsoft-windows386-211)
 * [Microsoft Windows 3.00](/disks/pc/windows/3.00/)
 * [Microsoft Windows 3.10](/disks/pc/windows/3.10/)

disks/pc/windows/2.0x/README.md

@@ -24,7 +24,10 @@ Microsoft Windows/386 2.01
 This Windows/386 release was finalized in September 1987, predating [Windows 2.03](/disks/pc/windows/2.03/)
 by several months.
 
-Directory listings of the three 1.2Mb distribution diskettes are provided below.
+Directory listings of the three 1.2Mb Microsoft Windows/386 2.01 distribution diskettes are provided below.
+
+In the [COMPAQ DeskPro 386](/devices/pc/machine/compaq/deskpro386/vga/2048kb/) machine below, you can run `WIN86`
+to start Windows in real-mode, or `WIN386` to start Windows in V86-mode.
 
 {% include machine.html id="deskpro386" %}
 

disks/pc/windows/3.00/README.md

@@ -15,10 +15,10 @@ Microsoft Windows 3.00
 
 The PCjs machine below starts Microsoft Windows 3.00, using an IBM PC AT running PC-DOS 3.20.
 
-{% include machine.html id="ibm5170-win300" %}
-
 Directory listings of the five 1.2Mb distribution diskettes are provided below.
 
+{% include machine.html id="ibm5170-win300" %}
+
 ### Directory of Windows 3.00 (Disk 1)
 
 	 Volume in drive A is WIN30DISK01

disks/pc/windows/3.10/README.md

@@ -15,10 +15,10 @@ Microsoft Windows 3.10
 
 The PCjs machine below starts Microsoft Windows 3.10, using an IBM PC AT running PC-DOS 3.30.
 
-{% include machine.html id="ibm5170-win310" %}
-
 Directory listings of the seven 1.2Mb distribution diskettes are provided below.
 
+{% include machine.html id="ibm5170-win310" %}
+
 ### Directory of Windows 3.10 (Disk 1)
 
 	 Volume in drive A is WIN31DISK1 

index.md

@@ -44,10 +44,10 @@ Some pre-configured machines are shown below, ready to run BASIC, DOS, Windows,
 
 {% include screenshot.html src="/apps/pc/1981/visicalc/thumbnail.jpg" width="200" height="120" title="IBM PC running VisiCalc" link="/apps/pc/1981/visicalc/" %}
 {% include screenshot.html src="/devices/pc/machine/5150/cga/64kb/donkey/thumbnail.jpg" width="200" height="120" title="IBM PC running DONKEY.BAS" link="/devices/pc/machine/5150/cga/64kb/donkey/" %}
-{% include screenshot.html src="/devices/pc/machine/5160/cga/256kb/demo/thumbnail.jpg" width="200" height="120" title="IBM PC XT w/CGA, 10Mb Hard Drive" link="/devices/pc/machine/5160/cga/256kb/demo/" %}
 {% include screenshot.html src="/disks/pc/os2/ibm/1.0/thumbnail.jpg" width="200" height="120" title="IBM PC AT w/EGA, OS/2 1.0" link="/disks/pc/os2/ibm/1.0/" %}
 {% include screenshot.html src="/devices/pc/machine/5160/cga/256kb/win101/thumbnail.jpg" width="200" height="120" title="IBM PC XT w/CGA, Windows 1.01" link="/devices/pc/machine/5160/cga/256kb/win101/" %}
 {% include screenshot.html src="/disks/pc/windows/1.01/thumbnail.jpg" width="200" height="120" title="IBM PC XT w/EGA, Windows 1.01" link="/disks/pc/windows/1.01/" %}
+{% include screenshot.html src="/disks/pc/windows/2.0x/thumbnail.jpg" width="200" height="120" title="COMPAQ DeskPro 386, Windows/386 2.01" link="/disks/pc/windows/2.0x/" %}
 {% include screenshot.html src="/disks/pc/windows/3.00/thumbnail.jpg" width="200" height="120" title="IBM PC AT w/EGA, Windows 3.00" link="/disks/pc/windows/3.00/" %}
 {% include screenshot.html src="/disks/pc/windows/3.10/thumbnail.jpg" width="200" height="120" title="IBM PC AT w/VGA, Windows 3.10" link="/disks/pc/windows/3.10/" %}
 {% include screenshot.html src="/disks/pc/windows/win95/4.00.950/thumbnail.jpg" width="200" height="120" title="COMPAQ DeskPro 386, Windows 95" link="/disks/pc/windows/win95/4.00.950/" %}

tests/pc/vga/README.md

@@ -17,14 +17,16 @@ machines:
 VGA "Black Book" Tests
 ---
 
-To aid in the development of PCjs VGA support, I've started adding some VGA tests to the project.  For now, the
+To aid in the development of PCjs VGA support, I've added some VGA tests to the project.
-only "tests" are samples taken directly from [Michael Abrash's Graphics Programming Black Book](https://github.com/jeffpar/abrash-black-book).
+For now, the only "tests" are samples taken directly from
+[Michael Abrash's Graphics Programming Black Book](https://github.com/jeffpar/abrash-black-book), which you
+can run in the [VGA "Black Book" Test Machine](#vga-black-book-test-machine) below.
 
 Abrash's book is available on many sites, but I'm partial to the Markdown version that [James Gregory](https://github.com/jagregory)
 has made available on GitHub, because (a) it's a brilliant way to render and share the text, and (b) it apparently has
 Abrash's blessing, so I feel more comfortable forking it, using it, and resharing it.
 
-The main reasons for my [fork](https://github.com/jeffpar/abrash-black-book): to make the book's
+The main reasons for my [fork](https://github.com/jeffpar/abrash-black-book) are to make the book's
 images display properly on GitHub, and to extract and add assorted source code listings as I need them.  Since that
 project's [/src](https://github.com/jeffpar/abrash-black-book/tree/master/src) folder contains just the book's text,
 I've added a [/code](https://github.com/jeffpar/abrash-black-book/tree/master/code) folder for the source code listings.
@@ -113,9 +115,11 @@ burden on the server, it's best to do this only when running PCjs from a local P
 One advantage of using [DiskDump](/modules/diskdump/) is that it automatically converts linefeeds in known text files
 (including ASM files) into DOS-compatible CR/LF sequences.
 
+VGA "Black Book" Test Machine
 ---
 
-The [Compaq DeskPro 386](/devices/pc/machine/compaq/deskpro386/vga/2048kb/) machine below uses the
+The [Compaq DeskPro 386](/devices/pc/machine/compaq/deskpro386/vga/2048kb/) machine below loads the
-[Library](/disks/pc/library.xml) disk collection and loads the "VGA Tests (Black Book)" disk in Drive B.
+"VGA Tests (Black Book)" disk from the PCjs [Library](/disks/pc/library.xml) disk collection into Drive B.
+Click the "Run" button to start the machine.
 
 {% include machine.html id="deskpro386" %}