Unhook WinEvents on automation thread

(Trying to prevent Excel 2016 exit crash)

Author: govert

Source/ExcelDna.IntelliSense.Host/ExcelDna.IntelliSense.Host.csproj

@@ -72,7 +72,8 @@ xcopy "$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDna.xll" "$(Targ
 xcopy "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn.dna*" "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn64.dna*" /C /Y
 xcopy "$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDna64.xll" "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn64.xll*" /C /Y
 "$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDnaPack.exe" "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn.dna" /Y /O "$(TargetDir)ExcelDna.IntelliSense.xll"
-"$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDnaPack.exe" "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn64.dna" /Y /O "$(TargetDir)ExcelDna.IntelliSense64.xll"</PostBuildEvent>
+"$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDnaPack.exe" "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn64.dna" /Y /O "$(TargetDir)ExcelDna.IntelliSense64.xll"
+xcopy "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn.xll.config" "$(TargetDir)ExcelDna.IntelliSense.xll.config"</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Source/ExcelDna.IntelliSense/UIMonitor/WinEvents.cs

@@ -101,15 +101,25 @@ public WinEventHook(WinEvent eventMin, WinEvent eventMax, SynchronizationContext
                 // Is SetLastError used? - SetWinEventHook documentation does not indicate so
                 throw new Win32Exception("SetWinEventHook failed");
             }
-            Logger.WinEvents.Info($"SetWinEventHook success");
+            Logger.WinEvents.Info($"SetWinEventHook success on thread {Thread.CurrentThread.ManagedThreadId}");
         }
 
         // This runs on the Excel main thread - get off quickly
         void HandleWinEvent(IntPtr hWinEventHook, WinEvent eventType, IntPtr hWnd, 
-                        int idObject, int idChild, uint dwEventThread, uint dwmsEventTime)
+                            int idObject, int idChild, uint dwEventThread, uint dwmsEventTime)
         {
-            // CONSIDER: We might add some filtering here... maybe only interested in some of the window / event combinations
-            _syncContextAuto.Post(OnWinEventReceived, new WinEventArgs(eventType, hWnd, idObject, idChild, dwEventThread, dwmsEventTime));
+            try
+            {
+                if (disposedValue)
+                    return;
+
+                // CONSIDER: We might add some filtering here... maybe only interested in some of the window / event combinations
+                _syncContextAuto.Post(OnWinEventReceived, new WinEventArgs(eventType, hWnd, idObject, idChild, dwEventThread, dwmsEventTime));
+            }
+            catch (Exception ex)
+            {
+                Logger.WinEvents.Warn($"HandleWinEvent Exception {ex}");
+            }
         }
 
         // Runs on our Automation thread (via SyncContext passed into the constructor)
@@ -128,13 +138,24 @@ protected virtual void Dispose(bool disposing)
         {
             if (!disposedValue)
             {
+                Logger.WinEvents.Info($"WinEventHook Dispose on thread {Thread.CurrentThread.ManagedThreadId}");
                 if (disposing)
                 {
                     // TODO: dispose managed state (managed objects).
                 }
-
-                Logger.WinEvents.Info($"UnhookWinEvent");
-                UnhookWinEvent(_hWinEventHook);
+                _syncContextAuto.Post(winEventHook =>
+                {
+                    try
+                    {
+                        Logger.WinEvents.Info($"UnhookWinEvent called on thread {Thread.CurrentThread.ManagedThreadId}");
+                        bool result = UnhookWinEvent((IntPtr)winEventHook);
+                        Logger.WinEvents.Info($"UnhookWinEvent result {result}");
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.WinEvents.Warn($"UnhookWinEvent Exception {ex}");
+                    }
+                }, _hWinEventHook);
 
                 disposedValue = true;
             }