Skip to content

Check for the return value of native SetParent calls in Control class #2262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RussKie merged 11 commits into from
Dec 4, 2019
+214 −94
Merged

Check for the return value of native SetParent calls in Control class #2262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6d399f4
Check the result of native SetParent in Control.
chenxinyanc Oct 31, 2019
6b8a346
Typo fix.
chenxinyanc Oct 31, 2019
f8b0514
Also apply checks in ActiveXImpl.
chenxinyanc Oct 31, 2019
9fe0d5f
Resolve comment.
chenxinyanc Nov 4, 2019
21afb52
Resolve comment.
chenxinyanc Nov 5, 2019
2d17728
Resolve comment.
chenxinyanc Nov 5, 2019
35448e5
Introduce some more aggressive refactor in RecreateHandleCore.
chenxinyanc Nov 11, 2019
3e51fe9
Resolve comment.
chenxinyanc Nov 11, 2019
710d135
Restore lock statement.
chenxinyanc Nov 11, 2019
4ac0fed
We still need created variable.
chenxinyanc Nov 11, 2019
e7d4a08
Fix rebase error.
chenxinyanc Dec 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Common/src/Interop/User32/Interop.SetParent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ internal static partial class Interop
{
internal static partial class User32
{
[DllImport(Libraries.User32, ExactSpelling = true)]
[DllImport(Libraries.User32, ExactSpelling = true, SetLastError = true)]
public static extern IntPtr SetParent(IntPtr hWndChild, IntPtr hWndChildNewParent);

public static IntPtr SetParent(IntPtr hWndChild, HandleRef hWndChildNewParent)
Expand Down
5 changes: 4 additions & 1 deletion src/System.Windows.Forms/src/Resources/SR.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4513,7 +4513,7 @@ Stack trace where the illegal operation occurred was:
</data>
<data name="PrintPreviewDialog_PrintPreview" xml:space="preserve">
<value>Print preview</value>
</data>
</data>
<data name="PrintPreviewDocumentDescr" xml:space="preserve">
<value>PrintDocument to be previewed.</value>
</data>
Expand Down Expand Up @@ -6653,4 +6653,7 @@ Stack trace where the illegal operation occurred was:
<data name="DefaultUpDownButtonsAccessibleName" xml:space="preserve">
<value>UpDown</value>
</data>
<data name="Win32SetParentFailed" xml:space="preserve">
<value>Failed to set Win32 parent window of the Control.</value>
</data>
</root>
5 changes: 5 additions & 0 deletions src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion src/System.Windows.Forms/src/System/Windows/Forms/Control.ActiveXImpl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,10 @@ internal unsafe void InPlaceActivate(Ole32.OLEIVERB verb)
// If it doesn't, that means that the host
// won't reflect messages back to us.
HWNDParent = hwndParent;
User32.SetParent(new HandleRef(_control, _control.Handle), hwndParent);
if (User32.SetParent(new HandleRef(_control, _control.Handle), hwndParent) == IntPtr.Zero)
Copy link
Copy Markdown
Contributor

@RussKie RussKie Nov 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hughbe look like we overlooked an overload public static IntPtr SetParent(IHandle hWndChild, IHandle hWndChildNewParent)

{
throw new Win32Exception(Marshal.GetLastWin32Error(), SR.Win32SetParentFailed);
}

// Now create our handle if it hasn't already been done.
_control.CreateControl();
Expand Down
Loading