windows: Fix RoInitialize() failure after a CoInitializeEx() call using apartment threading #5554
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
|
Ugh, this reintroduces #5270. Maybe it just stopped happening because WGI itself was broken... |
…ng apartment threading This mirrors the same codepath in WIN_CoInitialize() which handles STA and MTA.
slouken
reviewed
Apr 21, 2022
| CoIncrementMTAUsage_t CoIncrementMTAUsageFunc = (CoIncrementMTAUsage_t)WIN_LoadComBaseFunction("CoIncrementMTAUsage"); | ||
| if (CoIncrementMTAUsageFunc) { | ||
| if (FAILED(CoIncrementMTAUsageFunc(&cookie))) { | ||
| return SDL_SetError("CoIncrementMTAUsage() failed"); |
There was a problem hiding this comment.
Do we need to call WIN_RoUninitialize() in all the error cases in this function?
There was a problem hiding this comment.
WGI_JoystickQuit() will still call WIN_RoUninitialize() even if we fail initialization here.
However, it does look like there's a bug here if WIN_RoInitialize() itself fails. Calling WIN_RoUninitialize() in that case is wrong.
There was a problem hiding this comment.
Pushed 7325953 to fix that
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.
Description
This fixes #5552 by trying
RoInitialize()with bothRO_INIT_SINGLETHREADEDandRO_INIT_MULTITHREADEDto avoid failing ifWIN_CoInitialize()is called first. I also adjusted the code to mirrorWIN_CoInitialize()more closely.According to contextfree/winrt-rust#62 (comment),
RO_INIT_SINGLETHREADEDis equivalent toCOINIT_APARTMENTTHREADED.Existing Issue(s)
Fixes #5552