From e176eb9bf6ed97e2de415c5e909c628d25be15df Mon Sep 17 00:00:00 2001 From: Scott Jones Date: Thu, 25 Jun 2020 11:46:23 -0700 Subject: [PATCH 1/2] WUX -> MUX INotify* GUIDs changed --- .../Projections/INotifyCollectionChanged.cs | 6 +++--- .../Projections/INotifyPropertyChanged.cs | 6 +++--- .../NotifyCollectionChangedEventArgs.cs | 14 +++++++------- .../NotifyCollectionChangedEventHandler.cs | 4 ++-- .../Projections/PropertyChangedEventArgs.cs | 10 +++++----- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/WinRT.Runtime/Projections/INotifyCollectionChanged.cs b/WinRT.Runtime/Projections/INotifyCollectionChanged.cs index 9e92de782..4b4e799b1 100644 --- a/WinRT.Runtime/Projections/INotifyCollectionChanged.cs +++ b/WinRT.Runtime/Projections/INotifyCollectionChanged.cs @@ -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; diff --git a/WinRT.Runtime/Projections/INotifyPropertyChanged.cs b/WinRT.Runtime/Projections/INotifyPropertyChanged.cs index 70e896fe8..d5fdfc1da 100644 --- a/WinRT.Runtime/Projections/INotifyPropertyChanged.cs +++ b/WinRT.Runtime/Projections/INotifyPropertyChanged.cs @@ -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 { diff --git a/WinRT.Runtime/Projections/NotifyCollectionChangedEventArgs.cs b/WinRT.Runtime/Projections/NotifyCollectionChangedEventArgs.cs index a5cb8f023..d54810c5b 100644 --- a/WinRT.Runtime/Projections/NotifyCollectionChangedEventArgs.cs +++ b/WinRT.Runtime/Projections/NotifyCollectionChangedEventArgs.cs @@ -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 { @@ -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 { diff --git a/WinRT.Runtime/Projections/NotifyCollectionChangedEventHandler.cs b/WinRT.Runtime/Projections/NotifyCollectionChangedEventHandler.cs index 69a016d6c..d539114b1 100644 --- a/WinRT.Runtime/Projections/NotifyCollectionChangedEventHandler.cs +++ b/WinRT.Runtime/Projections/NotifyCollectionChangedEventHandler.cs @@ -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); diff --git a/WinRT.Runtime/Projections/PropertyChangedEventArgs.cs b/WinRT.Runtime/Projections/PropertyChangedEventArgs.cs index 44e9dd143..027151d1e 100644 --- a/WinRT.Runtime/Projections/PropertyChangedEventArgs.cs +++ b/WinRT.Runtime/Projections/PropertyChangedEventArgs.cs @@ -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 { From 125f9ef843c535f3452dee4ef232214764a6bbad Mon Sep 17 00:00:00 2001 From: Scott Jones Date: Thu, 25 Jun 2020 12:53:42 -0700 Subject: [PATCH 2/2] fixed INPC issues --- WinRT.Runtime/Projections/INotifyPropertyChanged.cs | 3 ++- WinRT.Runtime/Projections/PropertyChangedEventHandler.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WinRT.Runtime/Projections/INotifyPropertyChanged.cs b/WinRT.Runtime/Projections/INotifyPropertyChanged.cs index d5fdfc1da..e1672d7b4 100644 --- a/WinRT.Runtime/Projections/INotifyPropertyChanged.cs +++ b/WinRT.Runtime/Projections/INotifyPropertyChanged.cs @@ -34,7 +34,8 @@ static unsafe Vftbl() AbiToProjectionVftablePtr = (IntPtr)nativeVftbl; } - private static global::System.Runtime.CompilerServices.ConditionalWeakTable> _PropertyChanged_TokenTables; + private static global::System.Runtime.CompilerServices.ConditionalWeakTable> _PropertyChanged_TokenTables = new global::System.Runtime.CompilerServices.ConditionalWeakTable>(); + private static unsafe int Do_Abi_add_PropertyChanged_0(IntPtr thisPtr, IntPtr handler, out global::WinRT.EventRegistrationToken token) { token = default; diff --git a/WinRT.Runtime/Projections/PropertyChangedEventHandler.cs b/WinRT.Runtime/Projections/PropertyChangedEventHandler.cs index 5171381d7..8a69f01c2 100644 --- a/WinRT.Runtime/Projections/PropertyChangedEventHandler.cs +++ b/WinRT.Runtime/Projections/PropertyChangedEventHandler.cs @@ -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);