From bd50bb8daeb9cdaba204c571cf7ca75e246b730c Mon Sep 17 00:00:00 2001 From: Fabian Date: Tue, 30 Mar 2021 04:35:27 -0500 Subject: [PATCH] Add Windows 3.1 and Snowdrop --- index.html | 6 +++++- src/browser/main.js | 41 ++++++++++++++++++++++++++++++++++++++--- tests/full/run.js | 25 +++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 5709e1ae..c6df44e5 100644 --- a/index.html +++ b/index.html @@ -27,6 +27,8 @@ Including Minesweeper and Internet Explorer with internet access. Additional sectors are loaded as needed. Windows 95 4.6 MB Restored from snapshot + Windows 3.1 15 MB + Takes 15 seconds to boot Windows 1.01 0.6 MB Takes 1 second to boot MS-DOS 6.22 4.4 MB @@ -49,6 +51,8 @@ Fast graphical OS written in Assembly QNX 1.3 MB QNX 4.05 Demo disk (no networking) + Snowdrop 0.3 MB + A homebrew operating system from scratch, written in assembly language Solar OS 0.3 MB Simple graphical OS Bootchess 0.1 MB @@ -254,7 +258,7 @@

-Version: b40c8ad2 (Apr 23, 2020 01:04) +Version: 98e7110c2 (Feb 16, 2021 12:02)
Enable debug diff --git a/src/browser/main.js b/src/browser/main.js index bf36be46..ae621b0c 100644 --- a/src/browser/main.js +++ b/src/browser/main.js @@ -379,15 +379,27 @@ "async": false, "size": 1474560, }, - name: "Bootchess", + name: "BootChess", homepage: "http://www.pouet.net/prod.php?which=64962", }, + { + id: "bootbasic", + fda: { + "url": HOST + "bootbasic.img", + "async": false, + "size": 1474560, + }, + name: "bootBASIC", + homepage: "https://github.com/nanochess/bootBASIC", + }, { id: "windows2000", memory_size: 512 * 1024 * 1024, hda: { - "url": "images/windows2k.img", + "url": HOST + "windows2k.img", + "size": 2 * 1024 * 1024 * 1024, "async": true, + use_parts: !ON_LOCALHOST, }, name: "Windows 2000", state: { @@ -399,8 +411,10 @@ id: "windows2000-boot", memory_size: 512 * 1024 * 1024, hda: { - "url": "images/windows2k.img", + "url": HOST + "windows2k.img", + "size": 2 * 1024 * 1024 * 1024, "async": true, + use_parts: !ON_LOCALHOST, }, boot_order: 0x132, name: "Windows 2000", @@ -465,6 +479,16 @@ }, name: "Windows 3.0", }, + { + id: "windows31", + memory_size: 64 * 1024 * 1024, + hda: { + "url": HOST + "win31.img", + "async": false, + "size": 34463744, + }, + name: "Windows 3.1", + }, { id: "freebsd", memory_size: 256 * 1024 * 1024, @@ -541,6 +565,17 @@ name: "Skift", homepage: "https://skiftos.org/", }, + { + id: "snowdrop", + memory_size: 128 * 1024 * 1024, + fda: { + "url": HOST + "snowdrop.img", + "size": 1440 * 1024, + "async": false, + }, + name: "Snowdrop", + homepage: "http://www.sebastianmihai.com/snowdrop/", + }, { id: "openwrt", memory_size: 128 * 1024 * 1024, diff --git a/tests/full/run.js b/tests/full/run.js index 2baa8ee9..e368a605 100755 --- a/tests/full/run.js +++ b/tests/full/run.js @@ -118,6 +118,19 @@ if(cluster.isMaster) }, ], }, + { + name: "Snowdrop", + fda: root_path + "/images/snowdrop.img", + timeout: 30, + expect_graphical_mode: true, + expect_mouse_registered: true, + actions: [ + { + on_text: "[Snowdrop OS snowshell]:", + run: "desktop\n" + }, + ], + }, { name: "Linux", cdrom: root_path + "/images/linux.iso", @@ -341,6 +354,18 @@ if(cluster.isMaster) }, ], }, + { + name: "Windows 3.1", + skip_if_disk_image_missing: true, + timeout: 2 * 60, + hda: root_path + "/images/win31.img", + expect_graphical_mode: true, + expect_graphical_size: [1024, 768], + expect_mouse_registered: true, + expected_texts: [ + "MODE prepare code page function completed", + ], + }, { name: "FreeBSD", skip_if_disk_image_missing: true,