joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 19:08:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

update ref conf and timestamp

Browse Source
This commit is contained in:
Wengier
2020-11-07 23:06:56 -05:00
parent bdcb1fb3fa
commit 2b0748b7f3
21 changed files with 54 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@@ -5,7 +5,8 @@
section [gui] to [render] so that it will be in the
same section as the option "glshader". (Wengier)
- Added menu item "Select OpenGL (GLSL) shader..." to
allow OpenGL shader switch from the menu. (Wengier)
allow OpenGL shader switch from the menu, just like
the function for Direct3D pixel shaders. (Wengier)
- Added menu item "Show IDE disk or CD status" under
"DOS" menu to show the current assignments (disk or
CD image) of the IDE controllers. (Wengier)

0
contrib/glshaders/advinterp2x.glsl Normal file
View File

0
contrib/glshaders/advinterp3x.glsl Normal file
View File

0
contrib/glshaders/advmame2x.glsl Normal file
View File

0
contrib/glshaders/advmame3x.glsl Normal file
View File

0
contrib/glshaders/default.glsl Normal file
View File

0
contrib/glshaders/none.glsl Normal file
View File

0
contrib/glshaders/rgb2x.glsl Normal file
View File

0
contrib/glshaders/rgb3x.glsl Normal file
View File

0
contrib/glshaders/scan2x.glsl Normal file
View File

0
contrib/glshaders/scan3x.glsl Normal file
View File

0
contrib/glshaders/sharp.glsl Normal file
View File

0
contrib/glshaders/tv2x.glsl Normal file
View File

0
contrib/glshaders/tv3x.glsl Normal file
View File

2
contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
View File

@@ -10,7 +10,7 @@
<category>Emulation</category>
</categories>
<releases>
<release version="@PACKAGE_VERSION@" date="2020-11-5"/>
<release version="@PACKAGE_VERSION@" date="2020-11-8"/>
</releases>
<screenshots>
<screenshot type="default">

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

@@ -1710,12 +1710,16 @@ timeout = 0
# lfn: Enable long filename support. If set to auto (default), it is enabled if the reported DOS version is at least 7.0.
# If set to autostart, the builtin VER command won't activate/disactivate LFN support according to the reported DOS version.
# Possible values: true, false, 1, 0, auto, autostart.
#DOSBOX-X-ADV:# autoa20fix: If set (default), DOSBox-X will automatically re-run the executable with the A20 gate disabled if it failed with the "Packed file is corrupt" error.
#DOSBOX-X-ADV:# If both autoa20fix and autoloadfix are set, then the former will be tried first, and the latter will be tried if the former did not work.
#DOSBOX-X-ADV:# autoloadfix: If set (default), DOSBox-X will automatically re-run the executable with LOADFIX if it failed with the "Packed file is corrupt" error.
# automount: Enable automatic drive mounting in Windows.
# automountall: Automatically mount all available Windows drives at start.
# mountwarning: If set, a warning will be displayed if you try to mount C:\ in Windows or / in other platforms.
#DOSBOX-X-ADV:# autoa20fix: If set (default), DOSBox-X will automatically re-run the executable with the A20 gate disabled if it failed with the "Packed file is corrupt" error.
#DOSBOX-X-ADV:# If both autoa20fix and autoloadfix are set, then the former will be tried first, and the latter will be tried if the former did not work.
#DOSBOX-X-ADV:# autoloadfix: If set (default), DOSBox-X will automatically re-run the executable with LOADFIX if it failed with the "Packed file is corrupt" error.
# autofixwarning: If set to true or both, DOSBox-X will show messages when trying to automatically fix the "Packed file is corrupt" error.
# If set to false or none, DOSBox-X will not show such messages on the screen when the error occurred.
# If set to "a20fix" or "loadfix", DOSBox-X will show the message for the a20fix or the loadfix only.
# Possible values: true, false, 1, 0, both, a20fix, loadfix, none.
# startcmd: Allow starting commands to run on the Windows host including the use of START command.
# startwait: Specify whether DOSBox-X should wait for the Windows programs after they are started.
# startquiet: If set, DOSBox-X will not show information messages before launching Windows programs to run on the host.
@@ -1806,11 +1810,12 @@ umb = true
quick reboot = false
ver =
lfn = auto
#DOSBOX-X-ADV:autoa20fix = true
#DOSBOX-X-ADV:autoloadfix = true
automount = true
automountall = false
mountwarning = true
#DOSBOX-X-ADV:autoa20fix = true
#DOSBOX-X-ADV:autoloadfix = true
autofixwarning = true
startcmd = false
startwait = true
startquiet = false

5
dosbox-x.reference.conf
View File

