Migrate TaskDialogIndirect to CsWin32 #9900

elachlan · 2023-09-13T00:46:46Z

Related: #9825

We are waiting on some Win32MetaData changes to bubble into CsWin32 before I can complete this.

Currently blocked by microsoft/CsWin32#1020 which added BOOL.ToString clashing with our implementation but returning the hex value as a string instead of True/False.

Microsoft Reviewers: Open in CodeFlow

elachlan · 2023-09-14T00:47:32Z

@JeremyKuhne any suggestions on the BOOL.ToString() clash? Should we rename our implementation, or should we fix it upstream in CsWin32?

JeremyKuhne · 2023-10-05T17:59:53Z

@elachlan I'd just remove ours and have everything do ((bool)value).ToString().

elachlan · 2023-10-09T09:22:01Z

@AArnott could you please bump the CsWin32 Win32Metadata SDK version?

AArnott · 2023-10-09T18:49:15Z

@elachlan I have a local change where I started the work to update the metadata, but some breaking changes in the metadata made it more challenging than usual, so I set it aside. I'll pick it back up and see what I can do.

AArnott · 2023-10-09T19:29:54Z

Metadata update coming: microsoft/CsWin32#1063

elachlan · 2023-10-09T20:12:38Z

Thank you!

elachlan · 2023-10-23T23:35:30Z

@lonitra can you please have a look?

src/System.Windows.Forms.Primitives/src/Windows/Win32/UI/Controls/ToolInfoWrapper.cs

lonitra · 2023-10-24T02:14:28Z

I will take a look this week

lonitra

Great work here! My main concern here is making the .Anonymous more readable

....Windows.Forms.Primitives/tests/UnitTests/Interop/ComCtl32/TASKDIALOGCONFIGIconUnionTests.cs

src/System.Windows.Forms/src/System/Windows/Forms/TaskDialog.cs

lonitra · 2023-10-24T17:33:20Z

src/System.Windows.Forms/src/System/Windows/Forms/TaskDialog.cs

-        IntPtr wParam,
-        IntPtr lParam,
-        IntPtr lpRefData) =>
+        uint msg,


Any reason we didn't keep this as TASKDIALOG_NOTIFICATIONS?

To match the pfcallback signature of the TASKDIALOGCONFIG struct. Which changed when we switched to using the cswin32 generated struct. See line 1330.

It might make sense to update win32metadata based on the doc.
https://learn.microsoft.com/en-us/windows/win32/api/commctrl/nc-commctrl-pftaskdialogcallback

Based on docs that does seem to make sense. Could you open an issue there and perhaps also add a comment here to update this when that issue is resolved and cswin32 has consumed the fix? I think we'd probably get an error anyways once we update cswin32 version that has that fix, but it doesn't hurt.

Issue raised at: microsoft/win32metadata#1733

I am unsure if it will be accepted. But I think we are now allowing enums to group the constants and then adding an attribute to point to the enum for cswin32 to consume. This is instead of using the enum directly, to avoid issues.

Ok, we managed to get the issue resolved and now I guess we wait for a cswin32 update?

Pinged for a cswin32 update to consume latest metadata. Will circle back to this to review changes soon

Based on the commit history, we need to use v57 and cswin32 is using v56.

Oops 🤦‍♀️ v57 is not released yet so we would need to wait on that.. Once that is released we can follow steps in cswin32 readme to use newer metadata to avoid waiting for cswin32 to consume. Alternatively if we'd rather not wait we can leave as is and create tracking issue to bump and update this code when v57 is released.

Tracking issue is good:
#10348

src/System.Windows.Forms.Primitives/src/Windows/Win32/UI/Controls/ToolInfoWrapper.cs

src/System.Windows.Forms.Primitives/src/Windows/Win32/UI/Controls/TASKDIALOGCONFIG.cs

src/System.Windows.Forms.Primitives/src/Windows/Win32/UI/Controls/TVINSERTSTRUCTW.cs

src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/ComCtl32/TASKDIALOGCONFIGTests.cs

