joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-07 18:36:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix typos

Browse Source
This commit is contained in:
RainRat 2024-02-28 19:08:20 -08:00
parent 9d0efe0707
commit 902ce67fad
162 changed files with 391 additions and 391 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/bug_report.yml vendored
View File

@ -38,7 +38,7 @@ body:
id: os
attributes:
label: What operating system(s) this bug have occurred on?
description: Put in the release name of the OS (additionally with a extra version number and/or an architecture name) this problem have occurred on.
description: Put in the release name of the OS (additionally with an extra version number and/or an architecture name) this problem have occurred on.
placeholder: "Ex. Windows 10 21H2, Ubuntu 21.04 etc."
validations:
required: true

2
BUGS/Impact Studios - Legend.txt
View File

@ -13,7 +13,7 @@ Problem: Two parts of the demo, a rotating 3D dot object, does not
the screen.
Fix: The demo is using a combination of using the bitmask in the
grapics controller (register 8) and "bitplane flipping" using
graphics controller (register 8) and "bitplane flipping" using
the VGA DAC pel mask (0x3C6) to draw the objects. It hides the
"bitplane" using the Pel mask register, then sets the bitmask
in the graphics controller so that when it draws the object,

2
BUILD.md
View File

@ -37,7 +37,7 @@ In all cases, the code requires a C++ compiler that can support the C++11
standard.
Note that DOSBox-X supports both SDL 1.x and 2.x, and it is written to compile
against the in-tree copy of the SDL 1.x (Simple Directmedia Libary), or against
against the in-tree copy of the SDL 1.x (Simple Directmedia Library), or against
the SDL 2.x library provided by your Linux distribution.
For Visual Studio and MinGW compilation, the in-tree copy of SDL is always

36
CHANGELOG
View File

