ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lilypad:windows: Remove keyboard hooks code 

The code wasn't used, and generally low level hooks should be avoided
since they affect the responsiveness of all applications. On Windows 7
and later, the hooks may also be silently removed if they timeout, which
could be possible under heavy load.
This commit is contained in:
Jonathan Li 2016-05-27 23:40:31 +01:00
parent 4f24d22a68
commit 2aeceafb36
5 changed files with 0 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/LilyPad/DeviceEnumerator.cpp
View File

@ -21,7 +21,6 @@
#include "DeviceEnumerator.h"
#include "WindowsMessaging.h"
#include "DirectInput.h"
#include "KeyboardHook.h"
#include "RawInput.h"
#include "XInputEnum.h"
#include "HidDevice.h"
@ -39,7 +38,6 @@ void EnumDevices(int hideDXXinput) {
dm = new InputDeviceManager();
#ifdef _MSC_VER
EnumHookDevices();
EnumWindowsMessagingDevices();
EnumRawInputDevices();
EnumDualShock3s();

152
plugins/LilyPad/KeyboardHook.cpp
View File

@ -1,152 +0,0 @@
/* LilyPad - Pad plugin for PS2 Emulator
* Copyright (C) 2002-2014 PCSX2 Dev Team/ChickenLiver
*
* PCSX2 is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free
* Software Found- ation, either version 3 of the License, or (at your option)
* any later version.
*
* PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along
* with PCSX2. If not, see <http://www.gnu.org/licenses/>.
*/
#include "Global.h"
#include "InputManager.h"
#include "Config.h"
#include "KeyboardHook.h"
#include "WindowsKeyboard.h"
#include "VKey.h"
#include "WndProcEater.h"
extern HINSTANCE hInst;
LRESULT CALLBACK IgnoreKeyboardHook(int code, WPARAM wParam, LPARAM lParam);
ExtraWndProcResult StartHooksWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *output);
class IgnoreKeyboardHookDevice;
static IgnoreKeyboardHookDevice *ikhd = 0;
class IgnoreKeyboardHookDevice : public WindowsKeyboard {
public:
HHOOK hHook;
// When binding, eat all keys
int binding;
IgnoreKeyboardHookDevice() : WindowsKeyboard(IGNORE_KEYBOARD, L"Ignore Keyboard") {
// Don't want to send keypress/keyrelease messages.
for (int i=0; i<numPhysicalControls; i++) {
physicalControls[i].vkey = 0;
}
hHook = 0;
}
int Update() {
// So I'll bind to left/right control/shift instead of generic ones.
virtualControlState[VK_SHIFT] = 0;
virtualControlState[VK_CONTROL] = 0;
virtualControlState[VK_MENU] = 0;
return 1;
}
int Activate(InitInfo *initInfo) {
if (ikhd) ikhd->Deactivate();
binding = initInfo->bindingIgnore;
hWndProc = initInfo->hWndProc;
return 0;
printf( "(Lilypad) StartHook\n" );
hWndProc->Eat(StartHooksWndProc, EATPROC_NO_UPDATE_WHILE_UPDATING_DEVICES);
InitState();
ikhd = this;
active = 1;
return 1;
}
void Deactivate() {
printf( "(Lilypad) KillHook\n" );
FreeState();
if (active) {
if (hHook) {
UnhookWindowsHookEx(hHook);
hHook = 0;
}
if (ikhd == this) ikhd = 0;
active = 0;
}
}
};
void EnumHookDevices() {
dm->AddDevice(new IgnoreKeyboardHookDevice());
}
// Makes sure hooks are started in correct thread.
ExtraWndProcResult StartHooksWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *output) {
// Don't remove too quickly - could be other things happening in other threads.
// Attempted fix for keyboard input occasionally not working.
static int counter = 0;
if (ikhd && !ikhd->hHook && ikhd->active) {
counter = 0;
printf( "(Lilypad) SetHook\n" );
ikhd->hHook = SetWindowsHookEx(WH_KEYBOARD_LL, IgnoreKeyboardHook, hInst, 0);//GetCurrentThreadId());
if (ikhd->hHook == 0) ikhd->Deactivate();
}
printf( "(Lilypad) HookThinking!\n" );
counter ++;
if (counter % 1000 == 0)
return CONTINUE_BLISSFULLY_AND_RELEASE_PROC;
else
return CONTINUE_BLISSFULLY;
}
LRESULT CALLBACK IgnoreKeyboardHook(int code, WPARAM wParam, LPARAM lParam) {
HHOOK hHook = 0;
if (ikhd) {
printf( "(Lilypad) Hooked!!\n" );
hHook = ikhd->hHook;
if (hHook) {
if (code == HC_ACTION) {
if (wParam == WM_KEYDOWN || wParam == WM_SYSKEYDOWN) {
KBDLLHOOKSTRUCT* key = (KBDLLHOOKSTRUCT*) lParam;
if (key->vkCode < 256) {
for (int i=0; i<ikhd->pads[0][0].numBindings; i++) {
if (ikhd->pads[0][0].bindings[i].controlIndex == key->vkCode) {
return 1;
}
}
if (ikhd->binding){
ikhd->UpdateKey(key->vkCode, 1);
return 1;
}
}
if (config.vistaVolume) {
if (key->vkCode == VK_VOLUME_DOWN) {
SetVolume(config.volume-3);
return 1;
}
if (key->vkCode == VK_VOLUME_UP) {
SetVolume(config.volume+3);
return 1;
}
}
}
else if (wParam == WM_KEYUP || wParam == WM_SYSKEYUP) {
KBDLLHOOKSTRUCT* key = (KBDLLHOOKSTRUCT*) lParam;
if (ikhd->binding && key->vkCode < 256)
ikhd->UpdateKey(key->vkCode, 0);
}
}
return CallNextHookEx(hHook, code, wParam, lParam);
}
}
return CallNextHookEx(hHook, code, wParam, lParam);
}

