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

more

Browse Source
This commit is contained in:
Wengier 2020-10-17 23:28:58 -04:00
parent c3079ebd75
commit 99bdc41824
8 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/ISSUE_TEMPLATE/question.md vendored
View File

@ -1,8 +1,9 @@
---
name: Question
about: Ask for support or start a discussion about DOSBox-X.
about: Ask for support or start a discussion about DOSBox-X
label: question
---
**Please describe your question.**
A clear and concise description of what your question is. Ex. How do I [...]

8
CHANGELOG
View File

@ -4,10 +4,10 @@
similar to real DOS systems. (Wengier)
- Enhanced the config option "freesizecap" to allow
the setting "fixed" which is the same as "false",
and a new setting "dynamic" is added, which will be
similar to the setting "fixed" but the reported
free disk size will change if the free disk size
increases or decreases ever since. (Wengier)
and a new setting "relative" is added, which will
be similar to the setting "fixed" but the reported
free disk size will also change relative to the
change of the free disk size ever since. (Wengier)
- Added new CPU types to the "Emulate CPU speed" menu
group, namely 486DX4-100, 486DX5-133, Pentium-75,
and Pentium-90. Thanks again for the data provided

2
contrib/linux/dosbox-x.metainfo.xml.in
View File

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

7
dosbox-x.reference.conf
View File

@ -302,7 +302,10 @@ fileio = false
# or 386DX and 486 systems where the CPU communicated directly with the ISA bus (A24-A31 tied off)
# 26: 64MB aliasing. Some 486s had only 26 external address bits, some motherboards tied off A26-A31
# nocachedir: If set, MOUNT commands will mount with -nocachedir (disable directory caching) by default.
# freesizecap: If set, the value of MOUNT -freesize will be applied only if the actual free size is greater than the specified value.
# freesizecap: If set to "cap", the value of MOUNT -freesize will apply only if the actual free size is greater than the specified value.
# If set to "relative", the value of MOUNT -freesize will change relative to the specified value.
# If set to "fixed", the value of MOUNT -freesize will be a fixed one to be reported all the time.
# Possible values: true, false, fixed, relative, cap, 2, 1, 0.
# leading colon write protect image: If set, BOOT and IMGMOUNT commands will put an image file name with a leading colon (:) in write-protect mode.
# unmask keyboard on int 16 read: If set, INT 16h will unmask IRQ 1 (keyboard) when asked to read keyboard input.
# It is strongly recommended that you set this option if running Windows 3.11 Windows for Workgroups in DOSBox-X.
@ -380,7 +383,7 @@ isa memory hole at 512kb = false
reboot delay = -1
memalias = 0
nocachedir = false
freesizecap = true
freesizecap = cap
leading colon write protect image = true
unmask keyboard on int 16 read = true
int16 keyboard polling undocumented cf behavior = false

4
include/build_timestamp.h
View File

@ -1,4 +1,4 @@
/*auto-generated*/
#define UPDATED_STR "Oct 16, 2020 2:54:43pm"
#define GIT_COMMIT_HASH "118db9c"
#define UPDATED_STR "Oct 18, 2020 12:16:04am"
#define GIT_COMMIT_HASH "0521f93"
#define COPYRIGHT_END_YEAR "2020"

2
src/dos/dos_programs.cpp
View File

@ -6578,7 +6578,7 @@ void DOS_SetupPrograms(void) {
MSG_Add("PROGRAM_LOADROM_INCOMPATIBLE","Video BIOS not supported by machine type.\n");
MSG_Add("PROGRAM_LOADROM_UNRECOGNIZED","ROM file not recognized.\n");
MSG_Add("PROGRAM_LOADROM_BASIC_LOADED","BASIC ROM loaded.\n");
MSG_Add("PROGRAM_BIOSTEST_HELP","Boots into a BIOS image for running CPU tester BIOS.\n");
MSG_Add("PROGRAM_BIOSTEST_HELP","Boots into a BIOS image for running CPU tester BIOS.\n\nBIOSTEST image_file\n");
MSG_Add("VHD_ERROR_OPENING", "Could not open the specified VHD file.\n");
MSG_Add("VHD_INVALID_DATA", "The specified VHD file is corrupt and cannot be opened.\n");

10
src/dosbox.cpp
View File

@ -1016,8 +1016,8 @@ void Init_VGABIOS() {
force_nocachedir = section->Get_bool("nocachedir");
std::string freesizestr = section->Get_string("freesizecap");
if (freesizestr == "fixed" || freesizestr == "false" || freesizestr == "0") freesizecap = 0;
else if (freesizestr == "dynamic") freesizecap = 2;
else freesizecap = 0;
else if (freesizestr == "relative" || freesizestr == "2") freesizecap = 2;
else freesizecap = 1;
wpcolon = section->Get_bool("leading colon write protect image");
VGA_BIOS_Size_override = (Bitu)video_section->Get_int("vga bios size override");
@ -1315,7 +1315,7 @@ void DOSBOX_SetupConfigSections(void) {
const char* tandys[] = { "auto", "on", "off", 0};
const char* ps1opt[] = { "on", "off", 0};
const char* numopt[] = { "on", "off", "", 0};
const char* freesizeopt[] = {"true", "false", "fixed", "dynamic", "cap", "1", "0", 0};
const char* freesizeopt[] = {"true", "false", "fixed", "relative", "cap", "2", "1", "0", 0};
const char* truefalseautoopt[] = { "true", "false", "1", "0", "auto", 0};
const char* pc98fmboards[] = { "auto", "off", "false", "board14", "board26k", "board86", "board86c", 0};
const char* pc98videomodeopt[] = { "", "24khz", "31khz", "15khz", 0};
@ -1675,7 +1675,9 @@ void DOSBOX_SetupConfigSections(void) {
Pstring = secprop->Add_string("freesizecap",Property::Changeable::WhenIdle,"cap");
Pstring->Set_values(freesizeopt);
Pstring->Set_help("If set, the value of MOUNT -freesize will be applied only if the actual free size is greater than the specified value.");
Pstring->Set_help("If set to \"cap\", the value of MOUNT -freesize will apply only if the actual free size is greater than the specified value.\n"
"If set to \"relative\", the value of MOUNT -freesize will change relative to the specified value.\n"
"If set to \"fixed\", the value of MOUNT -freesize will be a fixed one to be reported all the time.");
Pbool = secprop->Add_bool("leading colon write protect image",Property::Changeable::WhenIdle,true);
Pbool->Set_help("If set, BOOT and IMGMOUNT commands will put an image file name with a leading colon (:) in write-protect mode.");

4
src/misc/programs.cpp
View File

@ -1056,8 +1056,8 @@ void CONFIG::Run(void) {
force_nocachedir = section->Get_bool("nocachedir");
std::string freesizestr = section->Get_string("freesizecap");
if (freesizestr == "fixed" || freesizestr == "false" || freesizestr == "0") freesizecap = 0;
else if (freesizestr == "dynamic") freesizecap = 2;
else freesizecap = 0;
else if (freesizestr == "relative" || freesizestr == "2") freesizecap = 2;
else freesizecap = 1;
wpcolon = section->Get_bool("leading colon write protect image");
if (!strcasecmp(inputline.substr(0, 9).c_str(), "saveslot=")) SetGameState_Run(section->Get_int("saveslot")-1);
} else if (!strcasecmp(pvars[0].c_str(), "sdl")) {