Added easyhook as a nuget package

xenolightning · Jul 20, 2016 · 5008f61 · 5008f61
1 parent 2a9770e
commit 5008f61
Show file tree

Hide file tree

Showing 25 changed files with 16 additions and 54 deletions.
diff --git a/AudioSwitcher.AudioApi.Hooking/AudioSwitcher.AudioApi.Hooking.csproj b/AudioSwitcher.AudioApi.Hooking/AudioSwitcher.AudioApi.Hooking.csproj
@@ -43,9 +43,9 @@
     <AssemblyOriginatorKeyFile>AudioSwitcherApi.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EasyHook, Version=2.7.5870.0, Culture=neutral, PublicKeyToken=4b580fca19d0b0c5, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\EasyHook\NetFX3.5\EasyHook.dll</HintPath>
+    <Reference Include="EasyHook, Version=2.7.6035.0, Culture=neutral, PublicKeyToken=4b580fca19d0b0c5, processorArchitecture=MSIL">
+      <HintPath>..\packages\EasyHook.2.7.6035\lib\net35\EasyHook.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -72,30 +72,25 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="AudioSwitcherApi.pfx" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\lib\EasyHook\NetFX3.5\EasyHook32.dll">
-      <Link>EasyHook32.dll</Link>
+    <Content Include="EasyHook32.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\lib\EasyHook\NetFX3.5\EasyHook32Svc.exe">
-      <Link>EasyHook32Svc.exe</Link>
+    <Content Include="EasyHook32Svc.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\lib\EasyHook\NetFX3.5\EasyHook64.dll">
-      <Link>EasyHook64.dll</Link>
+    <Content Include="EasyHook64.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\lib\EasyHook\NetFX3.5\EasyHook64Svc.exe">
-      <Link>EasyHook64Svc.exe</Link>
+    <Content Include="EasyHook64Svc.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\lib\EasyHook\NetFX3.5\EasyLoad32.dll">
-      <Link>EasyLoad32.dll</Link>
+    <Content Include="EasyLoad32.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\lib\EasyHook\NetFX3.5\EasyLoad64.dll">
-      <Link>EasyLoad64.dll</Link>
+    <Content Include="EasyLoad64.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

diff --git a/AudioSwitcher.AudioApi.Hooking/DefaultDeviceHook.cs b/AudioSwitcher.AudioApi.Hooking/DefaultDeviceHook.cs
@@ -93,9 +93,10 @@ public bool Hook(int processId)
 
                 return true;
             }
-            catch (Exception)
+            catch (Exception ex)
             {
                 Status = EHookStatus.Inactive;
+                Error?.Invoke(_hookedProcessId, ex);
             }
 
 

diff --git a/AudioSwitcher.AudioApi.Hooking/EasyHook32.dll b/AudioSwitcher.AudioApi.Hooking/EasyHook32.dll
diff --git a/AudioSwitcher.AudioApi.Hooking/EasyHook32Svc.exe b/AudioSwitcher.AudioApi.Hooking/EasyHook32Svc.exe
diff --git a/AudioSwitcher.AudioApi.Hooking/EasyHook64.dll b/AudioSwitcher.AudioApi.Hooking/EasyHook64.dll
diff --git a/AudioSwitcher.AudioApi.Hooking/EasyHook64Svc.exe b/AudioSwitcher.AudioApi.Hooking/EasyHook64Svc.exe
diff --git a/AudioSwitcher.AudioApi.Hooking/EasyLoad32.dll b/AudioSwitcher.AudioApi.Hooking/EasyLoad32.dll
diff --git a/AudioSwitcher.AudioApi.Hooking/EasyLoad64.dll b/AudioSwitcher.AudioApi.Hooking/EasyLoad64.dll
diff --git a/AudioSwitcher.AudioApi.Hooking/packages.config b/AudioSwitcher.AudioApi.Hooking/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="EasyHook" version="2.7.6035" targetFramework="net35" />
+</packages>
diff --git a/lib/EasyHook/NetFX3.5/EasyHook.dll b/lib/EasyHook/NetFX3.5/EasyHook.dll
diff --git a/lib/EasyHook/NetFX3.5/EasyHook32.dll b/lib/EasyHook/NetFX3.5/EasyHook32.dll
diff --git a/lib/EasyHook/NetFX3.5/EasyHook32Svc.exe b/lib/EasyHook/NetFX3.5/EasyHook32Svc.exe
diff --git a/lib/EasyHook/NetFX3.5/EasyHook64.dll b/lib/EasyHook/NetFX3.5/EasyHook64.dll
diff --git a/lib/EasyHook/NetFX3.5/EasyHook64Svc.exe b/lib/EasyHook/NetFX3.5/EasyHook64Svc.exe
diff --git a/lib/EasyHook/NetFX3.5/EasyLoad32.dll b/lib/EasyHook/NetFX3.5/EasyLoad32.dll
diff --git a/lib/EasyHook/NetFX3.5/EasyLoad64.dll b/lib/EasyHook/NetFX3.5/EasyLoad64.dll
diff --git a/lib/EasyHook/NetFX3.5/LICENSE b/lib/EasyHook/NetFX3.5/LICENSE
diff --git a/lib/EasyHook/NetFX4.0/EasyHook.dll b/lib/EasyHook/NetFX4.0/EasyHook.dll
diff --git a/lib/EasyHook/NetFX4.0/EasyHook32.dll b/lib/EasyHook/NetFX4.0/EasyHook32.dll
diff --git a/lib/EasyHook/NetFX4.0/EasyHook32Svc.exe b/lib/EasyHook/NetFX4.0/EasyHook32Svc.exe
diff --git a/lib/EasyHook/NetFX4.0/EasyHook64.dll b/lib/EasyHook/NetFX4.0/EasyHook64.dll
diff --git a/lib/EasyHook/NetFX4.0/EasyHook64Svc.exe b/lib/EasyHook/NetFX4.0/EasyHook64Svc.exe
diff --git a/lib/EasyHook/NetFX4.0/EasyLoad32.dll b/lib/EasyHook/NetFX4.0/EasyLoad32.dll
diff --git a/lib/EasyHook/NetFX4.0/EasyLoad64.dll b/lib/EasyHook/NetFX4.0/EasyLoad64.dll
diff --git a/lib/EasyHook/NetFX4.0/LICENSE b/lib/EasyHook/NetFX4.0/LICENSE