1
0
Fork 0
Commit graph

4882 commits

Author SHA1 Message Date
Peter Veenstra
5fc132c124 Improve logging and OS X support (jmarsh).
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4322
2020-02-13 20:39:45 +00:00
Patryk Obara
c3b9b36e2a Merge branch 'svn/trunk' r4321 2020-02-12 21:02:10 +01:00
Peter Veenstra
c765582c3e Some fixes to 4319 by jmarsh.
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4321
2020-02-12 16:18:05 +00:00
Patryk Obara
80d71e7442 Merge branch 'svn/trunk' r4320 2020-02-12 09:00:33 +01:00
Patryk Obara
45704c95fe Remove useless cast 2020-02-12 08:43:13 +01:00
Patryk Obara
0319f0955c Avoid duplicated calls to buf.str() 2020-02-12 08:42:23 +01:00
Patryk Obara
b7ec86f980 Prevent compilation of unreachable code
Fixes a finding from PVS-Studio and Coverity each.
2020-02-12 08:40:39 +01:00
Patryk Obara
e872ea0169 Use memory safe container for GL error log
Fixes V576 warning from PVS-Studio - in this case PVS is somewhat
pedantic, as it warns about printf'ing of malloc'ed memory and risk the
associated problems in OOM situations.

In this case it can be a problem, as LOG_MSG aka GFX_ShowMsg
allocates memory during printing in result an error message could cause
stack overflow, although it's extremely unlikely on modern OSes.

Avoid triggering this warning by using memory-safe container and using
C++11 data() accessor to vector internal buffer; in case of OOM
situation, stack will be unrolled and program should exit with nice
error message.
2020-02-12 08:40:01 +01:00
Patryk Obara
be6b446028 Merge branch 'svn/trunk' r4319 2020-02-12 08:39:40 +01:00
ripsaw8080
c91f46905b Report Q-Channel track number in BCD, meaning it is not converted to binary by the CD-ROM device driver. Fixes the CD-Player feature of DOS Navigator 1.51 when playing past track 15.
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4320
2020-02-11 22:02:03 +00:00
Peter Veenstra
4a565a75ed Add OpenGL shader support. (patch by ny00123 and refined by jmarsh). Add several builtin ones that mimic the scalers and some extra. Thanks jmarsh
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4319
2020-02-10 18:59:01 +00:00
Patryk Obara
e74e52404b Update allowed warnings limits 2020-02-10 03:44:37 +01:00
Patryk Obara
7677511aa3 Initialize imm variable
This is a small issue pointed out by Coverity; this variable might be
later used uninitialized in several places.

Making this change to test if Coverity updates report summary only after
the numbers actually changed (we just had fresh scan, but Coverity keeps
showing summary from few days ago).
2020-02-10 03:23:54 +01:00
Patryk Obara
5c8b1edeb0 Merge branch 'svn/trunk' r4318 2020-02-10 02:54:10 +01:00
Peter Veenstra
62ab91a269 Add LOGC to log cs:ip only. Modified version of patch 282 from Scott Percival.
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4318
2020-02-09 19:18:56 +00:00
Patryk Obara
bb794fc2f2 Update allowed warnings limits 2020-02-08 15:15:13 +01:00
Patryk Obara
bbd40ca73e Merge branch 'svn/trunk' r4317 2020-02-08 14:56:52 +01:00
Patryk Obara
77c4523723 Byteswap captured audio samples on PPC
Fixes: #161
2020-02-08 14:56:14 +01:00
Patryk Obara
e0e17ac6d9 Sync with branch 'svn/trunk' r4315
Revisions 4314 and 4315 were reverted:

- r4314 introduced several technical issues; keeping it away from
  the master branch until some improvements will land in SVN.
- r4315 touches code related to overlay, which was completely removed when
  porting to SDL2; this revert makes future merge commit cleaner.
