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

LilyPad: Fixed logging bug, log slightly more data. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@839 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
mattmenke 2009-03-24 00:12:39 +00:00
parent fd8a28543b
commit e0d7e180ac
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/LilyPad/KeyboardHook.cpp
View File

@ -71,11 +71,19 @@ void EnumHookDevices() {
// Makes sure hooks are started in correct thread. // Makes sure hooks are started in correct thread.
ExtraWndProcResult StartHooksWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *output) { 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) { if (ikhd && !ikhd->hHook && ikhd->active) {
counter = 0;
ikhd->hHook = SetWindowsHookEx(WH_KEYBOARD_LL, IgnoreKeyboardHook, hInst, 0); ikhd->hHook = SetWindowsHookEx(WH_KEYBOARD_LL, IgnoreKeyboardHook, hInst, 0);
if (ikhd->hHook == 0) ikhd->Deactivate(); if (ikhd->hHook == 0) ikhd->Deactivate();
} }
return CONTINUE_BLISSFULLY_AND_RELEASE_PROC; counter ++;
if (counter % 1000 == 0)
return CONTINUE_BLISSFULLY_AND_RELEASE_PROC;
else
return CONTINUE_BLISSFULLY;
} }
LRESULT CALLBACK IgnoreKeyboardHook(int code, WPARAM wParam, LPARAM lParam) { LRESULT CALLBACK IgnoreKeyboardHook(int code, WPARAM wParam, LPARAM lParam) {

24
plugins/LilyPad/LilyPad.cpp
View File

@ -69,22 +69,26 @@ int IsWindowMaximized (HWND hWnd) {
} }
void DEBUG_NEW_SET() { void DEBUG_NEW_SET() {
if (config.debug) { if (config.debug && bufSize>1) {
HANDLE hFile = CreateFileA("logs\\padLog.txt", GENERIC_WRITE, FILE_SHARE_READ, 0, OPEN_ALWAYS, 0, 0); HANDLE hFile = CreateFileA("logs\\padLog.txt", FILE_APPEND_DATA, FILE_SHARE_READ, 0, OPEN_ALWAYS, 0, 0);
if (hFile != INVALID_HANDLE_VALUE) { if (hFile != INVALID_HANDLE_VALUE) {
int i; int i;
char temp[1500]; char temp[1500];
char *end = temp; char *end = temp;
for (i=0; i<bufSize; i++) { sprintf(end, "%02X (%02X) ", inBuf[0], inBuf[1]);
end += 8;
for (i=2; i<bufSize; i++) {
sprintf(end, "%02X ", inBuf[i]); sprintf(end, "%02X ", inBuf[i]);
end = strchr(end, 0); end += 3;
} }
end++[0] = '\n'; end[-1] = '\n';
for (i=0; i<bufSize; i++) { sprintf(end, "%02X (%02X) ", outBuf[0], outBuf[1]);
end += 8;
for (i=2; i<bufSize; i++) {
sprintf(end, "%02X ", outBuf[i]); sprintf(end, "%02X ", outBuf[i]);
end = strchr(end, 0); end+=3;
} }
end++[0] = '\n'; end[-1] = '\n';
end++[0] = '\n'; end++[0] = '\n';
DWORD junk; DWORD junk;
WriteFile(hFile, temp, end-temp, &junk, 0); WriteFile(hFile, temp, end-temp, &junk, 0);
@ -889,12 +893,16 @@ u8 CALLBACK PADstartPoll(int port) {
query.lastByte = 0; query.lastByte = 0;
DEBUG_IN(port); DEBUG_IN(port);
DEBUG_OUT(0xFF); DEBUG_OUT(0xFF);
DEBUG_IN(slots[port]);
DEBUG_OUT(pads[port][slots[port]].enabled);
return 0xFF; return 0xFF;
} }
else { else {
query.queryDone = 1; query.queryDone = 1;
query.numBytes = 0; query.numBytes = 0;
query.lastByte = 1; query.lastByte = 1;
DEBUG_IN(0);
DEBUG_OUT(0);
DEBUG_IN(port); DEBUG_IN(port);
DEBUG_OUT(0); DEBUG_OUT(0);
return 0; return 0;