eng/Versions.props

....Windows.Forms.Primitives/tests/UnitTests/Interop/ComCtl32/TASKDIALOGCONFIGIconUnionTests.cs

lonitra

👍

Tanya-Solyanik

@elachlan - seem like https://github.com/dotnet/winforms/pull/9900/files#r1374857146 is not addressed, are we waiting on something to implement it?

src/System.Windows.Forms.Primitives/src/Windows/Win32/UI/Controls/ToolInfoWrapper.cs

src/System.Windows.Forms/src/System/Windows/Forms/Dialogs/TaskDialog/TaskDialogButton.cs

....Windows.Forms.Primitives/tests/UnitTests/Interop/ComCtl32/TASKDIALOGCONFIGIconUnionTests.cs

src/System.Windows.Forms/src/System/Windows/Forms/Dialogs/TaskDialog/TaskDialogButton.cs

elachlan · 2023-11-28T23:03:19Z

Thank you for pushing through with the reviews!

ghost assigned elachlan Sep 13, 2023

ghost added the draft draft PR label Sep 13, 2023

elachlan force-pushed the CsWin32-TaskDialogIndirect branch from af12fdd to 6adaebc Compare October 23, 2023 23:35

elachlan commented Oct 23, 2023

View reviewed changes

src/System.Windows.Forms.Primitives/src/Windows/Win32/UI/Controls/ToolInfoWrapper.cs Show resolved Hide resolved

elachlan marked this pull request as ready for review October 24, 2023 00:04

elachlan requested a review from a team as a code owner October 24, 2023 00:04

lonitra removed the draft draft PR label Oct 24, 2023

lonitra reviewed Oct 24, 2023

View reviewed changes

lonitra added the 📭 waiting-author-feedback The team requires more information from the author label Oct 24, 2023

ghost removed the 📭 waiting-author-feedback The team requires more information from the author label Oct 25, 2023

lonitra added the 📭 waiting-author-feedback The team requires more information from the author label Oct 27, 2023

ghost removed the 📭 waiting-author-feedback The team requires more information from the author label Oct 31, 2023

elachlan force-pushed the CsWin32-TaskDialogIndirect branch from 6b7d44c to ebb5cbc Compare November 14, 2023 04:02

elachlan requested a review from lonitra November 14, 2023 08:39

lonitra reviewed Nov 15, 2023

View reviewed changes

lonitra added the 📭 waiting-author-feedback The team requires more information from the author label Nov 15, 2023

ghost removed the 📭 waiting-author-feedback The team requires more information from the author label Nov 15, 2023

elachlan requested a review from lonitra November 16, 2023 01:02

lonitra added the 📭 waiting-author-feedback The team requires more information from the author label Nov 17, 2023

elachlan added 3 commits November 21, 2023 10:54

Migrate TaskDialogIndirect to CsWin32

335f33a

Update CsWin32 and migrate the rest of ComCtl32

4c2570c

Fix usings and tests

1b81133

elachlan added 5 commits November 21, 2023 10:54

Fix error

d3526e7

changes from review

ac98775

Changes from review

2419946

change from review

1449a03

Fix tests

2627884

elachlan force-pushed the CsWin32-TaskDialogIndirect branch from 51a6d8e to 2627884 Compare November 21, 2023 00:59

ghost removed the 📭 waiting-author-feedback The team requires more information from the author label Nov 21, 2023

elachlan mentioned this pull request Nov 21, 2023

[Tracking] Update TaskDialog HandleTaskDialogNativeCallback code when CsWin32 is updated to use Win32MetaData v57 #10348

Open

lonitra previously approved these changes Nov 21, 2023

View reviewed changes

lonitra added the ready-to-merge PRs that are ready to merge but worth notifying the internal team. label Nov 21, 2023

Tanya-Solyanik reviewed Nov 22, 2023

View reviewed changes

src/System.Windows.Forms.Primitives/src/Windows/Win32/UI/Controls/ToolInfoWrapper.cs Outdated Show resolved Hide resolved

