Make Windows main thread checks more forgiving #4003
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
The check on Windows to enforce that the event loop is created from the main thread is not fully reliable (rust-windowing#3999). Given that this check is not necessary on Windows and only exists more as an assert to enforce platform consistency in development, I have made it more lax: * It now produces a tracing::warn!() message instead of an outright panic. * The check is only compiled in with cfg(debug_assertions)
PJB3005
changed the title
I ran cargo fmt and it just broke... oh well
notgull
requested changes
Nov 21, 2024
|
Any idea how we'd go about checking that? |
This is checked by comparing the executing module (via GetModuleHandleExA GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) with GetModuleHandleA(NULL). If these are the same we're statically linked into the .exe.
|
Alright, I figured out a way to check it, hope this is sufficient. |
|
I would rather use a better way to detect if we are on the main thread, if possible. I've opened #4006 for this. Let me know if it works. |
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.
The check on Windows to enforce that the event loop is created from the main thread is not fully reliable (#3999). Given that this check is not necessary on Windows and only exists more as an assert to enforce platform consistency in development, I have made it more lax:
Fixes #3999
changelogmodule if knowledge of this change could be valuable to users