sync with main repo

RetailCoder.VBE/Common/DeclarationExtensions.cs

@@ -415,9 +415,11 @@ public static Declaration FindTarget(this IEnumerable<Declaration> declarations,
         {
             var items = declarations.ToList();
 
+            // TODO: Due to the new binding mechanism this can have more than one match (e.g. in the case of index expressions + simple name expressions)
+            // Left as is for now because the binding is not fully integrated yet.
             var target = items
                 .Where(item => !item.IsBuiltIn && validDeclarationTypes.Contains(item.DeclarationType))
-                .SingleOrDefault(item => item.IsSelected(selection)
+                .FirstOrDefault(item => item.IsSelected(selection)
                                      || item.References.Any(r => r.IsSelected(selection)));
 
             if (target != null)

RetailCoder.VBE/Common/DeclarationIconCache.cs

@@ -159,7 +159,7 @@ private static Uri GetIconUri(DeclarationType declarationType, Accessibility acc
                     path = "VSObject_Enum.png";
                     break;
 
-                case DeclarationType.EnumerationMember | DeclarationType.Constant:
+                case DeclarationType.EnumerationMember:
                     path = "VSObject_EnumItem.png";
                     break;
 
@@ -193,7 +193,7 @@ private static Uri GetIconUri(DeclarationType declarationType, Accessibility acc
                     path = "VSObject_ValueType.png";
                     break;
 
-                case DeclarationType.UserDefinedTypeMember | DeclarationType.Variable:
+                case DeclarationType.UserDefinedTypeMember:
                     path = "VSObject_Field.png";
                     break;
 

RetailCoder.VBE/Common/RubberduckHooks.cs

@@ -45,8 +45,7 @@ public void HookHotkeys()
             var config = _config.LoadConfiguration();
             var settings = config.UserSettings.GeneralSettings.HotkeySettings;
 
-            _rawinput = new RawInput(_mainWindowHandle, true);
-            _rawinput.AddMessageFilter();
+            _rawinput = new RawInput(_mainWindowHandle);
 
             var kb = (RawKeyboard)_rawinput.CreateKeyboard();
             _rawinput.AddDevice(kb);
@@ -69,15 +68,15 @@ private void Mouse_RawMouseInputReceived(object sender, RawMouseEventArgs e)
         {
             if (e.UlButtons.HasFlag(UsButtonFlags.RI_MOUSE_LEFT_BUTTON_UP) || e.UlButtons.HasFlag(UsButtonFlags.RI_MOUSE_RIGHT_BUTTON_UP))
             {
-                MessageReceived(this, HookEventArgs.Empty);
+                OnMessageReceived(this, HookEventArgs.Empty);
             }
         }
 
         private void Keyboard_RawKeyboardInputReceived(object sender, RawKeyEventArgs e)
         {
             if (e.Message == WM.KEYUP)
             {
-                MessageReceived(this, HookEventArgs.Empty);
+                OnMessageReceived(this, HookEventArgs.Empty);
             }
         }
 

RetailCoder.VBE/Common/WinAPI/IRawDevice.cs

@@ -4,7 +4,6 @@ namespace Rubberduck.Common.WinAPI
 {
     public interface IRawDevice
     {
-        void ProcessRawInput(IntPtr hdevice);
-        void EnumerateDevices();
+        void ProcessRawInput(InputData _rawBuffer);
     }
 }

RetailCoder.VBE/Common/WinAPI/RawInput.cs

@@ -1,30 +1,26 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics;
-using System.Windows.Forms;
 using System.Runtime.InteropServices;
-using System.Collections.Generic;
-using Rubberduck.Common.WinAPI;
+using System.Windows.Forms;
 
 namespace Rubberduck.Common.WinAPI
 {
     public class RawInput : NativeWindow
     {
-        readonly IntPtr _devNotifyHandle;
         static readonly Guid DeviceInterfaceHid = new Guid("4D1E55B2-F16F-11CF-88CB-001111000030");
-        private PreMessageFilter _filter;
         private readonly List<IRawDevice> _devices;
 
-        public RawInput(IntPtr parentHandle, bool captureOnlyInForeground)
+        public RawInput(IntPtr parentHandle)
         {
             AssignHandle(parentHandle);
-            _devNotifyHandle = RegisterForDeviceNotifications(parentHandle);
             _devices = new List<IRawDevice>();
         }
 
         public void AddDevice(IRawDevice device)
         {
             _devices.Add(device);
-            device.EnumerateDevices();
         }
 
         public IRawDevice CreateKeyboard()
@@ -35,90 +31,32 @@ public IRawDevice CreateKeyboard()
         public IRawDevice CreateMouse()
         {
             return new RawMouse(Handle, true);
-        }
-
-        public void AddMessageFilter()
-        {
-            if (null != _filter)
-            {
-                return;
-            }
-            _filter = new PreMessageFilter();
-            Application.AddMessageFilter(_filter);
-        }
-
-        private void RemoveMessageFilter()
-        {
-            if (null == _filter)
-            {
-                return;
-            }
-            Application.RemoveMessageFilter(_filter);
-        }
-
-        static IntPtr RegisterForDeviceNotifications(IntPtr parent)
-        {
-            var usbNotifyHandle = IntPtr.Zero;
-            var bdi = new BroadcastDeviceInterface();
-            bdi.DbccSize = Marshal.SizeOf(bdi);
-            bdi.BroadcastDeviceType = BroadcastDeviceType.DBT_DEVTYP_DEVICEINTERFACE;
-            bdi.DbccClassguid = DeviceInterfaceHid;
-            var mem = IntPtr.Zero;
-            try
-            {
-                mem = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(BroadcastDeviceInterface)));
-                Marshal.StructureToPtr(bdi, mem, false);
-                usbNotifyHandle = User32.RegisterDeviceNotification(parent, mem, DeviceNotification.DEVICE_NOTIFY_WINDOW_HANDLE);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Registration for device notifications Failed. Error: {0}", Marshal.GetLastWin32Error());
-                Debug.Print(e.StackTrace);
-            }
-            finally
-            {
-                Marshal.FreeHGlobal(mem);
-            }
-
-            if (usbNotifyHandle == IntPtr.Zero)
-            {
-                Debug.Print("Registration for device notifications Failed. Error: {0}", Marshal.GetLastWin32Error());
-            }
-
-            return usbNotifyHandle;
-        }
+        }        
 
         protected override void WndProc(ref Message message)
         {
             switch ((WM)message.Msg)
             {
                 case WM.INPUT:
                     {
-                        foreach (var device in _devices)
+                        InputData _rawBuffer;
+                        var dwSize = 0;
+                        User32.GetRawInputData(message.LParam, DataCommand.RID_INPUT, IntPtr.Zero, ref dwSize, Marshal.SizeOf(typeof(RawInputHeader)));
+                        int res = User32.GetRawInputData(message.LParam, DataCommand.RID_INPUT, out _rawBuffer, ref dwSize, Marshal.SizeOf(typeof(RawInputHeader)));
+                        if (dwSize != res)
                         {
-                            device.ProcessRawInput(message.LParam);
+                            var ex = new Win32Exception(Marshal.GetLastWin32Error());
+                            Debug.WriteLine("Error getting the rawinput buffer: {0}", ex.Message);
+                            return;
                         }
-                    }
-                    break;
-
-                case WM.DEVICECHANGE:
-                    {
-                        Debug.WriteLine("USB Device Arrival / Removal");
                         foreach (var device in _devices)
                         {
-                            device.EnumerateDevices();
+                            device.ProcessRawInput(_rawBuffer);
                         }
                     }
                     break;
             }
-
             base.WndProc(ref message);
         }
-
-        ~RawInput()
-        {
-            User32.UnregisterDeviceNotification(_devNotifyHandle);
-            RemoveMessageFilter();
-        }
     }
 }