Ensure proper ref count of underlying ocx #12281
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #12281 +/- ##
===================================================
+ Coverage 75.43346% 75.44869% +0.01523%
===================================================
Files 3103 3105 +2
Lines 634314 634353 +39
Branches 46876 46876
===================================================
+ Hits 478485 478611 +126
+ Misses 152403 152324 -79
+ Partials 3426 3418 -8
Flags with carried forward coverage won't be shown. Click here to find out more. |
JeremyKuhne
approved these changes
Oct 8, 2024
|
/backport to release/9.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/winforms/actions/runs/11240680586 |
|
/backport to release/8.0 |
|
Started backporting to release/8.0: https://github.com/dotnet/winforms/actions/runs/11240684310 |
|
@lonitra backporting to release/8.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Ensure proper ref count of underlying ocx
Using index info to reconstruct a base tree...
A src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/AxHost.cs
M src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxHostTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxHostTests.cs
Auto-merging src/System.Windows.Forms/src/System/Windows/Forms/AxHost.cs
CONFLICT (content): Merge conflict in src/System.Windows.Forms/src/System/Windows/Forms/AxHost.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Ensure proper ref count of underlying ocx
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
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 #12056
We had missed a release in
CreateWithoutLicense, causing the underlying ocx to linger afterAxHostcontrol disposal. Made the same adjustment forCreateWithLicense. While investigating also noticed a missing release forShowPropertyPagesso fixed this as well. Regression test has been added for this issue scenario.Microsoft Reviewers: Open in CodeFlow