2020-02-08 14:53:28 +01:00
Patryk Obara
b7029dac06 Revert "Rewrite video capturing and (…)" r4314
This reverts commit 987a48600d.
2020-02-08 14:52:48 +01:00
Patryk Obara
9264bbf969 Revert "Some graphics cards return (…)" r4315
This reverts commit eb9b86269d.
2020-02-08 14:52:11 +01:00
Patryk Obara
cd5cd2fc95
Be more precise about CGA support in upstream 2020-02-08 00:01:00 +01:00
Patryk Obara
d0755ec2b5 Mention CGA/mono in README.md 2020-02-07 23:54:22 +01:00
Peter Veenstra
ae80176bbb Increase limits a bit more for people who want to use that.
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4317
2020-02-07 15:41:31 +00:00
Peter Veenstra
2dec4d0a11 Limit max software scaler line limit to a 4k monitor. (relevant for people who use larger scalers)
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4316
2020-02-07 15:39:21 +00:00
Peter Veenstra
eb9b86269d Some graphics cards return a too small overlay when the size is larger than 1024. Fall back in that case.
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4315
2020-02-07 14:25:52 +00:00
krcroft
36e3789e91
Remove unecessary check and zeroing of arguments
This function uses its boolean return code to indicate success
or failure, which all callers check prior to using any of the
referenced arguments.  Therefore it's unecessary to zero-out
referenced arguments or use intermediate variables.
2020-02-07 00:23:36 -08:00
krcroft
8382eb0e7e
Reduce the track number's type to comply with MSCDEX 2020-02-07 00:23:36 -08:00
krcroft
95dc9db727
Update allowed warnings limits 2020-02-07 00:23:35 -08:00
krcroft
e1fec4beb7
Refactor slightly to clarify the flow and move to one return-point
This also squashes a PVS high issue mentioning that 'subUnit'
is checked after it was used.
2020-02-07 00:23:35 -08:00
krcroft
0272145955
Make the MSCDEX Audio Disk Info return compliant track-ranges
The specification says that legal track values range from 1 to 99,
where as the prior code would return 0 if any issue was encountered.
The spec has no allowance for issues in this function, and therefore
we're bound to simply return 1 instead.
2020-02-07 00:23:34 -08:00
krcroft
1cc88953de
Simplify Pause and Stop CD states 2020-02-07 00:23:34 -08:00
krcroft
7cac8e4c4f
Mimick CD players when first positioning the play head
For example, audio CD players will typically position themselves in
preparation to play the first audio track when "Play" is pushed.
This even occurs for mixed-mode CDs, where the player will start
playing at the first audio track. Therefore, we try to find the most
viable audio track and only fall back to defaults if needed.
(instead of "all zeros" like before).
2020-02-07 00:23:34 -08:00
krcroft
7f39fe86b4
Use "=" assignment when creating references and iterators 2020-02-07 00:23:31 -08:00
krcroft
eb1a9285fd
Simplify some combersome math statements
With types refined, we can switch to cleaner integer
math and avoid casting (to float and back to ints), and also
avoid ceil((float) a / b) by using the pure-integer form
of (a + b - 1) / b
2020-02-07 00:22:46 -08:00
krcroft
0dd9eca6d6
Reformat a couple statements and improve some log messages 2020-02-07 00:22:46 -08:00
krcroft
55f6e4307f
Simplify ISO size calculation
This is simplified by no longer retaining the read position,
which is unecessary because all read operations are offset
from an initial absolute position (so this was unecessary code).
2020-02-07 00:22:45 -08:00
krcroft
4aa3311021
Refine types and sizes to more accurately reflect the values they hold
This allows for fewer casts, simpler math, and more readable code
in subsequent commits.
2020-02-07 00:22:40 -08:00
Peter Veenstra
987a48600d Rewrite video capturing and fix some endian issues with all captures as well. Thanks jmarsh
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4314
2020-02-06 10:36:10 +00:00
Patryk Obara
81954dfe28 Use safe_strcat 2020-02-06 09:24:05 +01:00
Patryk Obara
2983de4db4 Use unsigned for numbers in shortened filenames
Bitu (aka uintptr_t) is not necessary for handling shortened files,
as we can represent max 10^7 shortened files anyway; unsigned is good
enough.

This allows use to use simple %u for conversion instead of PRIuPTR,
which caused a bug on AmigaOS on PPC.

Fixes: #162
2020-02-06 09:24:05 +01:00
Patryk Obara
4a6704367b Reorder includes for drive_cache
Class DOS_Drive_Cache is declared in dos_system.h, but this header was
indirectly included.  Remove faulty windows.h include (the correct one
exists in cross.h already).
2020-02-06 09:24:05 +01:00
Patryk Obara
079e1e1aa0 Remove pointless GCC_UNLIKELY from name shortener 2020-02-06 09:24:05 +01:00
Patryk Obara
d354727ac5 Update allowed warnings limits 2020-02-06 09:23:18 +01:00
Patryk Obara
a1ceacb6f1 Unifdef unused function in mame implementation 2020-02-06 09:23:18 +01:00
Patryk Obara
a7a9f84ae2 Annotate auto_free with 'inline' to prevent redefinition
This way we prevent unused function warning coming from some files
including this header.
2020-02-06 09:23:18 +01:00
Patryk Obara
f5bf769522 Unifdef unused scaler implementations
A number of "templated" scaler implementations are unused in the
implementation.  If any single one of them needs to be brought back
(unlikely), then it's a simple matter of removing an ifdef.

These templates turn off compilation of following scaler
implementations:

void Normal1x_9_8_L(const void*)
void Normal1x_9_8_R(const void*)
void Normal2x_9_8_L(const void*)
void Normal2x_9_8_R(const void*)
void Normal3x_9_8_L(const void*)
void Normal3x_9_8_R(const void*)
void NormalDw_9_8_L(const void*)
void NormalDw_9_8_R(const void*)
void NormalDh_9_8_L(const void*)
void NormalDh_9_8_R(const void*)
void HQ2x_15_L()
void HQ2x_15_R()
void HQ3x_15_L()
void HQ3x_15_R()
void Super2xSaI_15_L()
void Super2xSaI_15_R()
void SuperEagle_15_L()
void SuperEagle_15_R()
void _2xSaI_15_L()
void _2xSaI_15_R()
void AdvMame2x_15_L()
void AdvMame2x_15_R()
void AdvMame3x_15_L()
void AdvMame3x_15_R()
void Cache_9_8(const void*)
2020-02-06 09:23:18 +01:00
Patryk Obara
ca11ff7d58
Mention macOS test snapshot issue in README.md 2020-02-03 21:45:12 +01:00
Patryk Obara
c2691b1d4f Update allowed warnings limits 2020-02-03 06:09:39 +01:00
Patryk Obara
2e43cf551f Swap bytes for 15bpp and 16bpp screenshots on PPC
Fixes broken colours in screenshots taken on PPC machines.
2020-02-03 05:58:12 +01:00