24
plugins/LilyPad/KeyboardHook.h
View File

@ -1,24 +0,0 @@
/* LilyPad - Pad plugin for PS2 Emulator
* Copyright (C) 2002-2014 PCSX2 Dev Team/ChickenLiver
*
* PCSX2 is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free
* Software Found- ation, either version 3 of the License, or (at your option)
* any later version.
*
* PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along
* with PCSX2. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef KEYBOARD_HOOK_H
#define KEYBOARD_HOOK_H
void EnumHookDevices();
#endif

2
plugins/LilyPad/LilyPad.vcxproj
View File

@ -253,7 +253,6 @@
<ClCompile Include="DirectInput.cpp" />
<ClCompile Include="DualShock3.cpp" />
<ClCompile Include="HidDevice.cpp" />
<ClCompile Include="KeyboardHook.cpp" />
<ClCompile Include="KeyboardQueue.cpp" />
<ClCompile Include="RawInput.cpp" />
<ClCompile Include="WindowsKeyboard.cpp" />
@ -273,7 +272,6 @@
<ClInclude Include="DirectInput.h" />
<ClInclude Include="DualShock3.h" />
<ClInclude Include="HidDevice.h" />
<ClInclude Include="KeyboardHook.h" />
<ClInclude Include="KeyboardQueue.h" />
<ClInclude Include="RawInput.h" />
<ClInclude Include="usb.h" />

6
plugins/LilyPad/LilyPad.vcxproj.filters
View File

@ -42,9 +42,6 @@
<ClCompile Include="HidDevice.cpp">
<Filter>InputAPIs</Filter>
</ClCompile>
<ClCompile Include="KeyboardHook.cpp">
<Filter>InputAPIs</Filter>
</ClCompile>
<ClCompile Include="KeyboardQueue.cpp">
<Filter>InputAPIs</Filter>
</ClCompile>
@ -98,9 +95,6 @@
<ClInclude Include="HidDevice.h">
<Filter>InputAPIs</Filter>
</ClInclude>
<ClInclude Include="KeyboardHook.h">
<Filter>InputAPIs</Filter>
</ClInclude>
<ClInclude Include="KeyboardQueue.h">
<Filter>InputAPIs</Filter>
</ClInclude>