Fix scenarios where the managed object which the event handler is reg…

…istered on is gone. (#795)
microsoft · Apr 8, 2021 · 2c38175 · 2c38175
1 parent 7d70258
commit 2c38175
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/src/WinRT.Runtime/Projections/ICommand.net5.cs b/src/WinRT.Runtime/Projections/ICommand.net5.cs
@@ -252,7 +252,7 @@ private static unsafe int Do_Abi_remove_CanExecuteChanged_1(IntPtr thisPtr, glob
                 try
                 {
                     var __this = global::WinRT.ComWrappersSupport.FindObject<global::System.Windows.Input.ICommand>(thisPtr);
-                    if (_CanExecuteChanged_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(token, out var __handler))
+                    if (__this != null && _CanExecuteChanged_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(token, out var __handler))
                     {
                         __this.CanExecuteChanged -= __handler;
                     }

diff --git a/src/WinRT.Runtime/Projections/ICommand.netstandard2.0.cs b/src/WinRT.Runtime/Projections/ICommand.netstandard2.0.cs
@@ -237,7 +237,7 @@ private static unsafe int Do_Abi_remove_CanExecuteChanged_1(IntPtr thisPtr, glob
                 try
                 {
                     var __this = global::WinRT.ComWrappersSupport.FindObject<global::System.Windows.Input.ICommand>(thisPtr);
-                    if (_CanExecuteChanged_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(token, out var __handler))
+                    if (__this != null && _CanExecuteChanged_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(token, out var __handler))
                     {
                         __this.CanExecuteChanged -= __handler;
                     }

diff --git a/src/WinRT.Runtime/Projections/INotifyCollectionChanged.net5.cs b/src/WinRT.Runtime/Projections/INotifyCollectionChanged.net5.cs
@@ -67,7 +67,7 @@ private static unsafe int Do_Abi_remove_CollectionChanged_1(IntPtr thisPtr, glob
                 try
                 {
                     var __this = global::WinRT.ComWrappersSupport.FindObject<global::System.Collections.Specialized.INotifyCollectionChanged>(thisPtr);
-                    if (_CollectionChanged_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(token, out var __handler))
+                    if (__this != null && _CollectionChanged_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(token, out var __handler))
                     {
                         __this.CollectionChanged -= __handler;
                     }

diff --git a/src/WinRT.Runtime/Projections/INotifyCollectionChanged.netstandard2.0.cs b/src/WinRT.Runtime/Projections/INotifyCollectionChanged.netstandard2.0.cs
@@ -74,7 +74,7 @@ private static unsafe int Do_Abi_remove_CollectionChanged_1(IntPtr thisPtr, glob
                 try
                 {
                     var __this = global::WinRT.ComWrappersSupport.FindObject<global::System.Collections.Specialized.INotifyCollectionChanged>(thisPtr);
-                    if (_CollectionChanged_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(token, out var __handler))
+                    if (__this != null && _CollectionChanged_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(token, out var __handler))
                     {
                         __this.CollectionChanged -= __handler;
                     }

diff --git a/src/WinRT.Runtime/Projections/INotifyDataErrorInfo.net5.cs b/src/WinRT.Runtime/Projections/INotifyDataErrorInfo.net5.cs
@@ -108,7 +108,7 @@ private static unsafe int Do_Abi_remove_ErrorsChanged_2(IntPtr thisPtr, global::
                 try
                 {
                     var __this = global::WinRT.ComWrappersSupport.FindObject<global::System.ComponentModel.INotifyDataErrorInfo>(thisPtr);
-                    if (_ErrorsChanged_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(token, out var __handler))
+                    if (__this != null && _ErrorsChanged_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(token, out var __handler))
                     {
                         __this.ErrorsChanged -= __handler;
                     }

diff --git a/src/WinRT.Runtime/Projections/INotifyDataErrorInfo.netstandard2.0.cs b/src/WinRT.Runtime/Projections/INotifyDataErrorInfo.netstandard2.0.cs
@@ -134,7 +134,7 @@ private static unsafe int Do_Abi_remove_ErrorsChanged_2(IntPtr thisPtr, global::
                 try
                 {
                     var __this = global::WinRT.ComWrappersSupport.FindObject<global::System.ComponentModel.INotifyDataErrorInfo>(thisPtr);
-                    if (_ErrorsChanged_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(token, out var __handler))
+                    if (__this != null && _ErrorsChanged_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(token, out var __handler))
                     {
                         __this.ErrorsChanged -= __handler;
                     }

diff --git a/src/WinRT.Runtime/Projections/INotifyPropertyChanged.net5.cs b/src/WinRT.Runtime/Projections/INotifyPropertyChanged.net5.cs
@@ -66,7 +66,7 @@ private static unsafe int Do_Abi_remove_PropertyChanged_1(IntPtr thisPtr, global
                 try
                 {
                     var __this = global::WinRT.ComWrappersSupport.FindObject<global::System.ComponentModel.INotifyPropertyChanged>(thisPtr);
-                    if (_PropertyChanged_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(token, out var __handler))
+                    if (__this != null && _PropertyChanged_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(token, out var __handler))
                     {
                         __this.PropertyChanged -= __handler;
                     }

diff --git a/src/WinRT.Runtime/Projections/INotifyPropertyChanged.netstandard2.0.cs b/src/WinRT.Runtime/Projections/INotifyPropertyChanged.netstandard2.0.cs
@@ -74,7 +74,7 @@ private static unsafe int Do_Abi_remove_PropertyChanged_1(IntPtr thisPtr, global
                 try
                 {
                     var __this = global::WinRT.ComWrappersSupport.FindObject<global::System.ComponentModel.INotifyPropertyChanged>(thisPtr);
-                    if (_PropertyChanged_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(token, out var __handler))
+                    if (__this != null && _PropertyChanged_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(token, out var __handler))
                     {
                         __this.PropertyChanged -= __handler;
                     }

diff --git a/src/cswinrt/code_writers.h b/src/cswinrt/code_writers.h
@@ -4428,7 +4428,7 @@ private static unsafe int Do_Abi_%%
 try
 {
 var __this = global::WinRT.ComWrappersSupport.FindObject<%>(thisPtr);
-if(_%_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(%, out var __handler))
+if(__this != null && _%_TokenTables.TryGetValue(__this, out var __table) && __table.RemoveEventHandler(%, out var __handler))
 {
 __this.% -= __handler;
 }