Merge pull request #4983 from RainRat/master

fix typos

INSTALL.md

@@ -36,7 +36,7 @@ You can also easily upgrade DOSBox-X to the new version with the Windows install
 
 Apart from the Windows installers, you can also find portable zip files starting with `dosbox-x-vsbuild-` and `dosbox-x-mingw-win` in the [Releases](https://github.com/joncampbell123/dosbox-x/releases) page as an alternative way to install DOSBox-X. In the zip file you will find `Release` and `Release SDL2` folders, which correspond to SDL1 and SDL2 respectively.  
 
-Regarding Joystick support, the *SDL1 builds requires XInput compatible devices*. If your joystick is not Xinput compatible, you may want to try the SDL2 builds or DirectInput to XInput wrappers such as [Xoutput](https://github.com/csutorasa/XOutput) or [Xbox 360 contoller emulator](https://www.x360ce.com/).
+Regarding Joystick support, the *SDL1 builds requires XInput compatible devices*. If your joystick is not Xinput compatible, you may want to try the SDL2 builds or DirectInput to XInput wrappers such as [Xoutput](https://github.com/csutorasa/XOutput) or [Xbox 360 controller emulator](https://www.x360ce.com/).
 
 * Windows XP users must use the XP compatible installer with "XP" in the file name, which includes Visual Studio XP builds and the 32-bit MinGW low-end builds. Note that not all features are available in the MinGW low-end builds, currently Slirp support is known to be missing. You also need to install the [DirectX runtime](https://www.microsoft.com/en-us/download/details.aspx?id=8109) or DOSBox-X will complain you're missing `XInput9_1_0.dll`. XP compatible builds works in ReactOS as well, but support is considered experimental.
 * Windows Vista users can use the standard (non-XP) installer. While Visual Studio builds work well, MinGW dropped support for XP/Vista, so install the 32-bit low-end builds from the XP compatible installer if you prefer MinGW builds.

contrib/windows/installer/dosbox-x.reference.setup.conf

@@ -2457,7 +2457,7 @@ ipx = false
 #            If you have multiple DOSBox-Xes running on the same network,
 #            this has to be changed for each. AC:DE:48 is an address range reserved for
 #            private use, so modify the last three number blocks, e.g. AC:DE:48:88:99:AB.
-#            Default setting is 'random' which randomly choses a MAC address.
+#            Default setting is 'random' which randomly chooses a MAC address.
 # backend: The backend (either pcap or slirp is supported) used for the NE2000 Ethernet emulation.
 #            If set to "auto", then "slirp" is selected when available, otherwise "pcap" is selected when available.
 #            NE2000 Ethernet emulation will be disabled if no backend is available (or the specified backend if unavailable).

docs/PLANS/Bochs VBE and VirtualBox OMAPI emulation/TODO

@@ -6,7 +6,7 @@
   in Bochs and VirtualBox
 - Add code to emulate or fake other settings you can change through it.
 - Add setting in dosbox.conf that allows user to enable/disable this emulation.
-  The setting should be disabled by default, since this emulation is irrelevent
+  The setting should be disabled by default, since this emulation is irrelevant
   to DOS gaming but potentially useful for running Windows 3.1/95 (because I
   can then code up a simple linear framebuffer that uses the interface to do
   modesetting!). Don't code the setting as a boolean, code it as a multivalue

docs/PLANS/General TODO.txt

@@ -57,13 +57,13 @@ Some plans for future DOSBox-X developments
 
   - Instead of statically assigning I/O and memory handlers, all handlers are
     initialized to a lookup function.
-  - The DOSBox motherboard emulator at this point would also maintain it's own
+  - The DOSBox motherboard emulator at this point would also maintain its own
     setup of a system bus hierarchy (system resources and RAM vs forwarding to
     the ISA bus, or a PCI-based system that forwards to PCI which can forward
     via PCI-ISA bridge to ISA, etc.).
   - When the lookup function is called, the function goes through the "slow"
     path where it asks the motherboard what function to call, and the
-    motherboard returns a function pointer according to it's designation of
+    motherboard returns a function pointer according to its designation of
     routing, which is then written into the I/O handler. In other words, once
     an I/O port has been accessed, further access is a direct call to the
     I/O callback.
@@ -81,9 +81,9 @@ Some plans for future DOSBox-X developments
     Sound Blaster ISA PnP emulation will no longer emit a warning when
     Windows or any DOS program attempts to reprogram the base address.
     It would also allow DOS or Windows to change, relocate, enable/disable
-    PCI resources. The only performance penalty is that everytime a mapping
+    PCI resources. The only performance penalty is that every time a mapping
     changes, the emulator has to invalidate all I/O and memory callbacks
-    to allow the "slow" path to do it's work again.
+    to allow the "slow" path to do its work again.
   - The reason we don't do bus lookup every time is one of performance.
     DOSBox-X already has an array of IO handlers and memory page handlers,
     so why not make use of it as a cache for callbacks once the slow path
@@ -93,14 +93,14 @@ Some plans for future DOSBox-X developments
 * Motherboard & BIOS oriented system construction
   - Rather than the one way the DOSBox kernel does it, the user could instead
     specify that DOSBox-X emulate a particular motherboard with a particular
-    BIOS. The code could then construct I/O and memory mangement to emulate
+    BIOS. The code could then construct I/O and memory management to emulate
     the known chipsets on that board.
 
     Example: If instructed to, it would emulate the system board on an old
     laptop of mine with a Chips & Tech 386 AT ASIC, or it could emulate an
     old AST motherboard and instruct PIC emulation to act like a Unicorn
     Microelectronics UM8259A-2. The default of course would carefully
-    mimic for backwards compatability the DOSBox mainline "motherboard" and
+    mimic for backwards compatibility the DOSBox mainline "motherboard" and
     "bios" configuration.
 
   - Such construction may include (if on original hardware), VGA emulation
@@ -110,7 +110,7 @@ Some plans for future DOSBox-X developments
 * CD audio
 
   - Refactor the code to ensure we feed out CD audio in a way the guest
-    can track it's time accurately.
+    can track its time accurately.
   - IDE/ATAPI emulation needs to support the mode select or whatever commands
     used by DOS programs to change CD audio volume.
 
@@ -152,7 +152,7 @@ Some plans for future DOSBox-X developments
     keyboard and port 0x92 methods well.
   - So what exotic method are older demos using the clear the screen anyway?
     Can you figure it out? Their failure to clear the screen properly is
-    causing graphic anomolies during certain parts.
+    causing graphic anomalies during certain parts.
   - Memory and I/O resource management code. Rather than just pick regions
     of memory and I/O space, the emulation code should have a way to mark
     that such and such region has been taken for e.g. "VGA BIOS" and
@@ -164,7 +164,7 @@ Some plans for future DOSBox-X developments
   - Peripherals should assign themselves to a bus if possible. Sound Blaster
     emulation for example would register itself to the I/O ports on the
     ISA bus. Voodoo 3dfx emulation would register itself to the PCI bus.
-  - Support not just for declaring an ISA bus and it's frequency, but also
+  - Support not just for declaring an ISA bus and its frequency, but also
     for ISA devices that you would declare "attached" to the bus (same with
     PCI). Instead of DOSBox's design where peripherals are static and only
     one at a time is possible, we would allow you to declare peripherals

docs/PLANS/IBM PC ROM BASIC emulation/TODO

@@ -4,7 +4,7 @@
 - Also use the PC XT to study the various entry points, besides the obvious INT 19h.
   How is BASICA.COM triggering it, for example? I noticed a straight INT 19h triggers
   it in a way that "SYSTEM" does not work and you cannot return to DOS.
-- The Ralph Brown interrupt list vaugely references a whole range of interrupts as
+- The Ralph Brown interrupt list vaguely references a whole range of interrupts as
   related to ROM BASIC. How are they related? Do you call them? Or are they pointers?
 - Add code to DOSBox-X where, given a BIN image of the PC XT's ROM BIOS, it can boot
   into ROM BASIC from the DOSBox shell.

dosbox-x.reference.conf

@@ -1188,7 +1188,7 @@ ipx = false
 #            If you have multiple DOSBox-Xes running on the same network,
 #            this has to be changed for each. AC:DE:48 is an address range reserved for
 #            private use, so modify the last three number blocks, e.g. AC:DE:48:88:99:AB.
-#            Default setting is 'random' which randomly choses a MAC address.
+#            Default setting is 'random' which randomly chooses a MAC address.
 # backend: The backend (either pcap or slirp is supported) used for the NE2000 Ethernet emulation.
 #            If set to "auto", then "slirp" is selected when available, otherwise "pcap" is selected when available.
 #            NE2000 Ethernet emulation will be disabled if no backend is available (or the specified backend if unavailable).

dosbox-x.reference.full.conf

@@ -2393,7 +2393,7 @@ ipx = false
 #            If you have multiple DOSBox-Xes running on the same network,
 #            this has to be changed for each. AC:DE:48 is an address range reserved for
 #            private use, so modify the last three number blocks, e.g. AC:DE:48:88:99:AB.
-#            Default setting is 'random' which randomly choses a MAC address.
+#            Default setting is 'random' which randomly chooses a MAC address.
 # backend: The backend (either pcap or slirp is supported) used for the NE2000 Ethernet emulation.
 #            If set to "auto", then "slirp" is selected when available, otherwise "pcap" is selected when available.
 #            NE2000 Ethernet emulation will be disabled if no backend is available (or the specified backend if unavailable).

src/dos/dev_con.h

@@ -1176,7 +1176,7 @@ bool device_CON::Write(const uint8_t * data,uint16_t * size) {
                         ClearAnsi();
                     }
                     else {
-                        LOG(LOG_IOCTL,LOG_NORMAL)("ANSI: unknown char %c after a esc",data[count]); /*prob () */
+                        LOG(LOG_IOCTL,LOG_NORMAL)("ANSI: unknown char %c after an esc",data[count]); /*prob () */
                         ClearAnsi();
                     }
                     break;
@@ -1185,7 +1185,7 @@ bool device_CON::Write(const uint8_t * data,uint16_t * size) {
                         ansi.pc98rparen = true;
                     }
                     else {
-                        LOG(LOG_IOCTL, LOG_NORMAL)("ANSI: unknown char %c after a esc", data[count]); /*prob () */
+                        LOG(LOG_IOCTL, LOG_NORMAL)("ANSI: unknown char %c after an esc", data[count]); /*prob () */
                         ClearAnsi();
                     }
                     break;
@@ -1205,7 +1205,7 @@ bool device_CON::Write(const uint8_t * data,uint16_t * size) {
                 case '7': /* save cursor pos + attr TODO */
                 case '8': /* restore this TODO */
                 default:
-                    LOG(LOG_IOCTL,LOG_NORMAL)("ANSI: unknown char %c after a esc",data[count]); /*prob () */
+                    LOG(LOG_IOCTL,LOG_NORMAL)("ANSI: unknown char %c after an esc",data[count]); /*prob () */
                     ClearAnsi();
                     break;
             }

src/dos/dos.cpp

@@ -3719,7 +3719,7 @@ static Bitu DOS_29Handler(void)
 		case 'D':/* scrolling DOWN*/
 		case 'M':/* scrolling UP*/
 		default:
-			LOG(LOG_IOCTL,LOG_NORMAL)("ANSI: unknown char %c after a esc", reg_al); /*prob () */
+			LOG(LOG_IOCTL,LOG_NORMAL)("ANSI: unknown char %c after an esc", reg_al); /*prob () */
 			ClearAnsi29h();
 			break;
 		}

src/dos/dos_programs.cpp

@@ -4085,7 +4085,7 @@ class IMGMAKE : public Program {
             }
             while ((vol_sectors/sectors_per_cluster) >= (fatlimit - 2u) && sectors_per_cluster < 0x80u) sectors_per_cluster <<= 1;
             sbuf[0x0d]=(uint8_t)sectors_per_cluster;
-            // TODO small floppys have 2 sectors per cluster?
+            // TODO small floppies have 2 sectors per cluster?
             // reserved sectors
             host_writew(&sbuf[0x0e],reserved_sectors);
             // Number of FATs

src/dosbox.cpp

@@ -4718,7 +4718,7 @@ void DOSBOX_SetupConfigSections(void) {
         "If you have multiple DOSBox-Xes running on the same network,\n"
         "this has to be changed for each. AC:DE:48 is an address range reserved for\n"
         "private use, so modify the last three number blocks, e.g. AC:DE:48:88:99:AB.\n"
-        "Default setting is 'random' which randomly choses a MAC address.");
+        "Default setting is 'random' which randomly chooses a MAC address.");
     Pstring->SetBasic(true);
 
     Pstring = secprop->Add_string("backend", Property::Changeable::WhenIdle, "auto");

src/gui/menu.cpp

@@ -1235,7 +1235,7 @@ bool DOSBoxMenu::nsMenuInit(void) {
             item.nsAppendMenu(nsMenu);
         }
 
-        /* release our handle on the nsMenus. Mac OS X will keep them alive with it's
+        /* release our handle on the nsMenus. Mac OS X will keep them alive with its
            reference until the menu is destroyed at which point all items and submenus
            will be automatically destroyed */
         for (auto &id : master_list) {

src/gui/sdlmain.cpp

@@ -3126,7 +3126,7 @@ static void GUI_ShutDown(Section * /*sec*/) {
 static void SetPriority(PRIORITY_LEVELS level) {
 
 #if C_SET_PRIORITY
-// Do nothing if priorties are not the same and not root, else the highest
+// Do nothing if priorities are not the same and not root, else the highest
 // priority can not be set as users can only lower priority (not restore it)
 
     if((sdl.priority.focus != sdl.priority.nofocus ) &&

src/hardware/adlib.cpp

@@ -802,7 +802,7 @@ class Capture {
 
 			//if ( passed > 0 ) LOG_MSG( "Delay %d", passed ) ;
 
-			// If we passed more than 30 seconds since the last command, we'll restart the the capture
+			// If we passed more than 30 seconds since the last command, we'll restart the capture
 			if ( passed > 30000 ) {
 				CloseFile();
 				goto skipWrite;

src/hardware/imfc.cpp

@@ -6,7 +6,7 @@
  *  Copyright (C) 2017-2020  Loris Chiocca
  *    - Authored the IBM Music Feature card (IMFC) emulator, as follows:
  *    - Reverse-engineered the IMF's Z80 ROM and tested against hardware.
- *    - Used IDA Pro (licensed) to help structure and anonotate the assembly.
+ *    - Used IDA Pro (licensed) to help structure and annotate the assembly.
  *    - Ported the assembly to C++ (without IDA Pro's assembly-to-C module).
  *    - Integrated the results into a working DOSBox 0.74.3 patch.
  *    - Used the GPL v2+ Virtual FB-01 project for FB-01 emulation (below).
@@ -17,7 +17,7 @@
  *
  *  Copyright (C) 1997-1999  Jarek Burczynski <[email protected]>
  *    - Authored the YM-2151 emulator in MAME, which is used in the Virtual
- *      FB-01 project and dervices sources here.
+ *      FB-01 project and devices sources here.
  *
  *  ---
  *
@@ -604,7 +604,7 @@ struct MidiFlowPath {
 	// reports from the music card will reflect its programmed state.
 	uint8_t System_To_MidiOut;
 	// This is the path from MIDI IN to the sound processor. This path is set
-	// so that the music card can be controlled by an external MIDI devince.
+	// so that the music card can be controlled by an external MIDI device.
 	uint8_t MidiIn_To_SP;
 	// This is the route from the system to the sound processor. This path
 	// is set so that the music card can be controlled by the processor. Note:
@@ -7133,7 +7133,7 @@ class MusicFeatureCard : public Module_base {
 		// m_bufferFromMidiInState.setDataAdded();
 		if (m_bufferFromMidiInState.getIndexForNextWriteByte() ==
 		    m_bufferFromMidiInState.getLastReadByteIndex()) {
-			// oops... we just wrote into the data that hans't
+			// oops... we just wrote into the data that hasn't
 			// already been read :(
 			resetMidiInBuffersAndPorts();
 			m_bufferFromMidiInState.setOverflowErrorFlag();

src/hardware/vga_draw.cpp

@@ -5003,7 +5003,7 @@ void VGA_sof_debug_video_info(void) {
 		 * VGA: Each mode produces 4-bit pixels per dot clock (256-color mode loads 2 4-bit pixels and emits the 8-bit value per every other dot clock).
 		 *      Text modes and EGA/VGA 16-color modes produce values 0-15, CGA 4-color 0-3, CGA 2-color and monochrome EGA/MCGA 0-1,
 		 *      and 256-color mode 0-15 for each half of the 8-bit pixel value. Note that on EGA/VGA, there's a "color plane enable"
-		 *      register that is used to make sure CGA 2-color and monochrone MCGA modes are limited to one bitplane, in fact CGA 2-color
+		 *      register that is used to make sure CGA 2-color and monochrome MCGA modes are limited to one bitplane, in fact CGA 2-color
 		 *      and MCGA monochrome modes are really just EGA 16-color modes with only one bitplane enabled for display and writing
 		 *      and the memory map set up to emulate non-planar video memory like the DOS application expects. CGA 4-color is still one
 		 *      bitplane with odd/even mode enabled and a bit that instructs the hardware to latch 2 bits at a time which are then internally
@@ -5027,7 +5027,7 @@ void VGA_sof_debug_video_info(void) {
 		 *      Tseng ET4000 cards... doing that will instead give you a 320x200 screen that is not pixel doubled and is squeezed on
 		 *      the right half of the screen with garbage data on the left half).
 		 *
-		 *      Got it? Good. This complexity is why most games written for EGA work pefectly fine on VGA, even if they play with the
+		 *      Got it? Good. This complexity is why most games written for EGA work perfectly fine on VGA, even if they play with the
 		 *      EGA palette in the Attribute Controller or color plane masks.
 		 *
 		 * NOTES: A good test case for the color plane enable:
@@ -6750,7 +6750,7 @@ void VGA_SetupDrawing(Bitu /*val*/) {
 		hdend += 1;
 		vdend += 1;
 
-		// horitzontal blanking
+		// horizontal blanking
 		if (hbend <= (hbstart & hbend_mask)) hbend += hbend_mask + 1;
 		hbend += hbstart - (hbstart & hbend_mask);
 
@@ -7048,7 +7048,7 @@ void VGA_SetupDrawing(Bitu /*val*/) {
 	//Seems regular vga only listens to the 9 char pixel mode with character mode enabled
 	//Base pixel height around vertical totals of modes that have 100 clocks horizontal
 	//Different sync values gives different scaling of the whole vertical range
-	//VGA monitor just seems to thighten or widen the whole vertical range
+	//VGA monitor just seems to tighten or widen the whole vertical range
 
 	vga.draw.resizing=false;
 	vga.draw.has_split=false;

src/ints/bios.cpp

@@ -4853,7 +4853,7 @@ void PC98_BIOS_FDC_CALL(unsigned int flags) {
                 FDC_WAIT_TIMER_HACK();
             }
 
-            /* Prevent reading 1.44MB floppyies using 1.2MB read commands and vice versa.
+            /* Prevent reading 1.44MB floppies using 1.2MB read commands and vice versa.
              * FIXME: It seems MS-DOS 5.0 booted from a HDI image has trouble understanding
              *        when Drive A: (the first floppy) is a 1.44MB drive or not and fails
              *        because it only attempts it using 1.2MB format read commands. */
@@ -4932,7 +4932,7 @@ void PC98_BIOS_FDC_CALL(unsigned int flags) {
                 FDC_WAIT_TIMER_HACK();
             }
 
-            /* Prevent reading 1.44MB floppyies using 1.2MB read commands and vice versa.
+            /* Prevent reading 1.44MB floppies using 1.2MB read commands and vice versa.
              * FIXME: It seems MS-DOS 5.0 booted from a HDI image has trouble understanding
              *        when Drive A: (the first floppy) is a 1.44MB drive or not and fails
              *        because it only attempts it using 1.2MB format read commands. */
@@ -11486,7 +11486,7 @@ class BIOS:public Module_base{
                     isa_memory_hole_15mb = false;
             }
 
-            // FIXME: Erm, well this couldv'e been named better. It refers to the amount of conventional memory
+            // FIXME: Erm, well this could've been named better. It refers to the amount of conventional memory
             //        made available to the operating system below 1MB, which is usually DOS.
             dos_conventional_limit = (unsigned int)section->Get_int("dos mem limit");