Merge pull request #20 from Jabe/master

Expose MouseData and fix an issue with AsyncConcurrentQueue

Author: justcoding121

src/EventHook/Helpers/AsyncConcurrentQueue.cs

@@ -38,7 +38,7 @@ internal void Enqueue(T value)
 
             //signal 
             dequeueTaskLock.Wait();
-            dequeueTask.TrySetResult(true);
+            dequeueTask?.TrySetResult(true);
             dequeueTaskLock.Release();
 
         }

src/EventHook/Hooks/MouseHook.cs

@@ -11,6 +11,7 @@ internal class RawMouseEventArgs : EventArgs
     {
         internal MouseMessages Message { get; set; }
         internal Point Point { get; set; }
+        internal uint MouseData { get; set; }
     }
 
     /// <summary>
@@ -25,7 +26,9 @@ public enum MouseMessages
         WM_RBUTTONDOWN = 0x0204,
         WM_RBUTTONUP = 0x0205,
         WM_WHEELBUTTONDOWN = 0x207,
-        WM_WHEELBUTTONUP = 0x208
+        WM_WHEELBUTTONUP = 0x208,
+        WM_XBUTTONDOWN = 0x020B,
+        WM_XBUTTONUP = 0x020C
     }
 
     /// <summary>
@@ -94,7 +97,7 @@ private IntPtr HookCallback(
 
             hookStruct = (MSLLHOOKSTRUCT)Marshal.PtrToStructure(lParam, typeof(MSLLHOOKSTRUCT));
 
-            MouseAction(null, new RawMouseEventArgs { Message = (MouseMessages)wParam, Point = hookStruct.pt });
+            MouseAction(null, new RawMouseEventArgs { Message = (MouseMessages)wParam, Point = hookStruct.pt, MouseData = hookStruct.mouseData });
 
             return CallNextHookEx(_hookId, nCode, wParam, lParam);
         }

src/EventHook/MouseWatcher.cs

@@ -13,6 +13,7 @@ public class MouseEventArgs : EventArgs
     {
         public MouseMessages Message { get; set; }
         public Point Point { get; set; }
+        public uint MouseData { get; set; }
     }
 
     /// <summary>
@@ -134,7 +135,7 @@ private async Task ConsumeKeyAsync()
         /// <param name="kd"></param>
         private void KListener_KeyDown(RawMouseEventArgs kd)
         {
-            OnMouseInput?.Invoke(null, new MouseEventArgs { Message = kd.Message, Point = kd.Point });
+            OnMouseInput?.Invoke(null, new MouseEventArgs { Message = kd.Message, Point = kd.Point, MouseData = kd.MouseData });
         }
     }
 }