@ -41,7 +41,7 @@ Next:
tweakmode is supported by S3 chipsets, so it is OFF by default and you will
need to add "enable supermegazeux tweakmode=true" to the [video] section of
your dosbox.conf to enable it. (joncampbell123).
- Undo the "no parition offset" change. DOOM II for PC-9821 requires it to work
- Undo the "no partition offset" change. DOOM II for PC-9821 requires it to work
else the page flipping fails and sprites and rendering flickers as you play.
(joncampbell123).
- Allow text layer to appear in PC-98 256-color mode. Even though I was unable
@ -500,7 +500,7 @@ Next:
in reality the DH FPU case was normally used, to hit this bug you
had to use core=dynamic_nodhfpu. Also fix dynamic x86 DH FPU code
never to restore from DH case if the DH FPU code was never enabled,
which periodically caused FPU state to dissapear. (joncampbell123).
which periodically caused FPU state to disappear. (joncampbell123).
- Add dosbox.conf option to control the MSCDEX.EXE device name when
emulating a CD-ROM drive (joncampbell123).
- Wengier coded this nice text-only DOSBox-X logo for the TTF output.
@ -542,7 +542,7 @@ Next:
when you take a screenshot or record a video to AVI or MTS for
later review. (joncampbell123)
- Dynamic core: Fix serious bug in dynrec dynamic core where calls
to handle x86 FPU instructions erronously passed the entire
to handle x86 FPU instructions erroneously passed the entire
FPU status word instead of passing only the FPU stack pointer.
The result of this error was that floating point was erratic,
buggy, and often caused memory corruption in DOSBox-X eventually
@ -3164,7 +3164,7 @@ Next:
functions" menu group (under "Main") to use BIOS
function for the clipboard pasting instead of the
keystroke method. Make sure this option is disabled
if pasting clipboad text into Windows 3.x/9x apps
if pasting clipboard text into Windows 3.x/9x apps
(e.g. Notepad & Write) is desired. This setting can
be changed with "clip_paste_bios" config option in
in [sdl] section of the config file too. (Wengier)
@ -3270,7 +3270,7 @@ Next:
to 437 if current codepage is different. (Wengier)
- The setting "output=default" will enable the OpenGL
output for Linux systems if possible. (Wengier)
- Fixed the CGA/MCGA/MDA/Hercules-specfic shortcut
- Fixed the CGA/MCGA/MDA/Hercules-specific shortcut
function buttons in Mapper Editor, and the screen
colors after exiting from Mapper Editor when using
these machine types in Direct3D output (SDL1 build).
@ -4844,7 +4844,7 @@ Next:
This prevents Windows 95 Setup from creating WINBOOT.INI
and then changing it into a directory with the call.
- FAT driver bugs fixed where a newly created zero length file
combined with a lseek() can corrupt filesytem structures
combined with a lseek() can corrupt filesystem structures
(root directory and/or the second FAT table). This fixes
filesystem corruption when running Windows 95 install.
- Enabled printer emulation for non-Windows OSes (Linux,
@ -5455,7 +5455,7 @@ Next:
been removed.
- Added INT 25h/INT 26h emulation for FAT drives
mounted with IMGMOUNT.
- Fake disk paramter table fixed to indicate one
- Fake disk parameter table fixed to indicate one
reserved sector.
- Fixed INT 25h/INT 26h to return an error rather than
silently fail with success. Emulation of these calls
@ -5912,7 +5912,7 @@ Next:
- Add improved breakpoint handling to the debugger
- Rewrite the order of the debug help list so the keys come
last
- Clip to boundaries when there are no suggeted values for
- Clip to boundaries when there are no suggested values for
Prop_int
- Implement an obscure behavior of the VGA DAC. Fixes wrong
colors in Planet Soccer/Football.
@ -6256,7 +6256,7 @@ Next:
dates on the host filesystem.
- VS2017 project files can now compile DOSBox-X to run on
ARM64 versions of Windows 10 (driver1998)
- Fixed FAT driver progamming mistake (inherited from
- Fixed FAT driver programming mistake (inherited from
DOSBox SVN) that used the Windows 95 "Created" date/time
stamp rather than the original MS-DOS "Modified" date/time
stamp field.
@ -6936,7 +6936,7 @@ Next:
that has random values in DRAM address bits 23-20.
- Added dosbox.conf option that, if set, lets Gravis Ultrasound emulation
start a DMA transfer if the game/demo is polling the DMA control register
when DMA is unmasked and DMA terminal count has not occured, which helps
when DMA is unmasked and DMA terminal count has not occurred, which helps
some demoscene productions.
- Added "PIC unmask IRQ" option for Gravis Ultrasound emulation.
- Gravis Ultrasound emulation now has a dosbox.conf setting to initialize
@ -6968,7 +6968,7 @@ Next:
only for non-VESA modes. 1024x768 16-color mode works again.
- Fixed user-defined VESA BIOS modes to validate the required video
memory against the available memory on the emulated SVGA hardware.
- VESA BIOS modelist generaton moved into it's own function. Modelist
- VESA BIOS modelist generation moved into it's own function. Modelist
is regenerated upon editing/deletion of modes.
- VESA BIOS modes added as suggested by hail-to-the-ryzen
- VESA BIOS emulation now allows scriptable editing, deletion, and
@ -7166,7 +7166,7 @@ Next:
changes.
- Renderer SSE line comparison fixed to use correct sizeof()
of the integer type during compare.
- Renderer fixed not to use SSE and non-SSE line comparision
- Renderer fixed not to use SSE and non-SSE line comparison
at the same time, if SSE was enabled at compile time.
- Fixed in-tree SDL 1.x library to allow DOSBox-X to disable
auto-refresh of the window in Linux/X11 after SDL_SetVideoMode
@ -8192,7 +8192,7 @@ https://github.com/joncampbell123/dosbox-x/pull/290
activity.
- Fix various mscdex and cdrom detection schemes.
- Added Coremidi support on Mac OS X.
- Improve support for DOS devices when used to detect the existance
- Improve support for DOS devices when used to detect the existence
of directories in various ways.
- Add IRQ 2 emulation on VRET. (ega only)
- Added video parameter table and video state functionality.
@ -8343,7 +8343,7 @@ https://github.com/joncampbell123/dosbox-x/pull/290
- Add IPX functions needed by netbios.
- Make ports take emulated time.
- Tabcompletion is now aware of the CD command.
- Add suppport for the dac pel mask.
- Add support for the dac pel mask.
- Fixes to hercules emulation, better detection and bank switching.
- Fixes to tandy emulation, 640x200x16 mode and different sizes bank.
- EGA/VGA memory changes detection for faster rendering.
@ -8388,7 +8388,7 @@ https://github.com/joncampbell123/dosbox-x/pull/290
- Fixed a lot of things in the boot code. Most booters work now.
- Lots of improvements to the IPX emulation.
- Rewritten modem emulation. Should work with more games.
- Improvements to the dos memory managment routines.
- Improvements to the dos memory management routines.
- Add UMB (upper memory blocks) support.
- Emulate the pause key.
- Improve Composite CGA mode emulation.
@ -8638,12 +8638,12 @@ https://github.com/joncampbell123/dosbox-x/pull/290
- added partial support for int10:01 set cursortype
- fixed most of the problems/bugs with character input.
- fixed allocationinfo call.(darksun series)
- improved dos support for non-existant functions
- improved dos support for non-existent functions
- Split screen support
- prefix 66 67 support
- rewrote timingscheme so 1000 hz timers don't cause problems anymore
- update adlib emulation
- fixed some isues with the mouse (double clicks and visible when it shouldn't be)
- fixed some issues with the mouse (double clicks and visible when it shouldn't be)
- improved mouse behaviour (mickey/pixel rate) and detection routines.
- basic ansi.sys support
- Disney sound system emulation
@ -8709,4 +8709,4 @@ https://github.com/joncampbell123/dosbox-x/pull/290
- changed dma
- improved dma streams from emm memory
- added some cga videomodes
- added more funtions to the keyboard handler
- added more functions to the keyboard handler

2
CREDITS.md
View File

@ -3,7 +3,7 @@ Credits
Jonathan Campbell, the maintainer of DOSBox-X does not claim to have written all of the code in this project.
The purpose of this document is to try and build a comprehensive list of source code in this repository that was borrowed from other projects.
The purpose of this document is to try to build a comprehensive list of source code in this repository that was borrowed from other projects.
The base code is from the [DOSBox](https://www.dosbox.com) project in which most of the SVN commits made since 2011 were incorporated into DOSBox-X. This code had since been heavily modified by the DOSBox-X project.

4
Doxyfile
View File

@ -1580,7 +1580,7 @@ PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
# generate an inheritance diagram (in HTML, RTF and LaTeX) for classes with base
# or super classes. Setting the tag to NO turns the diagrams off. Note that
# this option also works with HAVE_DOT disabled, but it is recommended to
# install and use dot, since it yields more powerful graphs.
@ -1666,7 +1666,7 @@ UML_LOOK = NO
# the class node. If there are many fields or methods and many nodes the
# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
# threshold limits the number of items for each type to make the size more
# managable. Set this to 0 for no limit. Note that the threshold may be
# manageable. Set this to 0 for no limit. Note that the threshold may be
# exceeded by 50% before the limit is enforced.
UML_LIMIT_NUM_FIELDS = 10

28
NEWS
View File

@ -53,7 +53,7 @@ The game compatibility should be identical to 0.74.
- Modify movie recording code so that the movies aren't corrupt when
you exit dosbox without stopping the movie.
- Change RGB3x scaler to look more pretty.
- Improve initial register values compatility of the GUS.
- Improve initial register values compatibility of the GUS.
- Added autodetection for Gameblaster. (games can find it now)
- Change render preferences a bit to be more compatible with Windows 7.
- Add DOS fixes to terminate program. (fixes Fortune Teller)
@ -164,7 +164,7 @@ The game compatibility should be identical to 0.74.
activity.
- Fix various mscdex and cdrom detection schemes.
- Added Coremidi support on Mac OS X.
- Improve support for DOS devices when used to detect the existance
- Improve support for DOS devices when used to detect the existence
of directories in various ways.
- Add IRQ 2 emulation on VRET. (ega only)
- Added video parameter table and video state functionality.
@ -174,7 +174,7 @@ The game compatibility should be identical to 0.74.
- Fix mixer 16bit direct transfers on bigendian hosts.
0.72
- Fixed unitialized variable in joystick. (Fixes crashes on Vista and
- Fixed uninitialized variable in joystick. (Fixes crashes on Vista and
Mac OS X)
- Some bugfixes and speedups to the 64 bit recompiling core.
- Fixed sign flag on soundblaster dma transfers (Space Quest 6 intro)
@ -315,7 +315,7 @@ The game compatibility should be identical to 0.74.
- Add IPX functions needed by netbios.
- Make ports take emulated time.
- Tabcompletion is now aware of the CD command.
- Add suppport for the dac pel mask.
- Add support for the dac pel mask.
- Fixes to hercules emulation, better detection and bank switching.
- Fixes to tandy emulation, 640x200x16 mode and different sizes bank.
- EGA/VGA memory changes detection for faster rendering.
@ -348,7 +348,7 @@ The game compatibility should be identical to 0.74.
- Fixed a bug in the mixer code, that muted the music in certain games.
- Added an assembly fpu core.
- Made the shell more flexible for batch files.
- Check for unaligned memory acces fixes hangups on ARM processors.
- Check for unaligned memory access fixes hangups on ARM processors.
- Some 64 bit fixes.
- Added code to change configuration at runtime.
- Improved ADPCM emulation.
@ -360,7 +360,7 @@ The game compatibility should be identical to 0.74.
- Fixed a lot of things in the boot code. Most booters work now.
- Lots of improvements to the IPX emulation.
- Rewritten modem emulation. Should work with more games.
- Improvements to the dos memory managment routines.
- Improvements to the dos memory management routines.
- Add UMB (upper memory blocks) support.
- Emulate the pause key.
- Improve Composite CGA mode emulation.
@ -472,7 +472,7 @@ The game compatibility should be identical to 0.74.
- Added a keymapper.
- Added basic IPX emulation.
- Added cdrom iso support and floppy images support.
- Added the possibity to boot another dos version.
- Added the possibility to boot another dos version.
- Added Serial passthrough support (win32 only).
- Added the possibility to pause dosbox.
- Changed OpenGL so that it is initialized only when used.
@ -532,7 +532,7 @@ The game compatibility should be identical to 0.74.
- Added another way to switch to protected mode. (Thanks Morten Eriksen!)
- Fixed some odd badly documented behaviour with PSP/DTA
- Added some warnings on opening of readonly files in writemode(DOS default).
- Many shell enhanchements
- Many shell enhancements
- Fixed a win32 specific bug dealing with filenames starting with a "."
- Fixed some bugs with the directory structure: not found/can't save errors
@ -571,7 +571,7 @@ The game compatibility should be identical to 0.74.
0.58
- fixed date and time issues with fcbs
- added more commands to the internal Shell
- corrected config system when a old configfile was used
- corrected config system when an old configfile was used
- fixed cga put and get pixel
- fixed some vga register getting reset to wrong values
- improved support for foreign keyboards
@ -607,12 +607,12 @@ The game compatibility should be identical to 0.74.
- added partial support for int10:01 set cursortype
- fixed most of the problems/bugs with character input.
- fixed allocationinfo call.(darksun series)
- improved dos support for non-existant functions
- improved dos support for non-existent functions
- Split screen support
- prefix 66 67 support
- rewrote timingscheme so 1000 hz timers don't cause problems anymore
- update adlib emulation
- fixed some isues with the mouse (double clicks and visible when it shouldn't be)
- fixed some issues with the mouse (double clicks and visible when it shouldn't be)
- improved mouse behaviour (mickey/pixel rate) and detection routines.
- basic ansi.sys support
- Disney sound system emulation
@ -653,7 +653,7 @@ The game compatibility should be identical to 0.74.
- Rewrote most of the fcb calls to use normal dos calls.
0.55
- fixed the errors/warnings in prefix_66.h and prefix_66_of.h (decimal too large becomming unsigned).
- fixed the errors/warnings in prefix_66.h and prefix_66_of.h (decimal too large becoming unsigned).
- fixed compilation error on FreeBSD when #disable_joystick was defined
- int10_writechar has been updated to move the cursor position.
- changed the basedir routines to use the current working dir instead of argv[0]. This will fix and brake things :)
@ -678,12 +678,12 @@ The game compatibility should be identical to 0.74.
- changed dma
- improved dma streams from emm memory
- added some cga videomodes
- added more funtions to the keyboard handler
- added more functions to the keyboard handler
0.50:
-added F3 to repeat the last typed command.
-made it possible to change the shellmessages(dosshell). so
you can costumize it.(dosbox.lang)
you can customize it.(dosbox.lang)
-changed cpu core.
-Fixed a lot of errors with the keyboard: shift-f1 and
alt-f1 now works.

2
README.joystick
View File

@ -130,7 +130,7 @@ The mapper deadzones are affected by 'axes mapping', this is not likely to be a
General notes
-------------
You will want to try and experiment as on what settings works best for software A and software B, and will probably end up with software-specific configurations.
You will want to try to experiment as on what settings works best for software A and software B, and will probably end up with software-specific configurations.
Please note that most DOS software supporting joystick input will not react properly when you adjust CPU cycles while they are being run, i.e. either find the appropriate number of CPU cycles it requires first or restart it for a consistent joystick experience.

2
README.keyboard-layout-handling
View File

@ -41,7 +41,7 @@ codes to SDLK_* scan codes. Filling in the correct SDLK_* values given the
current keyboard locale is an important first step in getting your keyboard
layout to work.
The general rule is to try and pick the SDLK_* code according to the unshifted
The general rule is to try to pick the SDLK_* code according to the unshifted
unmodded character it would type. On US keyboards for example, the '1' key
enters '1' unshifted and '!' shifted.

2
README.source-code-description
View File

@ -941,7 +941,7 @@ The first part concerns IBM PC/XT/AT emulation and VGA
emulation, with adjustments for some SVGA chipsets and
for MDA/Hercules/Tandy/EGA as well.
The second part concerns NEC PC-98 and emulation of it's
The second part concerns NEC PC-98 and emulation of its
subsystem.
The two parts work somewhat independently. Which one

2
build-debug-macos
View File

@ -63,7 +63,7 @@ opts=
# if Brew has installed packages, try to use those too
brew="/opt/homebrew"
if [[ -d "${brew}" && -d "${brew}/include" && -d "${brew}/lib" ]]; then
echo "Brew is installed, I'm going to use it's libraries too"
echo "Brew is installed, I'm going to use its libraries too"
new="-I${brew}/include "
nld="-L${brew}/lib "
CFLAGS="${new}${CFLAGS} -g3"

2
build-debug-macos-sdl2
View File

@ -62,7 +62,7 @@ opts=
# if Brew has installed packages, try to use those too
brew="/opt/homebrew"
if [[ -d "${brew}" && -d "${brew}/include" && -d "${brew}/lib" ]]; then
echo "Brew is installed, I'm going to use it's libraries too"
echo "Brew is installed, I'm going to use its libraries too"
new="-I${brew}/include "
nld="-L${brew}/lib "
CFLAGS="${new}${CFLAGS} -g3"

2
build-macos
View File

@ -136,7 +136,7 @@ for arch in ${architectures}; do
# if Brew has installed packages, try to use those too
if [ -n "${!brew_cmd}" ]; then
echo "Brew is installed, I'm going to use it's libraries too"
echo "Brew is installed, I'm going to use its libraries too"
new="-I$(${!brew_cmd} --prefix)/include "
nld="-L$(${!brew_cmd} --prefix)/lib "
CFLAGS="${CFLAGS}${new}"

2
build-macos-sdl2
View File

@ -132,7 +132,7 @@ for arch in ${architectures}; do
# if Brew has installed packages, try to use those too
if [ -n "${!brew_cmd}" ]; then
echo "Brew is installed, I'm going to use it's libraries too"
echo "Brew is installed, I'm going to use its libraries too"
new="-I$(${!brew_cmd} --prefix)/include "
nld="-L$(${!brew_cmd} --prefix)/lib "
CFLAGS="${CFLAGS}${new}"

6
configure.ac
View File

@ -365,8 +365,8 @@ else
esac
fi
dnl Some needed libaries for OS2
dnl perharps join this with the other target depended checks. move them upwards
dnl Some needed libraries for OS2
dnl perhaps join this with the other target depended checks. move them upwards
if test x$host = xi386-pc-os2-emx ; then
CXXFLAGS="$CXXFLAGS -Zmt"
LDFLAGS="$LDFLAGS -Zomf -Zmt"
@ -660,7 +660,7 @@ case "$host_cpu" in
;;
esac
dnl TODO: Need GCC to know this code is using C++ lamda functions
dnl TODO: Need GCC to know this code is using C++ lambda functions
dnl LIBRARY TEST: ALSA
AM_PATH_ALSA(0.9.0, AC_DEFINE(HAVE_ALSA,1,[Define to 1 to use ALSA for MIDI]) , : )

2
contrib/glshaders/crt-aperture.glsl
View File

@ -143,7 +143,7 @@ uniform PRECISION float BRIGHTNESS;
the default hardware implementation will be used, otherwise the custom
implementations below will be used instead.
These custom implemenations rely on the `rubyTextureSize` uniform variable.
These custom implementations rely on the `rubyTextureSize` uniform variable.
The code could calculate the texture size from the sampler using the
textureSize() GLSL function, but this would require a minimum of GLSL
version 130, which may prevent the shader from working on older systems.

14
contrib/glshaders/crt-lottes-fast.glsl
View File

@ -51,7 +51,7 @@
// Improved the vignette when WARP is enabled
//--------------------------------------------------------------
// Didn't test HLSL or CPU options
// - Will incorportate patches if they are broken
// - Will incorporate patches if they are broken
// - But out of time to try them myself
//==============================================================
////////////////////////////////////////////////////////////////
@ -289,7 +289,7 @@ vec3 ToSrgb(vec3 c){return vec3(
// 1.00 = thinner scanlines (too thin)
#define INPUT_THIN 0.5 + (0.5 * SCANLINE_THINNESS)
//--------------------------------------------------------------
// Horizonal scan blur
// Horizontal scan blur
// -3.0 = pixely
// -2.5 = default
// -2.0 = smooth
@ -309,7 +309,7 @@ vec3 ToSrgb(vec3 c){return vec3(
vec3 CrtsFetch(vec2 uv){
// For shadertoy, scale to get native texels in the image
uv*=vec2(INPUT_X,INPUT_Y)/rubyTextureSize.xy;
// Move towards intersting parts
// Move towards interesting parts
// uv+=vec2(0.5,0.5);
// Non-shadertoy case would not have the color conversion
return FromSrgb(COMPAT_TEXTURE(rubyTexture,uv.xy,-16.0).rgb);}
@ -409,7 +409,7 @@ vec3 CrtsFetch(vec2 uv){
// Pixel {0,0} should be {0.5,0.5}
// Pixel {1,1} should be {1.5,1.5}
//--------------------------------------------------------------
// 'dark' - Exposure of of masked channel
// 'dark' - Exposure of masked channel
// 0.0=fully off, 1.0=no effect
//==============================================================
CrtsF3 CrtsMask(CrtsF2 pos,CrtsF1 dark){
@ -472,7 +472,7 @@ vec3 CrtsFetch(vec2 uv){
// a0=cos(min(0.5, off *thin)*2pi)*0.5+0.5;
// a1=cos(min(0.5,(1.0-off)*thin)*2pi)*0.5+0.5;
//--------------------------------------------------------------
// This leads to a image darkening factor of roughly:
// This leads to an image darkening factor of roughly:
// {(1.5-thin)/1.0}
// This is further reduced by the mask:
// {1.0/2.0+mask*1.0/2.0}
@ -516,7 +516,7 @@ vec3 CrtsFetch(vec2 uv){
// Shared with CrtsTone() function
CrtsF1 thin,
//--------------------------------------------------------------
// Horizonal scan blur
// Horizontal scan blur
// -3.0 = pixely
// -2.5 = default
// -2.0 = smooth
@ -584,7 +584,7 @@ vec3 CrtsFetch(vec2 uv){
#else
// Snap to center of one of four pixels
CrtsF1 x0=floor(pos.x-1.5)+0.5;
// Inital UV position
// Initial UV position
CrtsF2 p=CrtsF2(x0*rcpInputSize.x,y0*rcpInputSize.y);
// Fetch 4 nearest texels from 2 nearest scanlines
CrtsF3 colA0=CrtsFetch(p);

14
contrib/glshaders/crt-lottes-fast.subtle+gain.glsl
View File

@ -51,7 +51,7 @@
// Improved the vignette when WARP is enabled
//--------------------------------------------------------------
// Didn't test HLSL or CPU options
// - Will incorportate patches if they are broken
// - Will incorporate patches if they are broken
// - But out of time to try them myself
//==============================================================
////////////////////////////////////////////////////////////////
@ -321,7 +321,7 @@ vec3 ToSrgb(vec3 c){return vec3(
// 1.00 = thinner scanlines (too thin)
#define INPUT_THIN 0.5 + (0.5 * SCANLINE_THINNESS)
//--------------------------------------------------------------
// Horizonal scan blur
// Horizontal scan blur
// -3.0 = pixely
// -2.5 = default
// -2.0 = smooth
@ -341,7 +341,7 @@ vec3 ToSrgb(vec3 c){return vec3(
vec3 CrtsFetch(vec2 uv){
// For shadertoy, scale to get native texels in the image
uv*=vec2(INPUT_X,INPUT_Y)/rubyTextureSize.xy;
// Move towards intersting parts
// Move towards interesting parts
// uv+=vec2(0.5,0.5);
// Non-shadertoy case would not have the color conversion
return FromSrgb(COMPAT_TEXTURE(rubyTexture,uv.xy,-16.0).rgb);}
@ -441,7 +441,7 @@ vec3 CrtsFetch(vec2 uv){
// Pixel {0,0} should be {0.5,0.5}
// Pixel {1,1} should be {1.5,1.5}
//--------------------------------------------------------------
// 'dark' - Exposure of of masked channel
// 'dark' - Exposure of masked channel
// 0.0=fully off, 1.0=no effect
//==============================================================
CrtsF3 CrtsMask(CrtsF2 pos,CrtsF1 dark){
@ -504,7 +504,7 @@ vec3 CrtsFetch(vec2 uv){
// a0=cos(min(0.5, off *thin)*2pi)*0.5+0.5;
// a1=cos(min(0.5,(1.0-off)*thin)*2pi)*0.5+0.5;
//--------------------------------------------------------------
// This leads to a image darkening factor of roughly:
// This leads to an image darkening factor of roughly:
// {(1.5-thin)/1.0}
// This is further reduced by the mask:
// {1.0/2.0+mask*1.0/2.0}
@ -548,7 +548,7 @@ vec3 CrtsFetch(vec2 uv){
// Shared with CrtsTone() function
CrtsF1 thin,
//--------------------------------------------------------------
// Horizonal scan blur
// Horizontal scan blur
// -3.0 = pixely
// -2.5 = default
// -2.0 = smooth
@ -616,7 +616,7 @@ vec3 CrtsFetch(vec2 uv){
#else
// Snap to center of one of four pixels
CrtsF1 x0=floor(pos.x-1.5)+0.5;
// Inital UV position
// Initial UV position
CrtsF2 p=CrtsF2(x0*rcpInputSize.x,y0*rcpInputSize.y);
// Fetch 4 nearest texels from 2 nearest scanlines
CrtsF3 colA0=CrtsFetch(p);

2
contrib/glshaders/crt-lottes.glsl
View File

@ -23,7 +23,7 @@
#pragma parameter brightBoost "brightness boost" 1.0 0.0 2.0 0.05
#pragma parameter hardBloomPix "bloom-x soft" -1.5 -2.0 -0.5 0.1
#pragma parameter hardBloomScan "bloom-y soft" -2.0 -4.0 -1.0 0.1
#pragma parameter bloomAmount "bloom ammount" 0.15 0.0 1.0 0.05
#pragma parameter bloomAmount "bloom amount" 0.15 0.0 1.0 0.05
#pragma parameter shape "filter kernel shape" 2.0 0.0 10.0 0.05
#if defined(VERTEX)

2
contrib/glshaders/crt-pi.glsl
View File

@ -122,7 +122,7 @@ void main()
the default hardware implementation will be used, otherwise the custom
implementations below will be used instead.
These custom implemenations rely on the `rubyTextureSize` uniform variable.
These custom implementations rely on the `rubyTextureSize` uniform variable.
The code could calculate the texture size from the sampler using the
textureSize() GLSL function, but this would require a minimum of GLSL
version 130, which may prevent the shader from working on older systems.

2
contrib/glshaders/fakelottes.glsl
View File

@ -164,7 +164,7 @@ uniform COMPAT_PRECISION float monitor_gamma;
the default hardware implementation will be used, otherwise the custom
implementations below will be used instead.
These custom implemenations rely on the `rubyTextureSize` uniform variable.
These custom implementations rely on the `rubyTextureSize` uniform variable.
The code could calculate the texture size from the sampler using the
textureSize() GLSL function, but this would require a minimum of GLSL
version 130, which may prevent the shader from working on older systems.

2
contrib/glshaders/fakelottes.tweaked.glsl
View File

@ -164,7 +164,7 @@ uniform COMPAT_PRECISION float monitor_gamma;
the default hardware implementation will be used, otherwise the custom
implementations below will be used instead.
These custom implemenations rely on the `rubyTextureSize` uniform variable.
These custom implementations rely on the `rubyTextureSize` uniform variable.
The code could calculate the texture size from the sampler using the
textureSize() GLSL function, but this would require a minimum of GLSL
version 130, which may prevent the shader from working on older systems.

2
contrib/glshaders/pixel_perfect-scanlines.glsl
View File

@ -190,7 +190,7 @@ uniform vec2 rubyTextureSize;
the default hardware implementation will be used, otherwise the custom
implementations below will be used instead.
These custom implemenations rely on the `rubyTextureSize` uniform variable.
These custom implementations rely on the `rubyTextureSize` uniform variable.
The code could calculate the texture size from the sampler using the
textureSize() GLSL function, but this would require a minimum of GLSL
version 130, which may prevent the shader from working on older systems.

2
contrib/glshaders/pixel_perfect.glsl
View File

@ -178,7 +178,7 @@ uniform vec2 rubyTextureSize;
the default hardware implementation will be used, otherwise the custom
implementations below will be used instead.
These custom implemenations rely on the `rubyTextureSize` uniform variable.
These custom implementations rely on the `rubyTextureSize` uniform variable.
The code could calculate the texture size from the sampler using the
textureSize() GLSL function, but this would require a minimum of GLSL
version 130, which may prevent the shader from working on older systems.

2
contrib/glshaders/yeetron.glsl
View File

@ -101,7 +101,7 @@ COMPAT_VARYING vec2 v_texCoord;
the default hardware implementation will be used, otherwise the custom
implementations below will be used instead.
These custom implemenations rely on the `rubyTextureSize` uniform variable.
These custom implementations rely on the `rubyTextureSize` uniform variable.
The code could calculate the texture size from the sampler using the
textureSize() GLSL function, but this would require a minimum of GLSL
version 130, which may prevent the shader from working on older systems.

4
contrib/glshaders/zfast_crt.glsl
View File

@ -15,7 +15,7 @@ Notes: This shader does scaling with a weighted linear filter for adjustable
sharpness on the x and y axes based on the algorithm by Inigo Quilez here:
http://http://www.iquilezles.org/www/articles/texture/texture.htm
but modified to be somewhat sharper. Then a scanline effect that varies
based on pixel brighness is applied along with a monochrome aperture mask.
based on pixel brightness is applied along with a monochrome aperture mask.
This shader runs at 60fps on the Raspberry Pi 3 hardware at 2mpix/s
resolutions (1920x1080 or 1600x1200).
*/
@ -186,7 +186,7 @@ uniform COMPAT_PRECISION float MASK_FADE;
the default hardware implementation will be used, otherwise the custom
implementations below will be used instead.
These custom implemenations rely on the `rubyTextureSize` uniform variable.
These custom implementations rely on the `rubyTextureSize` uniform variable.
The code could calculate the texture size from the sampler using the
textureSize() GLSL function, but this would require a minimum of GLSL
version 130, which may prevent the shader from working on older systems.

2
contrib/linux/dosbox-x.asciidoc
View File

@ -18,7 +18,7 @@ Options are listed below. Depending on the option, one or more may be specified.
The optional _FILE_ argument should be a DOS executable or a directory.
If it is a DOS executable (.com .exe .bat), the program will run automatically.
If it is a directory, the directory specified will be mounted as the C:\ drive.
If the DOS executable requires parameters, enclose the command and it's parameters in quotes.
If the DOS executable requires parameters, enclose the command and its parameters in quotes.
For an introduction type _INTRO_ inside dosbox-x.

2
contrib/windows/installer/ISPPBuiltins.iss
View File

@ -43,7 +43,7 @@
// 6 - conditional inclusion acknowledgements
// 7 - reserved
// 8 - show strings emitted with #emit directive
// 9 - macro and functions successfull call acknowledgements
// 9 - macro and functions successful call acknowledgements
//10 - Local macro array allocation acknowledgements
//
//#pragma verboselevel 0

14
contrib/windows/installer/dosbox-x.reference.setup.conf
View File

@ -694,7 +694,7 @@ pc-98 anex86 font =
# dosv: Enable DOS/V emulation and specify which version to emulate. This option is intended for use with games or software
# originating from East Asia (China, Japan, Korea) that use the double byte character set (DBCS) encodings and DOS/V extensions
# to display Japanese (jp), Chinese (chs/cht/cn/tw), or Korean (ko) text. Note that enabling DOS/V replaces 80x25 text mode with
# a EGA/VGA graphics mode that emulates text mode to display the characters and may be incompatible with non-Asian software that
# an EGA/VGA graphics mode that emulates text mode to display the characters and may be incompatible with non-Asian software that
# assumes direct access to the text mode via segment 0xB800. For a general DOS environment with CJK support please disable DOS/V
# emulation and use TrueType font (TTF) output with a CJK code page (932, 936, 949, 950) and TTF font with CJK characters instead.
# Possible values: off, jp, ko, chs, cht, cn, tw.
@ -1055,7 +1055,7 @@ vsyncrate = 75
#DOSBOX-X-ADV:# double fault: Emulate double fault exception
#DOSBOX-X-ADV:# clear trap flag on unhandled int 1: If set, the DOS kernel INT 01h handler will clear the trap flag when called.
#DOSBOX-X-ADV:# Normally a DOS program using INT 01h and the trap flag (usually for debugging)
#DOSBOX-X-ADV:# will provide it's own INT 01h handler. Some programs need this option set in
#DOSBOX-X-ADV:# will provide its own INT 01h handler. Some programs need this option set in
#DOSBOX-X-ADV:# order to not crash during startup due to possible bugs or anti debugger tricks
#DOSBOX-X-ADV:# that went terribly wrong.
#DOSBOX-X-ADV:# reset on triple fault: Reset CPU on triple fault condition (failure to handle double fault)
@ -1549,7 +1549,7 @@ fluid.soundfont =
# attempts to play without enabling the speaker, set this option to true to
# compensate. This setting has no meaning if emulating a Sound Blaster 16 card.
#DOSBOX-X-ADV:# enable asp: If set, emulate the presence of the Sound Blaster 16 Advanced Sound Processor/Creative Sound Processor chip.
#DOSBOX-X-ADV:# NOTE: This only emulates it's presence and the basic DSP commands to communicate with it. Actual ASP/CSP functions are not yet implemented.
#DOSBOX-X-ADV:# NOTE: This only emulates its presence and the basic DSP commands to communicate with it. Actual ASP/CSP functions are not yet implemented.
#DOSBOX-X-ADV:# disable filtering: By default DOSBox-X filters Sound Blaster output to emulate lowpass filters and analog output limitations.
#DOSBOX-X-ADV:# Set this option to true to disable filtering. Note that doing so disables emulation of the Sound Blaster Pro
#DOSBOX-X-ADV:# output filter and ESS AudioDrive lowpass filter.
@ -1703,7 +1703,7 @@ blaster environment variable = true
# gusrate: Sample rate of Ultrasound emulation.
# Possible values: 49716, 48000, 44100, 32000, 22050, 16000, 11025, 8000.
#DOSBOX-X-ADV:# gus fixed render rate: If set, Gravis Ultrasound audio output is rendered at a fixed sample rate specified by 'gusrate'. This can provide better quality than real hardware,
#DOSBOX-X-ADV:# if desired. Else, Gravis Ultrasound emulation will change the sample rate of it's output according to the number of active channels, just like real hardware.
#DOSBOX-X-ADV:# if desired. Else, Gravis Ultrasound emulation will change the sample rate of its output according to the number of active channels, just like real hardware.
#DOSBOX-X-ADV:# Note: DOSBox-X defaults to 'false', while mainline DOSBox SVN is currently hardcoded to render as if this setting is 'true'.
# gusmemsize: Amount of RAM on the Gravis Ultrasound in KB. Set to -1 for default.
# gus master volume: Master Gravis Ultrasound GF1 volume, in decibels. Reducing the master volume can help with games or demoscene productions where the music is too loud and clipping.
@ -2267,9 +2267,9 @@ timeout = 0
# mouse report rate: Mouse reporting rate, or 0 for auto. This affects how often mouse events are reported to the guest through the mouse interrupt.
# Some games including CyClone need a lower reporting rate to function correctly. Auto mode allows the guest to change the report rate through the PS/2 mouse emulation.
# This option does not affect any DOS game that uses polling through INT 33h to detect mouse movement.
#DOSBOX-X-ADV:# int33 hide host cursor if interrupt subroutine: If set, the cursor on the host will be hidden if the DOS application provides it's own
#DOSBOX-X-ADV:# int33 hide host cursor if interrupt subroutine: If set, the cursor on the host will be hidden if the DOS application provides its own
#DOSBOX-X-ADV:# interrupt subroutine for the mouse driver to call, which is usually an indication that
#DOSBOX-X-ADV:# the DOS game wishes to draw the cursor with it's own support routines (DeluxePaint II).
#DOSBOX-X-ADV:# the DOS game wishes to draw the cursor with its own support routines (DeluxePaint II).
#DOSBOX-X-ADV:# int33 hide host cursor when polling: If set, the cursor on the host will be hidden even if the DOS application has also
#DOSBOX-X-ADV:# hidden the cursor in the guest, as long as the DOS application is polling position
#DOSBOX-X-ADV:# and button status. This can be useful for DOS programs that draw the cursor on their
@ -2283,7 +2283,7 @@ timeout = 0
#DOSBOX-X-ADV:# Note that some OS's like Microsoft Windows neither use INT 33h nor
#DOSBOX-X-ADV:# probe the AUX port directly and depend on this BIOS interface exclusively
#DOSBOX-X-ADV:# for PS/2 mouse support. In other cases there is no harm in leaving this enabled
#DOSBOX-X-ADV:# int15 wait force unmask irq: Some demos or games mistakingly use INT 15h AH=0x86 (WAIT) while leaving the IRQs needed for it masked.
#DOSBOX-X-ADV:# int15 wait force unmask irq: Some demos or games mistakenly use INT 15h AH=0x86 (WAIT) while leaving the IRQs needed for it masked.
#DOSBOX-X-ADV:# If this option is set (by default), the necessary IRQs will be unmasked when INT 15 AH=0x86 is used so that the game or demo does not hang.
#DOSBOX-X-ADV:# int15 mouse callback does not preserve registers: Set to true if the guest OS or DOS program assigns an INT 15h mouse callback,
#DOSBOX-X-ADV:# but does not properly preserve CPU registers. Diagnostic function only (default off).

2
contrib/windows/shaders/2xSaI.fx
View File

@ -666,7 +666,7 @@ float4 PS_Product2_Pass2 ( in VS_OUTPUT_PRODUCT2_PASS2 input ) : COLOR
// Final combine stage. Outputs to framebuffer.
//
// Uses preprocess information, and information about what pixel to output
// to to various interpolations of the colours where required.
// to various interpolations of the colours where required.
//
float4 PS_Combine ( in VS_OUTPUT_COMBINE input ) : COLOR
{

2
contrib/windows/shaders/2xSaI_sRGB.fx
View File

@ -666,7 +666,7 @@ half4 PS_Product2_Pass2 ( in VS_OUTPUT_PRODUCT2_PASS2 input ) : COLOR
// Final combine stage. Outputs to framebuffer.
//
// Uses preprocess information, and information about what pixel to output
// to to various interpolations of the colours where required.
// to various interpolations of the colours where required.
//
half4 PS_Combine ( in VS_OUTPUT_COMBINE input ) : COLOR
{

4
contrib/windows/shaders/GS2xFilter.fx
View File

@ -30,8 +30,8 @@ float scaling : SCALING = 1.1;
const float mx = 0.325; // start smoothing wt.
const float k = -0.250; // wt. decrease factor
const float max_w = 0.25; // max filter weigth
const float min_w = 0.00; // min filter weigth
const float max_w = 0.25; // max filter weight
const float min_w = 0.00; // min filter weight
const float lum_add = 0.25; // effects smoothing

4
contrib/windows/shaders/GS4xFilter.fx
View File

@ -30,8 +30,8 @@ float scaling : SCALING = 1.0;
const float mx = 1.00; // start smoothing wt.
const float k = -1.10; // wt. decrease factor
const float max_w = 0.90; // max filter weigth
const float min_w = 0.05; // min filter weigth
const float max_w = 0.90; // max filter weight
const float min_w = 0.05; // min filter weight
const float lum_add = 0.33; // effects smoothing
string preprocessTechique : PREPROCESSTECHNIQUE = "GS4xFilter";

6
contrib/windows/shaders/scale2x.fx
View File

@ -51,7 +51,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
// For the bottom row, pixels B and H are swapped vs the top row
// And for the right column, pixels D and F are swapped vs the left column
//
// That means, with dependant textures reads, this algorithm can be converted
// That means, with dependent textures reads, this algorithm can be converted
// into a fairly compact pixel shader
//
@ -105,7 +105,7 @@ VS_OUTPUT_NEW VS_New(
{
VS_OUTPUT_NEW Out = (VS_OUTPUT_NEW)0;
Out.Position = mul(float4(Position, 1), WorldViewProjection); // Matrix multipliy
Out.Position = mul(float4(Position, 1), WorldViewProjection); // Matrix multiply
Out.CentreUV = TexCoord;
Out.Selector = TexCoord*SourceDims;
@ -117,7 +117,7 @@ VS_OUTPUT_NEW VS_New(
// Pixel Shader
//
// Even faster version (Uses dependant texture reads to work)
// Even faster version (Uses dependent texture reads to work)
float4 PS_New ( in VS_OUTPUT_NEW input ) : COLOR
{
// half2 selector = frac(input.Selector);

8
contrib/windows/shaders/scale2x_ps14.fx
View File

@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
// ** PIXEL SHADER 1.4 VERSION **
//
// This version of the algorithm for Pixel Shader V 1.4 is significantly different from the
// original 2.0 version. It doesn't use any dependant texture reads
// original 2.0 version. It doesn't use any dependent texture reads
// Understanding the code may be quite difficult.
//
// ** ORIGINAL NOTES **
@ -59,7 +59,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
// For the bottom row, pixels B and H are swapped vs the top row
// And for the right column, pixels D and F are swapped vs the left column
//
// That means, with dependant textures reads, this algorithm can be converted
// That means, with dependent textures reads, this algorithm can be converted
// into a fairly compact pixel shader
//
//
@ -114,7 +114,7 @@ float4 SelectOffset(float3 Pos : POSITION) : COLOR
// 0.00 = Do nothing in shader
// 0.25 = Invert the logical comparison
// 1.00 = Ingore this value
// 1.00 = Ignore this value
if (Pos.x < 0.5 && Pos.y < 0.5) ret = float4(0.00, 0.25, 0.25, 1.00);
if (Pos.x < 0.5 && Pos.y >= 0.5) ret = float4(0.25, 1.00, 0.00, 0.25);
@ -184,7 +184,7 @@ R TR: !(A==L || A!=R || 0000 || B==R) +- 0.25, 0.00, 1.00, 0.25
R BR: !(0000 || A==R || B==L || B!=R) ++ 1.00, 0.25, 0.25, 0.00
// if greater than 0, we invert
// if greater then 0.5, we zero it out
// if greater than 0.5, we zero it out
1 1 0 1

4
contrib/windows/shaders/scaling.inc
View File

@ -31,7 +31,7 @@ matrix WorldViewProjection : WORLDVIEWPROJECTION; // world * view * projection
// Source Texture Definition for Scaler Effects
//
// Image Dimentions
// Image Dimensions
float2 SourceDims : SOURCEDIMS = 256.0F;
// Size of one Texel
@ -145,7 +145,7 @@ sampler OutputSelectSampler = sampler_state
//
// A Simple Texture that can do a modulo (or frac) by a lookup, rather than by
// using a arithmetic instruction. Not entirely accurate
// using an arithmetic instruction. Not entirely accurate
//
texture ModuloTexture
<

2
dosbox-x.reference.conf
View File

@ -321,7 +321,7 @@ pc-98 anex86 font =
# dosv: Enable DOS/V emulation and specify which version to emulate. This option is intended for use with games or software
# originating from East Asia (China, Japan, Korea) that use the double byte character set (DBCS) encodings and DOS/V extensions
# to display Japanese (jp), Chinese (chs/cht/cn/tw), or Korean (ko) text. Note that enabling DOS/V replaces 80x25 text mode with
# a EGA/VGA graphics mode that emulates text mode to display the characters and may be incompatible with non-Asian software that
# an EGA/VGA graphics mode that emulates text mode to display the characters and may be incompatible with non-Asian software that
# assumes direct access to the text mode via segment 0xB800. For a general DOS environment with CJK support please disable DOS/V
# emulation and use TrueType font (TTF) output with a CJK code page (932, 936, 949, 950) and TTF font with CJK characters instead.
# Possible values: off, jp, ko, chs, cht, cn, tw.

14
dosbox-x.reference.full.conf
View File

@ -675,7 +675,7 @@ pc-98 show graphics layer on initialize = true
# dosv: Enable DOS/V emulation and specify which version to emulate. This option is intended for use with games or software
# originating from East Asia (China, Japan, Korea) that use the double byte character set (DBCS) encodings and DOS/V extensions
# to display Japanese (jp), Chinese (chs/cht/cn/tw), or Korean (ko) text. Note that enabling DOS/V replaces 80x25 text mode with
# a EGA/VGA graphics mode that emulates text mode to display the characters and may be incompatible with non-Asian software that
# an EGA/VGA graphics mode that emulates text mode to display the characters and may be incompatible with non-Asian software that
# assumes direct access to the text mode via segment 0xB800. For a general DOS environment with CJK support please disable DOS/V
# emulation and use TrueType font (TTF) output with a CJK code page (932, 936, 949, 950) and TTF font with CJK characters instead.
# Possible values: off, jp, ko, chs, cht, cn, tw.
@ -1028,7 +1028,7 @@ vsyncrate = 75
# double fault: Emulate double fault exception
# clear trap flag on unhandled int 1: If set, the DOS kernel INT 01h handler will clear the trap flag when called.
# Normally a DOS program using INT 01h and the trap flag (usually for debugging)
# will provide it's own INT 01h handler. Some programs need this option set in
# will provide its own INT 01h handler. Some programs need this option set in
# order to not crash during startup due to possible bugs or anti debugger tricks
# that went terribly wrong.
# reset on triple fault: Reset CPU on triple fault condition (failure to handle double fault)
@ -1510,7 +1510,7 @@ fluid.chorus.type = 0
# attempts to play without enabling the speaker, set this option to true to
# compensate. This setting has no meaning if emulating a Sound Blaster 16 card.
# enable asp: If set, emulate the presence of the Sound Blaster 16 Advanced Sound Processor/Creative Sound Processor chip.
# NOTE: This only emulates it's presence and the basic DSP commands to communicate with it. Actual ASP/CSP functions are not yet implemented.
# NOTE: This only emulates its presence and the basic DSP commands to communicate with it. Actual ASP/CSP functions are not yet implemented.
# disable filtering: By default DOSBox-X filters Sound Blaster output to emulate lowpass filters and analog output limitations.
# Set this option to true to disable filtering. Note that doing so disables emulation of the Sound Blaster Pro
# output filter and ESS AudioDrive lowpass filter.
@ -1660,7 +1660,7 @@ io port aliasing = true
# gusrate: Sample rate of Ultrasound emulation.
# Possible values: 49716, 48000, 44100, 32000, 22050, 16000, 11025, 8000.
# gus fixed render rate: If set, Gravis Ultrasound audio output is rendered at a fixed sample rate specified by 'gusrate'. This can provide better quality than real hardware,
# if desired. Else, Gravis Ultrasound emulation will change the sample rate of it's output according to the number of active channels, just like real hardware.
# if desired. Else, Gravis Ultrasound emulation will change the sample rate of its output according to the number of active channels, just like real hardware.
# Note: DOSBox-X defaults to 'false', while mainline DOSBox SVN is currently hardcoded to render as if this setting is 'true'.
# gusmemsize: Amount of RAM on the Gravis Ultrasound in KB. Set to -1 for default.
# gus master volume: Master Gravis Ultrasound GF1 volume, in decibels. Reducing the master volume can help with games or demoscene productions where the music is too loud and clipping.
@ -2208,9 +2208,9 @@ timeout = 0
# mouse report rate: Mouse reporting rate, or 0 for auto. This affects how often mouse events are reported to the guest through the mouse interrupt.
# Some games including CyClone need a lower reporting rate to function correctly. Auto mode allows the guest to change the report rate through the PS/2 mouse emulation.
# This option does not affect any DOS game that uses polling through INT 33h to detect mouse movement.
# int33 hide host cursor if interrupt subroutine: If set, the cursor on the host will be hidden if the DOS application provides it's own
# int33 hide host cursor if interrupt subroutine: If set, the cursor on the host will be hidden if the DOS application provides its own
# interrupt subroutine for the mouse driver to call, which is usually an indication that
# the DOS game wishes to draw the cursor with it's own support routines (DeluxePaint II).
# the DOS game wishes to draw the cursor with its own support routines (DeluxePaint II).
# int33 hide host cursor when polling: If set, the cursor on the host will be hidden even if the DOS application has also
# hidden the cursor in the guest, as long as the DOS application is polling position
# and button status. This can be useful for DOS programs that draw the cursor on their
@ -2224,7 +2224,7 @@ timeout = 0
# Note that some OS's like Microsoft Windows neither use INT 33h nor
# probe the AUX port directly and depend on this BIOS interface exclusively
# for PS/2 mouse support. In other cases there is no harm in leaving this enabled
# int15 wait force unmask irq: Some demos or games mistakingly use INT 15h AH=0x86 (WAIT) while leaving the IRQs needed for it masked.
# int15 wait force unmask irq: Some demos or games mistakenly use INT 15h AH=0x86 (WAIT) while leaving the IRQs needed for it masked.
# If this option is set (by default), the necessary IRQs will be unmasked when INT 15 AH=0x86 is used so that the game or demo does not hang.
# int15 mouse callback does not preserve registers: Set to true if the guest OS or DOS program assigns an INT 15h mouse callback,
# but does not properly preserve CPU registers. Diagnostic function only (default off).

2
include/SDL_ttf.h
View File

@ -156,7 +156,7 @@ extern DECLSPEC int SDLCALL TTF_FontFaceIsFixedWidth(const TTF_Font *font);
extern DECLSPEC char * SDLCALL TTF_FontFaceFamilyName(const TTF_Font *font);
extern DECLSPEC char * SDLCALL TTF_FontFaceStyleName(const TTF_Font *font);
/* Check wether a glyph is provided by the font or not */
/* Check whether a glyph is provided by the font or not */
extern DECLSPEC int SDLCALL TTF_GlyphIsProvided(const TTF_Font *font, Uint16 ch);
/* Get the metrics (dimensions) of a glyph

2
include/bios_disk.h
View File

@ -240,7 +240,7 @@ public:
virtual uint8_t Write_AbsoluteSector(uint32_t sectnum, const void * data);
virtual uint8_t GetBiosType(void);
virtual void Set_Geometry(uint32_t setHeads, uint32_t setCyl, uint32_t setSect, uint32_t setSectSize);
// Parition and format the ramdrive
// Partition and format the ramdrive
virtual uint8_t Format();
// Create a hard drive image of a specified size; automatically select c/h/s

8
include/dos_inc.h
View File

@ -457,7 +457,7 @@ private:
#pragma pack(1)
#endif
struct sPSP {
uint8_t exit[2]; /* CP/M-like exit poimt */
uint8_t exit[2]; /* CP/M-like exit point */
uint16_t next_seg; /* Segment of first byte beyond memory allocated or program */
uint8_t fill_1; /* single char fill */
uint8_t far_call; /* far call opcode */
@ -467,7 +467,7 @@ private:
RealPt int_24; /* Critical Error Address */
uint16_t psp_parent; /* Parent PSP Segment */
uint8_t files[20]; /* File Table - 0xff is unused */
uint16_t environment; /* Segment of evironment table */
uint16_t environment; /* Segment of environment table */
RealPt stack; /* SS:SP Save point for int 0x21 calls */
uint16_t max_files; /* Maximum open files */
RealPt file_table; /* Pointer to File Table PSP:0x18 */
@ -476,7 +476,7 @@ private:
uint8_t truename_flag;
uint16_t nn_flags;
uint16_t dos_version;
uint8_t fill_2[14]; /* Lot's of unused stuff i can't care aboue */
uint8_t fill_2[14]; /* Lot's of unused stuff i can't care about */
uint8_t service[3]; /* INT 0x21 Service call int 0x21;retf; */
uint8_t fill_3[9]; /* This has some blocks with FCB info */
uint8_t fcb1[16]; /* first FCB */
@ -1013,7 +1013,7 @@ const std::map<std::string, int> country_code_map {
{"tt443", COUNTRYNO::Russia }, // Tatarstan Typewriter
{"ua", COUNTRYNO::Ukraine }, // 101-key
{"uk", COUNTRYNO::United_Kingdom }, // Standard
{"uk168", COUNTRYNO::United_Kingdom }, // Allternate
{"uk168", COUNTRYNO::United_Kingdom }, // Alternate
{"ur", COUNTRYNO::Ukraine }, // 101-key
{"ur465", COUNTRYNO::Ukraine }, // 101-key
{"ur1996", COUNTRYNO::Ukraine }, // 101-key

2
include/dosbox.h
View File

@ -389,7 +389,7 @@ public:
}
template <class T>
void registerPOD(T& pod) //register POD for serializatioin
void registerPOD(T& pod) //register POD for serialization
{
podRef.push_back(POD(pod));
}

4
include/enet.h
View File

@ -3631,8 +3631,8 @@ extern "C" {
}
/** Gets received data buffer. Returns buffer length.
* @param host host to access recevie buffer
* @param data ouput parameter for recevied data
* @param host host to access receive buffer
* @param data output parameter for received data
* @retval buffer length
*/
enet_uint32 enet_host_get_received_data(ENetHost *host, /*out*/ enet_uint8** data) {

2
include/informational.h
View File

@ -7,7 +7,7 @@
/* Endianness reminders & markers.
* And someday, when compiling for, say, PowerPC, it will map
* to whatever native datatype typedefs that tell PowerPC what endiannes to use */
* to whatever native datatype typedefs that tell PowerPC what endianness to use */
#define _Little_Endian_
#define _Big_Endian_
#define _Mixed_Endian_

4
include/ioapi.h
View File

@ -23,7 +23,7 @@
#if (!defined(_WIN32)) && (!defined(WIN32))
// Linux needs this to support file operation on files larger then 4+GB
// Linux needs this to support file operation on files larger than 4+GB
// But might need better if/def to select just the platforms that needs them.
#ifndef __USE_FILE_OFFSET64
@ -81,7 +81,7 @@
#include "mz64conf.h"
#endif
/* a type choosen by DEFINE */
/* a type chosen by DEFINE */
#ifdef HAVE_64BIT_INT_CUSTOM
typedef 64BIT_INT_CUSTOM_TYPE ZPOS64_T;
#else

2
include/ipx.h
View File

@ -146,7 +146,7 @@ public:
~ECBClass();
};
// The following routines may not be needed on all systems. On my build of SDL the IPaddress structure is 8 octects
// The following routines may not be needed on all systems. On my build of SDL the IPaddress structure is 8 octets
// and therefore screws up my IPXheader structure since it needs to be packed.
void UnpackIP(PackedIP ipPack, IPaddress * ipAddr);

12
include/jfont.h
View File

@ -34,17 +34,17 @@ typedef struct {
, RDFFB//bc: Font access first byte
, RDFSB//bd: Font access second byte
, RDFAP//be: Font Access Pattern
, RPESL//09: end scan line (superceded by EGA)
, RPULP//14: under scan line (superceded by EGA)
, RPESL//09: end scan line (superseded by EGA)
, RPULP//14: under scan line (superseded by EGA)
, RPSSC//db: DBCS start scan line
, RPSSU//d9: 2x DBCS upper start scan
, RPSSL//da: 2x DBCS lower start scan
, RPPAJ//dc: super imposed (only AX-2 system, not implemented)
, RCMOD//dd: Cursor Mode (not implemented)
, RCCLH//0e: Cursor location Upper bits (superceded by EGA)
, RCCLL//0f: Cursor location Lower bits (superceded by EGA)
, RCCSL//0a: Cursor Start Line (superceded by EGA)
, RCCEL//0b: Cursor End Line (superceded by EGA)
, RCCLH//0e: Cursor location Upper bits (superseded by EGA)
, RCCLL//0f: Cursor location Lower bits (superseded by EGA)
, RCCSL//0a: Cursor Start Line (superseded by EGA)
, RCCEL//0b: Cursor End Line (superseded by EGA)
, RCSKW//de: Cursor Skew control (not implemented)
, ROMSL//df: Unused?
, RSTAT//bf: Font register accessible status

6
include/mem.h
View File

@ -57,7 +57,7 @@ MemHandle MEM_NextHandle(MemHandle handle);
MemHandle MEM_NextHandleAt(MemHandle handle,Bitu where);
/*
The folowing six functions are used everywhere in the end so these should be changed for
The following six functions are used everywhere in the end so these should be changed for
Working on big or little endian machines
*/
@ -166,7 +166,7 @@ static INLINE uint32_t var_read(uint32_t * var) {
return host_readd((ConstHostPt)var);
}
/* The Folowing six functions are slower but they recognize the paged memory system */
/* The Following six functions are slower but they recognize the paged memory system */
uint8_t mem_readb(const PhysPt address);
uint16_t mem_readw(const PhysPt address);
@ -214,7 +214,7 @@ void mem_memcpy(PhysPt dest,PhysPt src,Bitu size);
Bitu mem_strlen(PhysPt pt);
void mem_strcpy(PhysPt dest,PhysPt src);
/* The folowing functions are all shortcuts to the above functions using physical addressing */
/* The following functions are all shortcuts to the above functions using physical addressing */
static inline constexpr PhysPt PhysMake(const uint16_t seg,const uint16_t off) {
return ((PhysPt)seg << 4U) + (PhysPt)off;

2
include/ne2000.h
View File

@ -78,7 +78,7 @@ typedef struct {
// Interrupt Mask Register - 0fh write
struct IMR_t {
bx_bool rx_inte; // PRXE - packet rx interrupt enable
bx_bool tx_inte; // PTXE - packet tx interrput enable
bx_bool tx_inte; // PTXE - packet tx interrupt enable
bx_bool rxerr_inte; // RXEE - rx error interrupt enable
bx_bool txerr_inte; // TXEE - tx error interrupt enable
bx_bool overw_inte; // OVWE - overwrite warn int enable

6
include/opus.h
View File

@ -103,7 +103,7 @@ extern "C" {
* @endcode
*
* where opus_encoder_get_size() returns the required size for the encoder state. Note that
* future versions of this code may change the size, so no assuptions should be made about it.
* future versions of this code may change the size, so no assumptions should be made about it.
*
* The encoder state is always continuous in memory and only a shallow copy is sufficient
* to copy it (e.g. memcpy())
@ -357,7 +357,7 @@ OPUS_EXPORT int opus_encoder_ctl(OpusEncoder *st, int request, ...) OPUS_ARG_NON
* error = opus_decoder_init(dec, Fs, channels);
* @endcode
* where opus_decoder_get_size() returns the required size for the decoder state. Note that
* future versions of this code may change the size, so no assuptions should be made about it.
* future versions of this code may change the size, so no assumptions should be made about it.
*
* The decoder state is always continuous in memory and only a shallow copy is sufficient
* to copy it (e.g. memcpy())
@ -621,7 +621,7 @@ OPUS_EXPORT void opus_pcm_soft_clip(float *pcm, int frame_size, int channels, fl
* framing overhead becomes negligible.
*
* The repacketizer currently only operates on elementary Opus
* streams. It will not manipualte multistream packets successfully, except in
* streams. It will not manipulate multistream packets successfully, except in
* the degenerate case where they consist of data from a single stream.
*
* The repacketizing process starts with creating a repacketizer state, either

4
include/opus_custom.h
View File

@ -178,7 +178,7 @@ OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT OpusCustomEncoder *opus_custom_encode
) OPUS_ARG_NONNULL(1);
/** Destroys a an encoder state.
/** Destroys an encoder state.
* @param[in] st <tt>OpusCustomEncoder*</tt>: State to be freed.
*/
OPUS_CUSTOM_EXPORT void opus_custom_encoder_destroy(OpusCustomEncoder *st);
@ -286,7 +286,7 @@ OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT OpusCustomDecoder *opus_custom_decode
int *error
) OPUS_ARG_NONNULL(1);
/** Destroys a an decoder state.
/** Destroys an decoder state.
* @param[in] st <tt>OpusCustomDecoder*</tt>: State to be freed.
*/
OPUS_CUSTOM_EXPORT void opus_custom_decoder_destroy(OpusCustomDecoder *st);

4
include/opus_multistream.h
View File

@ -143,7 +143,7 @@ extern "C" {
* <a href="https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810004.3.9">Vorbis
* channel ordering</a>. A decoder may wish to apply an additional permutation
* to the mapping the encoder used to achieve a different output channel
* order (e.g. for outputing in WAV order).
* order (e.g. for outputting in WAV order).
*
* Each multistream packet contains an Opus packet for each stream, and all of
* the Opus packets in a single multistream packet must have the same
@ -510,7 +510,7 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSDecoder *opus_multistream_decoder_crea
int *error
) OPUS_ARG_NONNULL(5);
/** Intialize a previously allocated decoder state object.
/** Initialize a previously allocated decoder state object.
* The memory pointed to by \a st must be at least the size returned by
* opus_multistream_encoder_get_size().
* This is intended for applications which use their own allocator instead of

2
include/opus_projection.h
View File

@ -405,7 +405,7 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusProjectionDecoder *opus_projection_decod
) OPUS_ARG_NONNULL(5);
/** Intialize a previously allocated projection decoder state object.
/** Initialize a previously allocated projection decoder state object.
* The memory pointed to by \a st must be at least the size returned by
* opus_projection_decoder_get_size().
* This is intended for applications which use their own allocator instead of

6
include/opusfile.h
View File

@ -729,7 +729,7 @@ struct OpusServerInfo{
/**The software used by the origin server (Server).
This is <code>NULL</code> if there was no <code>Server</code> header.*/
char *server;
/**The media type of the entity sent to the recepient (Content-Type).
/**The media type of the entity sent to the recipient (Content-Type).
This is <code>NULL</code> if there was no <code>Content-Type</code>
header.*/
char *content_type;
@ -1436,7 +1436,7 @@ void op_free(OggOpusFile *_of);
Some of these functions may be used successfully on the partially open
streams returned by op_test_callbacks() or one of the associated
convenience functions.
Their documention will indicate so explicitly.*/
Their documentation will indicate so explicitly.*/
/*@{*/
/**Returns whether or not the stream being read is seekable.
@ -1735,7 +1735,7 @@ int op_pcm_seek(OggOpusFile *_of,ogg_int64_t _pcm_offset) OP_ARG_NONNULL(1);
floating-point operations, to simplify support on devices without an
adequate FPU.
\warning HTTPS streams may be be vulnerable to truncation attacks if you do
\warning HTTPS streams may be vulnerable to truncation attacks if you do
not check the error return code from op_read_float() or its associated
functions.
If the remote peer does not close the connection gracefully (with a TLS

2
include/paging.h
View File

@ -64,7 +64,7 @@ static inline Bitu MEMMASK_Combine(const Bitu a,const Bitu b) {
#if defined(USE_FULL_TLB)
#define TLB_SIZE (1024*1024)
#else
#define TLB_SIZE 65536 // This must a power of 2 and greater then LINK_START
#define TLB_SIZE 65536 // This must a power of 2 and greater than LINK_START
#define BANK_SHIFT 28
#define BANK_MASK 0xffff // always the same as TLB_SIZE-1?
#define TLB_BANKS ((1024*1024/TLB_SIZE)-1)

2
include/regs.h
View File

@ -51,7 +51,7 @@
struct Segment {
uint16_t val;
PhysPt phys; /* The phyiscal address start in emulated machine */
PhysPt phys; /* The physical address start in emulated machine */
PhysPt limit;
};

4
include/sdk2_glide.h
View File

@ -385,7 +385,7 @@ typedef FxI32 GrTextureCombineFnc_t;
#define GR_TEXTURECOMBINE_OTHER 0x2 /* this TMU in passthru mode */
#define GR_TEXTURECOMBINE_ADD 0x3 /* tout = tthis + t(this+1) */
#define GR_TEXTURECOMBINE_MULTIPLY 0x4 /* texout = tthis * t(this+1) */
#define GR_TEXTURECOMBINE_SUBTRACT 0x5 /* Sutract from upstream TMU */
#define GR_TEXTURECOMBINE_SUBTRACT 0x5 /* Subtract from upstream TMU */
#define GR_TEXTURECOMBINE_DETAIL 0x6 /* detail--detail on tthis */
#define GR_TEXTURECOMBINE_DETAIL_OTHER 0x7 /* detail--detail on tthis+1 */
#define GR_TEXTURECOMBINE_TRILINEAR_ODD 0x8 /* trilinear--odd levels tthis*/
@ -534,7 +534,7 @@ typedef struct _GrState_s {
#define GR_PARAM_DISABLE 0x00
#define GR_PARAM_ENABLE 0x01
/* Componenets for strips */
/* Components for strips */
/* vertex */
#define GR_VERTEX_XYZ 3
#define GR_VERTEX_XYZW 4

8
include/serialport.h
View File

@ -185,7 +185,7 @@ public:
// CSerial requests an update of the input lines
virtual void updateMSR()=0;
// Control lines from prepherial to serial port
// Control lines from peripheral to serial port
bool getDTR();
bool getRTS();
@ -199,7 +199,7 @@ public:
void setCD(bool value);
void setCTS(bool value);
// From serial port to prepherial
// From serial port to peripheral
// set output lines
virtual void setRTSDTR(bool rts, bool dtr)=0;
virtual void setRTS(bool val)=0;
@ -225,7 +225,7 @@ public:
Bitu Read_MSR();
Bitu Read_SPR();
// If a byte comes from loopback or prepherial, put it in here.
// If a byte comes from loopback or peripheral, put it in here.
void receiveByte(uint8_t data);
void receiveByteEx(uint8_t data, uint8_t error);
@ -239,7 +239,7 @@ public:
// When done sending, notify here
void ByteTransmitted();
// Transmit byte to prepherial
// Transmit byte to peripheral
virtual void transmitByte(uint8_t val, bool first)=0;
// switch break state to the passed value

6
include/setup.h
View File

@ -71,7 +71,7 @@ public:
~Value() { destroy();};
Value(std::string const& in, Etype _t) { SetValue(in, _t); }
/* Assigment operators */
/* Assignment operators */
Value& operator= (Hex in) { return copy(Value(in));}
Value& operator= (int in) { return copy(Value(in));}
Value& operator= (bool in) { return copy(Value(in));}
@ -140,7 +140,7 @@ public:
protected:
//Set interval value to in or default if in is invalid. force always sets the value.
//Can be overriden to set a different value if invalid.
//Can be overridden to set a different value if invalid.
virtual bool SetVal(Value const& in, bool forced,bool warn=true,bool init=false) {
if(forced || CheckValue(in,warn)) {
value = in; is_modified = !init; return true;
@ -422,7 +422,7 @@ public:
Module_base(Section* configuration) : m_configuration(configuration) {};
// Module_base(Section* configuration, SaveState* state) {};
virtual ~Module_base(){/*LOG_MSG("executed")*/;};//Destructors are required
/* Returns true if succesful.*/
/* Returns true if successful.*/
virtual bool Change_Config(Section* /*newconfig*/) {return false;} ;
};
#endif

4
include/shell.h
View File

@ -162,7 +162,7 @@ public:
*/
void CMD_HELP(char * args);
/*! \brief Exteneded Ctrl+C switch
/*! \brief Extended Ctrl+C switch
*/
void CMD_BREAK(char * args);
@ -373,7 +373,7 @@ struct SHELL_Cmd {
/* Object to manage lines in the autoexec.bat The lines get removed from
* the file if the object gets destroyed. The environment is updated
* as well if the line set a a variable */
* as well if the line set a variable */
class AutoexecObject{
private:
bool installed = false;

4
include/timer.h
View File

@ -34,11 +34,11 @@ extern unsigned long PIT_TICK_RATE;
typedef void (*TIMER_TickHandler)(void);
/* Register a function that gets called everytime if 1 or more ticks pass */
/* Register a function that gets called every time if 1 or more ticks pass */
void TIMER_AddTickHandler(TIMER_TickHandler handler);
void TIMER_DelTickHandler(TIMER_TickHandler handler);
/* This will add 1 milliscond to all timers */
/* This will add 1 millisecond to all timers */
void TIMER_AddTick(void);
/* Functions for the system control port 61h */

10
include/unzip.h
View File

@ -150,10 +150,10 @@ extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
int iCaseSensitivity));
/*
Compare two filename (fileName1,fileName2).
If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
If iCaseSenisivity = 1, comparison is case sensitivity (like strcmp)
If iCaseSenisivity = 2, comparison is not case sensitivity (like strcmpi
or strcasecmp)
If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
If iCaseSenisivity = 0, case sensitivity is default of your operating system
(like 1 on Unix, 2 on Windows)
*/
@ -299,7 +299,7 @@ extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
uLong commentBufferSize));
/*
Get Info about the current file
if pfile_info!=NULL, the *pfile_info structure will contain somes info about
if pfile_info!=NULL, the *pfile_info structure will contain some info about
the current file
if szFileName!=NULL, the filemane string will be copied in szFileName
(fileNameBufferSize is the size of the buffer)
@ -379,7 +379,7 @@ extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
buf contain buffer where data must be copied
len the size of buf.
return the number of byte copied if somes bytes are copied
return the number of byte copied if some bytes are copied
return 0 if the end of file was reached
return <0 with error code if there is an error
(UNZ_ERRNO for IO error, or zLib error for uncompress error)

6
include/vga.h
View File

@ -380,11 +380,11 @@ typedef struct {
uint8_t evf; // [15:15] EVF Enable Vertical Filtering
// (MM81EC Stream FIFO and RAS Controls)
uint8_t fifo_alloc_ps; // Interpretation of [4:0], where 5 bits are number of slots alloted to secondary stream.
uint8_t fifo_alloc_ps; // Interpretation of [4:0], where 5 bits are number of slots allotted to secondary stream.
// N = secondary stream slots This value is set to 24 - N
uint8_t fifo_alloc_ss; // Interpretation of [4:0], set to N (up to 24)
uint8_t fifo_ss_threshhold; // Threshhold at which FIFO refill of secondary stream is triggered (low water point). Must be <= alloc_ss
uint8_t fifo_ps_threshhold; // Threshhold at which FIFO refill of primary stream is triggered (low water point). Must be <= alloc_ps
uint8_t fifo_ss_threshhold; // Threshold at which FIFO refill of secondary stream is triggered (low water point). Must be <= alloc_ss
uint8_t fifo_ps_threshhold; // Threshold at which FIFO refill of primary stream is triggered (low water point). Must be <= alloc_ps
uint8_t ras_rl; // [15:15] RL RAS Low Time Control
uint8_t ras_rp; // [16:16] RP RAS Pre-Charge Control
uint8_t edo_wsctl; // [18:18] EDO Memory Wait State Control

2
include/waveformatex.h
View File

@ -52,7 +52,7 @@ typedef struct { /* (sizeof) (offset hex) (offset dec) */
/* [doc] windows_WAVEFORMATEX
*
* Packed portable representation of the Microsoft Windows WAVEFORMATEX
* structure. This is the most common format because it can accomodate
* structure. This is the most common format because it can accommodate
* almost every non-PCM WAVE codec. WAVEFORMATEXTENSIBLE builds on this
* for additional codecs that don't have a 16-bit wFormatTag registered.
*/

4
include/zip.h
View File

@ -126,7 +126,7 @@ extern zipFile ZEXPORT zipOpen64 OF((const void *pathname, int append));
/* Note : there is no delete function into a zipfile.
If you want delete file into a zipfile, you must open a zipfile, and create another
Of couse, you can use RAW reading and writing to copy the file you did not want delte
Of course, you can use RAW reading and writing to copy the file you did not want delete
*/
extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,
@ -336,7 +336,7 @@ extern int ZEXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short
/*
zipRemoveExtraInfoBlock - Added by Mathias Svensson
Remove extra information block from a extra information data for the local file header or central directory header
Remove extra information block from an extra information data for the local file header or central directory header
It is needed to remove ZIP64 extra information blocks when before data is written if using RAW mode.

2
include/zipcrc.h
View File

@ -28,7 +28,7 @@ extern "C" {
* The definition of the used algorithm.
*
* This is not used anywhere in the generated code, but it may be used by the
* application code to call algoritm-specific code, is desired.
* application code to call algorithm-specific code, is desired.
*****************************************************************************/
#define CRC_ALGO_TABLE_DRIVEN 1

2
scripts/dosbox-installer.nsi
View File

@ -87,7 +87,7 @@ SetShellVarContext all
CreateShortCut "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\Extras\Video\Video instructions.lnk" "$INSTDIR\Video Codec\Video Instructions.txt"
;change outpath so the working directory gets set to zmbv
SetOutPath "$INSTDIR\Video Codec"
; Shortcut creation depends on wether we are 9x of NT
; Shortcut creation depends on whether we are 9x of NT
ClearErrors
ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
IfErrors we_9x we_nt

2
src/aviwriter/avi_writer.cpp
View File

@ -802,7 +802,7 @@ int avi_writer_emit_opendml_indexes(avi_writer *w) {
si++;
}
/* make sure the above loop does it's job */
/* make sure the above loop does its job */
assert((chunk_ofs + 0x7FFF0000ULL) > chunk_max);
/* start an AVISUPERINDEX */

2
src/builtin/xcopy/makefile
View File

@ -36,7 +36,7 @@ RM=del
############# TURBO_C ########################
# -w warn -M create map -f- no floating point -Z register optimize
# -O jump optimize -k- no standard stack frome -K unsigned char
# -O jump optimize -k- no standard stack frame -K unsigned char
# -exxx executable name (name must be part of option in CFLAGS)
# -mt tiny (default is small -ms)
# -N stack checking -a- byte alignment -ln no default libs

4
src/builtin/xcopy/xcopy.c
View File

@ -609,7 +609,7 @@ void build_name(char *dest,
/*-------------------------------------------------------------------------*/
/* Searchs through the source directory (and its subdirectories) and calls */
/* Searches through the source directory (and its subdirectories) and calls */
/* function "xcopy_file" for every found file. */
/*-------------------------------------------------------------------------*/
void xcopy_files(const char *src_pathname,
@ -755,7 +755,7 @@ void xcopy_file(const char *src_filename,
}
/* check source file for read permission */
/* (only usefull under an OS with the ability to deny read access) */
/* (only useful under an OS with the ability to deny read access) */
if (access(src_filename, R_OK) != 0) {
printf("%s - %s\n", catgets(cat, 1, 22, "Read access denied"), src_filename);
if (switch_continue) {

2
src/cpu/callback.cpp
View File

@ -463,7 +463,7 @@ Bitu CALLBACK_SetupExtra(Bitu callback, Bitu type, PhysPt physAddress, bool use_
if (machine == MCH_PCJR || IS_PC98_ARCH) {
/* NTS: NEC PC-98 does not have keyboard input on port 60h, it's a 8251 UART elsewhere.
*
* IBM PCjr reads the infared input on NMI interrupt, which then calls INT 48h to
* IBM PCjr reads the infrared input on NMI interrupt, which then calls INT 48h to
* translate to IBM PC/XT scan codes before passing AL directly to IRQ1 (INT 9).
* PCjr keyboard handlers, including games made for the PCjr, assume the scan code
* is in AL and do not read the I/O port */

2
src/cpu/core_dyn_x86/dyn_fpu.h
View File

@ -398,7 +398,7 @@ static void dyn_fpu_esc3(){
switch (sub) {
case 0x00: //FNENI
case 0x01: //FNDIS
LOG(LOG_FPU,LOG_ERROR)("8087 only fpu code used esc 3: group 4: subfuntion :%d",(int)sub);
LOG(LOG_FPU,LOG_ERROR)("8087 only fpu code used esc 3: group 4: subfunction :%d",(int)sub);
break;
case 0x02: //FNCLEX FCLEX
gen_call_function((void*)&FPU_FCLEX,"");

4
src/cpu/core_dynrec/decoder_opcodes.h
View File

@ -967,7 +967,7 @@ static bool dyn_grp7(void) {
case 0x02: // LGDT
case 0x03: // LIDT
// if (cpu.pmode && cpu.cpl) EXCEPTION(EXCEPTION_GP);
if (cpu.pmode && cpu.cpl) IllegalOptionDynrec("lgdt nonpriviledged");
if (cpu.pmode && cpu.cpl) IllegalOptionDynrec("lgdt nonprivileged");
dyn_fill_ea(FC_ADDR);
gen_protect_addr_reg();
dyn_read_word(FC_ADDR,FC_OP1,false);
@ -1000,7 +1000,7 @@ static bool dyn_grp7(void) {
return true;
case 0x07: // INVLPG
// if (cpu.pmode && cpu.cpl) EXCEPTION(EXCEPTION_GP);
if (cpu.pmode && cpu.cpl) IllegalOptionDynrec("invlpg nonpriviledged");
if (cpu.pmode && cpu.cpl) IllegalOptionDynrec("invlpg nonprivileged");
gen_call_function_raw(PAGING_ClearTLB);
break;
default: IllegalOptionDynrec("dyn_grp7_1");

2
src/cpu/core_dynrec/dyn_fpu.h
View File

@ -401,7 +401,7 @@ static void dyn_fpu_esc3(){
switch (decode.modrm.rm) {
case 0x00: //FNENI
case 0x01: //FNDIS
LOG(LOG_FPU,LOG_ERROR)("8087 only fpu code used esc 3: group 4: subfuntion: %d",(int)decode.modrm.rm);
LOG(LOG_FPU,LOG_ERROR)("8087 only fpu code used esc 3: group 4: subfunction: %d",(int)decode.modrm.rm);
break;
case 0x02: //FNCLEX FCLEX
gen_call_function_raw(FPU_FCLEX);

2
src/cpu/core_dynrec/risc_armv4le-common.h
View File

@ -24,7 +24,7 @@
// some configuring defines that specify the capabilities of this architecture
// or aspects of the recompiling
// protect FC_ADDR over function calls if necessaray
// protect FC_ADDR over function calls if necessary
// #define DRC_PROTECT_ADDR_REG
// try to use non-flags generating functions if possible

2
src/cpu/core_dynrec/risc_armv8le.h
View File

@ -24,7 +24,7 @@
// some configuring defines that specify the capabilities of this architecture
// or aspects of the recompiling
// protect FC_ADDR over function calls if necessaray
// protect FC_ADDR over function calls if necessary
// #define DRC_PROTECT_ADDR_REG
// try to use non-flags generating functions if possible

4
src/cpu/core_dynrec/risc_mipsel32.h
View File

@ -24,7 +24,7 @@
// some configuring defines that specify the capabilities of this architecture
// or aspects of the recompiling
// protect FC_ADDR over function calls if necessaray
// protect FC_ADDR over function calls if necessary
// #define DRC_PROTECT_ADDR_REG
// try to use non-flags generating functions if possible
@ -483,7 +483,7 @@ static void INLINE gen_fill_branch(DRC_PTR_SIZE_IM data) {
*(uint16_t*)data=((uint16_t)((uint32_t)cache.pos-data-4)>>2);
}
#if 0 // assume for the moment no branch will go farther then +/- 128KB
#if 0 // assume for the moment no branch will go farther than +/- 128KB
// conditional jump if register is nonzero
// for isdword==true the 32bit of the register are tested

4
src/cpu/core_dynrec/risc_x64.h
View File

@ -21,7 +21,7 @@
// some configuring defines that specify the capabilities of this architecture
// or aspects of the recompiling
// protect FC_ADDR over function calls if necessaray
// protect FC_ADDR over function calls if necessary
// #define DRC_PROTECT_ADDR_REG
// try to use non-flags generating functions if possible
@ -94,7 +94,7 @@ static void gen_mov_reg_qword(HostReg dest_reg,uint64_t imm);
static INLINE void gen_reg_memaddr(HostReg reg,void* data,uint8_t op,uint8_t prefix=0) {
int64_t diff = (int64_t)data-((int64_t)cache_rwtox(cache.pos+(prefix?7:6)));
// if ((diff<0x80000000LL) && (diff>-0x80000000LL)) { //clang messes itself up on this...
if ( (diff>>63) == (diff>>31) ) { //signed bit extend, test to see if value fits in a int32_t
if ( (diff>>63) == (diff>>31) ) { //signed bit extend, test to see if value fits in an int32_t
// mov reg,[rip+diff] (or similar, depending on the op) to fetch *data
if(prefix) cache_addb(prefix);
cache_addb(op);

2
src/cpu/core_dynrec/risc_x86.h
View File

@ -21,7 +21,7 @@
// some configuring defines that specify the capabilities of this architecture
// or aspects of the recompiling
// protect FC_ADDR over function calls if necessaray
// protect FC_ADDR over function calls if necessary
// #define DRC_PROTECT_ADDR_REG
// try to use non-flags generating functions if possible

8
src/cpu/cpu.cpp
View File

@ -157,7 +157,7 @@ void RDTSC_rebase() {
* that Intel processors will not update the shadow part of the segment register
* in real mode. I'm guessing that what Project Angel is doing, is using the same
* abuse of protected mode to also set the B (big) bit in the code segment so that
* it's code segment can extend past 64KB (huge unreal mode), which works until
* its code segment can extend past 64KB (huge unreal mode), which works until
* something like an interrupt chops off the top 16 bits of the instruction pointer.
*
* I want to clarify that realbig16 is an OPTION that is off by default, because
@ -538,7 +538,7 @@ void menu_update_autocycle(void) {
* processing NMI.
*
* NMI is an active HIGH, rising edge-sensitive asyn-
* chronous signal. Setup and hold times, t27 and and t28,
* chronous signal. Setup and hold times, t27 and t28,
* relative to the CLK2 signal must be met to guarantee
* recognition at a particular clock edge. To assure rec-
* ognition of NMI, it must be inactive for at least eight
@ -626,7 +626,7 @@ void CPU_Check_NMI() {
#if C_DEBUG
// #define CPU_CHECK_EXCEPT 1
// #define CPU_CHECK_IGNORE 1
/* Use CHECK_EXCEPT when something doesn't work to see if a exception is
/* Use CHECK_EXCEPT when something doesn't work to see if an exception is
* needed that isn't enabled by default.*/
#else
/* NORMAL NO CHECKING => More Speed */
@ -1161,7 +1161,7 @@ void CPU_Exception(Bitu which,Bitu error ) {
/* NTS: Putting some thought into it, I don't think divide by zero counts as something to throw a double fault
* over. I may be wrong. The behavior of Intel processors will ultimately decide.
*
* Until then, don't count Divide Overflow exceptions, so that the "EFP loader" can do it's disgusting
* Until then, don't count Divide Overflow exceptions, so that the "EFP loader" can do its disgusting
* anti-debugger hackery when loading parts of a demo. --J.C. */
if (!(which == 0/*divide by zero/overflow*/)) {
/* CPU_Interrupt() could cause another fault during memory access. This needs to happen here */

4
src/debug/debug_disasm.cpp
View File

@ -1,6 +1,6 @@
/*
Ripped out some stuff from the mame releae to only make it for 386's
Ripped out some stuff from the mame release to only make it for 386's
Changed some variables to use the standard DOSBox data types
Added my callback opcode
@ -44,7 +44,7 @@ Comments:
Health warning:
When writing and degbugging this code, I didn't have (and still don't have)
When writing and debugging this code, I didn't have (and still don't have)
a 32-bit disassembler to compare this guy's output with. It's therefore
quite likely that bugs will appear when disassembling instructions which use
the 386 and 486's native 32 bit mode. It seems to work fine in 16 bit mode.

2
src/debug/debug_gui.cpp
View File

@ -596,7 +596,7 @@ void DBGUI_StartUp(void) {
dbg.win_main=initscr();
#ifdef WIN32
/* Tell Windows 10 we DONT want a thin tall console window that fills the screen top to bottom.
/* Tell Windows 10 we DON'T want a thin tall console window that fills the screen top to bottom.
It's a nuisance especially when the user attempts to move the window up to the top to see
the status, only for Windows to auto-maximize. 30 lines is enough, thanks. */
{

2
src/dos/cdrom.cpp
View File

@ -202,7 +202,7 @@ int CDROM_GetMountType(const char* path, int forceCD) {
const char* cdName;
int num = SDL_CDNumDrives();
// If cd drive is forced then check if its in range and return 0
// If cd drive is forced then check if it's in range and return 0
if ((forceCD>=0) && (forceCD<num)) {
LOG(LOG_ALL,LOG_ERROR)("CDROM: Using drive %d",forceCD);
return 0;

2
src/dos/cdrom_aspi_win32.cpp
View File

@ -631,7 +631,7 @@ bool CDROM_Interface_Aspi::GetAudioStatus(bool& playing, bool& pause)
s.execscsicmd.CDBByte[0] = SCSI_SUBCHANNEL;
s.execscsicmd.CDBByte[1] = (lun<<5)|2; // lun & msf
s.execscsicmd.CDBByte[2] = 0x00; // no subq
s.execscsicmd.CDBByte[3] = 0x00; // dont care
s.execscsicmd.CDBByte[3] = 0x00; // don't care
s.execscsicmd.CDBByte[6] = 0; // track number (only in isrc mode, ignored)
s.execscsicmd.CDBByte[7] = 0; // alloc len
s.execscsicmd.CDBByte[8] = sizeof(sub);

16
src/dos/dos.cpp
View File

@ -219,8 +219,8 @@ uint32_t DOS_HMA_GET_FREE_SPACE() {
void DOS_HMA_CLAIMED(uint16_t bytes) {
uint32_t limit = DOS_HMA_LIMIT();
if (limit == 0) E_Exit("HMA allocatiom bug: Claim function called when HMA allocation is not enabled");
if (dos_hma_allocator == 0) E_Exit("HMA allocatiom bug: Claim function called without having determined start");
if (limit == 0) E_Exit("HMA allocation bug: Claim function called when HMA allocation is not enabled");
if (dos_hma_allocator == 0) E_Exit("HMA allocation bug: Claim function called without having determined start");
dos_hma_allocator += bytes;
if (dos_hma_allocator > limit) E_Exit("HMA allocation bug: Exceeded limit");
}
@ -518,7 +518,7 @@ void DOS_AddDays(uint8_t days) {
// Drive A: can be as slow as a 3.5" 1.44MB floppy disk
//
// This fixes MS-DOS games that crash or malfunction if the disk I/O is too fast.
// This also fixes "380 volt" and prevents the "city animation" from loading too fast for it's music timing (and getting stuck)
// This also fixes "380 volt" and prevents the "city animation" from loading too fast for its music timing (and getting stuck)
int disk_data_rate = 2100000; // 2.1MBytes/sec mid 1990s IDE PIO hard drive without SMARTDRV
int floppy_data_rate;
@ -1695,11 +1695,11 @@ static Bitu DOS_21Handler(void) {
// Important: This service does not set the carry flag!
//
// Fix for PC-98 game "Yu No". One of the TSRs used by the game, PLAY6.EXE,
// frees it's own PSP segment before using this TSR system call to remain
// frees its own PSP segment before using this TSR system call to remain
// resident in memory. On real PC-98 MS-DOS, INT 21h AH=31h appears to
// change the freed segment back into an allocated segment before resizing
// as directed by the number of paragraphs in DX. In order for PLAY6.EXE to
// do it's job properly without crashing the game we have to do the same.
// do its job properly without crashing the game we have to do the same.
//
// [Issue #3452]
//
@ -1710,7 +1710,7 @@ static Bitu DOS_21Handler(void) {
DOS_MCB psp_mcb(dos.psp()-1);
if (psp_mcb.GetPSPSeg() == 0/*free block?*/) {
/* say so in the log, and then change it into an allocated block */
LOG(LOG_DOSMISC,LOG_DEBUG)("Calling program asking to terminate and stay resident has apparently freed it's own PSP segment");
LOG(LOG_DOSMISC,LOG_DEBUG)("Calling program asking to terminate and stay resident has apparently freed its own PSP segment");
psp_mcb.SetPSPSeg(dos.psp());
}
}
@ -2005,7 +2005,7 @@ static Bitu DOS_21Handler(void) {
*
* This is needed for "Dark Purpose" to read it's DAT file
* correctly, which calls INT 21h AH=3Fh with DX=0004h and CX=FFFFh
* and will mis-render it's fonts, images, and color palettes
* and will mis-render its fonts, images, and color palettes
* if we do not do this.
*
* Ref: http://files.scene.org/get/mirrors/hornet/demos/1995/d/darkp.zip */
@ -2742,7 +2742,7 @@ static Bitu DOS_21Handler(void) {
CALLBACK_SCF(false);
break;
case 0x21: /* Capitalize String (cx=length) */
case 0x22: /* Capatilize ASCIZ string */
case 0x22: /* Capitalize ASCIZ string */
data = SegPhys(ds) + reg_dx;
if(reg_al == 0x21) len = reg_cx;
else len = mem_strlen(data); /* Is limited to 1024 */

2
src/dos/dos_classes.cpp
View File

@ -308,7 +308,7 @@ void DOS_PSP::CopyFileTable(DOS_PSP* srcpsp,bool createchildpsp) {
for (uint16_t i=0;i<20;i++) {
uint8_t handle = srcpsp->GetFileHandle(i);
if(createchildpsp)
{ //copy obeying not inherit flag.(but dont duplicate them)
{ //copy obeying not inherit flag.(but don't duplicate them)
bool allowCopy = true;//(handle==0) || ((handle>0) && (FindEntryByHandle(handle)==0xff));
if((handle<DOS_FILES) && Files[handle] && !(Files[handle]->flags & DOS_NOT_INHERIT) && allowCopy)
{

2
src/dos/dos_devices.cpp
View File

@ -759,7 +759,7 @@ uint8_t DOS_FindDevice(char const * name) {
static char com[5] = { 'C','O','M','1',0 };
static char lpt[5] = { 'L','P','T','1',0 };
// AUX is alias for COM1 and PRN for LPT1
// A bit of a hack. (but less then before).
// A bit of a hack. (but less than before).
// no need for casecmp as makename returns uppercase
if (strcmp(name_part, "AUX") == 0) name_part = com;
if (strcmp(name_part, "PRN") == 0) name_part = lpt;

2
src/dos/dos_files.cpp
View File

@ -1255,7 +1255,7 @@ bool DOS_GetFreeDiskSpace32(uint8_t drive,uint32_t * bytes,uint32_t * sectors,ui
}
bool DOS_DuplicateEntry(uint16_t entry,uint16_t * newentry) {
// Dont duplicate console handles
// Don't duplicate console handles
/* if (entry<=STDPRN) {
*newentry = entry;
return true;

4
src/dos/dos_network2.h
View File

@ -219,7 +219,7 @@ HANDLE hFind = INVALID_HANDLE_VALUE;
if (wc?MoveFileW((LPCWSTR)namehost, (LPCWSTR)namehost1):MoveFile(name1.c_str(), name2.c_str()))
return true;
uint16_t error=(uint16_t)GetLastError();
if (error == ERROR_ALREADY_EXISTS) // Not kwnown by DOS
if (error == ERROR_ALREADY_EXISTS) // Not known by DOS
error = DOSERR_ACCESS_DENIED;
DOS_SetError(error);
return false;
@ -330,7 +330,7 @@ bool Network_SetFileAttr(char const * const filename, uint16_t attr) {
{
int attribs = FILE_ATTRIBUTE_NORMAL;
if (attributes&3) // Read-only (1), Hidden (2), System (4) are the same in DOS and Windows
attribs = attributes&3; // We dont want (Windows) system files
attribs = attributes&3; // We don't want (Windows) system files
std::string name = filename;
if (filename[0]=='"') {

6
src/dos/dos_programs.cpp
View File

@ -1685,7 +1685,7 @@ bool MEM_map_ROM_physmem(Bitu start,Bitu end);
PageHandler &Get_ROM_page_handler(void);
// Normal BIOS is in the BIOS memory area
// ITF is in it's own buffer, served by mem_itf_rom
// ITF is in its own buffer, served by mem_itf_rom
void PC98_BIOS_Bank_Switch(void) {
if (PC98_BANK_Select == 0x00) {
MEM_RegisterHandler(0xF8,&mem_itf_rom,0x8);
@ -2557,7 +2557,7 @@ public:
extern const char* RunningProgram;
if (max_seg < 0x0800) {
/* TODO: For the adventerous, add a configuration option or command line switch to "BOOT"
/* TODO: For the adventurous, add a configuration option or command line switch to "BOOT"
* that allows us to boot the guest OS anyway in a manner that is non-standard. */
if (!quiet) WriteOut("32KB of RAM is required to boot a guest OS\n");
return;
@ -6581,7 +6581,7 @@ class IMGMOUNT : public Program {
sizes[3]/*cylinders*/ = (Bitu)((uint64_t)sectors / (uint64_t)sizes[2]/*heads*/ / (uint64_t)sizes[1]/*sectors/track*/);
if (IS_PC98_ARCH) {
/* TODO: PC-98 has it's own issues with a 4096-cylinder limit */
/* TODO: PC-98 has its own issues with a 4096-cylinder limit */
}
else {
/* INT 13h mapping, deal with 1024-cyl limit */

4
src/dos/drive_fat.cpp
View File

@ -2210,7 +2210,7 @@ void fatDrive::fatDriveInit(const char *sysFilename, uint32_t bytesector, uint32
return;
}
RootDirSectors = 0; /* FAT32 root directory has it's own allocation chain, instead of a fixed location */
RootDirSectors = 0; /* FAT32 root directory has its own allocation chain, instead of a fixed location */
DataSectors = (Bitu)BPB.v.BPB_TotSec32 - ((Bitu)BPB.v.BPB_RsvdSecCnt + ((Bitu)BPB.v.BPB_NumFATs * (Bitu)BPB.v32.BPB_FATSz32) + (Bitu)RootDirSectors);
CountOfClusters = DataSectors / BPB.v.BPB_SecPerClus;
firstDataSector = ((Bitu)BPB.v.BPB_RsvdSecCnt + ((Bitu)BPB.v.BPB_NumFATs * (Bitu)BPB.v32.BPB_FATSz32) + (Bitu)RootDirSectors) + (Bitu)partSectOff;
@ -2398,7 +2398,7 @@ void fatDrive::SetBPB(const FAT_BootSector::bpb_union_t &bpb) {
uint32_t DataSectors;
if (BPB.is_fat32()) {
RootDirSectors = 0; /* FAT32 root directory has it's own allocation chain, instead of a fixed location */
RootDirSectors = 0; /* FAT32 root directory has its own allocation chain, instead of a fixed location */
DataSectors = (Bitu)BPB.v.BPB_TotSec32 - ((Bitu)BPB.v.BPB_RsvdSecCnt + ((Bitu)BPB.v.BPB_NumFATs * (Bitu)BPB.v32.BPB_FATSz32) + (Bitu)RootDirSectors);
CountOfClusters = DataSectors / BPB.v.BPB_SecPerClus;
firstDataSector = ((Bitu)BPB.v.BPB_RsvdSecCnt + ((Bitu)BPB.v.BPB_NumFATs * (Bitu)BPB.v32.BPB_FATSz32) + (Bitu)RootDirSectors) + (Bitu)partSectOff;

2
src/dos/drive_iso.cpp
View File

@ -1719,7 +1719,7 @@ int isoDrive::readDirEntry(isoDirEntry* de, const uint8_t* data,unsigned int dir
// copy data into isoDirEntry struct, data[0] = length of DirEntry
// if (data[0] > sizeof(isoDirEntry)) return -1;//check disabled as isoDirentry is currently 258 bytes large. So it always fits
memcpy(de, data, data[0]);//Perharps care about a zero at the end.
memcpy(de, data, data[0]);//Perhaps care about a zero at the end.
// xa not supported
if (de->extAttrLength != 0) return -1;

2
src/dos/drive_local.cpp
View File

@ -2706,7 +2706,7 @@ bool localFile::LockFile(uint8_t mode, uint32_t pos, uint16_t size) {
}
Sleep(25); // If failed, wait 25 millisecs
}
else if (::UnlockFile(hFile, pos, 0, size, 0)) // This is a somewhat permanet condition!
else if (::UnlockFile(hFile, pos, 0, size, 0)) // This is a somewhat permanent condition!
return true;
DOS_SetError((uint16_t)GetLastError());
return false;

6
src/dos/wnaspi32.h
View File

@ -85,7 +85,7 @@ extern "C" {
#define SS_NO_ASPI 0xE3 // No ASPI managers resident
#define SS_FAILED_INIT 0xE4 // ASPI for windows failed init
#define SS_ASPI_IS_BUSY 0xE5 // No resources available to execute cmd
#define SS_BUFFER_TO_BIG 0xE6 // Buffer size to big to handle!
#define SS_BUFFER_TO_BIG 0xE6 // Buffer size too big to handle!
#define SS_MISMATCHED_COMPONENTS 0xE7 // The DLLs/EXEs of ASPI don't version check
#define SS_NO_ADAPTERS 0xE8 // No host adapters to manage
#define SS_INSUFFICIENT_RESOURCES 0xE9 // Couldn't allocate resources needed to init
@ -101,7 +101,7 @@ extern "C" {
#define HASTAT_DO_DU 0x12 // Data overrun data underrun
#define HASTAT_BUS_FREE 0x13 // Unexpected bus free
#define HASTAT_PHASE_ERR 0x14 // Target bus phase sequence // failure
#define HASTAT_TIMEOUT 0x09 // Timed out while SRB was waiting to beprocessed.
#define HASTAT_TIMEOUT 0x09 // Timed out while SRB was waiting to be processed.
#define HASTAT_COMMAND_TIMEOUT 0x0B // Adapter timed out processing SRB.
#define HASTAT_MESSAGE_REJECT 0x0D // While processing SRB, the // adapter received a MESSAGE
#define HASTAT_BUS_RESET 0x0E // A bus reset was detected.
@ -262,7 +262,7 @@ typedef struct // Offset
SRB_GetSetTimeouts, *PSRB_GetSetTimeouts, FAR *LPSRB_GetSetTimeouts;
//*****************************************************************************
// %%% ASPIBUFF - Structure For Controllng I/O Buffers %%%
// %%% ASPIBUFF - Structure For Controlling I/O Buffers %%%
//*****************************************************************************
typedef struct tag_ASPI32BUFF // Offset

26
src/dosbox.cpp
View File

@ -91,7 +91,7 @@
#include <list>
/*===================================TODO: Move to it's own file==============================*/
/*===================================TODO: Move to its own file==============================*/
#if defined(__SSE__) && !(defined(_M_AMD64) || defined(__e2k__))
bool sse2_available = false;
bool avx2_available = false;
@ -825,7 +825,7 @@ void Init_VGABIOS() {
}
// log
LOG(LOG_MISC,LOG_DEBUG)("Init_VGABIOS: Initializing VGA BIOS and parsing it's settings");
LOG(LOG_MISC,LOG_DEBUG)("Init_VGABIOS: Initializing VGA BIOS and parsing its settings");
// mem init must have already happened.
// We can remove this once the device callout system is in place.
@ -1072,7 +1072,7 @@ void DOSBOX_RealInit() {
// TODO: should be parsed by...? perhaps at some point we support machine= for backwards compat
// but translate it into two separate params that specify what machine vs what video hardware.
// or better yet as envisioned, a possible dosbox-x.conf schema that allows a machine with no
// base video of it's own, and then to specify an ISA or PCI card attached to the bus that
// base video of its own, and then to specify an ISA or PCI card attached to the bus that
// provides video.
std::string mtype(section->Get_string("machine"));
hercCard = HERC_GraphicsCard;
@ -2481,7 +2481,7 @@ void DOSBOX_SetupConfigSections(void) {
Pbool = secprop->Add_bool("sierra ramdac lock 565",Property::Changeable::WhenIdle,false);
Pbool->Set_help("When emulating High Sierra highcolor RAMDAC, assume 5:6:5 at all times if set. Else,\n"
"bit 6 of the DAC command selects between 5:5:5 and 5:6:5. Set this option for demos or\n"
"games that got the command byte wrong (MFX Transgrassion 2) or any other demo that is\n"
"games that got the command byte wrong (MFX Transgression 2) or any other demo that is\n"
"not rendering highcolor 16bpp correctly.");
Pbool = secprop->Add_bool("vga fill active memory",Property::Changeable::WhenIdle,false);
@ -2774,7 +2774,7 @@ void DOSBOX_SetupConfigSections(void) {
Pbool = secprop->Add_bool("clear trap flag on unhandled int 1",Property::Changeable::Always,false);
Pbool->Set_help("If set, the DOS kernel INT 01h handler will clear the trap flag when called.\n"
"Normally a DOS program using INT 01h and the trap flag (usually for debugging)\n"
"will provide it's own INT 01h handler. Some programs need this option set in\n"
"will provide its own INT 01h handler. Some programs need this option set in\n"
"order to not crash during startup due to possible bugs or anti debugger tricks\n"
"that went terribly wrong.");
@ -3459,7 +3459,7 @@ void DOSBOX_SetupConfigSections(void) {
* DS == CS. It uses the DS register to read local variables needed to manage the Sound Blaster card but
* it makes no attempt to push DS and then load the DS segment value it needs. While the demo may seem to
* run normally at first, eventually the interrupt is fired at just the right time to catch the demo in
* the middle of it's graphics routines (DS=A000). Since the ISR uses DS to load the Sound Blaster DSP
* the middle of its graphics routines (DS=A000). Since the ISR uses DS to load the Sound Blaster DSP
* I/O port, it reads some random value from *video RAM* and then hangs in a loop waiting for that I/O
* port to clear bit 7! Setting 'cs_equ_ds' works around that bug by instructing PIC emulation not to
* fire the interrupt unless segment registers CS and DS match. */
@ -3501,7 +3501,7 @@ void DOSBOX_SetupConfigSections(void) {
Pbool = secprop->Add_bool("enable asp",Property::Changeable::WhenIdle,false);
Pbool->Set_help("If set, emulate the presence of the Sound Blaster 16 Advanced Sound Processor/Creative Sound Processor chip.\n"
"NOTE: This only emulates it's presence and the basic DSP commands to communicate with it. Actual ASP/CSP functions are not yet implemented.");
"NOTE: This only emulates its presence and the basic DSP commands to communicate with it. Actual ASP/CSP functions are not yet implemented.");
Pbool = secprop->Add_bool("disable filtering",Property::Changeable::WhenIdle,false);
Pbool->Set_help("By default DOSBox-X filters Sound Blaster output to emulate lowpass filters and analog output limitations.\n"
@ -3723,7 +3723,7 @@ void DOSBOX_SetupConfigSections(void) {
Pbool = secprop->Add_bool("gus fixed render rate",Property::Changeable::WhenIdle,false);
Pbool->Set_help("If set, Gravis Ultrasound audio output is rendered at a fixed sample rate specified by 'gusrate'. This can provide better quality than real hardware,\n"
"if desired. Else, Gravis Ultrasound emulation will change the sample rate of it's output according to the number of active channels, just like real hardware.\n"
"if desired. Else, Gravis Ultrasound emulation will change the sample rate of its output according to the number of active channels, just like real hardware.\n"
"Note: DOSBox-X defaults to 'false', while mainline DOSBox SVN is currently hardcoded to render as if this setting is 'true'.");
Pint = secprop->Add_int("gusmemsize",Property::Changeable::WhenIdle,-1);
@ -4569,9 +4569,9 @@ void DOSBOX_SetupConfigSections(void) {
Pint->SetBasic(true);
Pbool = secprop->Add_bool("int33 hide host cursor if interrupt subroutine",Property::Changeable::WhenIdle,true);
Pbool->Set_help("If set, the cursor on the host will be hidden if the DOS application provides it's own\n"
Pbool->Set_help("If set, the cursor on the host will be hidden if the DOS application provides its own\n"
"interrupt subroutine for the mouse driver to call, which is usually an indication that\n"
"the DOS game wishes to draw the cursor with it's own support routines (DeluxePaint II).");
"the DOS game wishes to draw the cursor with its own support routines (DeluxePaint II).");
Pbool = secprop->Add_bool("int33 hide host cursor when polling",Property::Changeable::WhenIdle,false);
Pbool->Set_help("If set, the cursor on the host will be hidden even if the DOS application has also\n"
@ -4599,7 +4599,7 @@ void DOSBOX_SetupConfigSections(void) {
/* bugfix for Yodel "mayday" demo */
/* TODO: Set this option to default to "true" if it turns out most BIOSes unmask the IRQ during INT 15h AH=86 WAIT */
Pbool = secprop->Add_bool("int15 wait force unmask irq",Property::Changeable::OnlyAtStart,true);
Pbool->Set_help("Some demos or games mistakingly use INT 15h AH=0x86 (WAIT) while leaving the IRQs needed for it masked.\n"
Pbool->Set_help("Some demos or games mistakenly use INT 15h AH=0x86 (WAIT) while leaving the IRQs needed for it masked.\n"
"If this option is set (by default), the necessary IRQs will be unmasked when INT 15 AH=0x86 is used so that the game or demo does not hang.");
Pbool = secprop->Add_bool("int15 mouse callback does not preserve registers",Property::Changeable::OnlyAtStart,false);
@ -4768,7 +4768,7 @@ void DOSBOX_SetupConfigSections(void) {
"Notes:\n"
" - If mapped ranges differ, the shorter range is extended to fit.\n"
" - If conflicting host ports are given, only the first one is setup.\n"
" - If conflicting guest ports are given, the latter rule takes predecent.");
" - If conflicting guest ports are given, the latter rule takes precedent.");
Pstring = secprop->Add_string("udp_port_forwards", Property::Changeable::WhenIdle, "");
Pstring->Set_help("Forwards one or more UDP ports from the host into the DOS guest.\n"
@ -4778,7 +4778,7 @@ void DOSBOX_SetupConfigSections(void) {
for (size_t i=0;i < MAX_IDE_CONTROLLERS;i++) {
secprop=control->AddSection_prop(ide_names[i],&Null_Init,false);//done
/* Primary and Secondary are on by default, Teritary and Quaternary are off by default.
/* Primary and Secondary are on by default, Tertiary and Quaternary are off by default.
* Throughout the life of the IDE interface it was far more common for a PC to have just
* a Primary and Secondary interface */
Pbool = secprop->Add_bool("enable",Property::Changeable::OnlyAtStart,(i < 2) ? true : false);

8
src/fpu/fpu.cpp
View File

@ -317,7 +317,7 @@ void FPU_ESC1_Normal(Bitu rm) {
void FPU_ESC2_EA(Bitu rm,PhysPt addr) {
/* 32 bits integer operants */
/* 32 bits integer operands */
FPU_FLD_I32_EA(addr);
EATREE(rm);
}
@ -439,13 +439,13 @@ void FPU_ESC3_Normal(Bitu rm) {
if (FPU_ArchitectureType<=FPU_ARCHTYPE_8087)
fpu.cw.M = false;
else
LOG(LOG_FPU,LOG_ERROR)("8087 only fpu code used esc 3: group 4: subfuntion :%d",(int)sub);
LOG(LOG_FPU,LOG_ERROR)("8087 only fpu code used esc 3: group 4: subfunction :%d",(int)sub);
break;
case 0x01: //FNDIS
if (FPU_ArchitectureType<=FPU_ARCHTYPE_8087)
fpu.cw.M = true;
else
LOG(LOG_FPU,LOG_ERROR)("8087 only fpu code used esc 3: group 4: subfuntion :%d",(int)sub);
LOG(LOG_FPU,LOG_ERROR)("8087 only fpu code used esc 3: group 4: subfunction :%d",(int)sub);
break;
case 0x02: //FNCLEX FCLEX
FPU_FCLEX();
@ -598,7 +598,7 @@ void FPU_ESC5_Normal(Bitu rm) {
}
void FPU_ESC6_EA(Bitu rm,PhysPt addr) {
/* 16 bit (word integer) operants */
/* 16 bit (word integer) operands */
FPU_FLD_I16_EA(addr);
EATREE(rm);
}

2
src/fpu/fpu_instructions.h
View File

@ -211,7 +211,7 @@ static void FPU_FBLD(PhysPt addr,Bitu store_to) {
uint64_t base = 1;
for(uint8_t i = 0;i < 9;i++){
in = mem_readb(addr + i);
val += ( (in&0xf) * base); //in&0xf shouldn't be higher then 9
val += ( (in&0xf) * base); //in&0xf shouldn't be higher than 9
base *= 10;
val += ((( in>>4)&0xf) * base);
base *= 10;

2
src/fpu/fpu_instructions_longdouble.h
View File

@ -173,7 +173,7 @@ static void FPU_FBLD(PhysPt addr,Bitu store_to) {
uint64_t base = 1;
for(Bitu i = 0;i < 9;i++){
in = mem_readb(addr + i);
val += ( (in&0xf) * base); //in&0xf shouldn't be higher then 9
val += ( (in&0xf) * base); //in&0xf shouldn't be higher than 9
base *= 10;
val += ((( in>>4)&0xf) * base);
base *= 10;

2
src/gamelink/README.md
View File

@ -201,6 +201,6 @@ Developer Information
To write your own client, look at `src/gamelink/gamelink.cpp` to get an idea
how data is transmitted back and forth via one mutex and one shared memory
segment. `src/gamelink/gamelink.h` contains defititions of the structs that
segment. `src/gamelink/gamelink.h` contains definitions of the structs that
make up the shared memory. Access to that memory is only permitted while
holding the mutex.

2
src/gui/menu.cpp
View File

@ -1545,7 +1545,7 @@ void ConstructSubMenu(DOSBoxMenu::item_handle_t item_id, const char * const * li
mainMenu.get_item(item_id).display_list, separator_handle);
}
else if (!strcmp(ref,"||")) {
/* dito */
/* ditto */
DOSBoxMenu::item_handle_t separator_handle = separator_get(DOSBoxMenu::vseparator_type_id);
mainMenu.displaylist_append(
mainMenu.get_item(item_id).display_list, separator_handle);

Some files were not shown because too many files have changed in this diff Show More