Merge pull request #4526 from comintern/next

Cull build warnings

Author: retailcoder

Rubberduck.CodeAnalysis/Inspections/Inspector.cs

@@ -250,12 +250,25 @@ private bool IsDisabled(CodeInspectionSettings config, IInspection inspection)
 
             public void Dispose()
             {
+                Dispose(true);
+                GC.SuppressFinalize(this);
+            }
+
+            private bool _isDisposed;
+            protected virtual void Dispose(bool disposing)
+            {
+                if (_isDisposed || !disposing)
+                {
+                    return;
+                }
+
                 if (_configService != null)
                 {
                     _configService.SettingsChanged -= ConfigServiceSettingsChanged;
                 }
 
-                _inspections.Clear();
+                _inspections.Clear(); 
+                _isDisposed = true;
             }
         }
     }

Rubberduck.Core/AppMenu.cs

@@ -71,6 +71,19 @@ public void Localize()
 
         public void Dispose()
         {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private bool _isDisposed;
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_isDisposed || !disposing)
+            {
+                return;
+            }
+            _isDisposed = true;
+
             _parser.State.StateChanged -= OnParserStateChanged;
             _selectionService.SelectedDeclarationChanged -= OnSelectedDeclarationChange;
 

Rubberduck.Core/AutoComplete/Service/AutoCompleteService.cs

@@ -147,6 +147,19 @@ private void HandleKeyDown(object sender, AutoCompleteEventArgs e)
 
         public void Dispose()
         {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private bool _isDisposed;
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_isDisposed || !disposing)
+            {
+                return;
+            }
+            _isDisposed = true;
+
             Disable();
             if (_configService != null)
             {

Rubberduck.Core/CodeAnalysis/CodeMetrics/CodeMetricsViewModel.cs

@@ -120,6 +120,19 @@ private void UpdateNodes(IEnumerable<CodeExplorerItemViewModel> oldList, IEnumer
 
         public void Dispose()
         {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private bool _isDisposed;
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_isDisposed || !disposing)
+            {
+                return;
+            }
+            _isDisposed = true;
+
             _state.StateChanged -= OnStateChanged;
         }
 

Rubberduck.Core/Common/Hotkeys/Hotkey.cs

@@ -33,7 +33,7 @@ public Hotkey(IntPtr hWndVbe, string key, CommandBase command, Keys secondKey =
         public Keys Combo { get; }
         public Keys SecondKey { get; }
         public bool IsTwoStepHotkey { get; }
-        public bool IsAttached => HotkeyInfo.HookId != IntPtr.Zero;
+        public bool IsAttached => HotkeyInfo.HookId != 0;
 
         public event EventHandler<HookEventArgs> MessageReceived;
 
@@ -69,9 +69,10 @@ public void Detach()
                 return;
             }
 
-            if (!User32.UnregisterHotKey(_hWndVbe, HotkeyInfo.HookId))
+            if (!User32.UnregisterHotKey(_hWndVbe, new IntPtr(HotkeyInfo.HookId)))
             {
-                Logger.Warn($"Error calling UnregisterHotKey on hokey with id {HotkeyInfo.HookId} for command of type {Command.GetType()}; the error was {Marshal.GetLastWin32Error()}; going to delete the atom anyway... The memory may leak.");
+                var error = Marshal.GetLastWin32Error();
+                Logger.Warn($"Error calling UnregisterHotKey on hokey with id {HotkeyInfo.HookId} for command of type {Command.GetType()}; the error was {error}; going to delete the atom anyway... The memory may leak.");
             }
             Kernel32.SetLastError(Kernel32.ERROR_SUCCESS);
             Kernel32.GlobalDeleteAtom(HotkeyInfo.HookId);
@@ -81,7 +82,7 @@ public void Detach()
                 Logger.Warn($"Error calling DeleteGlobalAtom; the error was {lastError}, the id {HotkeyInfo.HookId} and the type of the associated command {Command.GetType()}.");
             }
 