@@ -630,6 +630,10 @@ timeout = 0
# automount: Enable automatic drive mounting in Windows.
# automountall: Automatically mount all available Windows drives at start.
# mountwarning: If set, a warning will be displayed if you try to mount C:\ in Windows or / in other platforms.
# autofixwarning: If set to true or both, DOSBox-X will show messages when trying to automatically fix the "Packed file is corrupt" error.
# If set to false or none, DOSBox-X will not show such messages on the screen when the error occurred.
# If set to "a20fix" or "loadfix", DOSBox-X will show the message for the a20fix or the loadfix only.
# Possible values: true, false, 1, 0, both, a20fix, loadfix, none.
# startcmd: Allow starting commands to run on the Windows host including the use of START command.
# startwait: Specify whether DOSBox-X should wait for the Windows programs after they are started.
# startquiet: If set, DOSBox-X will not show information messages before launching Windows programs to run on the host.
@@ -656,6 +660,7 @@ lfn = auto
automount = true
automountall = false
mountwarning = true
autofixwarning = true
startcmd = false
startwait = true
startquiet = false

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

@@ -1710,12 +1710,16 @@ timeout = 0
# lfn: Enable long filename support. If set to auto (default), it is enabled if the reported DOS version is at least 7.0.
# If set to autostart, the builtin VER command won't activate/disactivate LFN support according to the reported DOS version.
# Possible values: true, false, 1, 0, auto, autostart.
# autoa20fix: If set (default), DOSBox-X will automatically re-run the executable with the A20 gate disabled if it failed with the "Packed file is corrupt" error.
# If both autoa20fix and autoloadfix are set, then the former will be tried first, and the latter will be tried if the former did not work.
# autoloadfix: If set (default), DOSBox-X will automatically re-run the executable with LOADFIX if it failed with the "Packed file is corrupt" error.
# automount: Enable automatic drive mounting in Windows.
# automountall: Automatically mount all available Windows drives at start.
# mountwarning: If set, a warning will be displayed if you try to mount C:\ in Windows or / in other platforms.
# autoa20fix: If set (default), DOSBox-X will automatically re-run the executable with the A20 gate disabled if it failed with the "Packed file is corrupt" error.
# If both autoa20fix and autoloadfix are set, then the former will be tried first, and the latter will be tried if the former did not work.
# autoloadfix: If set (default), DOSBox-X will automatically re-run the executable with LOADFIX if it failed with the "Packed file is corrupt" error.
# autofixwarning: If set to true or both, DOSBox-X will show messages when trying to automatically fix the "Packed file is corrupt" error.
# If set to false or none, DOSBox-X will not show such messages on the screen when the error occurred.
# If set to "a20fix" or "loadfix", DOSBox-X will show the message for the a20fix or the loadfix only.
# Possible values: true, false, 1, 0, both, a20fix, loadfix, none.
# startcmd: Allow starting commands to run on the Windows host including the use of START command.
# startwait: Specify whether DOSBox-X should wait for the Windows programs after they are started.
# startquiet: If set, DOSBox-X will not show information messages before launching Windows programs to run on the host.
@@ -1806,11 +1810,12 @@ private area in umb = true
quick reboot = false
ver =
lfn = auto
autoa20fix = true
autoloadfix = true
automount = true
automountall = false
mountwarning = true
autoa20fix = true
autoloadfix = true
autofixwarning = true
startcmd = false
startwait = true
startquiet = false

4
include/build_timestamp.h
View File

@@ -1,4 +1,4 @@
/*auto-generated*/
#define UPDATED_STR "Nov 5, 2020 10:35:34pm"
#define GIT_COMMIT_HASH "4f4904b"
#define UPDATED_STR "Nov 8, 2020 2:11:38pm"
#define GIT_COMMIT_HASH "7a704f1"
#define COPYRIGHT_END_YEAR "2020"

27
src/dosbox.cpp
View File

