merged changes

Author: retailcoder

RetailCoder.VBE/Common/RubberduckHooks.cs

@@ -77,7 +77,7 @@ public void Attach()
             {
                 hook.Attach();
                 hook.MessageReceived += hook_MessageReceived;
-            }
+                }
 
             IsAttached = true;
         }
@@ -110,7 +110,7 @@ public void Detach()
             {
                 hook.Detach();
                 hook.MessageReceived -= hook_MessageReceived;
-            }
+                }
 
             IsAttached = false;
         }
@@ -135,7 +135,7 @@ public void Dispose()
             Detach();
         }
 
-        private IntPtr WindowProc(IntPtr hWnd, int uMsg, int wParam, int lParam)
+        private IntPtr WindowProc(IntPtr hWnd, uint uMsg, IntPtr wParam, IntPtr lParam)
         {
             try
             {
@@ -170,45 +170,40 @@ private IntPtr WindowProc(IntPtr hWnd, int uMsg, int wParam, int lParam)
         private bool HandleHotkeyMessage(int wParam)
         {
             var processed = false;
-            if (GetWindowThread(User32.GetForegroundWindow()) == GetWindowThread(_mainWindowHandle))
-            {
+                            if (GetWindowThread(User32.GetForegroundWindow()) == GetWindowThread(_mainWindowHandle))
+                            {
                 var hook = Hooks.OfType<Hotkey>().SingleOrDefault(k => k.HotkeyInfo.HookId == (IntPtr) wParam);
-                if (hook != null)
-                {
+                                if (hook != null)
+                                {
                     hook.OnMessageReceived();
-                    processed = true;
-                }
+                                    processed = true;
+                                }
             }
             return processed;
-        }
+                            }
 
         private void HandleActivateAppMessage(int wParam)
         {
             const int WA_INACTIVE = 0;
             const int WA_ACTIVE = 1;
             const int WA_CLICKACTIVE = 2;
 
-            switch (LoWord(wParam))
-            {
-                case WA_ACTIVE:
+                            switch (LoWord(wParam))
+                            {
+                                case WA_ACTIVE:
                 case WA_CLICKACTIVE:
-                    Attach();
-                    break;
+                                    Attach();
+                                    break;
 
-                case WA_INACTIVE:
-                    Detach();
-                    break;
-            }
+                                case WA_INACTIVE:
+                                    Detach();
+                                    break;
+                    }
         }
 
-        /// <summary>
-        /// Gets the integer portion of a word
-        /// </summary>
-        private static int LoWord(int dw)
+        private static int LoWord(IntPtr dw)
         {
-            return (dw & 0x8000) != 0
-                ? 0x8000 | (dw & 0x7FFF)
-                : dw & 0xFFFF;
+            return unchecked((short)(uint)dw);
         }
 
         private IntPtr GetWindowThread(IntPtr hWnd)

RetailCoder.VBE/Common/WinAPI/User32.cs

@@ -46,44 +46,9 @@ public static class User32
         [DllImport("user32.dll")]
         public static extern IntPtr SetWindowLong(IntPtr hWnd, int nIndex, WndProc dwNewLong);
 
-        /// <summary>
-        /// Changes an attribute of the specified window. 
-        /// The function also sets the 32-bit (long) value at the specified offset into the extra window memory.
-        /// </summary>
-        /// <param name="hWnd">A handle to the window and, indirectly, the class to which the window belongs.</param>
-        /// <param name="nIndex">The zero-based offset to the value to be set. 
-        /// Valid values are in the range zero through the number of bytes of extra window memory, minus the size of an integer.
-        /// <see cref="WindowLongFlags"/>.</param>
-        /// <param name="dwNewLong">The replacement value.</param>
-        /// <returns>The return value specifies the result of the message processing and depends on the message sent.</returns>
-        //public static IntPtr SetWindowLongPtr(IntPtr hWnd, WindowLongFlags nIndex, WndProc dwNewLong)
-        //{
-        //    return IntPtr.Size == 8 
-        //        ? SetWindowLongPtr64(hWnd, nIndex, dwNewLong) 
-        //        : new IntPtr(SetWindowLong32(hWnd, nIndex, dwNewLong.ToInt32()));
-        //}
-
-        //[DllImport("user32.dll", EntryPoint = "SetWindowLong")]
-        //private static extern int SetWindowLong32(IntPtr hWnd, WindowLongFlags nIndex, int dwNewLong);
-
-        //[DllImport("user32.dll", EntryPoint = "SetWindowLongPtr")]
-        //private static extern IntPtr SetWindowLongPtr64(IntPtr hWnd, WindowLongFlags nIndex, IntPtr dwNewLong);
-
-
-        /// <summary>
-        /// Passes message information to the specified window procedure.
-        /// </summary>
-        /// <param name="lpPrevWndFunc">The previous window procedure. 
-        /// If this value is obtained by calling the GetWindowLong function with the nIndex parameter set to GWL_WNDPROC or DWL_DLGPROC, 
-        /// it is actually either the address of a window or dialog box procedure, or a special internal value meaningful only to CallWindowProc.</param>
-        /// <param name="hWnd">A handle to the window procedure to receive the message.</param>
-        /// <param name="Msg">The message.</param>
-        /// <param name="wParam">Additional message-specific information. The contents of this parameter depend on the value of the Msg parameter.</param>
-        /// <param name="lParam">Additional message-specific information. The contents of this parameter depend on the value of the Msg parameter.</param>
-        /// <returns></returns>
         [DllImport("user32.dll")]
-        public static extern IntPtr CallWindowProc(WndProc lpPrevWndFunc, IntPtr hWnd, int Msg, int wParam, int lParam);
-        public delegate IntPtr WndProc(IntPtr hWnd, int uMsg, int wParam, int lParam);
+        public static extern IntPtr CallWindowProc(WndProc lpPrevWndFunc, IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
+        public delegate IntPtr WndProc(IntPtr hWnd, uint uMsg, IntPtr wParam, IntPtr lParam);
 
         /// <summary>
         /// A pointer to the hook procedure. 

RetailCoder.VBE/Inspections/UseMeaningfulNameInspection.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
@@ -25,10 +26,11 @@ public UseMeaningfulNameInspection(IMessageBox messageBox, RubberduckParserState
         public override IEnumerable<InspectionResultBase> GetInspectionResults()
         {
             var issues = UserDeclarations
-                            .Where(declaration => declaration.DeclarationType != DeclarationType.ModuleOption &&
+                            .Where(declaration => declaration.DeclarationType != DeclarationType.ModuleOption && 
                                                   (declaration.IdentifierName.Length < 3 ||
                                                   char.IsDigit(declaration.IdentifierName.Last()) ||
-                                                  !declaration.IdentifierName.Any(c => new[] {'a', 'e', 'i', 'o', 'u', 'y'}.Contains(c))))
+                                                  !declaration.IdentifierName.Any(c => 
+                                                      "aeiouy".Any(a => string.Compare(a.ToString(), c.ToString(), StringComparison.OrdinalIgnoreCase) == 0))))
                             .Select(issue => new UseMeaningfulNameInspectionResult(this, issue, State, _wrapperFactory, _messageBox))
                             .ToList();