#include "fixscancodemap.h"\r
-#include "registry.h"\r
#include "misc.h"\r
+#include "windowstool.h"\r
#include <tchar.h>\r
#include <tlhelp32.h>\r
\r
#pragma runtime_checks( "", off )\r
-static DWORD invokeFunc(InjectInfo *info)\r
+static DWORD WINAPI invokeFunc(InjectInfo *info)\r
{\r
BOOL ret;\r
HANDLE hToken;\r
HMODULE hAdvapi32;\r
+ DWORD result = 0;\r
+\r
FpImpersonateLoggedOnUser pImpersonateLoggedOnUser;\r
FpRevertToSelf pRevertToSelf;\r
FpOpenProcessToken pOpenProcessToken;\r
\r
HANDLE hProcess = info->pOpenProcess(PROCESS_QUERY_INFORMATION, FALSE, info->pid_);\r
if (hProcess == NULL) {\r
- return 1;\r
+ result = 1;\r
+ goto exit;\r
}\r
\r
ret = pOpenProcessToken(hProcess, TOKEN_QUERY | TOKEN_DUPLICATE , &hToken);\r
if (ret == FALSE) {\r
- return 2;\r
+ result = 2;\r
+ goto exit;\r
}\r
\r
ret = pImpersonateLoggedOnUser(hToken);\r
if (ret == FALSE) {\r
- return 3;\r
+ result = 3;\r
+ goto exit;\r
}\r
\r
- info->pUpdate(0, 1);\r
+ if (info->isVistaOrLater_) {\r
+ info->pUpdate4(1);\r
+ } else {\r
+ info->pUpdate8(0, 1);\r
+ }\r
\r
ret = pRevertToSelf();\r
if (ret == FALSE) {\r
- return 4;\r
+ result = 4;\r
+ goto exit;\r
+ }\r
+\r
+exit:\r
+ if (hToken != NULL) {\r
+ info->pCloseHandle(hToken);\r
+ }\r
+\r
+ if (hProcess != NULL) {\r
+ info->pCloseHandle(hProcess);\r
}\r
\r
- info->pCloseHandle(hToken);\r
- info->pCloseHandle(hProcess);\r
- return 0;\r
+ return result;\r
}\r
static int afterFunc(int arg)\r
{\r
0x003ae03a,\r
0x0029e029,\r
0x0070e070,\r
- 0x003b001e,\r
+ 0x007be07b,\r
};\r
\r
int FixScancodeMap::acquirePrivileges()\r
\r
BOOL bResult = Process32First(hSnap, &pe);\r
while (bResult){\r
- if (!_tcscmp(pe.szExeFile, _T("winlogon.exe"))) {\r
+ if (!_tcsicmp(pe.szExeFile, _T("winlogon.exe"))) {\r
DWORD sessionId;\r
\r
if (ProcessIdToSessionId(pe.th32ProcessID, &sessionId) != FALSE) {\r
}\r
\r
\r
+bool FixScancodeMap::clean(WlInfo wl)\r
+{\r
+ int ret = 0;\r
+\r
+ if (wl.m_hThread != NULL) {\r
+ DWORD result;\r
+\r
+ if (WaitForSingleObject(wl.m_hThread, 5000) == WAIT_TIMEOUT) {\r
+ return false;\r
+ }\r
+\r
+ GetExitCodeThread(wl.m_hThread, &result);\r
+ CloseHandle(wl.m_hThread);\r
+\r
+ if (wl.m_remoteMem != NULL && wl.m_hProcess != NULL) {\r
+ VirtualFreeEx(wl.m_hProcess, wl.m_remoteMem, 0, MEM_RELEASE);\r
+ }\r
+\r
+ if (wl.m_remoteInfo != NULL && wl.m_hProcess != NULL) {\r
+ VirtualFreeEx(wl.m_hProcess, wl.m_remoteInfo, 0, MEM_RELEASE);\r
+ }\r
+\r
+ if (wl.m_hProcess != NULL) {\r
+ CloseHandle(wl.m_hProcess);\r
+ }\r
+ }\r
+\r
+ return true;\r
+}\r
+\r
+\r
int FixScancodeMap::injectThread(DWORD dwPID)\r
{\r
int ret = 0;\r
DWORD err = 0;\r
BOOL wFlag;\r
+ WlInfo wi;\r
+\r
+ wi.m_hProcess = NULL;\r
+ wi.m_remoteMem = NULL;\r
+ wi.m_remoteInfo = NULL;\r
+ wi.m_hThread = NULL;\r
\r
- HANDLE hProcess = NULL;\r
- LPVOID remoteMem = NULL;\r
- LPVOID remoteInfo = NULL;\r
DWORD invokeFuncAddr = (DWORD)invokeFunc;\r
DWORD afterFuncAddr = (DWORD)afterFunc;\r
DWORD memSize = afterFuncAddr - invokeFuncAddr;\r
\r
- if ((hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, dwPID)) == NULL) {\r
+ if ((wi.m_hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, dwPID)) == NULL) {\r
ret = 8;\r
goto exit;\r
}\r
\r
- remoteMem = VirtualAllocEx(hProcess, NULL, memSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE);\r
- if (remoteMem == NULL) {\r
+ wi.m_remoteMem = VirtualAllocEx(wi.m_hProcess, NULL, memSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE);\r
+ if (wi.m_remoteMem == NULL) {\r
ret = 9;\r
err = GetLastError();\r
goto exit;\r
}\r
\r
- wFlag = WriteProcessMemory(hProcess, remoteMem, (char*)invokeFunc, memSize, (SIZE_T*)0);\r
+ wFlag = WriteProcessMemory(wi.m_hProcess, wi.m_remoteMem, (char*)invokeFunc, memSize, (SIZE_T*)0);\r
if (wFlag == FALSE) {\r
ret = 10;\r
goto exit;\r
}\r
\r
- remoteInfo = VirtualAllocEx(hProcess, NULL, sizeof(m_info), MEM_COMMIT, PAGE_READWRITE);\r
- if (remoteInfo == NULL) {\r
+ wi.m_remoteInfo = VirtualAllocEx(wi.m_hProcess, NULL, sizeof(m_info), MEM_COMMIT, PAGE_READWRITE);\r
+ if (wi.m_remoteInfo == NULL) {\r
ret = 11;\r
err = GetLastError();\r
goto exit;\r
}\r
\r
- wFlag = WriteProcessMemory(hProcess, remoteInfo, (char*)&m_info, sizeof(m_info), (SIZE_T*)0);\r
+ wFlag = WriteProcessMemory(wi.m_hProcess, wi.m_remoteInfo, (char*)&m_info, sizeof(m_info), (SIZE_T*)0);\r
if (wFlag == FALSE) {\r
ret = 12;\r
goto exit;\r
_T("afterFunc - invokeFunc=%d\r\n")\r
_T("remoteMem=0x%p\r\n")\r
_T("remoteInfo=0x%p(size: %d)\r\n"),\r
- invokeFunc, afterFunc, memSize, remoteMem, remoteInfo, sizeof(info));\r
+ invokeFunc, afterFunc, memSize, m_remoteMem, m_remoteInfo, sizeof(m_info));\r
if (MessageBox((HWND)NULL, buf, _T("upusp"), MB_OKCANCEL | MB_ICONSTOP) == IDCANCEL) {\r
(m_info.pUpdate)(0, 1);\r
goto exit;\r
}\r
#endif\r
\r
- HANDLE hThread = CreateRemoteThread(hProcess, NULL, 0, \r
- (LPTHREAD_START_ROUTINE)remoteMem, remoteInfo, 0, NULL);\r
- if (hThread == NULL) {\r
+ wi.m_hThread = CreateRemoteThread(wi.m_hProcess, NULL, 0, \r
+ (LPTHREAD_START_ROUTINE)wi.m_remoteMem, wi.m_remoteInfo, 0, NULL);\r
+ if (wi.m_hThread == NULL) {\r
ret = 13;\r
goto exit;\r
}\r
\r
- if (WaitForSingleObject(hThread, 5000) == WAIT_TIMEOUT) {\r
+ if (WaitForSingleObject(wi.m_hThread, 5000) == WAIT_TIMEOUT) {\r
ret = 14;\r
- goto exit;\r
+ m_wlTrash.push_back(wi);\r
+ goto dirty_exit;\r
}\r
DWORD result = -1;\r
- GetExitCodeThread(hThread, &result);\r
+ GetExitCodeThread(wi.m_hThread, &result);\r
ret = result;\r
- CloseHandle(hThread);\r
+ CloseHandle(wi.m_hThread);\r
+ wi.m_hThread = NULL;\r
\r
exit:\r
- if (remoteMem != NULL) {\r
- VirtualFreeEx(hProcess, remoteMem, 0, MEM_RELEASE);\r
+ if (wi.m_remoteMem != NULL && wi.m_hProcess != NULL) {\r
+ VirtualFreeEx(wi.m_hProcess, wi.m_remoteMem, 0, MEM_RELEASE);\r
+ wi.m_remoteMem = NULL;\r
}\r
\r
- if (remoteInfo != NULL) {\r
- VirtualFreeEx(hProcess, remoteInfo, 0, MEM_RELEASE);\r
+ if (wi.m_remoteInfo != NULL && wi.m_hProcess != NULL) {\r
+ VirtualFreeEx(wi.m_hProcess, wi.m_remoteInfo, 0, MEM_RELEASE);\r
+ wi.m_remoteInfo = NULL;\r
}\r
\r
- if (hProcess != NULL) {\r
- CloseHandle(hProcess);\r
+ if (wi.m_hProcess != NULL) {\r
+ CloseHandle(wi.m_hProcess);\r
+ wi.m_hProcess = NULL;\r
}\r
\r
+dirty_exit:\r
return ret;\r
}\r
\r
MINIMIZEDMETRICS mm;\r
int result = 0;\r
\r
- result = acquirePrivileges();\r
- if (result) {\r
+ if (m_errorOnConstruct) {\r
+ result = m_errorOnConstruct;\r
goto exit;\r
}\r
\r
- DWORD dwPID;\r
- if ((dwPID = getWinLogonPid()) == 0) {\r
- result = 15;\r
- goto exit;\r
- }\r
+ m_wlTrash.erase(remove_if(m_wlTrash.begin(), m_wlTrash.end(), FixScancodeMap::clean), m_wlTrash.end());\r
\r
memset(&mm, 0, sizeof(mm));\r
mm.cbSize = sizeof(mm);\r
SystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(mm), &mm, 0);\r
\r
- result = injectThread(dwPID);\r
- if (result) {\r
- goto exit;\r
+ result = injectThread(m_winlogonPid);\r
+ if (result == 14) {\r
+ // retry once\r
+ result = injectThread(m_winlogonPid);\r
+ if (result == 0) {\r
+ result = 22;\r
+ }\r
}\r
\r
SystemParametersInfo(SPI_SETMINIMIZEDMETRICS, sizeof(mm), &mm, 0);\r
int FixScancodeMap::fix()\r
{\r
ScancodeMap *origMap, *fixMap;\r
- Registry reg(HKEY_CURRENT_USER, _T("Keyboard Layout"));\r
- // Windows7 RC not support Scancode Map on HKCU?\r
- //Registry reg(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layout"));\r
DWORD origSize, fixSize;\r
bool ret;\r
int result = 0;\r
\r
// save original Scancode Map\r
- ret = reg.read(_T("Scancode Map"), NULL, &origSize, NULL, 0);\r
+ ret = m_pReg->read(_T("Scancode Map"), NULL, &origSize, NULL, 0);\r
if (ret) {\r
origMap = reinterpret_cast<ScancodeMap*>(malloc(origSize));\r
if (origMap == NULL) {\r
goto exit;\r
}\r
\r
- ret = reg.read(_T("Scancode Map"), reinterpret_cast<BYTE*>(origMap), &origSize, NULL, 0);\r
+ ret = m_pReg->read(_T("Scancode Map"), reinterpret_cast<BYTE*>(origMap), &origSize, NULL, 0);\r
if (ret == false) {\r
result = 17;\r
goto exit;\r
fixSize += 4;\r
}\r
\r
- ret = reg.write(_T("Scancode Map"), reinterpret_cast<BYTE*>(fixMap), fixSize);\r
+ ret = m_pReg->write(_T("Scancode Map"), reinterpret_cast<BYTE*>(fixMap), fixSize);\r
if (ret == false) {\r
result = 20;\r
goto exit;\r
result = update();\r
\r
if (origMap) {\r
- ret = reg.write(_T("Scancode Map"), reinterpret_cast<BYTE*>(origMap), origSize);\r
+ ret = m_pReg->write(_T("Scancode Map"), reinterpret_cast<BYTE*>(origMap), origSize);\r
} else {\r
- ret = reg.remove(_T("Scancode Map"));\r
+ ret = m_pReg->remove(_T("Scancode Map"));\r
}\r
if (ret == false) {\r
result = 21;\r
return update();\r
}\r
\r
-FixScancodeMap::FixScancodeMap()\r
+FixScancodeMap::FixScancodeMap() :\r
+ m_errorOnConstruct(0),\r
+ m_winlogonPid(0),\r
+ m_regHKCU(HKEY_CURRENT_USER, _T("Keyboard Layout")),\r
+ m_regHKLM(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layout")),\r
+ m_pReg(NULL)\r
{\r
HMODULE hMod;\r
\r
\r
hMod = GetModuleHandle(_T("user32.dll"));\r
if (hMod != NULL) {\r
- m_info.pUpdate = (FpUpdatePerUserSystemParameters)GetProcAddress(hMod, "UpdatePerUserSystemParameters");\r
- if (m_info.pUpdate == NULL) {\r
+ m_info.pUpdate4 = (FpUpdatePerUserSystemParameters4)GetProcAddress(hMod, "UpdatePerUserSystemParameters");\r
+ m_info.pUpdate8 = (FpUpdatePerUserSystemParameters8)m_info.pUpdate4;\r
+ if (m_info.pUpdate4 == NULL) {\r
return;\r
}\r
}\r
return;\r
}\r
}\r
+\r
+ // Windows7 RC not support Scancode Map on HKCU?\r
+ if (checkWindowsVersion(6, 1) == FALSE) {\r
+ m_pReg = &m_regHKCU; // Vista or earlier\r
+ } else {\r
+ m_pReg = &m_regHKLM; // Windows7 or later\r
+ }\r
+\r
+ // prototype of UpdatePerUserSystemParameters() differ vista or earlier\r
+ if (checkWindowsVersion(6, 0) == FALSE) {\r
+ m_info.isVistaOrLater_ = 0; // before Vista\r
+ } else {\r
+ m_info.isVistaOrLater_ = 1; // Vista or later\r
+ }\r
+\r
+ m_errorOnConstruct = acquirePrivileges();\r
+ if (m_errorOnConstruct) {\r
+ goto exit;\r
+ }\r
+\r
+ if ((m_winlogonPid = getWinLogonPid()) == 0) {\r
+ m_errorOnConstruct = 15;\r
+ goto exit;\r
+ }\r
+\r
+exit:\r
+ ;\r
}\r
\r
FixScancodeMap::~FixScancodeMap()\r
OSDN Git Service
