Couple of fixes for MinGW-w64 #6199
Merged
Conversation
This file contains 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
Suppress two format-truncation warnings in the windows-only codepath, which end up treated as errors by the winlibs mingw toolchain. The warnings arise because we do not check the return value of the snprintf() calls (which might truncate the message), but in those particular instances, we do not care about truncation. Therefore, explicitly suppress the warnings via pragmas instead of trying to work around them.
When assembling Windows executable, first remove all resources from the copy of bootloader file. This ensures that executable contains no embedded manifest, even if the bootloader was compiled using a toolchain that forcibly embeds a default manifest (e.g., mingw gcc toolchain from msys2). In onefile builds, the manifest (if already present) is rewritten later on, so it poses no problem. In onedir builds, however, an already present manifest makes Windows ignore the generated external manifest. This means that options such as uac-admin are effectively ignored, and that Common Controls v6 are not loaded for windowed bootloaders, resulting in an entry point for LoadIconMetric not being found.
It seems that with MinGW-w64 gcc, the %s format argument in a wide-char swprintf() function call does not correspond to wide-char (as it does under MSVC), but rather to single-char. Therefore, with mingw-compiled bootloader, the exception dialog displays only initial letters of script name and exception message. Use %ls to remove all ambiguity.
rokm
added
the
needs backport
bwoodsend
approved these changes
Sep 10, 2021
rokm
removed
the
needs backport
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes for the two issues from #6196 and a problem with string handling in exception dialog.