Skip to content
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

Jump to bottom

Replace INotify*-related IIDs with MUX versions, fix NRE crash on uninitialized CWT #331

Merged
merged 2 commits into from
Jun 25, 2020
Merged

Replace INotify*-related IIDs with MUX versions, fix NRE crash on uninitialized CWT #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e176eb9
WUX -> MUX INotify* GUIDs changed
Scottj1s Jun 25, 2020
125f9ef
fixed INPC issues
Scottj1s Jun 25, 2020
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
6 changes: 3 additions & 3 deletions WinRT.Runtime/Projections/INotifyCollectionChanged.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
using WinRT.Interop;

namespace ABI.System.Collections.Specialized
{
{
[global::WinRT.ObjectReferenceWrapper(nameof(_obj)), EditorBrowsable(EditorBrowsableState.Never)]
[Guid("28B167D5-1A31-465B-9B25-D5C3AE686C40")]
[Guid("530155E1-28A5-5693-87CE-30724D95A06D")]
public class INotifyCollectionChanged : global::System.Collections.Specialized.INotifyCollectionChanged
{
[Guid("28B167D5-1A31-465B-9B25-D5C3AE686C40")]
[Guid("530155E1-28A5-5693-87CE-30724D95A06D")]
public struct Vftbl
{
internal IInspectable.Vftbl IInspectableVftbl;
Expand Down
9 changes: 5 additions & 4 deletions WinRT.Runtime/Projections/INotifyPropertyChanged.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
using WinRT.Interop;

namespace ABI.System.ComponentModel
{
{
[global::WinRT.ObjectReferenceWrapper(nameof(_obj)), global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
[Guid("CF75D69C-F2F4-486B-B302-BB4C09BAEBFA")]
[Guid("90B17601-B065-586E-83D9-9ADC3A695284")]
public class INotifyPropertyChanged : global::System.ComponentModel.INotifyPropertyChanged
{
[Guid("CF75D69C-F2F4-486B-B302-BB4C09BAEBFA")]
[Guid("90B17601-B065-586E-83D9-9ADC3A695284")]
[StructLayout(LayoutKind.Sequential)]
public struct Vftbl
{
Expand All @@ -34,7 +34,8 @@ static unsafe Vftbl()
AbiToProjectionVftablePtr = (IntPtr)nativeVftbl;
}

private static global::System.Runtime.CompilerServices.ConditionalWeakTable<global::System.ComponentModel.INotifyPropertyChanged, global::WinRT.EventRegistrationTokenTable<global::System.ComponentModel.PropertyChangedEventHandler>> _PropertyChanged_TokenTables;
private static global::System.Runtime.CompilerServices.ConditionalWeakTable<global::System.ComponentModel.INotifyPropertyChanged, global::WinRT.EventRegistrationTokenTable<global::System.ComponentModel.PropertyChangedEventHandler>> _PropertyChanged_TokenTables = new global::System.Runtime.CompilerServices.ConditionalWeakTable<global::System.ComponentModel.INotifyPropertyChanged, global::WinRT.EventRegistrationTokenTable<global::System.ComponentModel.PropertyChangedEventHandler>>();

private static unsafe int Do_Abi_add_PropertyChanged_0(IntPtr thisPtr, IntPtr handler, out global::WinRT.EventRegistrationToken token)
{
token = default;
Expand Down
14 changes: 7 additions & 7 deletions WinRT.Runtime/Projections/NotifyCollectionChangedEventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
using WinRT.Interop;

namespace ABI.Microsoft.UI.Xaml.Interop
{
{
[global::WinRT.ObjectReferenceWrapper(nameof(_obj))]
[Guid("4CF68D33-E3F2-4964-B85E-945B4F7E2F21")]
[Guid("DA049FF2-D2E0-5FE8-8C7B-F87F26060B6F")]
internal class INotifyCollectionChangedEventArgs
{
[Guid("4CF68D33-E3F2-4964-B85E-945B4F7E2F21")]
[Guid("DA049FF2-D2E0-5FE8-8C7B-F87F26060B6F")]
[StructLayout(LayoutKind.Sequential)]
public struct Vftbl
{
Expand Down Expand Up @@ -107,14 +107,14 @@ internal static class INotifyCollectionChangedEventArgs_Delegates
public unsafe delegate int get_Action_0(IntPtr thisPtr, out global::System.Collections.Specialized.NotifyCollectionChangedAction value);
public unsafe delegate int get_NewItems_1(IntPtr thisPtr, out IntPtr value);
public unsafe delegate int get_OldItems_2(IntPtr thisPtr, out IntPtr value);
}

}


[global::WinRT.ObjectReferenceWrapper(nameof(_obj))]
[Guid("B30C3E3A-DF8D-44A5-9A38-7AC0D08CE63D")]
[Guid("5108EBA4-4892-5A20-8374-A96815E0FD27")]
internal class WinRTNotifyCollectionChangedEventArgsRuntimeClassFactory
{
[Guid("B30C3E3A-DF8D-44A5-9A38-7AC0D08CE63D")]
[Guid("5108EBA4-4892-5A20-8374-A96815E0FD27")]
[StructLayout(LayoutKind.Sequential)]
public struct Vftbl
{
Expand Down
4 changes: 2 additions & 2 deletions WinRT.Runtime/Projections/NotifyCollectionChangedEventHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

namespace ABI.System.Collections.Specialized
{

[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
[Guid("CA10B37C-F382-4591-8557-5E24965279B0")]
[Guid("8B0909DC-2005-5D93-BF8A-725F017BAA8D")]
public static class NotifyCollectionChangedEventHandler
{
private unsafe delegate int Abi_Invoke(IntPtr thisPtr, IntPtr sender, IntPtr e);
Expand Down
10 changes: 5 additions & 5 deletions WinRT.Runtime/Projections/PropertyChangedEventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@

namespace ABI.Microsoft.UI.Xaml.Data
{
[Guid("4F33A9A0-5CF4-47A4-B16F-D7FAAF17457E")]
[Guid("63D0C952-396B-54F4-AF8C-BA8724A427BF")]
[StructLayout(LayoutKind.Sequential)]
internal struct IPropertyChangedEventArgsVftbl
{
internal IInspectable.Vftbl IInspectableVftbl;
public _get_PropertyAsString get_PropertyName_0;
}

}


[global::WinRT.ObjectReferenceWrapper(nameof(_obj))]
[Guid("6DCC9C03-E0C7-4EEE-8EA9-37E3406EEB1C")]
[Guid("7C0C27A8-0B41-5070-B160-FC9AE960A36C")]
internal class WinRTPropertyChangedEventArgsRuntimeClassFactory
{
[Guid("6DCC9C03-E0C7-4EEE-8EA9-37E3406EEB1C")]
[Guid("7C0C27A8-0B41-5070-B160-FC9AE960A36C")]
[StructLayout(LayoutKind.Sequential)]
public struct Vftbl
{
Expand Down
2 changes: 1 addition & 1 deletion WinRT.Runtime/Projections/PropertyChangedEventHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace ABI.System.ComponentModel
{
[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
[Guid("50F19C16-0A22-4D8E-A089-1EA9951657D2")]
[Guid("E3DE52F6-1E32-5DA6-BB2D-B5B6096C962D")]
public static class PropertyChangedEventHandler
{
private unsafe delegate int Abi_Invoke(IntPtr thisPtr, IntPtr sender, IntPtr e);
Expand Down