summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Justin Kerk <dopefishjustin@gmail.com>2020-05-22 21:04:53 -0700
committer Justin Kerk <dopefishjustin@gmail.com>2020-05-22 21:04:53 -0700
commit4c2424c805b22b6aa828735db52eb243b19c808e (patch)
tree39834af216e762fca79ddcc9c76d992c7d5fa1ad
parentb901e785375ee9f3a740742ae1fbbaa93ffb0d7f (diff)
New not working software list additions
--------------------------------------- ibm5150: Wizzardz & War Lordz [LGR] (nw) cleanups, move SimLife to ibm5170 (#6728)
-rw-r--r--3rdparty/asio/src/examples/cpp03/timeouts/blocking_tcp_client.cpp242
-rw-r--r--hash/ibm5150.xml95
-rw-r--r--hash/ibm5170.xml21
3 files changed, 65 insertions, 293 deletions
diff --git a/3rdparty/asio/src/examples/cpp03/timeouts/blocking_tcp_client.cpp b/3rdparty/asio/src/examples/cpp03/timeouts/blocking_tcp_client.cpp
deleted file mode 100644
index 69d467af1bb..00000000000
--- a/3rdparty/asio/src/examples/cpp03/timeouts/blocking_tcp_client.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-//
-// blocking_tcp_client.cpp
-// ~~~~~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#include "asio/connect.hpp"
-#include "asio/deadline_timer.hpp"
-#include "asio/io_context.hpp"
-#include "asio/ip/tcp.hpp"
-#include "asio/read_until.hpp"
-#include "asio/streambuf.hpp"
-#include "asio/system_error.hpp"
-#include "asio/write.hpp"
-#include "asio/thread.hpp"
-#include <cstdlib>
-#include <iostream>
-#include <string>
-#include <boost/lambda/bind.hpp>
-#include <boost/lambda/lambda.hpp>
-
-using asio::deadline_timer;
-using asio::ip::tcp;
-using boost::lambda::bind;
-using boost::lambda::var;
-using boost::lambda::_1;
-
-//----------------------------------------------------------------------
-
-//
-// This class manages socket timeouts by applying the concept of a deadline.
-// Each asynchronous operation is given a deadline by which it must complete.
-// Deadlines are enforced by an "actor" that persists for the lifetime of the
-// client object:
-//
-// +----------------+
-// | |
-// | check_deadline |<---+
-// | | |
-// +----------------+ | async_wait()
-// | |
-// +---------+
-//
-// If the actor determines that the deadline has expired, the socket is closed
-// and any outstanding operations are consequently cancelled. The socket
-// operations themselves use boost::lambda function objects as completion
-// handlers. For a given socket operation, the client object runs the
-// io_context to block thread execution until the actor completes.
-//
-class client
-{
-public:
- client()
- : socket_(io_context_),
- deadline_(io_context_)
- {
- // No deadline is required until the first socket operation is started. We
- // set the deadline to positive infinity so that the actor takes no action
- // until a specific deadline is set.
- deadline_.expires_at(boost::posix_time::pos_infin);
-
- // Start the persistent actor that checks for deadline expiry.
- check_deadline();
- }
-
- void connect(const std::string& host, const std::string& service,
- boost::posix_time::time_duration timeout)
- {
- // Resolve the host name and service to a list of endpoints.
- tcp::resolver::results_type endpoints =
- tcp::resolver(io_context_).resolve(host, service);
-
- // Set a deadline for the asynchronous operation. As a host name may
- // resolve to multiple endpoints, this function uses the composed operation
- // async_connect. The deadline applies to the entire operation, rather than
- // individual connection attempts.
- deadline_.expires_from_now(timeout);
-
- // Set up the variable that receives the result of the asynchronous
- // operation. The error code is set to would_block to signal that the
- // operation is incomplete. Asio guarantees that its asynchronous
- // operations will never fail with would_block, so any other value in
- // ec indicates completion.
- asio::error_code ec = asio::error::would_block;
-
- // Start the asynchronous operation itself. The boost::lambda function
- // object is used as a callback and will update the ec variable when the
- // operation completes. The blocking_udp_client.cpp example shows how you
- // can use boost::bind rather than boost::lambda.
- asio::async_connect(socket_, endpoints, var(ec) = _1);
-
- // Block until the asynchronous operation has completed.
- do io_context_.run_one(); while (ec == asio::error::would_block);
-
- // Determine whether a connection was successfully established. The
- // deadline actor may have had a chance to run and close our socket, even
- // though the connect operation notionally succeeded. Therefore we must
- // check whether the socket is still open before deciding if we succeeded
- // or failed.
- if (ec || !socket_.is_open())
- throw asio::system_error(
- ec ? ec : asio::error::operation_aborted);
- }
-
- std::string read_line(boost::posix_time::time_duration timeout)
- {
- // Set a deadline for the asynchronous operation. Since this function uses
- // a composed operation (async_read_until), the deadline applies to the
- // entire operation, rather than individual reads from the socket.
- deadline_.expires_from_now(timeout);
-
- // Set up the variable that receives the result of the asynchronous
- // operation. The error code is set to would_block to signal that the
- // operation is incomplete. Asio guarantees that its asynchronous
- // operations will never fail with would_block, so any other value in
- // ec indicates completion.
- asio::error_code ec = asio::error::would_block;
-
- // Start the asynchronous operation itself. The boost::lambda function
- // object is used as a callback and will update the ec variable when the
- // operation completes. The blocking_udp_client.cpp example shows how you
- // can use boost::bind rather than boost::lambda.
- asio::async_read_until(socket_, input_buffer_, '\n', var(ec) = _1);
-
- // Block until the asynchronous operation has completed.
- do io_context_.run_one(); while (ec == asio::error::would_block);
-
- if (ec)
- throw asio::system_error(ec);
-
- std::string line;
- std::istream is(&input_buffer_);
- std::getline(is, line);
- return line;
- }
-
- void write_line(const std::string& line,
- boost::posix_time::time_duration timeout)
- {
- std::string data = line + "\n";
-
- // Set a deadline for the asynchronous operation. Since this function uses
- // a composed operation (async_write), the deadline applies to the entire
- // operation, rather than individual writes to the socket.
- deadline_.expires_from_now(timeout);
-
- // Set up the variable that receives the result of the asynchronous
- // operation. The error code is set to would_block to signal that the
- // operation is incomplete. Asio guarantees that its asynchronous
- // operations will never fail with would_block, so any other value in
- // ec indicates completion.
- asio::error_code ec = asio::error::would_block;
-
- // Start the asynchronous operation itself. The boost::lambda function
- // object is used as a callback and will update the ec variable when the
- // operation completes. The blocking_udp_client.cpp example shows how you
- // can use boost::bind rather than boost::lambda.
- asio::async_write(socket_, asio::buffer(data), var(ec) = _1);
-
- // Block until the asynchronous operation has completed.
- do io_context_.run_one(); while (ec == asio::error::would_block);
-
- if (ec)
- throw asio::system_error(ec);
- }
-
-private:
- void check_deadline()
- {
- // Check whether the deadline has passed. We compare the deadline against
- // the current time since a new asynchronous operation may have moved the
- // deadline before this actor had a chance to run.
- if (deadline_.expires_at() <= deadline_timer::traits_type::now())
- {
- // The deadline has passed. The socket is closed so that any outstanding
- // asynchronous operations are cancelled. This allows the blocked
- // connect(), read_line() or write_line() functions to return.
- asio::error_code ignored_ec;
- socket_.close(ignored_ec);
-
- // There is no longer an active deadline. The expiry is set to positive
- // infinity so that the actor takes no action until a new deadline is set.
- deadline_.expires_at(boost::posix_time::pos_infin);
- }
-
- // Put the actor back to sleep.
- deadline_.async_wait(bind(&client::check_deadline, this));
- }
-
- asio::io_context io_context_;
- tcp::socket socket_;
- deadline_timer deadline_;
- asio::streambuf input_buffer_;
-};
-
-//----------------------------------------------------------------------
-
-int main(int argc, char* argv[])
-{
- try
- {
- if (argc != 4)
- {
- std::cerr << "Usage: blocking_tcp <host> <port> <message>\n";
- return 1;
- }
-
- client c;
- c.connect(argv[1], argv[2], boost::posix_time::seconds(10));
-
- boost::posix_time::ptime time_sent =
- boost::posix_time::microsec_clock::universal_time();
-
- c.write_line(argv[3], boost::posix_time::seconds(10));
-
- for (;;)
- {
- std::string line = c.read_line(boost::posix_time::seconds(10));
-
- // Keep going until we get back the line that was sent.
- if (line == argv[3])
- break;
- }
-
- boost::posix_time::ptime time_received =
- boost::posix_time::microsec_clock::universal_time();
-
- std::cout << "Round trip time: ";
- std::cout << (time_received - time_sent).total_microseconds();
- std::cout << " microseconds\n";
- }
- catch (std::exception& e)
- {
- std::cerr << "Exception: " << e.what() << "\n";
- }
-
- return 0;
-}
diff --git a/hash/ibm5150.xml b/hash/ibm5150.xml
index a26d4bd8f6b..392957b4056 100644
--- a/hash/ibm5150.xml
+++ b/hash/ibm5150.xml
@@ -803,38 +803,6 @@ Known PC Booter Games Not Dumped, Or Dumped and Lost when Demonlord's Site went
</part>
</software>
- <software name="eyehorus">
- <description>Eye of Horus</description>
- <year>1989</year>
- <publisher>Fanfare</publisher>
- <info name="developer" value="Denton Designs" />
- <part name="flop1" interface="floppy_5_25">
- <dataarea name="flop" size = "368640">
- <rom name="Eye Of Horus [FanFare] [1989] [5.25DD] [Disk 1 of 5].img" size="368640" crc="43110255" sha1="bb23967a4a4186a54376a46087c108a76ae3ac8a"/>
- </dataarea>
- </part>
- <part name="flop2" interface="floppy_5_25">
- <dataarea name="flop" size = "368640">
- <rom name="Eye Of Horus [FanFare] [1989] [5.25DD] [Disk 2 of 5].img" size="368640" crc="8e2e7ca3" sha1="65949b63fb314a7181586d3aea0a6be292765168"/>
- </dataarea>
- </part>
- <part name="flop3" interface="floppy_5_25">
- <dataarea name="flop" size = "368640">
- <rom name="Eye Of Horus [FanFare] [1989] [5.25DD] [Disk 3 of 5].img" size="368640" crc="16f0aa40" sha1="e8d387ad8c4dbdbde19801cf1d72ad8a16318133"/>
- </dataarea>
- </part>
- <part name="flop4" interface="floppy_5_25">
- <dataarea name="flop" size = "368640">
- <rom name="Eye Of Horus [FanFare] [1989] [5.25DD] [Disk 4 of 5].img" size="368640" crc="fac37d18" sha1="9d942766c74f57e194e7377b2ad1d31678b48af7"/>
- </dataarea>
- </part>
- <part name="flop5" interface="floppy_5_25">
- <dataarea name="flop" size = "368640">
- <rom name="Eye Of Horus [FanFare] [1989] [5.25DD] [Disk 5 of 5].img" size="368640" crc="59fb1548" sha1="7dcc454402c154f70a18d1dd53a0920cd0215fac"/>
- </dataarea>
- </part>
- </software>
-
<software name="f15se">
<description>F-15 Strike Eagle (CGA/Tandy/EGA/Amstrad, 3.5")</description>
<year>1985</year>
@@ -8804,6 +8772,38 @@ has been replaced with an all-zero block. -->
</part>
</software>
+ <software name="eyehorus">
+ <description>Eye of Horus</description>
+ <year>1989</year>
+ <publisher>Fanfare</publisher>
+ <info name="developer" value="Denton Designs" />
+ <part name="flop1" interface="floppy_5_25">
+ <dataarea name="flop" size = "368640">
+ <rom name="Eye of Horus [FanFare] [1989] [5.25DD] [Disk 1 of 5].img" size="368640" crc="43110255" sha1="bb23967a4a4186a54376a46087c108a76ae3ac8a"/>
+ </dataarea>
+ </part>
+ <part name="flop2" interface="floppy_5_25">
+ <dataarea name="flop" size = "368640">
+ <rom name="Eye of Horus [FanFare] [1989] [5.25DD] [Disk 2 of 5].img" size="368640" crc="8e2e7ca3" sha1="65949b63fb314a7181586d3aea0a6be292765168"/>
+ </dataarea>
+ </part>
+ <part name="flop3" interface="floppy_5_25">
+ <dataarea name="flop" size = "368640">
+ <rom name="Eye of Horus [FanFare] [1989] [5.25DD] [Disk 3 of 5].img" size="368640" crc="16f0aa40" sha1="e8d387ad8c4dbdbde19801cf1d72ad8a16318133"/>
+ </dataarea>
+ </part>
+ <part name="flop4" interface="floppy_5_25">
+ <dataarea name="flop" size = "368640">
+ <rom name="Eye of Horus [FanFare] [1989] [5.25DD] [Disk 4 of 5].img" size="368640" crc="fac37d18" sha1="9d942766c74f57e194e7377b2ad1d31678b48af7"/>
+ </dataarea>
+ </part>
+ <part name="flop5" interface="floppy_5_25">
+ <dataarea name="flop" size = "368640">
+ <rom name="Eye of Horus [FanFare] [1989] [5.25DD] [Disk 5 of 5].img" size="368640" crc="59fb1548" sha1="7dcc454402c154f70a18d1dd53a0920cd0215fac"/>
+ </dataarea>
+ </part>
+ </software>
+
<software name="f19">
<!-- Dumped via Kryoflux, shows as good and unmodified -->
<description>F-19 Stealth Fighter (Version 435.04)</description>
@@ -11809,24 +11809,6 @@ has been replaced with an all-zero block. -->
</part>
</software>
- <software name="simlife">
- <description>SimLife</description>
- <year>1992</year>
- <publisher>Maxis Software</publisher>
- <info name="developer" value="Maxis Software" />
- <info name="version" value="1.00" />
- <part name="flop1" interface="floppy_3_5">
- <dataarea name="flop" size = "737280">
- <rom name="SimLife (USA) [Maxis] [1992] [3.5DD] [Disk 1 of 2].img" size="737280" crc="2565bba0" sha1="121122ec26a856272259cecf37322118911fc9b6"/>
- </dataarea>
- </part>
- <part name="flop2" interface="floppy_3_5">
- <dataarea name="flop" size = "737280">
- <rom name="SimLife (USA) [Maxis] [1992] [3.5DD] [Disk 2 of 2].img" size="737280" crc="7f61828f" sha1="459a4b9d0dc9bdd100d056c45e49f648777668a8"/>
- </dataarea>
- </part>
- </software>
-
<software name="bartvssm">
<description>The Simpsons - Bart vs. the Space Mutants</description>
<year>1991</year>
@@ -12591,6 +12573,19 @@ has been replaced with an all-zero block. -->
</part>
</software>
+ <!-- hangs at black screen -->
+ <software name="wizzardz" supported="no">
+ <description>Wizzardz &amp; War Lordz</description>
+ <year>1985</year>
+ <publisher>Ram-Tek</publisher>
+ <info name="developer" value="James R. Martin" />
+ <part name="flop1" interface="floppy_5_25">
+ <dataarea name="flop" size = "304146">
+ <rom name="wizzard.imd" size="304146" crc="05215c36" sha1="05b0fb2dd5ceae97fde46a071da06393e4803cd8"/>
+ </dataarea>
+ </part>
+ </software>
+
<software name="wndrland">
<!-- Dumped via Kryoflux, track 0 shows as modified on all disks -->
<description>Wonderland</description>
diff --git a/hash/ibm5170.xml b/hash/ibm5170.xml
index 58b00fb6e1a..40c0e7ff429 100644
--- a/hash/ibm5170.xml
+++ b/hash/ibm5170.xml
@@ -10526,6 +10526,7 @@ license:CC0
</dataarea>
</part>
</software>
+
<software name="wcgps" cloneof="f1gp">
<description>World Circuit - The Grand Prix Race Simulation (USA)</description>
<year>1992</year>
@@ -12875,9 +12876,27 @@ license:CC0
</software>
<software name="simlife">
- <description>SimLife</description>
+ <description>SimLife (set 1)</description>
+ <year>1992</year>
+ <publisher>Maxis</publisher>
+ <info name="developer" value="Maxis" />
+ <part name="flop1" interface="floppy_3_5">
+ <dataarea name="flop" size = "737280">
+ <rom name="SimLife (USA) [Maxis] [1992] [3.5DD] [Disk 1 of 2].img" size="737280" crc="2565bba0" sha1="121122ec26a856272259cecf37322118911fc9b6"/>
+ </dataarea>
+ </part>
+ <part name="flop2" interface="floppy_3_5">
+ <dataarea name="flop" size = "737280">
+ <rom name="SimLife (USA) [Maxis] [1992] [3.5DD] [Disk 2 of 2].img" size="737280" crc="7f61828f" sha1="459a4b9d0dc9bdd100d056c45e49f648777668a8"/>
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="simlifea" cloneof="simlife">
+ <description>SimLife (set 2, older)</description>
<year>1992</year>
<publisher>Maxis</publisher>
+ <info name="developer" value="Maxis" />
<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="737280">
<rom name="simlife.img" size="737280" crc="59898bed" sha1="346ae9fb47fe2a0324e2df8f1f77c09dd5c3d8ec"/>