From e524d0f1c2ec4f0a701a80bffdab41e8444c5fe0 Mon Sep 17 00:00:00 2001
From: Peter Veenstra <qbix79@users.sourceforge.net>
Date: Fri, 31 Aug 2018 17:43:09 +0000
Subject: [PATCH] <erge 0.74-2 documentation changes into trunk

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4157
---
 ChangeLog           | 55 +++++++++++++++++++++++++++++++++++++++++++++
 NEWS                | 12 ++++++++++
 README              | 47 +++++++++++++++++++++++++++-----------
 VERSION             |  2 +-
 src/gui/sdlmain.cpp |  8 ++++---
 5 files changed, 107 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3e912f86..d35031ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
+0.74-2
+  - Rewrite auto/max cycles algorithm to work better with windows 7, other 
+    OSes might benefit as well.
+  - Update 64bit recompiler to work on OSX and Linux.
+  - Several improvements to make the recompilers work with newer compilers and
+    add some workarounds about clang confusing itself.
+  - Fix several variables being the wrong size in the recompiler.
+  - Support absolute 64 bit addressing. (DRC:64 bit error messages)
+  - Zero extend data in dynrec core for LLVM compilation/
+  - Reduce overhead of the Mac version with a lot. Results in a speed increase.
+  - Replace NV_PixelDataRange with the more common ARB_PixelBufferObject 
+    extension. Should help with output=opengl.
+  - Reuse graphics window if possible instead of always creating a new one!
+  - Add patches to work better when called by WINE:
+    - support WINE style namemangling.
+    - allow Z:\ to be moved to a different drive. 
+  - Try to fix stuttering audio with opengl output on Linux. (or at least 
+    improve it. Linux users might need to increase the prebuffer option a bit)
+  - Fix automake and autoconf problems.
+  - Fix problems related to packed struct layouts.
+  - Fix compilation on gcc 4.4 and gcc 4.6.1.
+  - Fix compilation with -DPIC.
+  - Hopefully fix crash on shutdown, when unknown condition is encountered.
+  - Fix -lto with gcc.
+  - Fix clang compliation with asm fpu core.
+  - Fix mapper crash on startup and when changing the mapper key.
+  - Fix compilation in VS2015.
+  - Fix compilation on mingw64.
+  - Fix compilation on Frisbee and newer clang.
+  - Fix compilation machines that have X11 libraries installed, but use a SDL 
+    without X11.
+  - Fix a few problems relating to video capturing:
+    - Writing out the index too often. (slowdown with longer captures)
+    - Not being aware of when only the refresh rate changed.
+  - Fix call order when bitshifting the return order (VS C /O2 builds).
+  - Fix sign-extension error in S3 draw funcion, i.e. win3.1 analog clock.
+  - Fix expanddot not caring about the size of the inputbuffer.
+  - Some fixes for the debugger related to starting a program through debug.com.
+  - Bring OS/2 port code up to date.
+  - Reduce the amount of warning when compiling with quite a bit.
+  - Allow 15/26/32 bits input to the opengl output.
+  - Add cmd-q as exit key for macs.
+  - Fix icon and titlebar on very old setups.
+  - Fix off by one display size calculation errors with very large displays.
+  - Fix out of bounds access the unused byte in the 32 bit colour value of the 
+    hardware mouse cursor pixel was affected.
+  - Fix depreciated warnings on Mac, allow soundfont loading for coreaudio.
+  - Keep repeating a pressed key if another key was unpressed.
+  - Fix crash on OS X related to putting junk in the titlebar.
+  - Extend fullresolution=0x0 to work on Linux and Mac.
+  - Change gameblaster and tandy sound core to latest mame version.
+  - Improve numlock and capslock support on Linux and Macs. Still not perfect
+    on Windows.
+  - Added even more code to workaround Windows behaving weirdly with alt-tab.
+
 0.74
   - Several small game specific fixes/hacks/support. (Offensive,
     Roadhog, GTA installer, Kingdom O' Magic soundcard detection, 
diff --git a/NEWS b/NEWS
index adc6875e..bf6b7a13 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+0.74-2
+A maintenance release for DOSBox 0.74, which solves the following problems:
+
+- Windows: Fix auto/max cycles algorithm on Windows 7, which helps with 
+           stuttering audio.
+- Mac OS X: Bring a 64 bit version and improve performance.
+- Linux: Fix the 64bit dynrec cpu core and a lot of compilation problems. 
+         Add patches for the WINE Team.
+
+The game compatibility should be identical to 0.74.
+See the Changelog for a full list of changes.
+
 0.74
   - Several small game specific fixes/hacks/support. (Offensive,
     Roadhog, GTA installer, Kingdom O' Magic soundcard detection, 
diff --git a/README b/README
index 96d6dd21..5323229f 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-DOSBox v0.74 Manual (always use the latest version from www.dosbox.com)
+DOSBox v0.74-2 Manual (always use the latest version from www.dosbox.com)
 
 
 
@@ -47,7 +47,7 @@ It is essential that you get familiar with the idea of mounting, DOSBox does not
 automatically make any drive (or a part of it) accessible to the emulation. See
 the FAQ entry "How to start?" as well as the description of the MOUNT command
 (Section 4: "Internal Programs"). If you have your game on a cdrom you may try
-this guide: http://vogons.zetafleet.com/viewtopic.php?t=8933
+this guide: https://www.vogons.org/viewtopic.php?t=8933
 
 
 
@@ -58,6 +58,7 @@ this guide: http://vogons.zetafleet.com/viewtopic.php?t=8933
 START:      How to start?
 AUTOMATION: Do I always have to type these "mount" commands?
 FULLSCREEN: How do I change to fullscreen?
+FULLSCREEN: My fullscreen is too large.
 CD-ROM:     My CD-ROM doesn't work.
 CD-ROM:     The game/application can't find its CD-ROM.
 MOUSE:      The mouse doesn't work.
@@ -103,6 +104,26 @@ FULLSCREEN: How do I change to fullscreen?
     mode: Press alt-enter again.
 
 
+FULLSCREEN: My fullscreen is too large.
+    This is can be a problem on Windows 10, if you have display scaling
+    set to a value above 100%. Windows in that case will resize the screen
+    on top of dosbox resizing the screen, which can happen for the output:
+    ddraw, opengl, openglnb, overlay. You can disable this Windows behaviour
+    by enabling a specific compatibility setting:
+ 
+    - Right-click the DOSBox icon and select "Properties".
+    - Go to the "Compatibility" tab.
+    - Click on "Change high DPI settings".
+    - Tick "Override high DPI scaling behaviour" and set it to "Application".
+    - Apply the changes by clicking on "OK".
+
+    Unfortunately, this compatibility option causes some side effects in
+    windowed mode, and in this case you will need to change the resolution
+    in the config/Options file for windowresolution (e.g. 1024x768).
+
+    Alternatively, you can disable the display scaling and or use a lower
+    fullresolution value.
+
 CD-ROM: My CD-ROM doesn't work.
     To mount your CD-ROM in DOSBox you have to specify some additional options
     when mounting the CD-ROM.
@@ -256,7 +277,7 @@ KEYBOARD: Right Shift and "\" doesn't work in DOSBox. (Windows only)
     dosbox.exe
     check whether keyboard started to work properly. As windib is slower it is
     best to use one of the two solutions provided here:
-    http://vogons.zetafleet.com/viewtopic.php?t=24072
+    https://www.vogons.org/viewtopic.php?t=24072
 
 
 KEYBOARD: The keyboard lags.
@@ -308,9 +329,9 @@ OPTIONS: I would like to change DOSBox's options.
 
 HELP: Great Manual, but I still don't get it.
     For more questions read the rest of this Manual. You may also look at:
-    guides located at http://vogons.zetafleet.com/viewforum.php?f=39
-    the wiki of DOSBox http://www.dosbox.com/wiki/
-    the site/forum: http://www.dosbox.com
+    guides located at https://www.vogons.org/viewforum.php?f=53
+    the wiki of DOSBox https://www.dosbox.com/wiki/
+    the site/forum: https://www.dosbox.com
 
 
 
@@ -1018,7 +1039,7 @@ KEYB [keyboardlayoutcode [codepage [codepagefile]]]
      examples are PL214 (Polish typists) or PL457 (Polish programmers).
      It specifies the keyboard layout to be used.
      The list of all layouts built into DOSBox is here:
-     http://vogons.zetafleet.com/viewtopic.php?t=21824
+     https://www.vogons.org/viewtopic.php?t=21824
 
   [codepage] is the number of the codepage to be used. The keyboard layout
      has to provide support for the specified codepage, otherwise the layout
@@ -1097,7 +1118,7 @@ if the key doesn't work i.e. fn-cmd-ctrl-F1, but some keys may still need
 remapping (in Linux too).
 
 Saved/recorded files can be found in:
-   (Windows)    "Start/WinLogo Menu"->"All Programs"->DOSBox-0.74->Extras
+   (Windows)    "Start/WinLogo Menu"->"All Programs"->"DOSBox-0.74-2"->Extras
    (Linux)      ~/.dosbox/capture
    (Mac OS X)   "~/Library/Preferences/capture"
 This can be changed in the DOSBox configuration file.
@@ -1252,7 +1273,7 @@ Layout switching
   in this case just the layout identifier needs to be specified (like
   keyboardlayout=PL214 in the DOSBox configuration file, or using "keyb PL214"
   at the DOSBox command prompt). The list of all layouts built into DOSBox is
-  here: http://vogons.zetafleet.com/viewtopic.php?t=21824
+  here: https://www.vogons.org/viewtopic.php?t=21824
 
   Some keyboard layouts (for example layout GK319 codepage 869 and layout RU441
   codepage 808) have support for dual layouts that can be accessed by pressing
@@ -1487,9 +1508,9 @@ To display the DOSBox status window:
 
 The configuration file is automatically created the first time you run DOSBox.
 The file can be found in:
-   (Windows)  "Start/WinLogo Menu"->"All Programs"->DOSBox-0.74->Options
-   (Linux)    ~/.dosbox/dosbox-0.74.conf
-   (Mac OS X) "~/Library/Preferences/DOSBox 0.74 Preferences"
+   (Windows)  "Start/WinLogo Menu"->"All Programs"->"DOSBox-0.74-2"->Options
+   (Linux)    ~/.dosbox/dosbox-0.74-2.conf
+   (Mac OS X) "~/Library/Preferences/DOSBox 0.74-2 Preferences"
 The file is divided into several sections. Each section starts with a
 [section name] line. The settings are the property=value lines where value can
 be altered to customize DOSBox.
@@ -1550,7 +1571,7 @@ See the THANKS file.
 ============
 
 See the site: 
-http://www.dosbox.com
+https://www.dosbox.com
 for an email address (The Crew-page).
 
 
diff --git a/VERSION b/VERSION
index 3ea25f59..a6e956f0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.74
+0.74-2
diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp
index 4aa4fd4b..c4f65e27 100644
--- a/src/gui/sdlmain.cpp
+++ b/src/gui/sdlmain.cpp
@@ -1255,8 +1255,8 @@ static void GUI_StartUp(Section * sec) {
 		int win_w = GetSystemMetrics(SM_CXSCREEN);
 		int win_h = GetSystemMetrics(SM_CYSCREEN);
 		if (sdl_w != win_w && sdl_h != win_h) 
-			LOG_MSG("Windows dpi/blurry apps scaling detected! The screen might be too large or not show properly,\n"
-		        "please see the DOSBox Manual/README for details.\n");
+			LOG_MSG("Windows dpi/blurry apps scaling detected! The screen might be too large or not\n"
+			        "show properly, please see the DOSBox options file (fullresolution) for details.\n");
 		}
 #else
 	if (!sdl.desktop.full.width || !sdl.desktop.full.height){
@@ -1712,7 +1712,9 @@ void Config_Add_SDL() {
 	Pstring = sdl_sec->Add_string("fullresolution",Property::Changeable::Always,"original");
 	Pstring->Set_help("What resolution to use for fullscreen: original, desktop or a fixed size (e.g. 1024x768).\n"
 	                  "  Using your monitor's native resolution with aspect=true might give the best results.\n"
-			  "  If you end up with small window on a large screen, try an output different from surface.");
+			  "  If you end up with small window on a large screen, try an output different from surface."
+	                  "  On Windows 10 with display scaling (Scale and layout) set to a value above 100%, it is recommended\n"
+	                  "  to use a lower full/windowresolution, in order to avoid window size problems.");
 
 	Pstring = sdl_sec->Add_string("windowresolution",Property::Changeable::Always,"original");
 	Pstring->Set_help("Scale the window to this size IF the output device supports hardware scaling.\n"