diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 031f505d2..93dc398fb 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -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 diff --git a/BUGS/Impact Studios - Legend.txt b/BUGS/Impact Studios - Legend.txt index 92ab22c3a..4925757d6 100644 --- a/BUGS/Impact Studios - Legend.txt +++ b/BUGS/Impact Studios - Legend.txt @@ -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, diff --git a/BUILD.md b/BUILD.md index d6d526165..15fbd0e1d 100644 --- a/BUILD.md +++ b/BUILD.md @@ -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 diff --git a/CHANGELOG b/CHANGELOG index 54e24e9c5..c529e20c5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/CREDITS.md b/CREDITS.md index 2f18da608..5a652b7f8 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -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. diff --git a/Doxyfile b/Doxyfile index 71854ba80..0d99786e0 100644 --- a/Doxyfile +++ b/Doxyfile @@ -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 diff --git a/NEWS b/NEWS index c13a55e9a..ebd39fb2a 100644 --- a/NEWS +++ b/NEWS @@ -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. diff --git a/README.joystick b/README.joystick index b66c57d3c..bbec9daf5 100644 --- a/README.joystick +++ b/README.joystick @@ -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. diff --git a/README.keyboard-layout-handling b/README.keyboard-layout-handling index f023ce5cf..4c9a33db3 100644 --- a/README.keyboard-layout-handling +++ b/README.keyboard-layout-handling @@ -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. diff --git a/README.source-code-description b/README.source-code-description index 30938fbe4..1983924ef 100644 --- a/README.source-code-description +++ b/README.source-code-description @@ -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 diff --git a/build-debug-macos b/build-debug-macos index 45d659eee..77ec603db 100755 --- a/build-debug-macos +++ b/build-debug-macos @@ -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" diff --git a/build-debug-macos-sdl2 b/build-debug-macos-sdl2 index 36721499c..299c63b45 100755 --- a/build-debug-macos-sdl2 +++ b/build-debug-macos-sdl2 @@ -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" diff --git a/build-macos b/build-macos index 01c25aa2b..8d945f29f 100755 --- a/build-macos +++ b/build-macos @@ -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}" diff --git a/build-macos-sdl2 b/build-macos-sdl2 index 4b0865324..b54b64a14 100755 --- a/build-macos-sdl2 +++ b/build-macos-sdl2 @@ -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}" diff --git a/configure.ac b/configure.ac index afa508ca5..61b08d3fe 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) , : ) diff --git a/contrib/glshaders/crt-aperture.glsl b/contrib/glshaders/crt-aperture.glsl index a12e5e9eb..1b385b156 100644 --- a/contrib/glshaders/crt-aperture.glsl +++ b/contrib/glshaders/crt-aperture.glsl @@ -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. diff --git a/contrib/glshaders/crt-lottes-fast.glsl b/contrib/glshaders/crt-lottes-fast.glsl index 6b4eb034e..8c05f8f77 100644 --- a/contrib/glshaders/crt-lottes-fast.glsl +++ b/contrib/glshaders/crt-lottes-fast.glsl @@ -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); diff --git a/contrib/glshaders/crt-lottes-fast.subtle+gain.glsl b/contrib/glshaders/crt-lottes-fast.subtle+gain.glsl index d54c7da60..e2eeebe58 100644 --- a/contrib/glshaders/crt-lottes-fast.subtle+gain.glsl +++ b/contrib/glshaders/crt-lottes-fast.subtle+gain.glsl @@ -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); diff --git a/contrib/glshaders/crt-lottes.glsl b/contrib/glshaders/crt-lottes.glsl index 98eb9f579..1d867f05a 100644 --- a/contrib/glshaders/crt-lottes.glsl +++ b/contrib/glshaders/crt-lottes.glsl @@ -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) diff --git a/contrib/glshaders/crt-pi.glsl b/contrib/glshaders/crt-pi.glsl index 5543d23c0..29c5d27c8 100644 --- a/contrib/glshaders/crt-pi.glsl +++ b/contrib/glshaders/crt-pi.glsl @@ -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. diff --git a/contrib/glshaders/fakelottes.glsl b/contrib/glshaders/fakelottes.glsl index 8dea43e8d..6fa85e9b7 100644 --- a/contrib/glshaders/fakelottes.glsl +++ b/contrib/glshaders/fakelottes.glsl @@ -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. diff --git a/contrib/glshaders/fakelottes.tweaked.glsl b/contrib/glshaders/fakelottes.tweaked.glsl index 099ec4f82..d61e21d6f 100644 --- a/contrib/glshaders/fakelottes.tweaked.glsl +++ b/contrib/glshaders/fakelottes.tweaked.glsl @@ -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. diff --git a/contrib/glshaders/pixel_perfect-scanlines.glsl b/contrib/glshaders/pixel_perfect-scanlines.glsl index 84e963317..2625eafc8 100644 --- a/contrib/glshaders/pixel_perfect-scanlines.glsl +++ b/contrib/glshaders/pixel_perfect-scanlines.glsl @@ -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. diff --git a/contrib/glshaders/pixel_perfect.glsl b/contrib/glshaders/pixel_perfect.glsl index 0bbd5a580..241f4fcf4 100644 --- a/contrib/glshaders/pixel_perfect.glsl +++ b/contrib/glshaders/pixel_perfect.glsl @@ -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. diff --git a/contrib/glshaders/yeetron.glsl b/contrib/glshaders/yeetron.glsl index 641f5dd6c..9d46b1fff 100644 --- a/contrib/glshaders/yeetron.glsl +++ b/contrib/glshaders/yeetron.glsl @@ -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. diff --git a/contrib/glshaders/zfast_crt.glsl b/contrib/glshaders/zfast_crt.glsl index 8c88250e1..b235ab0e8 100644 --- a/contrib/glshaders/zfast_crt.glsl +++ b/contrib/glshaders/zfast_crt.glsl @@ -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. diff --git a/contrib/linux/dosbox-x.asciidoc b/contrib/linux/dosbox-x.asciidoc index de21b0c79..35ce9d61f 100644 --- a/contrib/linux/dosbox-x.asciidoc +++ b/contrib/linux/dosbox-x.asciidoc @@ -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. diff --git a/contrib/windows/installer/ISPPBuiltins.iss b/contrib/windows/installer/ISPPBuiltins.iss index 8c371c366..9d6656589 100644 --- a/contrib/windows/installer/ISPPBuiltins.iss +++ b/contrib/windows/installer/ISPPBuiltins.iss @@ -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 diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf index 2e9bfd9e3..db33c9c73 100644 --- a/contrib/windows/installer/dosbox-x.reference.setup.conf +++ b/contrib/windows/installer/dosbox-x.reference.setup.conf @@ -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). diff --git a/contrib/windows/shaders/2xSaI.fx b/contrib/windows/shaders/2xSaI.fx index 9044edb4b..a68a32c96 100644 --- a/contrib/windows/shaders/2xSaI.fx +++ b/contrib/windows/shaders/2xSaI.fx @@ -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 { diff --git a/contrib/windows/shaders/2xSaI_sRGB.fx b/contrib/windows/shaders/2xSaI_sRGB.fx index 42bb63963..672800a90 100644 --- a/contrib/windows/shaders/2xSaI_sRGB.fx +++ b/contrib/windows/shaders/2xSaI_sRGB.fx @@ -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 { diff --git a/contrib/windows/shaders/GS2xFilter.fx b/contrib/windows/shaders/GS2xFilter.fx index 59dc4b882..a69845532 100644 --- a/contrib/windows/shaders/GS2xFilter.fx +++ b/contrib/windows/shaders/GS2xFilter.fx @@ -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 diff --git a/contrib/windows/shaders/GS4xFilter.fx b/contrib/windows/shaders/GS4xFilter.fx index 8b991fc9c..03658287c 100644 --- a/contrib/windows/shaders/GS4xFilter.fx +++ b/contrib/windows/shaders/GS4xFilter.fx @@ -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"; diff --git a/contrib/windows/shaders/scale2x.fx b/contrib/windows/shaders/scale2x.fx index 0eaccc369..e45270df8 100644 --- a/contrib/windows/shaders/scale2x.fx +++ b/contrib/windows/shaders/scale2x.fx @@ -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); diff --git a/contrib/windows/shaders/scale2x_ps14.fx b/contrib/windows/shaders/scale2x_ps14.fx index 3e190fe98..904da98fe 100644 --- a/contrib/windows/shaders/scale2x_ps14.fx +++ b/contrib/windows/shaders/scale2x_ps14.fx @@ -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 diff --git a/contrib/windows/shaders/scaling.inc b/contrib/windows/shaders/scaling.inc index 45c341db9..c7b2e744a 100644 --- a/contrib/windows/shaders/scaling.inc +++ b/contrib/windows/shaders/scaling.inc @@ -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 < diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index 15c9356be..ce3c822ac 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -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. diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf index 4916e7379..6b561bdd2 100644 --- a/dosbox-x.reference.full.conf +++ b/dosbox-x.reference.full.conf @@ -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). diff --git a/include/SDL_ttf.h b/include/SDL_ttf.h index ac3a90b47..59605e851 100644 --- a/include/SDL_ttf.h +++ b/include/SDL_ttf.h @@ -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 diff --git a/include/bios_disk.h b/include/bios_disk.h index e9141f744..fb21792ce 100644 --- a/include/bios_disk.h +++ b/include/bios_disk.h @@ -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 diff --git a/include/dos_inc.h b/include/dos_inc.h index 55244b535..36782736b 100644 --- a/include/dos_inc.h +++ b/include/dos_inc.h @@ -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 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 diff --git a/include/dosbox.h b/include/dosbox.h index 70544598b..d9d53833c 100644 --- a/include/dosbox.h +++ b/include/dosbox.h @@ -389,7 +389,7 @@ public: } template - void registerPOD(T& pod) //register POD for serializatioin + void registerPOD(T& pod) //register POD for serialization { podRef.push_back(POD(pod)); } diff --git a/include/enet.h b/include/enet.h index 3b9d6ae8e..8ce3aaa6a 100644 --- a/include/enet.h +++ b/include/enet.h @@ -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) { diff --git a/include/informational.h b/include/informational.h index e08fc2d7a..c799a133f 100644 --- a/include/informational.h +++ b/include/informational.h @@ -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_ diff --git a/include/ioapi.h b/include/ioapi.h index 367a3130b..0bc6904ff 100644 --- a/include/ioapi.h +++ b/include/ioapi.h @@ -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 diff --git a/include/ipx.h b/include/ipx.h index a7bdc4ca9..a61c560cc 100644 --- a/include/ipx.h +++ b/include/ipx.h @@ -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); diff --git a/include/jfont.h b/include/jfont.h index 475db3330..23ffd42bc 100644 --- a/include/jfont.h +++ b/include/jfont.h @@ -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 diff --git a/include/mem.h b/include/mem.h index cefa431ae..0b1fbfbfa 100644 --- a/include/mem.h +++ b/include/mem.h @@ -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; diff --git a/include/ne2000.h b/include/ne2000.h index c9264a22c..567f26860 100644 --- a/include/ne2000.h +++ b/include/ne2000.h @@ -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 diff --git a/include/opus.h b/include/opus.h index bd8159dfa..2fc97b178 100644 --- a/include/opus.h +++ b/include/opus.h @@ -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 diff --git a/include/opus_custom.h b/include/opus_custom.h index cd10f3064..427abecbe 100644 --- a/include/opus_custom.h +++ b/include/opus_custom.h @@ -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 OpusCustomEncoder*: 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 OpusCustomDecoder*: State to be freed. */ OPUS_CUSTOM_EXPORT void opus_custom_decoder_destroy(OpusCustomDecoder *st); diff --git a/include/opus_multistream.h b/include/opus_multistream.h index 1e14b72e7..fceab87d7 100644 --- a/include/opus_multistream.h +++ b/include/opus_multistream.h @@ -143,7 +143,7 @@ extern "C" { * Vorbis * channel ordering. 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 diff --git a/include/opus_projection.h b/include/opus_projection.h index da5e4f1ef..cb4a333b5 100644 --- a/include/opus_projection.h +++ b/include/opus_projection.h @@ -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 diff --git a/include/opusfile.h b/include/opusfile.h index 9d9616a6e..f5141eef7 100644 --- a/include/opusfile.h +++ b/include/opusfile.h @@ -729,7 +729,7 @@ struct OpusServerInfo{ /**The software used by the origin server (Server). This is NULL if there was no Server 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 NULL if there was no Content-Type 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 diff --git a/include/paging.h b/include/paging.h index 0a99dbfa8..3e6a8db85 100644 --- a/include/paging.h +++ b/include/paging.h @@ -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) diff --git a/include/regs.h b/include/regs.h index 8b4dab325..3db65d456 100644 --- a/include/regs.h +++ b/include/regs.h @@ -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; }; diff --git a/include/sdk2_glide.h b/include/sdk2_glide.h index 169a935f5..a3b7f85eb 100644 --- a/include/sdk2_glide.h +++ b/include/sdk2_glide.h @@ -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 diff --git a/include/serialport.h b/include/serialport.h index 72ab73d18..b16f969ce 100644 --- a/include/serialport.h +++ b/include/serialport.h @@ -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 diff --git a/include/setup.h b/include/setup.h index c848a07ae..5ea526728 100644 --- a/include/setup.h +++ b/include/setup.h @@ -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 diff --git a/include/shell.h b/include/shell.h index d5c113754..258f58345 100644 --- a/include/shell.h +++ b/include/shell.h @@ -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; diff --git a/include/timer.h b/include/timer.h index d12ee5f85..bd729ceb5 100644 --- a/include/timer.h +++ b/include/timer.h @@ -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 */ diff --git a/include/unzip.h b/include/unzip.h index 493507e2b..fc40dafd8 100644 --- a/include/unzip.h +++ b/include/unzip.h @@ -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) diff --git a/include/vga.h b/include/vga.h index 18e12af92..0c14c76af 100644 --- a/include/vga.h +++ b/include/vga.h @@ -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 diff --git a/include/waveformatex.h b/include/waveformatex.h index a2c90c240..adb5cdf46 100644 --- a/include/waveformatex.h +++ b/include/waveformatex.h @@ -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. */ diff --git a/include/zip.h b/include/zip.h index ff0ae5674..f23d2220e 100644 --- a/include/zip.h +++ b/include/zip.h @@ -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. diff --git a/include/zipcrc.h b/include/zipcrc.h index d2ffc5609..6441ae73c 100644 --- a/include/zipcrc.h +++ b/include/zipcrc.h @@ -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 diff --git a/scripts/dosbox-installer.nsi b/scripts/dosbox-installer.nsi index 5f747f6ec..9f1c5c4bf 100644 --- a/scripts/dosbox-installer.nsi +++ b/scripts/dosbox-installer.nsi @@ -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 diff --git a/src/aviwriter/avi_writer.cpp b/src/aviwriter/avi_writer.cpp index 725231383..937559301 100644 --- a/src/aviwriter/avi_writer.cpp +++ b/src/aviwriter/avi_writer.cpp @@ -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 */ diff --git a/src/builtin/xcopy/makefile b/src/builtin/xcopy/makefile index 2732fd440..019a6df78 100644 --- a/src/builtin/xcopy/makefile +++ b/src/builtin/xcopy/makefile @@ -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 diff --git a/src/builtin/xcopy/xcopy.c b/src/builtin/xcopy/xcopy.c index 47e34d718..113ae2c9e 100644 --- a/src/builtin/xcopy/xcopy.c +++ b/src/builtin/xcopy/xcopy.c @@ -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) { diff --git a/src/cpu/callback.cpp b/src/cpu/callback.cpp index e887cc1f4..653cff7fd 100644 --- a/src/cpu/callback.cpp +++ b/src/cpu/callback.cpp @@ -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 */ diff --git a/src/cpu/core_dyn_x86/dyn_fpu.h b/src/cpu/core_dyn_x86/dyn_fpu.h index 53f395017..f1ae06f61 100644 --- a/src/cpu/core_dyn_x86/dyn_fpu.h +++ b/src/cpu/core_dyn_x86/dyn_fpu.h @@ -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,""); diff --git a/src/cpu/core_dynrec/decoder_opcodes.h b/src/cpu/core_dynrec/decoder_opcodes.h index c37afa6b3..88e7d0f1a 100644 --- a/src/cpu/core_dynrec/decoder_opcodes.h +++ b/src/cpu/core_dynrec/decoder_opcodes.h @@ -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"); diff --git a/src/cpu/core_dynrec/dyn_fpu.h b/src/cpu/core_dynrec/dyn_fpu.h index 912a2488d..0358f2070 100644 --- a/src/cpu/core_dynrec/dyn_fpu.h +++ b/src/cpu/core_dynrec/dyn_fpu.h @@ -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); diff --git a/src/cpu/core_dynrec/risc_armv4le-common.h b/src/cpu/core_dynrec/risc_armv4le-common.h index 7f8c92bf5..28f35dadf 100644 --- a/src/cpu/core_dynrec/risc_armv4le-common.h +++ b/src/cpu/core_dynrec/risc_armv4le-common.h @@ -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 diff --git a/src/cpu/core_dynrec/risc_armv8le.h b/src/cpu/core_dynrec/risc_armv8le.h index cc4a01133..43ef622a2 100644 --- a/src/cpu/core_dynrec/risc_armv8le.h +++ b/src/cpu/core_dynrec/risc_armv8le.h @@ -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 diff --git a/src/cpu/core_dynrec/risc_mipsel32.h b/src/cpu/core_dynrec/risc_mipsel32.h index 0c9855374..622f8d9a7 100644 --- a/src/cpu/core_dynrec/risc_mipsel32.h +++ b/src/cpu/core_dynrec/risc_mipsel32.h @@ -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 diff --git a/src/cpu/core_dynrec/risc_x64.h b/src/cpu/core_dynrec/risc_x64.h index ca5beec3e..d8de3812f 100644 --- a/src/cpu/core_dynrec/risc_x64.h +++ b/src/cpu/core_dynrec/risc_x64.h @@ -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); diff --git a/src/cpu/core_dynrec/risc_x86.h b/src/cpu/core_dynrec/risc_x86.h index 318ec3130..36570d594 100644 --- a/src/cpu/core_dynrec/risc_x86.h +++ b/src/cpu/core_dynrec/risc_x86.h @@ -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 diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp index 21fcf1a3b..72adf4c61 100644 --- a/src/cpu/cpu.cpp +++ b/src/cpu/cpu.cpp @@ -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 */ diff --git a/src/debug/debug_disasm.cpp b/src/debug/debug_disasm.cpp index 46fd1d7b9..1aab3b801 100644 --- a/src/debug/debug_disasm.cpp +++ b/src/debug/debug_disasm.cpp @@ -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. diff --git a/src/debug/debug_gui.cpp b/src/debug/debug_gui.cpp index ea6f7c718..f93fc00cb 100644 --- a/src/debug/debug_gui.cpp +++ b/src/debug/debug_gui.cpp @@ -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. */ { diff --git a/src/dos/cdrom.cpp b/src/dos/cdrom.cpp index 82f2f5380..77c3016da 100644 --- a/src/dos/cdrom.cpp +++ b/src/dos/cdrom.cpp @@ -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 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 */ diff --git a/src/dos/dos_classes.cpp b/src/dos/dos_classes.cpp index a1d0de09c..39e2ba9c3 100644 --- a/src/dos/dos_classes.cpp +++ b/src/dos/dos_classes.cpp @@ -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((handleflags & DOS_NOT_INHERIT) && allowCopy) { diff --git a/src/dos/dos_devices.cpp b/src/dos/dos_devices.cpp index 65fcfc56d..51a9d7744 100644 --- a/src/dos/dos_devices.cpp +++ b/src/dos/dos_devices.cpp @@ -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; diff --git a/src/dos/dos_files.cpp b/src/dos/dos_files.cpp index 1ece2c68d..fa38c3d47 100644 --- a/src/dos/dos_files.cpp +++ b/src/dos/dos_files.cpp @@ -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; diff --git a/src/dos/dos_network2.h b/src/dos/dos_network2.h index b37bfed04..ad6aa693b 100644 --- a/src/dos/dos_network2.h +++ b/src/dos/dos_network2.h @@ -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]=='"') { diff --git a/src/dos/dos_programs.cpp b/src/dos/dos_programs.cpp index 787f454a6..01b7f9134 100644 --- a/src/dos/dos_programs.cpp +++ b/src/dos/dos_programs.cpp @@ -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 */ diff --git a/src/dos/drive_fat.cpp b/src/dos/drive_fat.cpp index a4bc9a464..a25979598 100644 --- a/src/dos/drive_fat.cpp +++ b/src/dos/drive_fat.cpp @@ -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; diff --git a/src/dos/drive_iso.cpp b/src/dos/drive_iso.cpp index b54627d2d..c19e3b359 100644 --- a/src/dos/drive_iso.cpp +++ b/src/dos/drive_iso.cpp @@ -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; diff --git a/src/dos/drive_local.cpp b/src/dos/drive_local.cpp index 033ebcdf3..88d7466bd 100644 --- a/src/dos/drive_local.cpp +++ b/src/dos/drive_local.cpp @@ -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; diff --git a/src/dos/wnaspi32.h b/src/dos/wnaspi32.h index 92b9921bf..e1940fee6 100644 --- a/src/dos/wnaspi32.h +++ b/src/dos/wnaspi32.h @@ -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 diff --git a/src/dosbox.cpp b/src/dosbox.cpp index a6b0a405e..1eda17e5d 100644 --- a/src/dosbox.cpp +++ b/src/dosbox.cpp @@ -91,7 +91,7 @@ #include -/*===================================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); diff --git a/src/fpu/fpu.cpp b/src/fpu/fpu.cpp index 235b7bc49..5c25316f5 100644 --- a/src/fpu/fpu.cpp +++ b/src/fpu/fpu.cpp @@ -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); } diff --git a/src/fpu/fpu_instructions.h b/src/fpu/fpu_instructions.h index 67255739c..eb480dacc 100644 --- a/src/fpu/fpu_instructions.h +++ b/src/fpu/fpu_instructions.h @@ -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; diff --git a/src/fpu/fpu_instructions_longdouble.h b/src/fpu/fpu_instructions_longdouble.h index 5b22334e8..0cbaa874c 100644 --- a/src/fpu/fpu_instructions_longdouble.h +++ b/src/fpu/fpu_instructions_longdouble.h @@ -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; diff --git a/src/gamelink/README.md b/src/gamelink/README.md index 4818cfe19..a66e0b45e 100644 --- a/src/gamelink/README.md +++ b/src/gamelink/README.md @@ -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. diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp index a6646af3f..0f9641e85 100644 --- a/src/gui/menu.cpp +++ b/src/gui/menu.cpp @@ -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); diff --git a/src/gui/midi.cpp b/src/gui/midi.cpp index 0c5fb8bd6..ede018152 100644 --- a/src/gui/midi.cpp +++ b/src/gui/midi.cpp @@ -520,7 +520,7 @@ void MIDI_RawOutByte(uint8_t data) { midi.handler->PlayMsg(midi.rt_buf); return; } - /* Test for a active sysex transfer */ + /* Test for an active sysex transfer */ if (midi.status==0xf0) { if (!(data&0x80)) { if (midi.sysex.used<(SYSEX_SIZE-1)) midi.sysex.buf[midi.sysex.used++] = data; diff --git a/src/gui/midi_timidity.h b/src/gui/midi_timidity.h index d3a86d60f..e854a7cea 100644 --- a/src/gui/midi_timidity.h +++ b/src/gui/midi_timidity.h @@ -235,7 +235,7 @@ int MidiHandler_timidity::timidity_ctl_command(char * buff, const char *fmt, ... va_list ap; if (fmt != NULL) { - /* if argumends are present, write them to control connection */ + /* if arguments are present, write them to control connection */ va_start(ap, fmt); len = vsnprintf(buff, BUFSIZ-1, fmt, ap); /* leave one byte for \n */ va_end(ap); diff --git a/src/gui/render.cpp b/src/gui/render.cpp index f1e9c7682..9e412d06d 100644 --- a/src/gui/render.cpp +++ b/src/gui/render.cpp @@ -827,7 +827,7 @@ forcenormal: render.scale.blocks = render.src.width / SCALER_BLOCKSIZE; render.scale.lastBlock = render.src.width % SCALER_BLOCKSIZE; render.scale.inHeight = render.src.height; - /* Reset the palette change detection to it's initial value */ + /* Reset the palette change detection to its initial value */ render.pal.first= 0; render.pal.last = 255; render.pal.changed = false; diff --git a/src/gui/sdl_ttf.c b/src/gui/sdl_ttf.c index 0ce48b2ea..3e46f08f8 100644 --- a/src/gui/sdl_ttf.c +++ b/src/gui/sdl_ttf.c @@ -477,7 +477,7 @@ TTF_Font* TTF_OpenFontIndexRW( SDL_RWops *src, int freesrc, int ptsize, long ind error = FT_Set_Pixel_Sizes( face, face->available_sizes[ptsize].height, face->available_sizes[ptsize].width ); - /* With non-scalale fonts, Freetype2 likes to fill many of the + /* With non-scalable fonts, Freetype2 likes to fill many of the * font metrics with the value of 0. The size of the * non-scalable fonts must be determined differently * or sometimes cannot be determined. @@ -1141,7 +1141,7 @@ int TTF_SizeUNICODE(TTF_Font *font, const Uint16 *text, int *w, int *h) outline_delta = font->outline * 2; } - /* Load each character and sum it's bounding box */ + /* Load each character and sum its bounding box */ x= 0; for ( ch=text; *ch; ++ch ) { Uint16 c = *ch; @@ -2036,7 +2036,7 @@ void TTF_SetFontStyle( TTF_Font* font, int style ) font->style = style | font->face_style; /* Flush the cache if the style has changed. - * Ignore UNDERLINE which does not impact glyph drawning. + * Ignore UNDERLINE which does not impact glyph drawing. * */ if ( (font->style | TTF_STYLE_NO_GLYPH_CHANGE ) != ( prev_style | TTF_STYLE_NO_GLYPH_CHANGE )) { Flush_Cache( font ); diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp index e3f63fcf5..5dee89e81 100644 --- a/src/gui/sdlmain.cpp +++ b/src/gui/sdlmain.cpp @@ -469,7 +469,7 @@ void WindowsTaskbarUpdatePreviewRegion(void) { /* NTS: The MSDN documentation is misleading. Apparently, despite 30+ years of Windows SDK behavior where the "client area" is the area below the menu bar and inside the frame, - ITaskbarList3's idea of the "client area" is the the area inside the frame INCLUDING + ITaskbarList3's idea of the "client area" is the area inside the frame INCLUDING the menu bar. Why? */ if (GetMenu(GetHWND()) != NULL) { MENUBARINFO mb; @@ -499,7 +499,7 @@ void WindowsTaskbarResetPreviewRegion(void) { /* NTS: The MSDN documentation is misleading. Apparently, despite 30+ years of Windows SDK behavior where the "client area" is the area below the menu bar and inside the frame, - ITaskbarList3's idea of the "client area" is the the area inside the frame INCLUDING + ITaskbarList3's idea of the "client area" is the area inside the frame INCLUDING the menu bar. Why? */ if (GetMenu(GetHWND()) != NULL) { MENUBARINFO mb; @@ -900,7 +900,7 @@ Bitu GUI_JoystickCount(void) { } #if !defined(MACOSX) -/* TODO: should move to it's own file ================================================ */ +/* TODO: should move to its own file ================================================ */ static unsigned char logo[32*32*4]= { #include "dosbox_logo.h" }; @@ -9195,7 +9195,7 @@ int main(int argc, char* argv[]) SDL_MAIN_NOEXCEPT { Drop root privileges after they are no longer needed, which is a good practice if the executable is setuid root. dropPrivilegesTemp() is called by PARPORTS::PARPORTS() after - contructing CDirectLPT instances, but only if the constant + constructing CDirectLPT instances, but only if the constant HAS_CDIRECTLPT is non-zero. dropPrivileges() should be called regardless (if initPassthroughIO() is used anywhere else). */ diff --git a/src/hardware/8255.cpp b/src/hardware/8255.cpp index 700ca519d..caeced466 100644 --- a/src/hardware/8255.cpp +++ b/src/hardware/8255.cpp @@ -151,7 +151,7 @@ void Intel8255::writeControl(const uint8_t data) { portCWriteMask &= ~((mode & 0x10) ? 0x38 : 0xC8); } - /* according to PC-98 hardware it seems changing a port to input makes the latch forget it's contents */ + /* according to PC-98 hardware it seems changing a port to input makes the latch forget its contents */ latchOutPortA &= ~portAWriteMask; latchOutPortB &= ~portBWriteMask; latchOutPortC &= ~portCWriteMask; diff --git a/src/hardware/dbopl.cpp b/src/hardware/dbopl.cpp index 63e504901..f39ca9abe 100644 --- a/src/hardware/dbopl.cpp +++ b/src/hardware/dbopl.cpp @@ -102,7 +102,7 @@ namespace DBOPL { //How much to subtract from the base value for the final attenuation static const uint8_t KslCreateTable[16] = { - //0 will always be be lower than 7 * 8 + //0 will always be lower than 7 * 8 64, 32, 24, 19, 16, 12, 11, 10, 8, 6, 5, 4, @@ -142,7 +142,7 @@ static uint16_t SinTable[ 512 ]; #if ( DBOPL_WAVE > WAVE_HANDLER ) //Layout of the waveform table in 512 entry intervals -//With overlapping waves we reduce the table to half it's size +//With overlapping waves we reduce the table to half its size // | |//\\|____|WAV7|//__|/\ |____|/\/\| // |\\//| | |WAV7| | \/| | | @@ -509,7 +509,7 @@ void Operator::Write80( const Chip* chip, uint8_t val ) { void Operator::WriteE0( const Chip* chip, uint8_t val ) { if ( !(regE0 ^ val) ) return; - //in opl3 mode you can always selet 7 waveforms regardless of waveformselect + //in opl3 mode you can always select 7 waveforms regardless of waveformselect const uint8_t waveForm = val & ( ( 0x3 & chip->waveFormMask ) | (0x7 & chip->opl3Active ) ); regE0 = val; #if ( DBOPL_WAVE == WAVE_HANDLER ) @@ -895,7 +895,7 @@ Channel* Channel::BlockTemplate( Chip* chip, uint32_t samples, int32_t* output ) default: break; } - //Init the operators with the the current vibrato and tremolo values + //Init the operators with the current vibrato and tremolo values Op( 0 )->Prepare( chip ); Op( 1 )->Prepare( chip ); if ( mode > sm4Start ) { @@ -1011,7 +1011,7 @@ Chip::Chip( bool _opl3Mode ) : opl3Mode( _opl3Mode ) { vibratoShift = ( VibratoTable[ vibratoIndex >> 2] & 7) + vibratoStrength; tremoloValue = TremoloTable[ tremoloIndex ] >> tremoloStrength; - //Check hom many samples there can be done before the value changes + //Check how many samples there can be done before the value changes uint32_t todo = LFO_MAX - lfoCounter; uint32_t count = (todo + lfoAdd - 1) / lfoAdd; if ( count > samples ) { @@ -1022,7 +1022,7 @@ Chip::Chip( bool _opl3Mode ) : opl3Mode( _opl3Mode ) { lfoCounter &= (LFO_MAX - 1); //Maximum of 7 vibrato value * 4 vibratoIndex = ( vibratoIndex + 1 ) & 31; - //Clip tremolo to the the table size + //Clip tremolo to the table size if ( tremoloIndex + 1 < TREMOLO_TABLE ) ++tremoloIndex; else diff --git a/src/hardware/dbopl.h b/src/hardware/dbopl.h index 6d434fda5..9c25ad36a 100644 --- a/src/hardware/dbopl.h +++ b/src/hardware/dbopl.h @@ -19,7 +19,7 @@ #include "adlib.h" #include "dosbox.h" -//Use 8 handlers based on a small logatirmic wavetabe and an exponential table for volume +//Use 8 handlers based on a small logarithmic wavetable and an exponential table for volume #define WAVE_HANDLER 10 //Use a logarithmic wavetable with an exponential table for volume #define WAVE_TABLELOG 11 @@ -93,7 +93,7 @@ public: #endif uint32_t waveIndex; //WAVE_BITS shifted counter of the frequency index uint32_t waveAdd; //The base frequency without vibrato - uint32_t waveCurrent; //waveAdd + vibratao + uint32_t waveCurrent; //waveAdd + vibrato uint32_t chanData; //Frequency/octave and derived data coming from whatever channel controls this uint32_t freqMul; //Scale channel frequency with this, TODO maybe remove? @@ -106,7 +106,7 @@ public: uint32_t attackAdd; //Timers for the different states of the envelope uint32_t decayAdd; uint32_t releaseAdd; - uint32_t rateIndex; //Current position of the evenlope + uint32_t rateIndex; //Current position of the envelope uint8_t rateZero; //Bits for the different states of the envelope having no changes uint8_t keyOn; //Bitmask of different values that can generate keyon diff --git a/src/hardware/glide.cpp b/src/hardware/glide.cpp index aa7f04bd0..8ad138037 100644 --- a/src/hardware/glide.cpp +++ b/src/hardware/glide.cpp @@ -478,7 +478,7 @@ void GLIDE_ResetScreen(bool update) VGA_SetOverride(true); GFX_Stop(); - // OpenGlide will resize the window on it's own (using SDL) + // OpenGlide will resize the window on its own (using SDL) if(glide.width && ( #ifdef WIN32 // dgVoodoo needs a little help :) diff --git a/src/hardware/gus.cpp b/src/hardware/gus.cpp index 3af43d45b..6b390457c 100644 --- a/src/hardware/gus.cpp +++ b/src/hardware/gus.cpp @@ -620,7 +620,7 @@ static void GUSReset(void) { * Global Data High (3X5) is either an 8-bit transfer for one of the GF registers or the high part of a 16-bit wide register with 8-bit I/O. * * Prior to 2015/12/29 DOSBox and DOSBox-X contained a programming error here where reset and master IRQ enable were handled from the - * LOWER 8 bits, when the code should have been checking the UPPER 8 bits. Programming error #2 was the mis-interpetation of bit 0 (bit 8 of + * LOWER 8 bits, when the code should have been checking the UPPER 8 bits. Programming error #2 was the mis-interpretation of bit 0 (bit 8 of * the gRegData). According to the SDK, clearing bit 0 triggers RESET, setting bit 0 starts the card running again. The original code had * it backwards. */ GUS_reset_reg = (myGUS.gRegData >> 8) & 7; @@ -1314,7 +1314,7 @@ static inline uint8_t read_GF1_mapping_control(const unsigned int ch) { * appear to be the same, with the exception that Crystal Semiconductor adds 16 registers with the * "MODE 2" bit. * - * Perhaps at some point, we can untie this from GUS emulation and let it exist as it's own C++ + * Perhaps at some point, we can untie this from GUS emulation and let it exist as its own C++ * class that covers CS4231A, AD1848, and other "WSS" chipset emulation on behalf of GUS and SB * emulation, much like the OPL3 emulation already present in this source tree for Sound Blaster. * @@ -1933,7 +1933,7 @@ void GUS_DMA_Event_Transfer(DmaChannel *chan,Bitu dmawords) { //Check for 16 or 8bit channel read*=(chan->DMA16+1u); if((myGUS.DMAControl & 0x80) != 0) { - //Invert the MSB to convert twos compliment form + //Invert the MSB to convert twos complement form Bitu i; if((myGUS.DMAControl & 0x40) == 0) { // 8-bit data @@ -2354,7 +2354,7 @@ public: if (irq_val > 0) { string s = section->Get_string("irq hack"); if (!s.empty() && s != "none") { - LOG(LOG_MISC,LOG_NORMAL)("GUS emulation: Assigning IRQ hack '%s' as instruced",s.c_str()); + LOG(LOG_MISC,LOG_NORMAL)("GUS emulation: Assigning IRQ hack '%s' as instructed",s.c_str()); PIC_Set_IRQ_hack(irq_val,PIC_parse_IRQ_hack_string(s.c_str())); } } diff --git a/src/hardware/hardware.cpp b/src/hardware/hardware.cpp index bd1fff852..2fb3814ce 100644 --- a/src/hardware/hardware.cpp +++ b/src/hardware/hardware.cpp @@ -2259,7 +2259,7 @@ void HARDWARE_Destroy(Section * sec) { void HARDWARE_Init() { LOG(LOG_MISC,LOG_DEBUG)("HARDWARE_Init: initializing"); - /* TODO: Hardware init. We moved capture init to it's own function. */ + /* TODO: Hardware init. We moved capture init to its own function. */ AddExitFunction(AddExitFunctionFuncPair(HARDWARE_Destroy),true); } diff --git a/src/hardware/ide.cpp b/src/hardware/ide.cpp index ef9667294..28f724bad 100644 --- a/src/hardware/ide.cpp +++ b/src/hardware/ide.cpp @@ -693,7 +693,7 @@ void IDEATAPICDROMDevice::mode_sense() { * 1 (0x20) = Tray * 2 (0x40) = Popup * 3 (0x60) = Reserved - * 4 (0x80) = Changer with indivually changeable discs + * 4 (0x80) = Changer with individually changeable discs * 5 (0xA0) = Changer using a magazine mechanism * 6 (0xC0) = Reserved * 6 (0xE0) = Reserved */ @@ -860,7 +860,7 @@ void IDEATAPICDROMDevice::read_toc() { /* NTS: The SCSI MMC standards say we're allowed to indicate the return data * is longer than it's allocation length. But here's the thing: some MS-DOS * CD-ROM drivers will ask for the TOC but only provide enough room for one - * entry (OAKCDROM.SYS) and if we signal more data than it's buffer, it will + * entry (OAKCDROM.SYS) and if we signal more data than its buffer, it will * reject our response and render the CD-ROM drive inaccessible. So to make * this emulation work, we have to cut our response short to the driver's * allocation length */ @@ -2916,7 +2916,7 @@ static Bitu IDE_SelfIO_In(IDEController *ide,Bitu port,Bitu len) { if (ide->int13fakev86io && IDE_CPU_Is_Vm86()) { /* Trigger I/O in virtual 8086 mode, where the OS can trap it and act on it. * Windows 95 uses V86 traps to help "autodetect" what IDE drive and port the - * BIOS uses on INT 13h so that it's internal IDE driver can take over, which + * BIOS uses on INT 13h so that its internal IDE driver can take over, which * is the whole reason for this hack. */ return CPU_ForceV86FakeIO_In(port,len); } @@ -3031,7 +3031,7 @@ void IDE_EmuINT13DiskReadByBIOS_LBA(unsigned char disk,uint64_t lba) { * what IDE hard disk and controller corresponds to what DOS * drive. So to get 32-bit disk access to work in Windows 95, * we have to put on a good show to convince Windows 95 we're - * a legitimate BIOS INT 13h call doing it's job. */ + * a legitimate BIOS INT 13h call doing its job. */ IDE_SelfIO_In(ide,ide->base_io+7u,1); /* dum de dum reading status */ IDE_SelfIO_Out(ide,ide->base_io+6u,(ms<<4u)+0xE0u+(lba>>24u),1); /* drive and head */ IDE_SelfIO_In(ide,ide->base_io+7u,1); /* dum de dum reading status */ @@ -3202,7 +3202,7 @@ void IDE_EmuINT13DiskReadByBIOS(unsigned char disk,unsigned int cyl,unsigned int * what IDE hard disk and controller corresponds to what DOS * drive. So to get 32-bit disk access to work in Windows 95, * we have to put on a good show to convince Windows 95 we're - * a legitimate BIOS INT 13h call doing it's job. */ + * a legitimate BIOS INT 13h call doing its job. */ IDE_SelfIO_In(ide,ide->base_io+7u,1); /* dum de dum reading status */ IDE_SelfIO_Out(ide,ide->base_io+6u,(ms<<4u)+0xA0u+head,1); /* drive and head */ IDE_SelfIO_In(ide,ide->base_io+7u,1); /* dum de dum reading status */ diff --git a/src/hardware/imfc.cpp b/src/hardware/imfc.cpp index 1d8c10879..7ab571fa4 100644 --- a/src/hardware/imfc.cpp +++ b/src/hardware/imfc.cpp @@ -205,7 +205,7 @@ enum MidiDataPacketState : uint8_t { }; struct BufferFlags { - // bit-7:true=no data / false=has data / bit6:read errors encounted / + // bit-7:true=no data / false=has data / bit6:read errors encountered / // bit5: overflow error / bit4: offline error volatile uint8_t _unused1 : 4; volatile uint8_t _hasOfflineError : 1; @@ -351,7 +351,7 @@ public: { BufferDataType data = m_buffer[lastReadByteIndex]; if (m_debug) { - IMF_LOG("%s - poping data 0x%02X from queue @ %i", + IMF_LOG("%s - popping data 0x%02X from queue @ %i", m_name.c_str(), data, lastReadByteIndex); @@ -2463,7 +2463,7 @@ public: uint8_t readPortPIU0() { - // reading PIU0 is not dependant on the mode of group0 + // reading PIU0 is not dependent on the mode of group0 // if group0 was specified as OUTPUT then it returns the last // value written const uint8_t val = readPort0(); @@ -2490,7 +2490,7 @@ public: } uint8_t readPortPIU1() { - // reading PIU1 is not dependant on the mode of group1 + // reading PIU1 is not dependent on the mode of group1 // if group1 was specified as OUTPUT then it returns the last // value written const uint8_t val = readPort1(); @@ -3035,7 +3035,7 @@ private: uint32_t csm_req = 0; /* CSM KEY ON / KEY OFF sequence request */ - uint32_t irq_enable = 0; /* IRQ enable for timer B (bit 3) and timer A (bit 2); bit 7 - CSM mode (keyon to all slots, everytime timer A overflows) */ + uint32_t irq_enable = 0; /* IRQ enable for timer B (bit 3) and timer A (bit 2); bit 7 - CSM mode (keyon to all slots, every time timer A overflows) */ uint32_t status = 0; /* chip status (BUSY, IRQ Flags) */ uint8_t connect[8] = {}; /* channels connections */ // clang-format on @@ -3328,7 +3328,7 @@ const uint16_t ym2151_device::phaseinc_rom[768] = { Here are just 256 samples out of much longer data. - It does NOT repeat every 256 samples on real chip and I wasnt able to + It does NOT repeat every 256 samples on real chip and I wasn't able to find the point where it repeats (even in strings as long as 131072 samples). I only put it here because its better than nothing and perhaps @@ -4555,7 +4555,7 @@ void ym2151_device::advance() * is that the sound played is the same as after normal KEY ON. */ - if (csm_req != 0U) /* CSM KEYON/KEYOFF seqeunce request */ + if (csm_req != 0U) /* CSM KEYON/KEYOFF sequence request */ { if (csm_req == 2) /* KEY ON */ { @@ -9404,8 +9404,8 @@ private: // ROM Address: 0x1BAD // The pitchbender is a type of wheel controller built into a device, such as a synthesizer, used to modify pitch. The pitchbnder range sets // the width of pitch fluctuation generated by the pitchbend wheel. The value range is from 0 through 12. When the pitchbender range is set to 0, no pitch fluctuation - // occurs. Each time the pitchbender parameter is incremeted by one, the variable width expands both a half-step higher and lower. Weh nthe pitchbender parameter is - // set to 12, the pitchbend is altered plus or minus one cotave. + // occurs. Each time the pitchbender parameter is incremented by one, the variable width expands both a half-step higher and lower. When the pitchbender parameter is + // set to 12, the pitchbend is altered plus or minus one octave. // clang-format on void setInstrumentParameter_PitchbenderRange(InstrumentParameters* instr, @@ -12416,7 +12416,7 @@ private: while (m_midiChannelToAssignedInstruments[curMidiChannel][t] != 0xFF) { t++; - }; // go to first 0xFF occurance + }; // go to first 0xFF occurrence m_midiChannelToAssignedInstruments[curMidiChannel][t] = i; } log_debug("initMidiChannelToAssignedInstruments:"); diff --git a/src/hardware/iohandler.cpp b/src/hardware/iohandler.cpp index 2295dcbc2..90e196074 100644 --- a/src/hardware/iohandler.cpp +++ b/src/hardware/iohandler.cpp @@ -232,7 +232,7 @@ static Bitu IO_ReadSlowPath(Bitu port,Bitu iolen) { } /* if nothing matched, assign default handler to IO handler slot. - * if one device responded, assign it's handler to the IO handler slot. + * if one device responded, assign its handler to the IO handler slot. * if more than one responded, then do not update the IO handler slot. */ assert(iolen >= 1 && iolen <= 4); porti = (iolen >= 4) ? 2 : (unsigned int)(iolen - 1); /* 1 2 x 4 -> 0 1 1 2 */ @@ -292,7 +292,7 @@ void IO_WriteSlowPath(Bitu port,Bitu val,Bitu iolen) { } /* if nothing matched, assign default handler to IO handler slot. - * if one device responded, assign it's handler to the IO handler slot. + * if one device responded, assign its handler to the IO handler slot. * if more than one responded, then do not update the IO handler slot. */ assert(iolen >= 1 && iolen <= 4); porti = (iolen >= 4) ? 2 : (unsigned int)(iolen - 1); /* 1 2 x 4 -> 0 1 1 2 */ @@ -619,7 +619,7 @@ void IO_CalloutObject::InvalidateCachedHandlers(void) { * * Not too bad, really. */ - /* for both the base I/O, as well as it's aliases, revert the I/O ports back to "slow path" */ + /* for both the base I/O, as well as its aliases, revert the I/O ports back to "slow path" */ for (p=m_port;p < 0x10000ul;p += alias_mask+1ul) IO_InvalidateCachedHandler(p,range_mask+1ul); } @@ -746,7 +746,7 @@ void IO_InitCallouts(void) { * * this allows us to maintain ready-made IO callout objects to return quickly rather * than write more complicated code where the caller has to make an IO_CalloutObject - * and then call install and we have to add it's pointer to a list/vector/whatever. + * and then call install and we have to add its pointer to a list/vector/whatever. * It also avoids problems where if we have to resize the vector, the pointers become * invalid, because callers have only handles and they have to put all the pointers * back in order for us to resize the vector. */ diff --git a/src/hardware/ipxserver.cpp b/src/hardware/ipxserver.cpp index 41319111c..2fe3ab7e8 100644 --- a/src/hardware/ipxserver.cpp +++ b/src/hardware/ipxserver.cpp @@ -177,7 +177,7 @@ static void IPX_ServerLoop() { // Check to see if echo packet if(SDLNet_Read16(tmpHeader->dest.socket) == 0x2) { - // Null destination node means its a server registration packet + // Null destination node means it's a server registration packet if(tmpHeader->dest.addr.byIP.host == 0x0) { UnpackIP(tmpHeader->src.addr.byIP, &tmpAddr); for(i=0;i bits 3,2,1 of kcode */ CH->kcode = (CH->block_fnum&0x1c00)>>9; - /* the info below is actually opposite to what is stated in the Manuals (verifed on real YM3812) */ + /* the info below is actually opposite to what is stated in the Manuals (verified on real YM3812) */ /* if notesel == 0 -> lsb of kcode is bit 10 (MSB) of fnum */ /* if notesel == 1 -> lsb of kcode is bit 9 (MSB-1) of fnum */ if (mode&0x40) diff --git a/src/hardware/mame/sn76496.cpp b/src/hardware/mame/sn76496.cpp index a34fd77ca..e7ad1f8af 100644 --- a/src/hardware/mame/sn76496.cpp +++ b/src/hardware/mame/sn76496.cpp @@ -55,7 +55,7 @@ 28/03/2005 : Sebastien Chevalier Update th SN76496Write func, according to SN76489 doc found on SMSPower. - - On write with 0x80 set to 0, when LastRegister is other then TONE, + - On write with 0x80 set to 0, when LastRegister is other than TONE, the function is similar than update with 0x80 set to 1 23/04/2007 : Lord Nightmare diff --git a/src/hardware/mame/ymf262.cpp b/src/hardware/mame/ymf262.cpp index 1c199d69f..6fcedcc2f 100644 --- a/src/hardware/mame/ymf262.cpp +++ b/src/hardware/mame/ymf262.cpp @@ -24,15 +24,15 @@ Revision History: sounds, 3 two-operator melody sounds and 5 rhythm sounds (with four operators). 5. 8 selectable waveforms. 6. 4-channel sound output. - 7. YMF262 compabile DAC (YAC512) is available. - 8. LFO for vibrato and tremolo effedts. + 7. YMF262 compatible DAC (YAC512) is available. + 8. LFO for vibrato and tremolo effects. 9. 2 programmable timers. 10. Shorter register access time compared with YM3812. 11. 5V single supply silicon gate CMOS process. 12. 24 Pin SOP Package (YMF262-M), 48 Pin SQFP Package (YMF262-S). -differences between OPL2 and OPL3 not documented in Yamaha datahasheets: +differences between OPL2 and OPL3 not documented in Yamaha datasheets: - sinus table is a little different: the negative part is off by one... - in order to enable selection of four different waveforms on OPL2 @@ -766,7 +766,7 @@ static inline void advance(OPL3 *chip) case EG_SUS: /* sustain phase */ /* this is important behaviour: - one can change percusive/non-percussive modes on the fly and + one can change percussive/non-percussive modes on the fly and the chip will remain in sustain phase - verified on real YM3812 */ if(op->eg_type) /* non-percussive mode */ @@ -1337,7 +1337,7 @@ static void OPLCloseTable( void ) -static void OPL3_initalize(OPL3 *chip) +static void OPL3_initialize(OPL3 *chip) { int i; @@ -1987,7 +1987,7 @@ static void OPL3WriteReg(OPL3 *chip, int r, int v) /* BLK 2,1,0 bits -> bits 3,2,1 of kcode */ CH->kcode = (CH->block_fnum&0x1c00)>>9; - /* the info below is actually opposite to what is stated in the Manuals (verifed on real YMF262) */ + /* the info below is actually opposite to what is stated in the Manuals (verified on real YMF262) */ /* if notesel == 0 -> lsb of kcode is bit 10 (MSB) of fnum */ /* if notesel == 1 -> lsb of kcode is bit 9 (MSB-1) of fnum */ if (chip->nts&0x40) @@ -2329,10 +2329,10 @@ static void OPL3ResetChip(OPL3 *chip) //FIX IT registers 101, 104 and 105 -//FIX IT (dont change CH.D, CH.C, CH.B and CH.A in C0-C8 registers) +//FIX IT (don't change CH.D, CH.C, CH.B and CH.A in C0-C8 registers) for(c = 0xff ; c >= 0x20 ; c-- ) OPL3WriteReg(chip,c,0); -//FIX IT (dont change CH.D, CH.C, CH.B and CH.A in C0-C8 registers) +//FIX IT (don't change CH.D, CH.C, CH.B and CH.A in C0-C8 registers) for(c = 0x1ff ; c >= 0x120 ; c-- ) OPL3WriteReg(chip,c,0); @@ -2368,7 +2368,7 @@ static OPL3 *OPL3Create(device_t *device, int clock, int rate, int type) chip->rate = rate; /* init global tables */ - OPL3_initalize(chip); + OPL3_initialize(chip); /* reset chip */ OPL3ResetChip(chip); diff --git a/src/hardware/memory.cpp b/src/hardware/memory.cpp index ae398f550..b391230c6 100644 --- a/src/hardware/memory.cpp +++ b/src/hardware/memory.cpp @@ -310,7 +310,7 @@ static PageHandler *MEM_SlowPath(Bitu page) { } /* if nothing matched, assign default handler to MEM handler slot. - * if one device responded, assign it's handler to the MEM handler slot. + * if one device responded, assign its handler to the MEM handler slot. * if more than one responded, then do not update the MEM handler slot. */ // assert(iolen >= 1 && iolen <= 4); // porti = (iolen >= 4) ? 2 : (iolen - 1); /* 1 2 x 4 -> 0 1 1 2 */ @@ -337,7 +337,7 @@ void MEM_FreeHandler(Bitu phys_page,Bitu page_range) { void MEM_CalloutObject::InvalidateCachedHandlers(void) { Bitu p; - /* for both the base page, as well as it's aliases, revert the pages back to "slow path" */ + /* for both the base page, as well as its aliases, revert the pages back to "slow path" */ for (p=m_base;p < memory.handler_pages;p += alias_mask+1) MEM_InvalidateCachedHandler(p,range_mask+1); } @@ -454,7 +454,7 @@ void MEM_CalloutObject::Uninstall() { * * this allows us to maintain ready-made MEM callout objects to return quickly rather * than write more complicated code where the caller has to make an MEM_CalloutObject - * and then call install and we have to add it's pointer to a list/vector/whatever. + * and then call install and we have to add its pointer to a list/vector/whatever. * It also avoids problems where if we have to resize the vector, the pointers become * invalid, because callers have only handles and they have to put all the pointers * back in order for us to resize the vector. */ @@ -1744,7 +1744,7 @@ void Init_AddressLimitAndGateMask() { /* WARNING: Binary arithmetic done with 64-bit integers because under Microsoft C++ ((1UL << 32UL) - 1UL) == 0, which is WRONG. But I'll never get back the 4 days I wasted chasing it down, trying to - figure out why DOSBox was getting stuck reopening it's own CON file handle. */ + figure out why DOSBox was getting stuck reopening its own CON file handle. */ memory.mem_alias_pagemask = (uint32_t) (((((uint64_t)1) << (uint64_t)memory.address_bits) - (uint64_t)1) >> (uint64_t)12); diff --git a/src/hardware/mpu401.cpp b/src/hardware/mpu401.cpp index 84b97923f..e9875bada 100644 --- a/src/hardware/mpu401.cpp +++ b/src/hardware/mpu401.cpp @@ -794,7 +794,7 @@ public: * * MMD.COM, a common MIDI MPU-401 driver in the PC-98 world, seems to have * IRQ detection problems unless the IRQ is masked during the detection phase. - * It will fail to detect any IRQ that is unmasked during it's detection phase. + * It will fail to detect any IRQ that is unmasked during its detection phase. * For some reason it's not totally consistent i.e. the MMD.COM driver included * with Touhou Project 2 can detect MIDI on IRQ 5 when unmasked, but not 3, 12, or 6, * or sometimes only on IRQ 6 if I/O delays are lengthened. diff --git a/src/hardware/opl.h b/src/hardware/opl.h index 02eae14bf..743cad06c 100644 --- a/src/hardware/opl.h +++ b/src/hardware/opl.h @@ -117,7 +117,7 @@ typedef int8_t int8_t; adlib register set. Only the channels 0,1,2 (first set) and 9,10,11 (second set) can act as 4op channels. The two additional operators for a channel y come from the - 2op channel y+3 so the operatorss y, (9+y), y+3, (9+y)+3 make up a 4op + 2op channel y+3 so the operators y, (9+y), y+3, (9+y)+3 make up a 4op channel. */ typedef struct operator_struct { diff --git a/src/hardware/parport/printer.cpp b/src/hardware/parport/printer.cpp index dc8ee0393..f24208cc9 100644 --- a/src/hardware/parport/printer.cpp +++ b/src/hardware/parport/printer.cpp @@ -920,7 +920,7 @@ bool CPrinter::processCommandChar(uint8_t ch) style &= ~STYLE_BOLD; updateFont(); break; - case 0x47: // Select dobule-strike printing (ESC G) + case 0x47: // Select double-strike printing (ESC G) style |= STYLE_DOUBLESTRIKE; break; case 0x48: // Cancel double-strike printing (ESC H) @@ -2102,7 +2102,7 @@ void CPrinter::outputPage() return; } - /* First try to alloacte the png structures */ + /* First try to allocate the png structures */ png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (!png_ptr) return; info_ptr = png_create_info_struct(png_ptr); diff --git a/src/hardware/parport/printer.h b/src/hardware/parport/printer.h index 25c56431e..1858b79e8 100644 --- a/src/hardware/parport/printer.h +++ b/src/hardware/parport/printer.h @@ -122,7 +122,7 @@ public: private: - // used to fill the color "sub-pallettes" + // used to fill the color "sub-palettes" void FillPalette(uint8_t redmax, uint8_t greenmax, uint8_t bluemax, uint8_t colorID, SDL_Palette* pal); diff --git a/src/hardware/pcspeaker.cpp b/src/hardware/pcspeaker.cpp index 3c8b7cf54..14eac04fd 100644 --- a/src/hardware/pcspeaker.cpp +++ b/src/hardware/pcspeaker.cpp @@ -686,7 +686,7 @@ static void PCSPEAKER_CallBack(Bitu len) { /* hack: some indexes come out at 1.001, fix that for the next round. * this is a consequence of DOSBox-X allowing the CPU cycles - * count use to overrun slightly for accuracy. if we DONT fix + * count use to overrun slightly for accuracy. if we DON'T fix * this the delay queue will get stuck and PC speaker output * will stop. */ for (Bitu i=0;i < spkr.used;i++) { diff --git a/src/hardware/reSID/envelope.cpp b/src/hardware/reSID/envelope.cpp index df6c107fe..842a08ade 100644 --- a/src/hardware/reSID/envelope.cpp +++ b/src/hardware/reSID/envelope.cpp @@ -65,7 +65,7 @@ void EnvelopeGenerator::reset() // // NB! Sampling ENV3 shows that the calculated values are not exact. // It may seem like most calculated values have been rounded (.5 is rounded -// down) and 1 has beed added to the result. A possible explanation for this +// down) and 1 has been added to the result. A possible explanation for this // is that the SID designers have used the calculated values directly // as rate counter comparison values, not considering a one cycle delay to // zero the counter. This would yield an actual period of comparison value + 1. diff --git a/src/hardware/reSID/filter.h b/src/hardware/reSID/filter.h index a767e43c4..9ff0b3bbb 100644 --- a/src/hardware/reSID/filter.h +++ b/src/hardware/reSID/filter.h @@ -84,7 +84,7 @@ // R1 - summer resistor // Rq - resistor array controlling resonance (4 resistors) // R - NMOS FET voltage controlled resistor controlling cutoff frequency -// Rs - shunt resitor +// Rs - shunt resistor // C - capacitor // // diff --git a/src/hardware/reSID/spline.h b/src/hardware/reSID/spline.h index 38cc8bf19..309344410 100644 --- a/src/hardware/reSID/spline.h +++ b/src/hardware/reSID/spline.h @@ -40,7 +40,7 @@ // Engineering Mathematics". // // Our approach is to approximate the properties of Catmull-Rom splines for -// piecewice cubic polynomials f(x) = ax^3 + bx^2 + cx + d as follows: +// piecewise cubic polynomials f(x) = ax^3 + bx^2 + cx + d as follows: // Each curve segment is specified by four interpolation points, // p0, p1, p2, p3. // The curve between p1 and p2 must interpolate both p1 and p2, and in addition diff --git a/src/hardware/sblaster.cpp b/src/hardware/sblaster.cpp index 1f6b60265..199978151 100644 --- a/src/hardware/sblaster.cpp +++ b/src/hardware/sblaster.cpp @@ -1170,7 +1170,7 @@ static void DSP_DoDMATransfer(DMA_MODES mode,Bitu freq,bool stereo,bool dontInit * program, before it is divided by two for stereo. * * Of course, some demos like Crystal Dream take the approach of just setting the - * sample rate to the max supported by the card and then letting it's timer interrupt + * sample rate to the max supported by the card and then letting its timer interrupt * define the sample rate. So of course anything below 44.1KHz sounds awful. */ if (sb.dma_dac_mode && sb.goldplay_stereo && (stereo || sb.mixer.sbpro_stereo) && sb.single_sample_dma) sb.dma_dac_srcrate = sb.freq; @@ -1923,7 +1923,7 @@ static void DSP_DoCommand(void) { // so there's no point below that rate in additional rendering. if (rt < 1000) rt = 1000; - // FIXME: What does the ESS AudioDrive do to it's filter/sample rate divider registers when emulating this Sound Blaster command? + // FIXME: What does the ESS AudioDrive do to its filter/sample rate divider registers when emulating this Sound Blaster command? ESSreg(0xA1) = 128 - (397700 / 22050); ESSreg(0xA2) = 256 - (7160000 / (82 * ((4 * 22050) / 10))); @@ -1931,7 +1931,7 @@ static void DSP_DoCommand(void) { // The sound card isn't given any hint what the actual sample rate is, only that it's given // instruction when to change the 8-bit value being output to the DAC which is why older DOS // games using this method tend to sound "grungy" compared to DMA playback. We recreate the - // effect here by asking the mixer to do it's linear interpolation as if at 23KHz while + // effect here by asking the mixer to do its linear interpolation as if at 23KHz while // rendering the audio at whatever rate the DOS game is giving it to us. sb.chan->SetFreq((Bitu)(rt * 0x100),0x100); updateSoundBlasterFilter(sb.freq); @@ -2340,7 +2340,7 @@ static void DSP_DoCommand(void) { break; case 0x37: /* MIDI Read Timestamp Interrupt & Write Poll */ DSP_SB2_ABOVE; - LOG(LOG_SB,LOG_DEBUG)("DSP:Entering MIDI Read Timstamp Interrupt/Write Poll mode"); + LOG(LOG_SB,LOG_DEBUG)("DSP:Entering MIDI Read Timestamp Interrupt/Write Poll mode"); sb.dsp.midi_rwpoll_mode = true; sb.dsp.midi_read_interrupt = true; sb.dsp.midi_read_with_timestamps = true; @@ -3216,7 +3216,7 @@ static Bitu read_sb(Bitu port,Bitu /*iolen*/) { /* NTS: DSP "busy cycle" is independent of whether the DSP is actually * busy (executing a command) or highspeed mode. On SB16 hardware, * writing a DSP command during the busy cycle means that the command - * is remembered, but not acted on until the DSP leaves it's busy + * is remembered, but not acted on until the DSP leaves its busy * cycle. */ sb.busy_cycle_io_hack++; /* NTS: busy cycle I/O timing hack! */ if (DSP_busy_cycle()) @@ -3823,7 +3823,7 @@ public: * trick of reading port 22Ch to wait for bit 7 to clear (which is normal), then * using the value it read (left over from AL) as the byte to sum it's audio output * to before sending out to the DAC. This is why, if the write status port returns - * a different value like 0x2A, the audio crackes with saturation errors. + * a different value like 0x2A, the audio crackles with saturation errors. * * Overload's Sound Blaster output code: * @@ -4128,7 +4128,7 @@ public: if (sb.hw.irq != 0 && sb.hw.irq != 0xFF) { s = section->Get_string("irq hack"); if (!s.empty() && s != "none") { - LOG(LOG_SB,LOG_NORMAL)("Sound Blaster emulation: Assigning IRQ hack '%s' as instruced",s.c_str()); + LOG(LOG_SB,LOG_NORMAL)("Sound Blaster emulation: Assigning IRQ hack '%s' as instructed",s.c_str()); PIC_Set_IRQ_hack((int)sb.hw.irq,PIC_parse_IRQ_hack_string(s.c_str())); } } diff --git a/src/hardware/serialport/directserial.cpp b/src/hardware/serialport/directserial.cpp index da64e117e..7c7a18041 100644 --- a/src/hardware/serialport/directserial.cpp +++ b/src/hardware/serialport/directserial.cpp @@ -230,7 +230,7 @@ void CDirectSerial::handleUpperEvent(uint16_t type) { break; } case SERIAL_TX_EVENT: { - // Maybe echo cirquit works a bit better this way + // Maybe echo circuit works a bit better this way if(rx_state==D_RX_IDLE && CanReceiveByte()) { if(doReceive()) { // a byte was received diff --git a/src/hardware/serialport/nullmodem.cpp b/src/hardware/serialport/nullmodem.cpp index 6ecc9c1cd..b8232fc20 100644 --- a/src/hardware/serialport/nullmodem.cpp +++ b/src/hardware/serialport/nullmodem.cpp @@ -404,7 +404,7 @@ void CNullModem::handleUpperEvent(uint16_t type) { break; } case SERIAL_TX_EVENT: { - // Maybe echo cirquit works a bit better this way + // Maybe echo circuit works a bit better this way if (rx_state==N_RX_IDLE && CanReceiveByte() && clientsocket) { if (doReceive()) { // a byte was received diff --git a/src/hardware/serialport/nullmodem.h b/src/hardware/serialport/nullmodem.h index 6382dad77..6ce0b50a9 100644 --- a/src/hardware/serialport/nullmodem.h +++ b/src/hardware/serialport/nullmodem.h @@ -85,7 +85,7 @@ private: Bitu rx_retry; // counter of retries Bitu rx_retry_max; // how many POLL_EVENTS to wait before causing - // a overrun error. + // an overrun error. Bitu tx_gather; // how long to gather tx data before // sending all of them [milliseconds] diff --git a/src/hardware/serialport/serialport.cpp b/src/hardware/serialport/serialport.cpp index a45b07f88..6d8f4fb14 100644 --- a/src/hardware/serialport/serialport.cpp +++ b/src/hardware/serialport/serialport.cpp @@ -906,7 +906,7 @@ void CSerial::Write_reserved (uint8_t data, uint8_t address) { } /*****************************************************************************/ -/* MCR Access: returns cirquit state as boolean. **/ +/* MCR Access: returns circuit state as boolean. **/ /*****************************************************************************/ bool CSerial::getDTR () { if(loopback) return false; diff --git a/src/hardware/tandy_sound.cpp b/src/hardware/tandy_sound.cpp index bf10afb89..af45d3afd 100644 --- a/src/hardware/tandy_sound.cpp +++ b/src/hardware/tandy_sound.cpp @@ -331,7 +331,7 @@ public: /* ports from second DMA controller conflict with tandy ports at 0xC0. * Furthermore, the default I/O handlers after de-registration are needed * to ensure the SN76496 is writeable at port 0xC0 whether you're doing - * normal 8-bit I/O or your a weirdo like Prince of Persia using 16-bit + * normal 8-bit I/O or you're a weirdo like Prince of Persia using 16-bit * I/O to write frequency values. (bugfix for Tandy mode of Prince of * Persia). */ CloseSecondDMAController(); diff --git a/src/hardware/timer.cpp b/src/hardware/timer.cpp index 9612af306..0a2013c26 100644 --- a/src/hardware/timer.cpp +++ b/src/hardware/timer.cpp @@ -106,7 +106,7 @@ struct PIT_Block { * * This fixes "Tony & Friends in Kellogg's Land" which does some rather weird elaborate * timing stuff with both PIT 0 (timer) and PIT 2 (PC speaker but the output is off) to - * do it's event timing and to modify the VGA DAC mask mid-frame precisely to do that + * do its event timing and to modify the VGA DAC mask mid-frame precisely to do that * effect of making the bottom half look like there is water. * Ref: [https://github.com/joncampbell123/dosbox-x/issues/4467] */ last_counter.cycle = 0; @@ -474,7 +474,7 @@ bool TIMER2_ClockGateEnabled(void) { // // This is either the result of extremely sloppy code that happened to work on the democoder's // machine (non-Intel hardware that minimally implements a 8254?) or perhaps a race condition -// between the program and it's own IRQ 0 interrupt. +// between the program and its own IRQ 0 interrupt. // // Additional notes from testing: It is indeed some sort of race condition. There is code to // set PIT 0 to mode 2 counter 0 momentarily before going back to mode 0. Interrupts are @@ -754,7 +754,7 @@ static void write_p43(Bitu /*port*/,Bitu val,Bitu /*iolen*/) { pit[latch].mode = mode; /* If the line goes from low to up => generate irq. - * ( BUT needs to stay up until acknowlegded by the cpu!!! therefore: ) + * ( BUT needs to stay up until acknowledged by the cpu!!! therefore: ) * If the line goes to low => disable irq. * Mode 0 starts with a low line. (so always disable irq) * Mode 2,3 start with a high line. diff --git a/src/hardware/vga.cpp b/src/hardware/vga.cpp index 8d89451b8..fad90e4a4 100644 --- a/src/hardware/vga.cpp +++ b/src/hardware/vga.cpp @@ -395,7 +395,7 @@ void VGA_DetermineMode(void) { // display them just fine. The other is that checking for 2-color CGA mode entirely by // whether video RAM is mapped to B8000h is a really lame way to go about it. // -// The only catch here is that a contributer (Wengier, I think?) tied a DOS/V CGA rendering +// The only catch here is that a contributor (Wengier, I think?) tied a DOS/V CGA rendering // mode into M_CGA2 that we need to watch for. // else if ((vga.gfx.miscellaneous & 0x0c)==0x0c && J3_IsCga4Dcga()) VGA_SetMode(M_DCGA); diff --git a/src/hardware/vga_attr.cpp b/src/hardware/vga_attr.cpp index 90f445545..4fcddc2b8 100644 --- a/src/hardware/vga_attr.cpp +++ b/src/hardware/vga_attr.cpp @@ -165,7 +165,7 @@ void VGA_ATTR_SetPalette(uint8_t index, uint8_t val) { // That would mean that if Framework III had actually managed to enable the color palette, it would display // with whatever random garbage happened to exist in the hardware palette, and I don't think such a // program would let that stand in that kind of corporate office work type software that probably cost a - // fair amount in it's day. + // fair amount in its day. if (vga.herc.exception & 0x10) VGA_DAC_CombineColor(index,vga.herc.palette[index&0xF]); else if (vga.herc.exception & 0x20) diff --git a/src/hardware/vga_crtc.cpp b/src/hardware/vga_crtc.cpp index 69a86aba4..872e9c478 100644 --- a/src/hardware/vga_crtc.cpp +++ b/src/hardware/vga_crtc.cpp @@ -73,7 +73,7 @@ Bitu vga_read_p3d4(Bitu port,Bitu iolen) { (void)port;//UNUSED (void)iolen;//UNUSED - /* NOTES: Paradise/Westdern Digital SVGA decodes only bits [5:0] inclusive and repeat every 0x40 */ + /* NOTES: Paradise/Western Digital SVGA decodes only bits [5:0] inclusive and repeat every 0x40 */ return crtc(index); } diff --git a/src/hardware/vga_draw.cpp b/src/hardware/vga_draw.cpp index 2b1e41c94..035ce3d08 100644 --- a/src/hardware/vga_draw.cpp +++ b/src/hardware/vga_draw.cpp @@ -2805,7 +2805,7 @@ Text_Draw_State pc98_text_draw; * packed framebuffer. * * Since PC-98 also has planar memory, it wouldn't surprise me if the 256-color mode is just the - * same trick except with 16-bit quantitites loaded from memory instead of VGA's 8-bit quantities. + * same trick except with 16-bit quantities loaded from memory instead of VGA's 8-bit quantities. * * The behavior of the hardware suggest to me that it also allowed NEC to change as little about * the video hardware as possible, except how it shifts and interprets the planar word data. @@ -3490,7 +3490,7 @@ again: } } uint8_t * data=VGA_DrawLine( vga.draw.address, vga.draw.address_line ); - /* WARNING: For magic reasons possibly related to gremlins added by the GNU C++ compiler or other otherwordly phenomona, + /* WARNING: For magic reasons possibly related to gremlins added by the GNU C++ compiler or other otherworldly phenomena, * modifying the rendered scanline pointed to by *data somehow corrupts the video memory of the guest, even though * *data is 8bpp or 32bpp pixel data that was translated FROM the guest video memory TO a host bitmap and writing * over *data in any way should have no effect on the guest video memory it rendered from, but somehow, it does. @@ -5191,7 +5191,7 @@ void VGA_sof_debug_video_info(void) { * the meaning of the pins changes depending on whether the card is emitting 200-line output compatible with a * CGA monitor or 350-line output for an EGA monitor. In the 200-line mode only the 4 bits have meaning and they * are handled the same as CGA IRGB output. In 350-line mode the 6 bits define one of 64 possible colors in the - * form rgbRGB as binary bits where the least signficant bits are "rgb" and most significant bits are "RGB". + * form rgbRGB as binary bits where the least significant bits are "rgb" and most significant bits are "RGB". * This is why you can't do more than 16 colors except in 350-line modes. */ if (vga.draw.bpp == 8) { /* Doesn't use anything else */ unsigned int dkgray = (egaMonitorMode() == EGA) ? 0x38 : 0x10; @@ -6657,7 +6657,7 @@ void VGA_SetupDrawing(Bitu /*val*/) { /* NTS: PC-98 emulation re-uses VGA state FOR NOW. * This will slowly change to accommodate PC-98 display controller over time - * and IS_PC98_ARCH will become it's own case statement. */ + * and IS_PC98_ARCH will become its own case statement. */ if (IS_PC98_ARCH) { hdend = pc98_gdc[GDC_MASTER].active_display_words_per_line; diff --git a/src/hardware/vga_memory.cpp b/src/hardware/vga_memory.cpp index 1fb61d03f..e33d3b03e 100644 --- a/src/hardware/vga_memory.cpp +++ b/src/hardware/vga_memory.cpp @@ -2192,7 +2192,7 @@ public: { addr -= 0xb8000; PhysPt phys_page = addr >> 12; - //test for a unaliged bank, then replicate 2x16kb + //test for a unaligned bank, then replicate 2x16kb if (vga.tandy.mem_bank & 1) phys_page&=0x03; return ( phys_page * 4096 ) + ( addr & 0x0FFF ); @@ -2306,7 +2306,7 @@ public: if( vga.mode!=M_AMSTRAD ) { phys_page-=0xb8; - //test for a unaliged bank, then replicate 2x16kb + //test for a unaligned bank, then replicate 2x16kb if (vga.tandy.mem_bank & 1) phys_page&=0x03; return vga.tandy.mem_base + (phys_page * 4096); @@ -2747,7 +2747,7 @@ void VGA_SetupHandlers(void) { * so that they can write to the linear address just as if a 386SX where that mapping existed. * This is basically the same idea as "just under the BIOS at top of CPU addressable RAM" * so if memalias is more than 24 bits map it to (1 << memalias) - 1MB to be consistent - * because that address will map to whereever PEGC's LFB is even if, say, running on a 486SX + * because that address will map to wherever PEGC's LFB is even if, say, running on a 486SX * with 26 address pins. */ if (MEM_get_address_bits() > 24) { Bitu page = ((Bitu)1 << (Bitu)(MEM_get_address_bits() - 12/*pages not bytes*/)) - (Bitu)0x100/*1MB in pages*/; diff --git a/src/hardware/vga_pc98_cg.cpp b/src/hardware/vga_pc98_cg.cpp index 245dda657..ab881496f 100644 --- a/src/hardware/vga_pc98_cg.cpp +++ b/src/hardware/vga_pc98_cg.cpp @@ -86,7 +86,7 @@ void pc98_a1_write(Bitu port,Bitu val,Bitu iolen) { case 0xA5: /* From documentation: * - * bit [7:6] = Dont care + * bit [7:6] = Don't care * bit [5] = L/R * bit [4] = 0 * bit [3:0] = C3-C0 @@ -113,7 +113,7 @@ void pc98_a1_write(Bitu port,Bitu val,Bitu iolen) { // I'm also guessing that this RAM is not involved with the single-wide // character set, which is why writes to 0x0056/0x0057 are redirected to // 0x8056/0x8057. Without this hack, Touhou Project 2 will overwrite - // the letter 'W' when loading it's font data (Level 1 will show "Eastern ind" + // the letter 'W' when loading its font data (Level 1 will show "Eastern ind" // instead of "Eastern Wind" for the music title as a result). // // On real hardware it seems, attempts to write anywhere outside 0xxx56/0xxx57 diff --git a/src/hardware/vga_s3.cpp b/src/hardware/vga_s3.cpp index 0264f55f9..ca58a8210 100644 --- a/src/hardware/vga_s3.cpp +++ b/src/hardware/vga_s3.cpp @@ -585,7 +585,7 @@ Bitu SVGA_S3_ReadCRTC( Bitu reg, Bitu iolen) { return (uint8_t)((vga.config.display_start & 0x1f0000)>>16); case 0x6a: /* Extended System Control 4 */ return (uint8_t)(vga.svga.bank_read & 0x7f); - case 0x6b: // BIOS scatchpad: LFB address + case 0x6b: // BIOS scratchpad: LFB address return vga.s3.reg_6b; default: return 0x00; diff --git a/src/hardware/voodoo_data.h b/src/hardware/voodoo_data.h index 6f5dcdd5b..a6270182e 100644 --- a/src/hardware/voodoo_data.h +++ b/src/hardware/voodoo_data.h @@ -682,7 +682,7 @@ struct _fbi_state UINT8 fogblend[64]; /* 64-entry fog table */ UINT8 fogdelta[64]; /* 64-entry fog table */ - UINT8 fogdelta_mask; /* mask for for delta (0xff for V1, 0xfc for V2) */ + UINT8 fogdelta_mask; /* mask for fog delta (0xff for V1, 0xfc for V2) */ // rgb_t clut[512]; /* clut gamma data */ }; @@ -905,7 +905,7 @@ INLINE INT64 fast_reciplog(INT64 value, INT32 *log2) /* compute the interpolation value */ interp = (temp >> (31 - RECIPLOG_LOOKUP_BITS - 8)) & 0xff; - /* do a linear interpolatation between the two nearest table values */ + /* do a linear interpolation between the two nearest table values */ /* for both the log and the reciprocal */ rlog = (table[1] * (0x100 - interp) + table[3] * interp) >> 8; recip = (table[0] * (0x100 - interp) + table[2] * interp) >> 8; diff --git a/src/hardware/voodoo_emu.cpp b/src/hardware/voodoo_emu.cpp index d4ae68978..70dd91fc2 100644 --- a/src/hardware/voodoo_emu.cpp +++ b/src/hardware/voodoo_emu.cpp @@ -54,7 +54,7 @@ Voodoo 2: 2,4MB frame buffer RAM 2,4,8,16MB texture RAM - 90MHz clock frquency + 90MHz clock frequency clears @ 2 pixels/clock (RGB and depth simultaneously) renders @ 1 pixel/clock ultrafast clears @ 16 pixels/clock @@ -913,7 +913,7 @@ void ncc_table_update(ncc_table *n) { int r, g, b, i; - /* generte all 256 possibilities */ + /* generate all 256 possibilities */ for (i = 0; i < 256; i++) { int vi = (i >> 2) & 0x03; @@ -984,7 +984,7 @@ void dacdata_r(dac_state *d, UINT8 regnum) /************************************* * - * Texuture parameter computation + * Texture parameter computation * *************************************/ diff --git a/src/ints/bios.cpp b/src/ints/bios.cpp index c5eeee598..095e7def7 100644 --- a/src/ints/bios.cpp +++ b/src/ints/bios.cpp @@ -1744,7 +1744,7 @@ void ISAPNP_Cfg_Reset(Section *sec) { /* NTS: This is... kind of a terrible hack. It basically tricks Windows into executing our * INT 15h handler as if the APM entry point. Except that instead of an actual INT 15h * triggering the callback, a FAR CALL triggers the callback instead (CB_RETF not CB_IRET). */ - /* TODO: We should really consider moving the APM BIOS code in INT15_Handler() out into it's + /* TODO: We should really consider moving the APM BIOS code in INT15_Handler() out into its * own function, then having the INT15_Handler() call it as well as directing this callback * directly to it. If you think about it, this hack also lets the "APM entry point" invoke * other arbitrary INT 15h calls which is not valid. */ @@ -1760,7 +1760,7 @@ void ISAPNP_Cfg_Reset(Section *sec) { * stack, thus, the cause of random crashes in Windows was simply that we were * flipping flag bits in the middle of the return address on the stack. The other * source of random crashes is that the CF/ZF manipulation in INT 15h wasn't making - * it's way back to Windows, meaning that when APM BIOS emulation intended to return + * its way back to Windows, meaning that when APM BIOS emulation intended to return * an error (by setting CF), Windows didn't get the memo (CF wasn't set on return) * and acted as if the call succeeded, or worse, CF happened to be set on entry and * was never cleared by APM BIOS emulation. @@ -2174,7 +2174,7 @@ static Bitu ISAPNP_Handler(bool protmode /* called from protected mode interface * * so the first argument on the stack is an int that we read to determine what the caller is asking * - * Dont forget in the real-mode world: + * Don't forget in the real-mode world: * sizeof(int) == 16 bits * sizeof(long) == 32 bits */ @@ -3234,11 +3234,11 @@ void update_pc98_function_row(unsigned char setting,bool force_redraw) { if (pc98_function_row_mode == 2) { /* draw the function row. - * based on on real hardware: + * based on real hardware: * * The function key is 72 chars wide. 4 blank chars on each side of the screen. * It is divided into two halves, 36 chars each. - * Within each half, aligned to it's side, is 5 x 7 regions. + * Within each half, aligned to its side, is 5 x 7 regions. * 6 of the 7 are inverted. centered in the white block is the function key. */ for (unsigned int i=0;i < 40;) { mem_writew(0xA0000+((o+i)*2),0x0000); @@ -3260,11 +3260,11 @@ void update_pc98_function_row(unsigned char setting,bool force_redraw) { } else if (pc98_function_row_mode == 1) { /* draw the function row. - * based on on real hardware: + * based on real hardware: * * The function key is 72 chars wide. 4 blank chars on each side of the screen. * It is divided into two halves, 36 chars each. - * Within each half, aligned to it's side, is 5 x 7 regions. + * Within each half, aligned to its side, is 5 x 7 regions. * 6 of the 7 are inverted. centered in the white block is the function key. */ for (unsigned int i=0;i < 40;) { mem_writew(0xA0000+((o+i)*2),0x0000); @@ -5817,7 +5817,7 @@ static Bitu INT8_Handler(void) { value change, then it sends it to the keyboard. This is why on older DOS machines you could change LEDs by writing to 40:17. We have to emulate this also because Windows 3.1/9x seems to rely on - it when handling the keyboard from it's own driver. Their driver does + it when handling the keyboard from its own driver. Their driver does hook the keyboard and handles keyboard I/O by itself, but it still allows the BIOS to do the keyboard magic from IRQ 0 (INT 8h). Yech. */ if (enable_bios_timer_synchronize_keyboard_leds) { @@ -8222,7 +8222,7 @@ private: * NOTED: Neko Project II determines INT 18h AH=30h availability by whether or not it was compiled * with 31khz hsync support (SUPPORT_CRT31KHZ) */ - /* Set up the translation table poiner, which is relative to segment 0xFD80 */ + /* Set up the translation table pointer, which is relative to segment 0xFD80 */ mem_writew(0x522,(unsigned int)(Real2Phys(BIOS_PC98_KEYBOARD_TRANSLATION_LOCATION) - 0xFD800)); mem_writew(0x5C6,(unsigned int)(Real2Phys(BIOS_PC98_KEYBOARD_TRANSLATION_LOCATION) - 0xFD800)); mem_writew(0x5C8,0xFD80); @@ -8273,7 +8273,7 @@ private: { Bitu sz = MEM_TotalPages(); - /* The standard BIOS is said to put it's stack (at least at OS boot time) 512 bytes past the end of the boot sector + /* The standard BIOS is said to put its stack (at least at OS boot time) 512 bytes past the end of the boot sector * meaning that the boot sector loads to 0000:7C00 and the stack is set grow downward from 0000:8000 */ if (sz > 8) sz = 8; /* 4KB * 8 = 32KB = 0x8000 */ @@ -8933,7 +8933,7 @@ private: } // ISA Plug & Play BIOS entrypoint - // NTS: Apparently, Windows 95, 98, and ME will re-enumerate and re-install PnP devices if our entry point changes it's address. + // NTS: Apparently, Windows 95, 98, and ME will re-enumerate and re-install PnP devices if our entry point changes its address. if (!IS_PC98_ARCH && ISAPNPBIOS) { Bitu base; unsigned int i; @@ -10205,7 +10205,7 @@ public: LOG(LOG_MISC,LOG_DEBUG)("BIOS: setting tandy 128KB base region to %lxh",(unsigned long)tandy_128kbase); } else if (machine == MCH_PCJR) { - /* PCjr reserves the top of it's internal 128KB of RAM for video RAM. + /* PCjr reserves the top of its internal 128KB of RAM for video RAM. * Sidecars can extend it past 128KB but it requires DOS drivers or TSRs * to modify the MCB chain so that it a) marks the video memory as reserved * and b) creates a new free region above the video RAM region. @@ -10473,7 +10473,7 @@ public: } ~BIOS(){ /* snap the CPU back to real mode. this code thinks in terms of 16-bit real mode - * and if allowed to do it's thing in a 32-bit guest OS like WinNT, will trigger + * and if allowed to do its thing in a 32-bit guest OS like WinNT, will trigger * a page fault. */ CPU_Snap_Back_To_Real_Mode(); @@ -10599,7 +10599,7 @@ void BIOS_PnP_ComPortRegister(Bitu port,Bitu irq) { const unsigned char h1[9] = { ISAPNP_SYSDEV_HEADER( ISAPNP_ID('P','N','P',0x0,0x5,0x0,0x1), /* PNP0501 16550A-compatible COM port */ - ISAPNP_TYPE(0x07,0x00,0x02), /* type: RS-232 communcations device, 16550-compatible */ + ISAPNP_TYPE(0x07,0x00,0x02), /* type: RS-232 communications device, 16550-compatible */ 0x0001 | 0x0002) }; diff --git a/src/ints/bios_disk.cpp b/src/ints/bios_disk.cpp index 9eec35718..064366b53 100644 --- a/src/ints/bios_disk.cpp +++ b/src/ints/bios_disk.cpp @@ -1694,7 +1694,7 @@ void imageDisk::Set_Geometry(uint32_t setHeads, uint32_t setCyl, uint32_t setSec Bitu bigdisk_shift = 0; if (IS_PC98_ARCH) { - /* TODO: PC-98 has it's own 4096 cylinder limit */ + /* TODO: PC-98 has its own 4096 cylinder limit */ } else { if(setCyl > 16384) LOG_MSG("Warning: This disk image is too big."); @@ -1896,7 +1896,7 @@ static Bitu INT13_DiskHandler(void) { /* INT 13h is limited to 512 bytes/sector (as far as I know). * The sector buffer in this function is limited to 512 bytes/sector, - * so this is also a protection against overruning the stack if you + * so this is also a protection against overrunning the stack if you * mount a PC-98 disk image (1024 bytes/sector) and try to read it with INT 13h. */ if (imageDiskList[drivenum]->sector_size > sizeof(sectbuf)) { LOG(LOG_MISC,LOG_DEBUG)("INT 13h: Read failed because disk bytes/sector on drive %c is too large",(char)drivenum+'A'); @@ -1957,7 +1957,7 @@ static Bitu INT13_DiskHandler(void) { /* INT 13h is limited to 512 bytes/sector (as far as I know). * The sector buffer in this function is limited to 512 bytes/sector, - * so this is also a protection against overruning the stack if you + * so this is also a protection against overrunning the stack if you * mount a PC-98 disk image (1024 bytes/sector) and try to read it with INT 13h. */ if (imageDiskList[drivenum]->sector_size > sizeof(sectbuf)) { LOG(LOG_MISC,LOG_DEBUG)("INT 13h: Write failed because disk bytes/sector on drive %c is too large",(char)drivenum+'A'); diff --git a/src/ints/bios_keyboard.cpp b/src/ints/bios_keyboard.cpp index 29b0119a8..ace607a68 100644 --- a/src/ints/bios_keyboard.cpp +++ b/src/ints/bios_keyboard.cpp @@ -37,7 +37,7 @@ #endif /* SDL by default treats numlock and scrolllock different from all other keys. - * In recent versions this can disabled by a environment variable which we set in sdlmain.cpp + * In recent versions this can disabled by an environment variable which we set in sdlmain.cpp * Define the following if this is the case */ #if SDL_VERSION_ATLEAST(1, 2, 14) #define CAN_USE_LOCK 1 @@ -304,7 +304,7 @@ void BIOSKEY_PC98_Write_Tables(void) { /* Assume this function will not be called unless BIOS_PC98_KEYBOARD_TRANSLATION_LOCATION points to ROM BIOS. * It's actually not exactly a 1:1 mapping, the empty range between 0x56-0x61 is skipped according to the - * tables on real hardare. On real hardware the tables are noticeably 0x60 (not 0x80) bytes apart from each other. + * tables on real hardware. On real hardware the tables are noticeably 0x60 (not 0x80) bytes apart from each other. * Special processing is done for the shift state keys that do not involve the table. */ /* [0] Normal */ @@ -628,7 +628,7 @@ static Bitu IRQ1_Handler(void) { break; case 0x1d: /* Ctrl Pressed */ if (INT16_AX_GetKBDBIOSMode() == 0x51 && (flags3 & 0x02)) - trimKana();//英数カナ keycode not assignged in AX + trimKana();//英数カナ keycode not assigned in AX else if (!(flags3 &0x01)) { flags1 |=0x04; if (flags3 &0x02) flags3 |=0x04; diff --git a/src/ints/bios_memdisk.cpp b/src/ints/bios_memdisk.cpp index 111420804..736e877cd 100644 --- a/src/ints/bios_memdisk.cpp +++ b/src/ints/bios_memdisk.cpp @@ -151,7 +151,7 @@ imageDiskMemory::imageDiskMemory(imageDisk* underlyingImage) : imageDisk(ID_MEMO init(diskParams, true, underlyingImage); } -// Internal initialization code to create a image of a specified geometry +// Internal initialization code to create an image of a specified geometry void imageDiskMemory::init(diskGeo diskParams, bool isHardDrive, imageDisk* underlyingImage) { //initialize internal variables in case we fail out this->total_sectors = 0; diff --git a/src/ints/ems.cpp b/src/ints/ems.cpp index c6c09a950..f6a29d5a6 100644 --- a/src/ints/ems.cpp +++ b/src/ints/ems.cpp @@ -394,7 +394,7 @@ static uint8_t EMM_AllocateSystemHandle(uint16_t pages/*NTS: EMS pages are 16KB, * Why? Well, if the system handle exists on an even megabyte, then it no longer matters what state the A20 * gate is in. If the DOS game relies on EMM386.EXE but fiddles with the A20 gate while running in virtual 8086 * mode, setting this option can help avoid crashes, where normally clearing the A20 gate prevents EMM386.EXE - * from using it's protected mode structures (GDT, page tables) and the sudden aliasing turns them into junk + * from using its protected mode structures (GDT, page tables) and the sudden aliasing turns them into junk * and the system crashes (random contents in DOS conventional memory interpreted as protected mode structures * doesn't work very well). */ mem = 0; @@ -731,7 +731,7 @@ static uint8_t GetSetHandleName(void) { static uint8_t GetSetHandleAttributes(void) { switch (reg_al) { - case 0x00: // Get handle attribubtes + case 0x00: // Get handle attributes if (!ValidHandle(reg_dx)) return EMM_INVALID_HANDLE; reg_al = EMM_VOLATILE; // We only support volatile break; diff --git a/src/ints/int10.cpp b/src/ints/int10.cpp index 3553af84a..401e44522 100644 --- a/src/ints/int10.cpp +++ b/src/ints/int10.cpp @@ -1234,7 +1234,7 @@ static void INT10_Seg40Init(void) { // Should be zero for PCjr (which defines it as function key), and Tandy (which does not define it), // and MDA/Hercules/CGA (which also does not define this byte). // - // Furthermore, some games such as "Road Runner" by Mindscape use that byte as part of it's + // Furthermore, some games such as "Road Runner" by Mindscape use that byte as part of its // detection routines to differentiate between CGA, EGA, and Tandy. For the game to work properly // in Tandy emulation, this byte must be zero. if (IS_EGAVGA_ARCH) { @@ -1788,7 +1788,7 @@ void INT10_Startup(Section *sec) { call_10=CALLBACK_Allocate(); CALLBACK_Setup(call_10,&INT10_Handler,CB_IRET,"Int 10 video"); RealSetVec(0x10,CALLBACK_RealPointer(call_10)); - //Init the 0x40 segment and init the datastructures in the the video rom area + //Init the 0x40 segment and init the datastructures in the video rom area INT10_SetupRomMemory(); INT10_Seg40Init(); INT10_SetupBasicVideoParameterTable(); diff --git a/src/ints/int10_modes.cpp b/src/ints/int10_modes.cpp index d02097c8b..0f4835b36 100644 --- a/src/ints/int10_modes.cpp +++ b/src/ints/int10_modes.cpp @@ -1407,7 +1407,7 @@ bool INT10_SetVideoMode(uint16_t mode) { case M_TEXT: if (CurMode->cwidth==9) seq_data[1] &= ~1; seq_data[2]|=0x3; //Enable plane 0 and 1 - seq_data[4]|=0x01; //Alpanumeric + seq_data[4]|=0x01; //Alphanumeric seq_data[4]&=~0x04; //odd/even enable break; case M_DCGA: @@ -1814,12 +1814,12 @@ bool INT10_SetVideoMode(uint16_t mode) { break; case M_CGA4: gfx_data[0x5]|=0x20; //CGA mode - gfx_data[0x6]|=0x0f; //graphics mode at at 0xb800=0xbfff + gfx_data[0x6]|=0x0f; //graphics mode at 0xb800=0xbfff if (IS_EGAVGA_ARCH) gfx_data[0x5]|=0x10; break; case M_DCGA: case M_CGA2: - gfx_data[0x6]|=0x0d; //graphics mode at at 0xb800=0xbfff, chain odd/even disabled + gfx_data[0x6]|=0x0d; //graphics mode at 0xb800=0xbfff, chain odd/even disabled break; default: break; @@ -2130,7 +2130,7 @@ dac_text16: IO_Write(crtc_base,0x45); IO_Write(crtc_base+1u,0x00); - // Accellerator setup + // Accelerator setup Bitu reg_50=S3_XGA_8BPP; switch (CurMode->type) { case M_LIN15: @@ -2172,7 +2172,7 @@ dac_text16: unsigned char s3_mode = 0x00; switch (CurMode->type) { - case M_LIN4: // <- There's a discrepance with real hardware on this + case M_LIN4: // <- There's a discrepancy with real hardware on this case M_LIN8: case M_LIN15: case M_LIN16: diff --git a/src/ints/int10_pal.cpp b/src/ints/int10_pal.cpp index b37177bbb..4a76734c4 100644 --- a/src/ints/int10_pal.cpp +++ b/src/ints/int10_pal.cpp @@ -58,7 +58,7 @@ void INT10_SetSinglePaletteRegister(uint8_t reg,uint8_t val) { break; case M_TANDY4: { if (CurMode->mode!=0x0a) { - // Palette values are kept constand by the BIOS. + // Palette values are kept constant by the BIOS. // The four colors are mapped to special palette values by hardware. // 3D8/3D9 registers influence this mapping. We need to figure out // which entry is used for the requested color. diff --git a/src/ints/mouse.cpp b/src/ints/mouse.cpp index 581e8a830..a14fa90bb 100644 --- a/src/ints/mouse.cpp +++ b/src/ints/mouse.cpp @@ -1483,7 +1483,7 @@ static void Mouse_Reset(void) { mouse.last_released_y[but] = 0; } - // Dont set max coordinates here. it is done by SetResolution! + // Don't set max coordinates here. it is done by SetResolution! mouse.x = static_cast((mouse.max_x + 1)/ 2); mouse.y = static_cast((mouse.max_y + 1)/ 2); mouse.sub_mask = 0; diff --git a/src/ints/xms.cpp b/src/ints/xms.cpp index 3b8b258bf..1a8e8c5aa 100644 --- a/src/ints/xms.cpp +++ b/src/ints/xms.cpp @@ -408,7 +408,7 @@ void XMS_DOS_LocalA20DisableIfNotEnabled_XMSCALL(void) { uint32_t old_eax = reg_eax; uint32_t old_ebx = reg_ebx; - LOG(LOG_DOSMISC,LOG_DEBUG)("Temporarily disabling A20 gate by calling XMS entry point. Hopefully the vm86 protected mode kernel will do it's job"); + LOG(LOG_DOSMISC,LOG_DEBUG)("Temporarily disabling A20 gate by calling XMS entry point. Hopefully the vm86 protected mode kernel will do its job"); reg_ah = 0x06; /* local disable */ CALLBACK_RunRealFar((uint16_t)(xms_callback>>16ul),(uint16_t)(xms_callback&0xFFFFul)); diff --git a/src/misc/ethernet_pcap.h b/src/misc/ethernet_pcap.h index c08fdaf8f..6cf9910ce 100644 --- a/src/misc/ethernet_pcap.h +++ b/src/misc/ethernet_pcap.h @@ -36,7 +36,7 @@ * This backend uses a physical Ethernet device. All types of traffic * such as IPX, TCP, NetBIOS work over this interface. * This requires libpcap or WinPcap to be installed and your selected - * network interface to support promiscious operation. + * network interface to support promiscuous operation. */ class PcapEthernetConnection : public EthernetConnection { public: diff --git a/src/misc/programs.cpp b/src/misc/programs.cpp index d3711c7d0..b78506a8b 100644 --- a/src/misc/programs.cpp +++ b/src/misc/programs.cpp @@ -124,7 +124,7 @@ void PROGRAMS_MakeFile(char const * const name,PROGRAMS_Main * main,const char * uint8_t *comdata; uint8_t index; - /* Copy save the pointer in the vector and save it's index */ + /* Copy save the pointer in the vector and save its index */ if (internal_progs.size()>255) E_Exit("PROGRAMS_MakeFile program size too large (%d)",static_cast(internal_progs.size())); index = (uint8_t)internal_progs.size(); @@ -207,8 +207,8 @@ void Program::ChangeToLongCmd() { * can only be given on the shell ( so no int 21 4b) * Securemode part is disabled as each of the internal command has already * protection for it. (and it breaks games like cdman) - * it is also done for long arguments to as it is convient (as the total commandline can be longer then 127 characters. - * imgmount with lot's of parameters + * it is also done for long arguments too as it is convenient (as the total commandline can be longer than 127 characters. + * imgmount with lots of parameters * Length of arguments can be ~120. but switch when above 100 to be sure */ @@ -1419,7 +1419,7 @@ void CONFIG::Run(void) { if (!strcasecmp(pvars[0].c_str(), "config")) WriteOut("set\ninstall\ninstallhigh\ndevice\ndevicehigh\n"); } else { - // find the property by it's name + // find the property by its name size_t i = 0; while (true) { Property *p = psec->Get_prop((int)(i++)); @@ -1457,7 +1457,7 @@ void CONFIG::Run(void) { p->Get_help(),propvalues.c_str(), p->Get_Default_Value().ToString().c_str(), p->GetValue().ToString().c_str()); - // print 'changability' + // print 'changeability' if (p->getChange()==Property::Changeable::OnlyAtStart) { WriteOut(MSG_Get("PROGRAM_CONFIG_HLP_NOCHANGE")); } diff --git a/src/misc/setup.cpp b/src/misc/setup.cpp index 4c95a329f..b9bbf6b4d 100644 --- a/src/misc/setup.cpp +++ b/src/misc/setup.cpp @@ -54,7 +54,7 @@ void Value::destroy() { } Value& Value::copy(Value const& in) { - if (this != &in) { //Selfassigment! + if (this != &in) { //Selfassignment! if (type != V_NONE && type != in.type) throw WrongType(); destroy(); plaincopy(in); @@ -318,7 +318,7 @@ bool Prop_int::CheckValue(Value const& in, bool warn) { // if (!suggested_values.empty() && Property::CheckValue(in,warn)) return true; if (!suggested_values.empty()) return Property::CheckValue(in,warn); - //No >= and <= in Value type and == is ambigiuous + //No >= and <= in Value type and == is ambiguous int mi = min; int ma = max; int va = static_cast(Value(in)); @@ -470,7 +470,7 @@ bool Prop_multival_remain::SetValue(std::string const& input,bool init) { if (loc != string::npos) local.erase(0,loc); loc = local.find_first_of(separator); string in = "";//default value - /* when i == number_of_properties add the total line. (makes more then + /* when i == number_of_properties add the total line. (makes more than * one string argument possible for parameters of cpu) */ if (loc != string::npos && i < number_of_properties) { //separator found in = local.substr(0,loc); diff --git a/src/misc/winiconv.c b/src/misc/winiconv.c index 93b520fde..fca191bb7 100644 --- a/src/misc/winiconv.c +++ b/src/misc/winiconv.c @@ -1086,7 +1086,7 @@ ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize) /* * Check if codepage is one of those for which the dwFlags parameter * to MultiByteToWideChar() must be zero. Return zero or - * MB_ERR_INVALID_CHARS. The docs in Platform SDK for for Windows + * MB_ERR_INVALID_CHARS. The docs in Platform SDK for Windows * Server 2003 R2 claims that also codepage 65001 is one of these, but * that doesn't seem to be the case. The MSDN docs for MSVS2008 leave * out 65001 (UTF-8), and that indeed seems to be the case on XP, it diff --git a/src/output/direct3d/direct3d.cpp b/src/output/direct3d/direct3d.cpp index a400176bd..49398de04 100644 --- a/src/output/direct3d/direct3d.cpp +++ b/src/output/direct3d/direct3d.cpp @@ -1543,7 +1543,7 @@ void CDirect3D::SetupSceneScaled(void) if (psActive) { D3DXMatrixScaling(&m_matWorld, (float)dwScaledWidth, (float)dwScaledHeight, 1.0f); { /* translation matrix to make dwX and dwY effective. Note that the code inherited from Daum naturally - centers the image on screen by it's design, so the calculation has to account for that. */ + centers the image on screen by its design, so the calculation has to account for that. */ /* NTS: The reason we go to these great pains for pixel shaders is that there are other forks of DOSBox that have this same Direct3D code, but without this fork's alterations that use pure integer coordinates. The shaders require the -0.5 to 0.5 vertex and texture coordinates diff --git a/src/shell/shell.cpp b/src/shell/shell.cpp index ea69c95fa..9847e6f38 100644 --- a/src/shell/shell.cpp +++ b/src/shell/shell.cpp @@ -235,7 +235,7 @@ void AutoexecObject::Uninstall() { char* buf2 = new char[n + 1]; safe_strncpy(buf2, buf.c_str(), n + 1); bool stringset = false; - // If it's a environment variable remove it from there as well + // If it's an environment variable remove it from there as well if ((strncasecmp(buf2,"set ",4) == 0) && (strlen(buf2) > 4)){ char* after_set = buf2 + 4;//move to variable that is being set char* test2 = strpbrk(after_set,"="); @@ -1164,7 +1164,7 @@ public: if (control->opt_prerun) RunAdditional(); - /* add stuff from the configfile unless -noautexec or -securemode is specified. */ + /* add stuff from the configfile unless -noautoexec or -securemode is specified. */ const char * extra = section->data.c_str(); if (extra && !secure && !control->opt_noautoexec) { /* detect if "echo off" is the first line */ @@ -1240,7 +1240,7 @@ public: if (access(buffer,F_OK)) continue; autoexec[12].Install(std::string("MOUNT C \"") + buffer + "\""); autoexec[13].Install("C:"); - /* Save the non-modified filename (so boot and imgmount can use it (long filenames, case sensivitive)) */ + /* Save the non-modified filename (so boot and imgmount can use it (long filenames, case sensitive)) */ strcpy(orig,name); upcase(name); if(strstr(name,".BAT") != 0) { diff --git a/src/shell/shell_cmds.cpp b/src/shell/shell_cmds.cpp index 5ea404e8a..d005a5ae7 100644 --- a/src/shell/shell_cmds.cpp +++ b/src/shell/shell_cmds.cpp @@ -1419,7 +1419,7 @@ void DOS_Shell::CMD_CHDIR(char * args) { if(drive == 'Z') WriteOut(MSG_Get("SHELL_CMD_CHDIR_HINT"),toupper(targetdisplay)); } else if (!DOS_ChangeDir(sargs)) { - /* Changedir failed. Check if the filename is longer then 8 and/or contains spaces */ + /* Changedir failed. Check if the filename is longer than 8 and/or contains spaces */ std::string temps(args),slashpart; std::string::size_type separator = temps.find_first_of("\\/"); @@ -2323,7 +2323,7 @@ void DOS_Shell::CMD_COPY(char * args) { dos.dta(save_dta); return; } - // Gather all sources (extension to copy more then 1 file specified at command line) + // Gather all sources (extension to copy more than 1 file specified at command line) // Concatenating files go as follows: All parts except for the last bear the concat flag. // This construction allows them to be counted (only the non concat set) char q[]="\""; @@ -2393,7 +2393,7 @@ void DOS_Shell::CMD_COPY(char * args) { } copysource target; - // If more then one object exists and last target is not part of a + // If more than one object exists and last target is not part of a // concat sequence then make it the target. if(sources.size()>1 && !sources[sources.size()-2].concat){ target = sources.back(); diff --git a/tests/gtest/gtest.cc b/tests/gtest/gtest.cc index b7e8dc0cc..0714f7b42 100644 --- a/tests/gtest/gtest.cc +++ b/tests/gtest/gtest.cc @@ -177,7 +177,7 @@ const char kStackTraceMarker[] = "\nStack trace:\n"; // is specified on the command line. bool g_help_flag = false; -// Utilty function to Open File for Writing +// Utility function to Open File for Writing static FILE* OpenFileForWriting(const std::string& output_file) { FILE* fileout = nullptr; FilePath output_file_path(output_file); diff --git a/tests/tests.h b/tests/tests.h index 33dfa67fa..3a8a93b46 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -27,7 +27,7 @@ #include "shell_redirection_tests.cpp" #else -//google test code causes problem on win9x, remove them and add empty impelmentations for linkage. +//google test code causes problem on win9x, remove them and add empty implementations for linkage. #include #include "gtest/gtest.h"