src/System.Windows.Forms/src/System/Windows/Forms/Dialogs/TaskDialog/TaskDialogButton.cs Outdated Show resolved Hide resolved

Tanya-Solyanik removed the ready-to-merge PRs that are ready to merge but worth notifying the internal team. label Nov 22, 2023

Changes from review

2c365f4

elachlan dismissed lonitra’s stale review via 2c365f4 November 22, 2023 23:33

Add alias to tests

4e36639

Tanya-Solyanik previously approved these changes Nov 28, 2023

View reviewed changes

Tanya-Solyanik added the ready-to-merge PRs that are ready to merge but worth notifying the internal team. label Nov 28, 2023

lonitra requested changes Nov 28, 2023

View reviewed changes

....Windows.Forms.Primitives/tests/UnitTests/Interop/ComCtl32/TASKDIALOGCONFIGIconUnionTests.cs Show resolved Hide resolved

src/System.Windows.Forms/src/System/Windows/Forms/Dialogs/TaskDialog/TaskDialogButton.cs Outdated Show resolved Hide resolved

ghost added the 📭 waiting-author-feedback The team requires more information from the author label Nov 28, 2023

lonitra removed the ready-to-merge PRs that are ready to merge but worth notifying the internal team. label Nov 28, 2023

changes from review

a0c4a6a

elachlan dismissed Tanya-Solyanik’s stale review via a0c4a6a November 28, 2023 22:00

ghost removed the 📭 waiting-author-feedback The team requires more information from the author label Nov 28, 2023

lonitra approved these changes Nov 28, 2023

View reviewed changes

lonitra enabled auto-merge (squash) November 28, 2023 22:02

lonitra merged commit 85c155e into dotnet:main Nov 28, 2023
8 of 9 checks passed

ghost added this to the 9.0 Preview1 milestone Nov 28, 2023

elachlan deleted the CsWin32-TaskDialogIndirect branch November 28, 2023 23:03

github-actions bot locked and limited conversation to collaborators Dec 29, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate TaskDialogIndirect to CsWin32 #9900

Migrate TaskDialogIndirect to CsWin32 #9900

elachlan commented Sep 13, 2023 •

edited

Loading

elachlan commented Sep 14, 2023

JeremyKuhne commented Oct 5, 2023

elachlan commented Oct 9, 2023

AArnott commented Oct 9, 2023

AArnott commented Oct 9, 2023

elachlan commented Oct 9, 2023

elachlan commented Oct 23, 2023

lonitra commented Oct 24, 2023

lonitra left a comment

lonitra Oct 24, 2023

elachlan Oct 26, 2023

elachlan Oct 26, 2023

lonitra Oct 27, 2023

elachlan Oct 31, 2023

elachlan Nov 14, 2023

lonitra Nov 14, 2023 •

edited

Loading

elachlan Nov 15, 2023

lonitra Nov 17, 2023

elachlan Nov 21, 2023

lonitra left a comment

Tanya-Solyanik left a comment

elachlan commented Nov 28, 2023

Migrate TaskDialogIndirect to CsWin32 #9900

Migrate TaskDialogIndirect to CsWin32 #9900

Conversation

elachlan commented Sep 13, 2023 • edited Loading

Microsoft Reviewers: Open in CodeFlow

elachlan commented Sep 14, 2023

JeremyKuhne commented Oct 5, 2023

elachlan commented Oct 9, 2023

AArnott commented Oct 9, 2023

AArnott commented Oct 9, 2023

elachlan commented Oct 9, 2023

elachlan commented Oct 23, 2023

lonitra commented Oct 24, 2023

lonitra left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lonitra Nov 14, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lonitra left a comment

Choose a reason for hiding this comment

Tanya-Solyanik left a comment

Choose a reason for hiding this comment

elachlan commented Nov 28, 2023

elachlan commented Sep 13, 2023 •

edited

Loading

lonitra Nov 14, 2023 •

edited

Loading