-            HotkeyInfo = new HotkeyInfo(IntPtr.Zero, Combo);
+            HotkeyInfo = new HotkeyInfo(0, Combo);
             ClearCommandShortcutText();
         }
 
@@ -92,14 +93,15 @@ private void HookKey(Keys key, uint shift)
                 return;
             }
 
-            var hookId = (IntPtr)Kernel32.GlobalAddAtom(Guid.NewGuid().ToString());
-            if (hookId == IntPtr.Zero)
-            {
-                Logger.Warn($"Error calling GlobalAddAtom; the error was {Marshal.GetLastWin32Error()}; aborting the HookKey operation...");    
+            var hookId = Kernel32.GlobalAddAtom(Guid.NewGuid().ToString());
+            var error = Marshal.GetLastWin32Error();
+            if (hookId == 0)
+            {               
+                Logger.Warn($"Error calling GlobalAddAtom; the error was {error}; aborting the HookKey operation...");    
                 return;
             }
 
-            var success = User32.RegisterHotKey(_hWndVbe, hookId, shift, (uint)key);
+            var success = User32.RegisterHotKey(_hWndVbe, new IntPtr(hookId), shift, (uint)key);
             if (!success)
             {
                 Logger.Debug(RubberduckUI.CommonHotkey_KeyNotRegistered, key);

Rubberduck.Core/Common/Hotkeys/HotkeyInfo.cs

@@ -9,13 +9,13 @@ public struct HotkeyInfo
     {
         private const Keys Modifiers = Keys.Alt | Keys.Control | Keys.Shift;
 
-        public HotkeyInfo(IntPtr hookId, Keys keys)
+        public HotkeyInfo(ushort hookId, Keys keys)
         {
             HookId = hookId;
             Keys = keys;
         }
 
-        public IntPtr HookId { get; }
+        public ushort HookId { get; }
         public Keys Keys { get; }
 
         public override string ToString()

Rubberduck.Core/Common/RubberduckHooks.cs

@@ -172,7 +172,7 @@ private bool HandleHotkeyMessage(IntPtr wParam)
             var processed = false;
             try
             {
-                var hook = Hooks.OfType<Hotkey>().SingleOrDefault(k => k.HotkeyInfo.HookId == wParam);
+                var hook = Hooks.OfType<Hotkey>().SingleOrDefault(k => k.HotkeyInfo.HookId == (ushort)wParam);
                 if (hook != null)
                 {
                     hook.OnMessageReceived();

Rubberduck.Core/Common/WinAPI/Kernel32.cs

@@ -28,7 +28,7 @@ public static class Kernel32
         /// <param name="nAtom">The atom and character string to be deleted.</param>
         /// <returns>The function always returns (ATOM) 0.</returns>
         [DllImport("kernel32.dll", SetLastError=true, ExactSpelling=true)]
-        public static extern ushort GlobalDeleteAtom(IntPtr nAtom);
+        public static extern ushort GlobalDeleteAtom(ushort nAtom);
 
         /// <summary>
         /// Sets the last-error code for the calling thread.

Rubberduck.Core/UI/CodeExplorer/CodeExplorerWindow.cs

@@ -7,7 +7,7 @@
 namespace Rubberduck.UI.CodeExplorer
 {
     [ExcludeFromCodeCoverage]
-    public partial class CodeExplorerWindow : UserControl, IDockableUserControl
+    public sealed partial class CodeExplorerWindow : UserControl, IDockableUserControl
     {
         private const string ClassId = "C5318B59-172F-417C-88E3-B377CDA2D809";
         string IDockableUserControl.ClassId { get { return ClassId; } }

Rubberduck.Core/UI/CodeExplorer/Commands/ExportCommand.cs

@@ -72,10 +72,20 @@ protected override void OnExecute(object parameter)
 
         public void Dispose()
         {
-            if (_saveFileDialog != null)
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private bool _isDisposed;
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_isDisposed || !disposing)
             {
-                _saveFileDialog.Dispose();
+                return;
             }
+
+            _saveFileDialog?.Dispose();
+            _isDisposed = true;
         }
     }
 }