@@ -3668,19 +3668,6 @@ void DOSBOX_SetupConfigSections(void) {
"If set to autostart, the builtin VER command won't activate/disactivate LFN support according to the reported DOS version.");
Pstring->SetBasic(true);
Pstring = secprop->Add_string("autofixwarning",Property::Changeable::WhenIdle,"auto");
Pstring->Set_values(autofix_settings);
Pstring->Set_help("If set to true or both, DOSBox-X will show messages when trying to automatically fix the \"Packed file is corrupt\" error.\n"
"If set to false or none, DOSBox-X will not show such messages on the screen when the error occurred.\n"
"If set to \"a20fix\" or \"loadfix\", DOSBox-X will show the message for the a20fix or the loadfix only.");
Pbool = secprop->Add_bool("autoa20fix",Property::Changeable::WhenIdle,true);
Pbool->Set_help("If set (default), DOSBox-X will automatically re-run the executable with the A20 gate disabled if it failed with the \"Packed file is corrupt\" error.\n"
"If both autoa20fix and autoloadfix are set, then the former will be tried first, and the latter will be tried if the former did not work.");
Pbool = secprop->Add_bool("autoloadfix",Property::Changeable::WhenIdle,true);
Pbool->Set_help("If set (default), DOSBox-X will automatically re-run the executable with LOADFIX if it failed with the \"Packed file is corrupt\" error.");
Pbool = secprop->Add_bool("automount",Property::Changeable::WhenIdle,true);
Pbool->Set_help("Enable automatic drive mounting in Windows.");
Pbool->SetBasic(true);
@@ -3693,6 +3680,20 @@ void DOSBOX_SetupConfigSections(void) {
Pbool->Set_help("If set, a warning will be displayed if you try to mount C:\\ in Windows or / in other platforms.");
Pbool->SetBasic(true);
Pbool = secprop->Add_bool("autoa20fix",Property::Changeable::WhenIdle,true);
Pbool->Set_help("If set (default), DOSBox-X will automatically re-run the executable with the A20 gate disabled if it failed with the \"Packed file is corrupt\" error.\n"
"If both autoa20fix and autoloadfix are set, then the former will be tried first, and the latter will be tried if the former did not work.");
Pbool = secprop->Add_bool("autoloadfix",Property::Changeable::WhenIdle,true);
Pbool->Set_help("If set (default), DOSBox-X will automatically re-run the executable with LOADFIX if it failed with the \"Packed file is corrupt\" error.");
Pstring = secprop->Add_string("autofixwarning",Property::Changeable::WhenIdle,"true");
Pstring->Set_values(autofix_settings);
Pstring->Set_help("If set to true or both, DOSBox-X will show messages when trying to automatically fix the \"Packed file is corrupt\" error.\n"
"If set to false or none, DOSBox-X will not show such messages on the screen when the error occurred.\n"
"If set to \"a20fix\" or \"loadfix\", DOSBox-X will show the message for the a20fix or the loadfix only.");
Pstring->SetBasic(true);
Pbool = secprop->Add_bool("startcmd",Property::Changeable::OnlyAtStart,false);
Pbool->Set_help("Allow starting commands to run on the Windows host including the use of START command.");
Pbool->SetBasic(true);

17
src/gui/sdlmain.cpp
View File

@@ -8302,7 +8302,7 @@ bool vid_select_pixel_shader_menu_callback(DOSBoxMenu* const menu, DOSBoxMenu::i
const char* name = ofn.lpstrFile;
/* filenames in Windows are case insensitive so do the comparison the same */
if (!strnicmp(name, cwd, strlen(cwd))) {
if (!strncasecmp(name, cwd, strlen(cwd))) {
name += strlen(cwd);
while (*name == '\\') name++;
}
@@ -8356,7 +8356,7 @@ bool vid_select_glsl_shader_menu_callback(DOSBoxMenu* const menu, DOSBoxMenu::it
char CurrentDir[512];
char * Temp_CurrentDir = CurrentDir;
getcwd(Temp_CurrentDir, 512);
std::string cwd = std::string(Temp_CurrentDir)+"\\glshaders\\";
std::string cwd = std::string(Temp_CurrentDir)+CROSS_FILESPLIT+"glshaders"+CROSS_FILESPLIT;
const char *lFilterPatterns[] = {"*.glsl","*.GLSL"};
const char *lFilterDescription = "OpenGL shader files (*.glsl)";
char const * lTheOpenFileName = tinyfd_openFileDialog("Select OpenGL shader",cwd.c_str(),2,lFilterPatterns,lFilterDescription,0);
@@ -8370,24 +8370,27 @@ bool vid_select_glsl_shader_menu_callback(DOSBoxMenu* const menu, DOSBoxMenu::it
std::string tmp = "";
/* filenames in Windows are case insensitive so do the comparison the same */
if (!strnicmp(name, cwd.c_str(), cwd.size())) {
if (!strncasecmp(name, cwd.c_str(), cwd.size())) {
name += cwd.size();
while (*name == '\\') name++;
while (*name == CROSS_FILESPLIT) name++;
}
/* the shader set included with the source code includes none.glsl which is empty.
if that was chosen then just change it to "none" so the GLSL shader code does
not waste it's time. */
{
const char* n = strrchr(name, '\\');
const char* n = strrchr(name, CROSS_FILESPLIT);
if (n == NULL) n = name;
else n++;
if (!strcasecmp(n, "advinterp2x.glsl") || !strcasecmp(n, "advinterp3x.glsl") ||
if (!strcasecmp(n, "none.glsl"))
tmp = "default";
else if (!strcasecmp(n, "advinterp2x.glsl") || !strcasecmp(n, "advinterp3x.glsl") ||
!strcasecmp(n, "advmame2x.glsl") || !strcasecmp(n, "advmame3x.glsl") ||
!strcasecmp(n, "rgb2x.glsl") || !strcasecmp(n, "rgb3x.glsl") ||
!strcasecmp(n, "scan2x.glsl") || !strcasecmp(n, "scan3x.glsl") ||
!strcasecmp(n, "tv2x.glsl") || !strcasecmp(n, "tv3x.glsl") || !strcasecmp(n, "sharp.glsl")) {
!strcasecmp(n, "tv2x.glsl") || !strcasecmp(n, "tv3x.glsl") ||
!strcasecmp(n, "sharp.glsl") || !strcasecmp(n, "default.glsl")) {
tmp = n;
tmp.erase(tmp.size()-5, string::npos);
} else