Project classes implementing generics and Project arrays #2096
Conversation
manodasanW
commented
Oct 28, 2025
manodasanW
commented
- Added support for projecting classes implementing generics
- Added support for projecting arrays
- Ported all the additions to the new format.
- To avoid having them as all manual projections, I added support for partial additions which basically cswinrt will generate the type with partial and we will add the addition as another partial type. This is mostly for types which just had a custom ToString that they wanted to add.
- Enabled all the projections and address issues encountered.
- Moved most event sources to respective ABI namespace to avoid hard coding in cswinrt.exe
src/Projections/Windows.UI.Xaml/ABI.Windows.System/DispatcherQueueProxyHandler.cs
Outdated
Show resolved
Hide resolved
src/cswinrt/strings/additions/Windows.Storage.Streams/WellKnownStreamInterfaceIIDs.cs
Outdated
Show resolved
Hide resolved
src/WinRT.Runtime2/InteropServices/ProjectionDllExports/TokenizerHelper.cs
Show resolved
Hide resolved
| { | ||
| public override string ToString() | ||
| { | ||
| return string.Concat("GeneratorPosition (", Index.ToString(global::System.Globalization.CultureInfo.InvariantCulture), ",", Offset.ToString(global::System.Globalization.CultureInfo.InvariantCulture), ")"); |
There was a problem hiding this comment.
We can optimize this with an interpolated string builder. I'll do this in a separate PR, want to experiment with exposing a custom handler from the runtime so that we can reuse it in all these places where we just always do invariant culture formatting.
...itions/Microsoft.UI.Xaml.Media.Animation/Microsoft.UI.Xaml.Media.Animation.RepeatBehavior.cs
Outdated
Show resolved
Hide resolved
|
|
||
| case RepeatBehaviorType.Count: | ||
|
|
||
| global::System.Text.StringBuilder sb = new global::System.Text.StringBuilder(); |
There was a problem hiding this comment.
Also we should set SkipLocalsInit for all projection .dlls if we don't already. At least the merged .dll, as we own it.
...trings/additions/Microsoft.UI.Xaml.Media.Media3D/Microsoft.UI.Xaml.Media.Media3D.Matrix3D.cs
Outdated
Show resolved
Hide resolved
| // the transform is identity by default | ||
| private static Matrix s_identity = CreateIdentity(); | ||
|
|
||
| public static Matrix Identity |
There was a problem hiding this comment.
@tannergooding is there something smart we could do here like creating a BCL matrix and reinterpreting it or something, rather than storing this value in a static field like this?
|
|
||
| w.write(R"( | ||
| %IEnumerator<%> %GetEnumerator() => %.GetEnumerator(%); | ||
| [UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "GetEnumerator")] | ||
| static extern IEnumerator<%> %GetEnumerator([UnsafeAccessorType("ABI.System.Collections.Generic.<#CsWinRT>IEnumerableMethods`1<<#corlib>System-ComponentModel-DataErrorsChangedEventArgs>, WinRT.Interop.dll")] object _, WindowsRuntimeObjectReference objRef); |
There was a problem hiding this comment.
Generic mangled names use ' for the generic arity prefix, not the backtick (we changed it as it broke ILSpy) 😄
| _m31, _m32, _m33, _m34, | ||
| _offsetX, _offsetY, _offsetZ, _m44); | ||
| char separator = global::WindowsRuntime.InteropServices.TokenizerHelper.GetNumericListSeparator(provider); | ||
| DefaultInterpolatedStringHandler handler = new(0, 31, provider, stackalloc char[64]); |
There was a problem hiding this comment.
Not entirely sure 64 is enough, can we double check what's the average length of this text and adjust the scratch buffer? If it's 256 or less we can use that, otherwise we can skip it entirely if it won't be enough anyway, to avoid the extra copy.
| OffsetX, | ||
| OffsetY); | ||
| char separator = global::WindowsRuntime.InteropServices.TokenizerHelper.GetNumericListSeparator(provider); | ||
| DefaultInterpolatedStringHandler handler = new(0, 11, provider, stackalloc char[64]); |
There was a problem hiding this comment.
Same here as above, we might want to tweak the scratch buffer size.
