diff --git a/AudioSwitcher.AudioApi.Hooking/AudioSwitcher.AudioApi.Hooking.csproj b/AudioSwitcher.AudioApi.Hooking/AudioSwitcher.AudioApi.Hooking.csproj index 84accef..f680e0c 100644 --- a/AudioSwitcher.AudioApi.Hooking/AudioSwitcher.AudioApi.Hooking.csproj +++ b/AudioSwitcher.AudioApi.Hooking/AudioSwitcher.AudioApi.Hooking.csproj @@ -43,9 +43,9 @@ AudioSwitcherApi.pfx - - False - ..\lib\EasyHook\NetFX3.5\EasyHook.dll + + ..\packages\EasyHook.2.7.6035\lib\net35\EasyHook.dll + True @@ -72,30 +72,25 @@ + - - EasyHook32.dll + PreserveNewest - - EasyHook32Svc.exe + PreserveNewest - - EasyHook64.dll + PreserveNewest - - EasyHook64Svc.exe + PreserveNewest - - EasyLoad32.dll + PreserveNewest - - EasyLoad64.dll + PreserveNewest diff --git a/AudioSwitcher.AudioApi.Hooking/DefaultDeviceHook.cs b/AudioSwitcher.AudioApi.Hooking/DefaultDeviceHook.cs index d465012..6abdbec 100644 --- 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 new file mode 100644 index 0000000..1abdf09 Binary files /dev/null and b/AudioSwitcher.AudioApi.Hooking/EasyHook32.dll differ diff --git a/AudioSwitcher.AudioApi.Hooking/EasyHook32Svc.exe b/AudioSwitcher.AudioApi.Hooking/EasyHook32Svc.exe new file mode 100644 index 0000000..ce412cd Binary files /dev/null and b/AudioSwitcher.AudioApi.Hooking/EasyHook32Svc.exe differ diff --git a/AudioSwitcher.AudioApi.Hooking/EasyHook64.dll b/AudioSwitcher.AudioApi.Hooking/EasyHook64.dll new file mode 100644 index 0000000..626e8fb Binary files /dev/null and b/AudioSwitcher.AudioApi.Hooking/EasyHook64.dll differ diff --git a/AudioSwitcher.AudioApi.Hooking/EasyHook64Svc.exe b/AudioSwitcher.AudioApi.Hooking/EasyHook64Svc.exe new file mode 100644 index 0000000..3e96b6d Binary files /dev/null and b/AudioSwitcher.AudioApi.Hooking/EasyHook64Svc.exe differ diff --git a/AudioSwitcher.AudioApi.Hooking/EasyLoad32.dll b/AudioSwitcher.AudioApi.Hooking/EasyLoad32.dll new file mode 100644 index 0000000..bafa417 Binary files /dev/null and b/AudioSwitcher.AudioApi.Hooking/EasyLoad32.dll differ diff --git a/AudioSwitcher.AudioApi.Hooking/EasyLoad64.dll b/AudioSwitcher.AudioApi.Hooking/EasyLoad64.dll new file mode 100644 index 0000000..7354ee2 Binary files /dev/null and b/AudioSwitcher.AudioApi.Hooking/EasyLoad64.dll differ diff --git a/AudioSwitcher.AudioApi.Hooking/packages.config b/AudioSwitcher.AudioApi.Hooking/packages.config new file mode 100644 index 0000000..138288a --- /dev/null +++ b/AudioSwitcher.AudioApi.Hooking/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/lib/EasyHook/NetFX3.5/EasyHook.dll b/lib/EasyHook/NetFX3.5/EasyHook.dll deleted file mode 100644 index 539d8fd..0000000 Binary files a/lib/EasyHook/NetFX3.5/EasyHook.dll and /dev/null differ diff --git a/lib/EasyHook/NetFX3.5/EasyHook32.dll b/lib/EasyHook/NetFX3.5/EasyHook32.dll deleted file mode 100644 index db60b36..0000000 Binary files a/lib/EasyHook/NetFX3.5/EasyHook32.dll and /dev/null differ diff --git a/lib/EasyHook/NetFX3.5/EasyHook32Svc.exe b/lib/EasyHook/NetFX3.5/EasyHook32Svc.exe deleted file mode 100644 index cd3bfaa..0000000 Binary files a/lib/EasyHook/NetFX3.5/EasyHook32Svc.exe and /dev/null differ diff --git a/lib/EasyHook/NetFX3.5/EasyHook64.dll b/lib/EasyHook/NetFX3.5/EasyHook64.dll deleted file mode 100644 index d731fb7..0000000 Binary files a/lib/EasyHook/NetFX3.5/EasyHook64.dll and /dev/null differ diff --git a/lib/EasyHook/NetFX3.5/EasyHook64Svc.exe b/lib/EasyHook/NetFX3.5/EasyHook64Svc.exe deleted file mode 100644 index e0bff78..0000000 Binary files a/lib/EasyHook/NetFX3.5/EasyHook64Svc.exe and /dev/null differ diff --git a/lib/EasyHook/NetFX3.5/EasyLoad32.dll b/lib/EasyHook/NetFX3.5/EasyLoad32.dll deleted file mode 100644 index 73b6278..0000000 Binary files a/lib/EasyHook/NetFX3.5/EasyLoad32.dll and /dev/null differ diff --git a/lib/EasyHook/NetFX3.5/EasyLoad64.dll b/lib/EasyHook/NetFX3.5/EasyLoad64.dll deleted file mode 100644 index b07c55f..0000000 Binary files a/lib/EasyHook/NetFX3.5/EasyLoad64.dll and /dev/null differ diff --git a/lib/EasyHook/NetFX3.5/LICENSE b/lib/EasyHook/NetFX3.5/LICENSE deleted file mode 100644 index c7b8ece..0000000 --- a/lib/EasyHook/NetFX3.5/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2009 Christoph Husse & Copyright (c) 2012 Justin Stenning - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/lib/EasyHook/NetFX4.0/EasyHook.dll b/lib/EasyHook/NetFX4.0/EasyHook.dll deleted file mode 100644 index 06d7f1e..0000000 Binary files a/lib/EasyHook/NetFX4.0/EasyHook.dll and /dev/null differ diff --git a/lib/EasyHook/NetFX4.0/EasyHook32.dll b/lib/EasyHook/NetFX4.0/EasyHook32.dll deleted file mode 100644 index 379c5e6..0000000 Binary files a/lib/EasyHook/NetFX4.0/EasyHook32.dll and /dev/null differ diff --git a/lib/EasyHook/NetFX4.0/EasyHook32Svc.exe b/lib/EasyHook/NetFX4.0/EasyHook32Svc.exe deleted file mode 100644 index f0aa3f4..0000000 Binary files a/lib/EasyHook/NetFX4.0/EasyHook32Svc.exe and /dev/null differ diff --git a/lib/EasyHook/NetFX4.0/EasyHook64.dll b/lib/EasyHook/NetFX4.0/EasyHook64.dll deleted file mode 100644 index 7c2e91f..0000000 Binary files a/lib/EasyHook/NetFX4.0/EasyHook64.dll and /dev/null differ diff --git a/lib/EasyHook/NetFX4.0/EasyHook64Svc.exe b/lib/EasyHook/NetFX4.0/EasyHook64Svc.exe deleted file mode 100644 index ac04b0c..0000000 Binary files a/lib/EasyHook/NetFX4.0/EasyHook64Svc.exe and /dev/null differ diff --git a/lib/EasyHook/NetFX4.0/EasyLoad32.dll b/lib/EasyHook/NetFX4.0/EasyLoad32.dll deleted file mode 100644 index 0219448..0000000 Binary files a/lib/EasyHook/NetFX4.0/EasyLoad32.dll and /dev/null differ diff --git a/lib/EasyHook/NetFX4.0/EasyLoad64.dll b/lib/EasyHook/NetFX4.0/EasyLoad64.dll deleted file mode 100644 index 929dae0..0000000 Binary files a/lib/EasyHook/NetFX4.0/EasyLoad64.dll and /dev/null differ diff --git a/lib/EasyHook/NetFX4.0/LICENSE b/lib/EasyHook/NetFX4.0/LICENSE deleted file mode 100644 index c7b8ece..0000000 --- a/lib/EasyHook/NetFX4.0/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2009 Christoph Husse & Copyright (c) 2012 Justin Stenning - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE.