Merge Version/4.2 into master. #4297
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add Novell NetWare 2.x Card Key emulation
Preparation for modem phonebook files
Modem emulation (includinng SLIP connectivity)
…u's internal timer emulation Co-authored-by: OBattler <oubattler@gmail.com>
Co-authored-by: OBattler <oubattler@gmail.com>
So that the build compiles fine.
Fix incompatible pointers of the generic PIT and PCjr's
And a proper Compaq Portable III 386 BIOS. Note: The SCAT 286 003 machine is a SCAT-based AMI 286 machine.
Add the Tandy 4000 AT compatible and SCAT-286-003 machines
feature/sound: ESS AudioDrive ES1688
| /* Load the ROMs for the selected machine. */ | ||
| if (!machine_available(machine)) { | ||
| swprintf(temp, sizeof_w(temp), plat_get_string(IDS_2063), machine_getname()); | ||
| swprintf(temp, sizeof_w(temp), plat_get_string(STRING_HW_NOT_AVAILABLE_MACHINE), machine_getname()); |
Check failure
Code scanning / CodeQL
Non-constant format string
| memset(tempc, 0, sizeof(tempc)); | ||
| device_get_name(video_card_getdevice(gfxcard[0]), 0, tempc); | ||
| swprintf(temp, sizeof_w(temp), plat_get_string(IDS_2064), tempc); | ||
| swprintf(temp, sizeof_w(temp), plat_get_string(STRING_HW_NOT_AVAILABLE_VIDEO), tempc); |
Check failure
Code scanning / CodeQL
Non-constant format string
| device_get_name(video_card_getdevice(gfxcard[1]), 0, tempc); | ||
| swprintf(temp, sizeof_w(temp), plat_get_string(IDS_2163), tempc); | ||
| ui_msgbox_header(MBX_INFO, (wchar_t *) IDS_2129, temp); | ||
| swprintf(temp, sizeof_w(temp), plat_get_string(STRING_HW_NOT_AVAILABLE_VIDEO2), tempc); |
Check failure
Code scanning / CodeQL
Non-constant format string
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Briefly describe what you are submitting.
Checklist
References
Provide links to datasheets or other documentation that helped you implement this pull request.