OSDN Git Service

Use LPCSTR instead of CString in arguments of SaveKeyBind,
[xkeymacs/xkeymacs.git] / xkeymacs / profile.cpp
index 32f6db5..923ff43 100644 (file)
@@ -8,8 +8,9 @@
 #include "MainFrm.h"\r
 #include "DotXkeymacs.h"\r
 #include <Imm.h>\r
-#include <Shlwapi.h>   // Windows NT/2000: Requires Windows 2000 (or Windows NT 4.0 with Internet Explorer 4.0 or later). \r
-                                               // Windows 95/98/Me: Requires Windows 98 (or Windows 95 with Internet Explorer 4.0 or later). \r
+#include <Shlwapi.h>\r
+#include <TlHelp32.h>\r
+#include <vector>\r
 \r
 #ifdef _DEBUG\r
 #undef THIS_FILE\r
@@ -19,8 +20,8 @@ static char THIS_FILE[]=__FILE__;
 \r
 struct CommandTypeName\r
 {\r
-       int nCommandType;\r
-       LPCTSTR szCommandTypeName;\r
+       int nType;\r
+       LPCTSTR szName;\r
 };\r
 \r
 static const CommandTypeName CommandTypes[] = {\r
@@ -301,14 +302,13 @@ static const KeyName KeyNames[] = {
        {VK_NONAME,             _T("Noname")},\r
        {VK_PA1,                _T("PA1")},\r
        {VK_OEM_CLEAR,  _T("OEM Clear")},\r
-       {0xff,                  _T("")},\r
+       {0xff,                  _T("Fn")},\r
 };\r
 \r
-CXkeymacsData CProfile::m_XkeymacsData[MAX_APP];\r
+CONFIG CProfile::m_Config;\r
+TCHAR CProfile::m_szAppTitle[MAX_APP][WINDOW_TEXT_LENGTH];\r
 TASK_LIST CProfile::m_TaskList[MAX_TASKS];\r
 DWORD CProfile::m_dwTasks;\r
-ScanCode CProfile::m_CurrentScanCodeMap[MAX_HKEY_TYPE][4][256];\r
-ScanCode CProfile::m_ScanCodeMap[MAX_HKEY_TYPE][4][256];\r
 \r
 enum { INITIAL_SIZE    = 51200 };\r
 enum { EXTEND_SIZE     = 25600 };\r
@@ -409,7 +409,7 @@ BOOL CALLBACK CProfile::EnumWindowsProc(const HWND hWnd, const LPARAM lParam)
        CComboBox               *pApplication   = (CComboBox*)lParam;\r
        PTASK_LIST              pTask                   = CProfile::m_TaskList;\r
        \r
-       TCHAR szWindowName[WINDOW_NAME_LENGTH];\r
+       TCHAR szWindowName[WINDOW_TEXT_LENGTH];\r
        TCHAR szClassName[CLASS_NAME_LENGTH];\r
        WINDOWPLACEMENT wpl;\r
        \r
@@ -421,7 +421,8 @@ BOOL CALLBACK CProfile::EnumWindowsProc(const HWND hWnd, const LPARAM lParam)
        // Get Process Name\r
        DWORD dwProcessId = 0;\r
        GetWindowThreadProcessId(hWnd, &dwProcessId);\r
-       for (DWORD i = 0; i < CProfile::m_dwTasks; ++i) {\r
+       DWORD i;\r
+       for (i = 0; i < CProfile::m_dwTasks; ++i) {\r
                if (pTask[i].dwProcessId == dwProcessId) {\r
 \r
                        // Get Application Name\r
@@ -455,7 +456,7 @@ BOOL CALLBACK CProfile::EnumWindowsProc(const HWND hWnd, const LPARAM lParam)
                        } else if (!_tcsnicmp(pTask[i].ProcessName, _T("vim.exe"), sizeof(pTask[i].ProcessName))) {\r
                                szAppName.Format(_T("VIM"));\r
                        } else {\r
-                               CUtils::SetCorrectApplicationName(pTask[i].ProcessName, sizeof(pTask[i].ProcessName), szWindowName, sizeof(szWindowName));\r
+                               CUtils::SetCorrectApplicationName(pTask[i].ProcessName, szWindowName);\r
                                GetAppName(&szAppName, szWindowName);\r
                        }\r
                        break;\r
@@ -475,356 +476,185 @@ BOOL CALLBACK CProfile::EnumWindowsProc(const HWND hWnd, const LPARAM lParam)
        }\r
        return TRUE;\r
 }\r
-       \r
-//////////////////////////////////////////////////////////////////////\r
-// Construction/Destruction\r
-//////////////////////////////////////////////////////////////////////\r
-\r
-CProfile::CProfile()\r
-{\r
-\r
-}\r
 \r
-CProfile::~CProfile()\r
+void CProfile::LoadRegistry()\r
 {\r
-\r
-}\r
-\r
-// This method initializes data in the registry, or retrieves and validates registry data.\r
-// bSaveAndValidate specifies a flag that indicates \r
-// whether registry data is being initialized (FALSE) or data is being retrieved (TRUE). \r
-void CProfile::UpdateRegistryData(const BOOL bSaveAndValidate)\r
-{\r
-       CString szEntry;\r
-       CString szApplicationName;\r
-       CString szApplicationTitle;\r
-       CString szWindowText;\r
-       CString szWindowTextType;\r
-\r
-       BOOL bUseDialogSetting = FALSE;\r
-\r
-       for (int nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
-               // application name\r
-               CString szSection(MAKEINTRESOURCE(IDS_REG_SECTION_APPLICATION));\r
-               szEntry.Format(IDS_REG_ENTRY_APPLICATION, nApplicationID);\r
-               if (bSaveAndValidate) { // retrieve\r
-                       m_XkeymacsData[nApplicationID].ClearAll();\r
-                       szApplicationName = AfxGetApp()->GetProfileString(szSection, szEntry);\r
-                       if (szApplicationName.IsEmpty()) {\r
-                               if (nApplicationID) {\r
-                                       if (!bUseDialogSetting) {\r
-                                               szApplicationName.LoadString(IDS_DIALOG);\r
-                                               bUseDialogSetting = TRUE;\r
-                                       } else {\r
-                                               continue;\r
-                                       }\r
-                               } else {\r
-                                       szApplicationName.LoadString(IDS_DEFAULT);\r
+       bool bDialog = false;\r
+       const CString section(MAKEINTRESOURCE(IDS_REG_SECTION_APPLICATION));    \r
+       for (int nAppID = 0; nAppID < MAX_APP; ++nAppID) {\r
+               CString entry;\r
+               entry.Format(IDS_REG_ENTRY_APPLICATION, nAppID);\r
+               CString appName = AfxGetApp()->GetProfileString(section, entry);\r
+               if (appName.IsEmpty())  {\r
+                       if (nAppID) {\r
+                               if (bDialog)\r
+                                       continue;\r
+                               appName.LoadString(IDS_DIALOG);\r
+                               bDialog = true;\r
+                       } else\r
+                               appName.LoadString(IDS_DEFAULT);\r
+               } else if (appName == CString(MAKEINTRESOURCE(IDS_DIALOG)))\r
+                       bDialog = true;\r
+               _tcsncpy_s(m_Config.szSpecialApp[nAppID], appName, _TRUNCATE);\r
+               entry.LoadString(IDS_REG_ENTRY_APPLICATOIN_TITLE);\r
+               _tcsncpy_s(m_szAppTitle[nAppID], AfxGetApp()->GetProfileString(appName, entry), _TRUNCATE);\r
+               entry.LoadString(IDS_REG_ENTRY_WINDOW_TEXT);\r
+               _tcsncpy_s(m_Config.szWindowText[nAppID], AfxGetApp()->GetProfileString(appName, entry, _T("*")), _TRUNCATE);\r
+\r
+               const CString regApp = CString(MAKEINTRESOURCE(IDS_REGSUBKEY_DATA)) + _T("\\") + appName;\r
+               for (int nComID = 1; nComID < MAX_COMMAND; ++nComID) {\r
+                       entry = CCommands::GetCommandName(nComID);\r
+                       HKEY hKey;\r
+                       const CString regKey = regApp + _T("\\") + entry;\r
+                       if (RegOpenKeyEx(HKEY_CURRENT_USER, regKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS) {\r
+                               TCHAR szKeyBind[128];\r
+                               DWORD dwKeyBind = _countof(szKeyBind);\r
+                               for (DWORD dwIndex = 0; RegEnumKeyEx(hKey, dwIndex, szKeyBind, &dwKeyBind, NULL, NULL, NULL, NULL) == ERROR_SUCCESS; ++dwIndex) {\r
+                                       int nType, nKey;\r
+                                       ReadKeyBind(&nType, &nKey, szKeyBind);\r
+                                       m_Config.nCommandID[nAppID][nType][nKey] = nComID;\r
+                                       dwKeyBind = _countof(szKeyBind);\r
                                }\r
+                               RegCloseKey(hKey);\r
                        } else {\r
-                               if (szApplicationName == CString(MAKEINTRESOURCE(IDS_DIALOG))) {\r
-                                       bUseDialogSetting = TRUE;\r
+                               // Set the default assignment\r
+                               for (int i = 0; const int nKey = CCommands::GetDefaultCommandKey(nComID, i); ++i) {\r
+                                       if (CCommands::GetDefaultControlID(nComID, i) == IDC_CO2)\r
+                                               continue;\r
+                                       const int nType = CCommands::GetDefaultCommandType(nComID, i);\r
+                                       m_Config.nCommandID[nAppID][nType][nKey] = nComID;\r
                                }\r
                        }\r
-                       m_XkeymacsData[nApplicationID].SetApplicationName(szApplicationName);\r
-               } else {                                // initialize\r
-                       szApplicationName = m_XkeymacsData[nApplicationID].GetApplicationName();\r
-                       if (szApplicationName.IsEmpty()) {\r
-                               continue;\r
-                       }\r
-                       AfxGetApp()->WriteProfileString(szSection, szEntry, szApplicationName);\r
-               }\r
-\r
-               // application title\r
-               szEntry.LoadString(IDS_REG_ENTRY_APPLICATOIN_TITLE);\r
-               if (bSaveAndValidate) { // retrieve\r
-                       szApplicationTitle = AfxGetApp()->GetProfileString(szApplicationName, szEntry);\r
-                       m_XkeymacsData[nApplicationID].SetApplicationTitle(szApplicationTitle);\r
-               } else {                                // initialize\r
-                       szApplicationTitle = m_XkeymacsData[nApplicationID].GetApplicationTitle();\r
-                       while (!szApplicationTitle.IsEmpty() && szApplicationTitle.GetAt(0) == _T(' ')) {\r
-                               szApplicationTitle.Delete(0);\r
-                       }\r
-                       AfxGetApp()->WriteProfileString(szApplicationName, szEntry, szApplicationTitle);\r
-               }\r
-\r
-               // window text\r
-               szEntry.LoadString(IDS_REG_ENTRY_WINDOW_TEXT);\r
-               if (bSaveAndValidate) { // retrieve\r
-                       szWindowText = AfxGetApp()->GetProfileString(szApplicationName, szEntry, _T("*"));\r
-                       if (szWindowText.IsEmpty()) {\r
-                               szWindowText = _T('*');\r
-                       }\r
-                       m_XkeymacsData[nApplicationID].SetWindowText(szWindowText);\r
-               } else {                                // initialize\r
-                       szWindowText = m_XkeymacsData[nApplicationID].GetWindowText();\r
-                       AfxGetApp()->WriteProfileString(szApplicationName, szEntry, szWindowText);\r
-               }\r
-\r
-               // window text type\r
-               szEntry.LoadString(IDS_REG_ENTRY_WINDOW_TEXT_TYPE);\r
-               if (bSaveAndValidate) { // retrieve\r
-                       szWindowTextType = AfxGetApp()->GetProfileString(szApplicationName, szEntry);\r
-\r
-                       int nWindowTextType = IDS_WINDOW_TEXT_IGNORE;\r
-                       if (szWindowTextType == CString(MAKEINTRESOURCE(IDS_WINDOW_TEXT_MATCH))) {\r
-                               nWindowTextType = IDS_WINDOW_TEXT_MATCH;\r
-                       } else if (szWindowTextType == CString(MAKEINTRESOURCE(IDS_WINDOW_TEXT_MATCH_FORWARD))) {\r
-                               nWindowTextType = IDS_WINDOW_TEXT_MATCH_FORWARD;\r
-                       } else if (szWindowTextType == CString(MAKEINTRESOURCE(IDS_WINDOW_TEXT_MATCH_BACKWARD))) {\r
-                               nWindowTextType = IDS_WINDOW_TEXT_MATCH_BACKWARD;\r
-                       } else if (szWindowTextType == CString(MAKEINTRESOURCE(IDS_WINDOW_TEXT_MATCH_FULL))) {\r
-                               nWindowTextType = IDS_WINDOW_TEXT_MATCH_FULL;\r
-                       }\r
-\r
-                       m_XkeymacsData[nApplicationID].SetWindowTextType(nWindowTextType);\r
-               } else {                                // initialize\r
-                       szWindowTextType.LoadString(m_XkeymacsData[nApplicationID].GetWindowTextType());\r
-                       AfxGetApp()->WriteProfileString(szApplicationName, szEntry, szWindowTextType);\r
                }\r
-\r
-               // on/off\r
-               if (bSaveAndValidate) { // retrieve\r
-                       for (int nCommandID = 1; nCommandID < MAX_COMMAND; ++nCommandID) {\r
-                               szEntry = CXkeymacsData::GetCommandName(nCommandID);\r
-                               if (szEntry.IsEmpty()) {\r
-                                       break;\r
-                               }\r
-\r
-                               HKEY hKey = NULL;\r
-                               CString szSubKey(MAKEINTRESOURCE(IDS_REGSUBKEY_DATA));\r
-                               szSubKey += _T("\\") + szApplicationName + _T("\\") + szEntry;\r
-                               if (RegOpenKeyEx(HKEY_CURRENT_USER, szSubKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS) {\r
-                                       // Use registry data\r
-                                       TCHAR szKeyBind[128] = {'\0'};\r
-                                       DWORD dwKeyBind = sizeof(szKeyBind);\r
-                                       FILETIME ft = {'\0'};   // not use\r
-                                       for (DWORD dwIndex = 0;\r
-                                                RegEnumKeyEx(hKey, dwIndex, szKeyBind, &dwKeyBind, NULL, NULL, NULL, &ft) == ERROR_SUCCESS;\r
-                                                ++dwIndex) {\r
-                                               int nCommandType = 0;\r
-                                               int nKey = 0;\r
-                                               ReadKeyBind(&nCommandType, &nKey, szKeyBind);\r
-                                               m_XkeymacsData[nApplicationID].SetCommandID(nCommandType, nKey, nCommandID);\r
-\r
-//                                             if (nCommandType == CONTROL && nKey == 'D') {\r
-//                                                     CUtils::Log("GetProfileInt(at ibeam cursor only): %s, %s", szSubKey, szKeyBind);\r
-//                                             }\r
-                                               const CString szSection = szSubKey.Right(szSubKey.GetLength() - CString(MAKEINTRESOURCE(IDS_REGSUBKEY_DATA)).GetLength() - _tcslen(_T("\\"))) + _T("\\") + szKeyBind;\r
-                                               const BOOL bAtIbeamCursorOnly = AfxGetApp()->GetProfileInt(szSection, CString(MAKEINTRESOURCE(IDS_REG_ENTRY_AT_IBEAM_CURSOR_ONLY)), FALSE);\r
-                                               m_XkeymacsData[nApplicationID].SetAtIbeamCursorOnly(nCommandType, nKey, bAtIbeamCursorOnly);\r
-\r
-                                               memset(szKeyBind, 0, sizeof(szKeyBind));\r
-                                               dwKeyBind = sizeof(szKeyBind);\r
-                                       }\r
-                                       RegCloseKey(hKey);\r
-                               } else {\r
-                                       // Use default setting\r
-                                       for (int i = 0; ; ++i) {\r
-                                               if (CXkeymacsData::GetDefaultControlID(nCommandID, i) == IDC_CO2) {\r
-                                                       continue;\r
-                                               }\r
-\r
-                                               int nCommandType = CXkeymacsData::GetDefaultCommandType(nCommandID, i);\r
-                                               int nKey = CXkeymacsData::GetDefaultCommandKey(nCommandID, i);\r
-                                               if (nKey == 0) {\r
-                                                       break;\r
-                                               }\r
-                                               m_XkeymacsData[nApplicationID].SetCommandID(nCommandType, nKey, nCommandID);\r
-                                               m_XkeymacsData[nApplicationID].SetAtIbeamCursorOnly(nCommandType, nKey, FALSE);\r
-                                       }\r
-                               }\r
-                       }\r
-                       for (int nFunctionID = 0; nFunctionID < CDotXkeymacs::GetFunctionNumber(); ++nFunctionID) {\r
-                               HKEY hKey = NULL;\r
-                               CString szSubKey(MAKEINTRESOURCE(IDS_REGSUBKEY_DATA));\r
-                               szSubKey += _T("\\") + szApplicationName + _T("\\") + CDotXkeymacs::GetFunctionSymbol(nFunctionID);\r
-                               if (RegOpenKeyEx(HKEY_CURRENT_USER, szSubKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS) {\r
-                                       // Use registry data\r
-                                       CDotXkeymacs::ClearKey(nFunctionID, nApplicationID);\r
-                                       TCHAR szKeyBind[128] = {'\0'};\r
-                                       DWORD dwKeyBind = sizeof(szKeyBind);\r
-                                       FILETIME ft = {'\0'};   // not use\r
-                                       for (DWORD dwIndex = 0; RegEnumKeyEx(hKey, dwIndex, szKeyBind, &dwKeyBind, NULL, NULL, NULL, &ft) == ERROR_SUCCESS; ++dwIndex) {\r
-                                               int nCommandType = 0;\r
-                                               int nKey = 0;\r
-                                               ReadKeyBind(&nCommandType, &nKey, szKeyBind);\r
-                                               CDotXkeymacs::SetKey(nFunctionID, nApplicationID, nCommandType, nKey);\r
-\r
-                                               memset(szKeyBind, 0, sizeof(szKeyBind));\r
-                                               dwKeyBind = sizeof(szKeyBind);\r
-                                       }\r
-                                       RegCloseKey(hKey);\r
-                               }\r
-                       }\r
-               } else {                                // initialize\r
-                       // create all commands\r
-                       for (int nCommandID = 1; nCommandID < MAX_COMMAND; ++nCommandID) {\r
-                               szEntry = CXkeymacsData::GetCommandName(nCommandID);\r
-                               if (szEntry.IsEmpty()) {\r
-                                       break;\r
-                               }\r
-\r
-                               SaveCommand(szApplicationName, nCommandID);\r
-                       }\r
-                       for (int nCommandType = 0; nCommandType < MAX_COMMAND_TYPE; ++nCommandType) {\r
-                               for (int nKey = 0; nKey < MAX_KEY; ++nKey) {\r
-                                       int nCommandID = m_XkeymacsData[nApplicationID].GetCommandID(nCommandType, nKey);\r
-                                       SaveKeyBind(szApplicationName, nCommandID, nCommandType, nKey);\r
-                               }\r
-                       }\r
-                       for (int nFunctionID = 0; nFunctionID < CDotXkeymacs::GetFunctionNumber(); ++nFunctionID) {\r
-                               for (int nKeyID = 0; nKeyID < CDotXkeymacs::GetKeyNumber(nFunctionID, nApplicationID); ++nKeyID) {\r
-                                       int nCommandType = 0;\r
-                                       int nKey = 0;\r
-                                       CDotXkeymacs::GetKey(nFunctionID, nApplicationID, nKeyID, &nCommandType, &nKey);\r
-                                       SaveKeyBind(szApplicationName, CDotXkeymacs::GetFunctionSymbol(nFunctionID), nCommandType, nKey);\r
+               for (int nFuncID = 0; nFuncID < CDotXkeymacs::GetFunctionNumber(); ++nFuncID) {\r
+                       HKEY hKey;\r
+                       const CString regKey = regApp + _T("\\") + CDotXkeymacs::GetFunctionSymbol(nFuncID);\r
+                       if (RegOpenKeyEx(HKEY_CURRENT_USER, regKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS) {\r
+                               CDotXkeymacs::ClearKey(nFuncID, nAppID);\r
+                               TCHAR szKeyBind[128];\r
+                               DWORD dwKeyBind = _countof(szKeyBind);\r
+                               for (DWORD dwIndex = 0; RegEnumKeyEx(hKey, dwIndex, szKeyBind, &dwKeyBind, NULL, NULL, NULL, NULL) == ERROR_SUCCESS; ++dwIndex) {\r
+                                       int nType, nKey;\r
+                                       ReadKeyBind(&nType, &nKey, szKeyBind);\r
+                                       CDotXkeymacs::SetKey(nFuncID, nAppID, nType, nKey);\r
+                                       dwKeyBind = _countof(szKeyBind);\r
                                }\r
+                               RegCloseKey(hKey);\r
                        }\r
                }\r
 \r
-               // kill-ring-max\r
-               szEntry.LoadString(IDS_REG_ENTRY_KILL_RING_MAX);\r
-               if (bSaveAndValidate) { // retrieve\r
-                       int nKillRingMax = AfxGetApp()->GetProfileInt(szApplicationName, szEntry, 1);\r
-                       m_XkeymacsData[nApplicationID].SetKillRingMax(nKillRingMax);\r
-               } else {                                // initialize\r
-                       int nKillRingMax = m_XkeymacsData[nApplicationID].GetKillRingMax();\r
-                       AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, nKillRingMax);\r
-               }\r
-\r
-               // Use Dialog Setting\r
-               szEntry.LoadString(IDS_REG_ENTRY_USE_DIALOG_SETTING);\r
-               if (bSaveAndValidate) { // retrieve\r
-                       BOOL bUseDialogSetting = AfxGetApp()->GetProfileInt(szApplicationName,szEntry, 1);\r
-                       m_XkeymacsData[nApplicationID].SetUseDialogSetting(bUseDialogSetting);\r
-               } else {                                // initialize\r
-                       BOOL bUseDialogSetting = m_XkeymacsData[nApplicationID].GetUseDialogSetting();\r
-                       AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, bUseDialogSetting);\r
+               entry.LoadString(IDS_REG_ENTRY_KILL_RING_MAX);\r
+               m_Config.nKillRingMax[nAppID] = AfxGetApp()->GetProfileInt(appName, entry, 1);\r
+               entry.LoadString(IDS_REG_ENTRY_USE_DIALOG_SETTING);\r
+               m_Config.bUseDialogSetting[nAppID] = AfxGetApp()->GetProfileInt(appName, entry, 1);\r
+               entry.LoadString(IDS_REG_ENTRY_DISABLE_XKEYMACS);\r
+               m_Config.nSettingStyle[nAppID] = AfxGetApp()->GetProfileInt(appName, entry, 0) ? SETTING_DISABLE : SETTING_SPECIFIC;\r
+               entry.LoadString(IDC_REG_ENTRY_IGNORE_META_CTRL);\r
+               m_Config.bIgnoreUndefinedMetaCtrl[nAppID] = AfxGetApp()->GetProfileInt(appName, entry, 0);\r
+               entry.LoadString(IDC_REG_ENTRY_IGNORE_C_X);\r
+               m_Config.bIgnoreUndefinedC_x[nAppID] = AfxGetApp()->GetProfileInt(appName, entry, 0);\r
+               entry.LoadString(IDC_REG_ENTRY_ENABLE_CUA);\r
+               m_Config.bEnableCUA[nAppID] = AfxGetApp()->GetProfileInt(appName, entry, 0);\r
+               entry.LoadString(IDS_REG_ENTRY_326_COMPATIBLE);\r
+               m_Config.b326Compatible[nAppID] = AfxGetApp()->GetProfileInt(appName, entry, 0);\r
+       }\r
+}\r
+\r
+void CProfile::SaveRegistry()\r
+{\r
+       const CString section(MAKEINTRESOURCE(IDS_REG_SECTION_APPLICATION));    \r
+       for (int nAppID = 0; nAppID < MAX_APP; ++nAppID) {\r
+               const LPCTSTR szAppName = m_Config.szSpecialApp[nAppID];\r
+               CString entry;\r
+               entry.Format(IDS_REG_ENTRY_APPLICATION, nAppID);\r
+               if (!szAppName[0]) {\r
+                       if (!AfxGetApp()->GetProfileString(section, entry).IsEmpty())\r
+                               AfxGetApp()->WriteProfileString(section, entry, _T(""));\r
+                       continue;\r
                }\r
-\r
-               // Setting Style\r
-               szEntry.LoadString(IDS_REG_ENTRY_DISABLE_XKEYMACS);\r
-               if (bSaveAndValidate) { // retrieve\r
-                       int nSettingStyle = SETTING_SPECIFIC;\r
-                       if (AfxGetApp()->GetProfileInt(szApplicationName, szEntry, 0) != 0) {\r
-                               nSettingStyle = SETTING_DISABLE;\r
+               AfxGetApp()->WriteProfileString(section, entry, szAppName);\r
+\r
+               entry.LoadString(IDS_REG_ENTRY_APPLICATOIN_TITLE);\r
+               CString appTitle = m_szAppTitle[nAppID];\r
+               appTitle.TrimLeft(_T(' '));\r
+               AfxGetApp()->WriteProfileString(szAppName, entry, appTitle);\r
+               entry.LoadString(IDS_REG_ENTRY_WINDOW_TEXT);\r
+               AfxGetApp()->WriteProfileString(szAppName, entry, m_Config.szWindowText[nAppID]);\r
+\r
+               const CString regApp = CString(MAKEINTRESOURCE(IDS_REGSUBKEY_DATA)) + _T("\\") + szAppName;\r
+               // Create all commands\r
+               for (int nComID = 1; nComID < MAX_COMMAND; ++nComID)\r
+                       SaveCommand(szAppName, nComID);\r
+               for (int nType = 0; nType < MAX_COMMAND_TYPE; ++nType)\r
+                       for (int nKey = 0; nKey < MAX_KEY; ++nKey)\r
+                               SaveKeyBind(szAppName, m_Config.nCommandID[nAppID][nType][nKey], nType, nKey);\r
+               for (int nFuncID = 0; nFuncID < CDotXkeymacs::GetFunctionNumber(); ++nFuncID)\r
+                       for (int nKeyID = 0; nKeyID < CDotXkeymacs::GetKeyNumber(nFuncID, nAppID); ++nKeyID) {\r
+                               int nType, nKey;\r
+                               CDotXkeymacs::GetKey(nFuncID, nAppID, nKeyID, &nType, &nKey);\r
+                               SaveKeyBind(szAppName, CDotXkeymacs::GetFunctionSymbol(nFuncID), nType, nKey);\r
                        }\r
-                       m_XkeymacsData[nApplicationID].SetSettingStyle(nSettingStyle);\r
-               } else {                                // initialize\r
-                       BOOL bDisableXkeymacs = FALSE;\r
-                       if (m_XkeymacsData[nApplicationID].GetSettingStyle() == SETTING_DISABLE) {\r
-                               bDisableXkeymacs = TRUE;\r
-                       }\r
-                       AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, bDisableXkeymacs);\r
-               }\r
-\r
-               // Ignore Meta Ctrl+? when it is undefined.\r
-               szEntry.LoadString(IDC_REG_ENTRY_IGNORE_META_CTRL);\r
-               if (bSaveAndValidate) { // retrieve\r
-                       m_XkeymacsData[nApplicationID].SetIgnoreUndefinedMetaCtrl(AfxGetApp()->GetProfileInt(szApplicationName, szEntry, 0));\r
-               } else {                                // initialize\r
-                       AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, m_XkeymacsData[nApplicationID].GetIgnoreUndefinedMetaCtrl());\r
-               }\r
-\r
-               // Ignore C-x ? when it is undefined.\r
-               szEntry.LoadString(IDC_REG_ENTRY_IGNORE_C_X);\r
-               if (bSaveAndValidate) { // retrieve\r
-                       m_XkeymacsData[nApplicationID].SetIgnoreUndefinedC_x(AfxGetApp()->GetProfileInt(szApplicationName, szEntry, 0));\r
-               } else {                                // initialize\r
-                       AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, m_XkeymacsData[nApplicationID].GetIgnoreUndefinedC_x());\r
-               }\r
-\r
-               // Enable CUA-mode\r
-               szEntry.LoadString(IDC_REG_ENTRY_ENABLE_CUA);\r
-               if (bSaveAndValidate) { // retrieve\r
-                       m_XkeymacsData[nApplicationID].SetEnableCUA(AfxGetApp()->GetProfileInt(szApplicationName, szEntry, 0));\r
-               } else {                                // initialize\r
-                       AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, m_XkeymacsData[nApplicationID].GetEnableCUA());\r
-               }\r
 \r
-               // Version 3.26 compatible mode\r
-               szEntry.LoadString(IDS_REG_ENTRY_326_COMPATIBLE);\r
-               if (bSaveAndValidate) { // retrieve\r
-                       m_XkeymacsData[nApplicationID].Set326Compatible(AfxGetApp()->GetProfileInt(szApplicationName, szEntry, 0));\r
-               } else {                                // initialize\r
-                       AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, m_XkeymacsData[nApplicationID].Get326Compatible());\r
-               }\r
+               entry.LoadString(IDS_REG_ENTRY_KILL_RING_MAX);\r
+               AfxGetApp()->WriteProfileInt(szAppName, entry, m_Config.nKillRingMax[nAppID]);\r
+               entry.LoadString(IDS_REG_ENTRY_USE_DIALOG_SETTING);\r
+               AfxGetApp()->WriteProfileInt(szAppName, entry, m_Config.bUseDialogSetting[nAppID]);\r
+               entry.LoadString(IDS_REG_ENTRY_DISABLE_XKEYMACS);\r
+               AfxGetApp()->WriteProfileInt(szAppName, entry, m_Config.nSettingStyle[nAppID] == SETTING_DISABLE);\r
+               entry.LoadString(IDC_REG_ENTRY_IGNORE_META_CTRL);\r
+               AfxGetApp()->WriteProfileInt(szAppName, entry, m_Config.bIgnoreUndefinedMetaCtrl[nAppID]);\r
+               entry.LoadString(IDC_REG_ENTRY_IGNORE_C_X);\r
+               AfxGetApp()->WriteProfileInt(szAppName, entry, m_Config.bIgnoreUndefinedC_x[nAppID]);\r
+               entry.LoadString(IDC_REG_ENTRY_ENABLE_CUA);\r
+               AfxGetApp()->WriteProfileInt(szAppName, entry, m_Config.bEnableCUA[nAppID]);\r
+               entry.LoadString(IDS_REG_ENTRY_326_COMPATIBLE);\r
+               AfxGetApp()->WriteProfileInt(szAppName, entry, m_Config.b326Compatible[nAppID]);\r
        }\r
 }\r
 \r
-void CProfile::LoadRegistryData()\r
+void CProfile::LoadData()\r
 {\r
        CDotXkeymacs::Load();\r
        LevelUp();\r
-       UpdateRegistryData(TRUE);\r
+       LoadRegistry();\r
 }\r
 \r
-void CProfile::SaveRegistryData()\r
+void CProfile::SaveData()\r
 {\r
        DeleteAllRegistryData();\r
-       UpdateRegistryData(FALSE);\r
+       SaveRegistry();\r
        SetDllData();\r
 }\r
 \r
 void CProfile::SetDllData()\r
 {\r
-       CMainFrame *pMainFrame = (CMainFrame*)AfxGetMainWnd();\r
-\r
-       pMainFrame->m_pXkeymacsDll->ClearFunctionDefinition();\r
-       for (int nFunctionID = 0; nFunctionID < CDotXkeymacs::GetFunctionNumber(); ++nFunctionID) {\r
-               pMainFrame->m_pXkeymacsDll->SetFunctionDefinition(nFunctionID, CDotXkeymacs::GetFunctionDefinition(nFunctionID));\r
-       }\r
-\r
-       for (int nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
-\r
-               CString szApplicationName = m_XkeymacsData[nApplicationID].GetApplicationName();\r
-\r
-               if (szApplicationName.IsEmpty()) {\r
-                       pMainFrame->m_pXkeymacsDll->Clear(nApplicationID);\r
-                       continue;\r
-               }\r
-\r
-               pMainFrame->m_pXkeymacsDll->SetApplicationName(nApplicationID, szApplicationName);\r
-               pMainFrame->m_pXkeymacsDll->SetWindowText(nApplicationID, m_XkeymacsData[nApplicationID].GetWindowText());\r
-               pMainFrame->m_pXkeymacsDll->SetCommandID(nApplicationID, CONTROL, 'X', 0);\r
-               pMainFrame->m_pXkeymacsDll->SetAtIbeamCursorOnly(nApplicationID, CONTROL, 'X', FALSE);\r
-\r
-               for (int nCommandType = 0; nCommandType < MAX_COMMAND_TYPE; ++nCommandType) {\r
-                       for (int nKey = 0; nKey < MAX_KEY; ++nKey) {\r
-                               const int nCommandID = m_XkeymacsData[nApplicationID].GetCommandID(nCommandType, nKey);\r
-                               pMainFrame->m_pXkeymacsDll->SetCommandID(nApplicationID, nCommandType, nKey, nCommandID);\r
-                               const BOOL bAtIbeamCursorOnly = m_XkeymacsData[nApplicationID].GetAtIbeamCursorOnly(nCommandType, nKey);\r
-                               pMainFrame->m_pXkeymacsDll->SetAtIbeamCursorOnly(nApplicationID, nCommandType, nKey, bAtIbeamCursorOnly);\r
-                               if ((nCommandType & CONTROLX) && nCommandID) {\r
-                                       pMainFrame->m_pXkeymacsDll->SetCommandID(nApplicationID, CONTROL, 'X', 1);                      // Commands[1] is C-x\r
-                                       pMainFrame->m_pXkeymacsDll->SetAtIbeamCursorOnly(nApplicationID, CONTROL, 'X', bAtIbeamCursorOnly);\r
-                               }\r
-                       }\r
-               }\r
-\r
-               for (int nFunctionID = 0; nFunctionID < CDotXkeymacs::GetFunctionNumber(); ++nFunctionID) {\r
-                       for (int nKeyID = 0; nKeyID < CDotXkeymacs::GetKeyNumber(nFunctionID, nApplicationID); ++nKeyID) {\r
-                               int nCommandType = 0;\r
-                               int nKey = 0;\r
-                               CDotXkeymacs::GetKey(nFunctionID, nApplicationID, nKeyID, &nCommandType, &nKey);\r
-                               pMainFrame->m_pXkeymacsDll->SetFunctionKey(nFunctionID, nApplicationID, nCommandType, nKey);\r
-                               if (nCommandType & CONTROLX) {\r
-                                       pMainFrame->m_pXkeymacsDll->SetCommandID(nApplicationID, CONTROL, 'X', 1);                      // Commands[1] is C-x\r
-                                       const BOOL bAtIbeamCursorOnly = m_XkeymacsData[nApplicationID].GetAtIbeamCursorOnly(nCommandType, nKey);\r
-                                       pMainFrame->m_pXkeymacsDll->SetAtIbeamCursorOnly(nApplicationID, CONTROL, 'X', bAtIbeamCursorOnly);\r
-                               }\r
+       memset(m_Config.nFunctionID, -1, sizeof(m_Config.nFunctionID));\r
+       for (int nFuncID = 0; nFuncID < CDotXkeymacs::GetFunctionNumber(); ++nFuncID)\r
+               _tcscpy_s(m_Config.szFunctionDefinition[nFuncID], CDotXkeymacs::GetFunctionDefinition(nFuncID));\r
+\r
+       for (int nAppID = 0; nAppID < MAX_APP; ++nAppID) {\r
+               m_Config.nCommandID[nAppID][CONTROL]['X'] = 0; // C-x is unassigned.\r
+               for (int nType = 0; nType < MAX_COMMAND_TYPE; ++nType)\r
+                       for (int nKey = 0; nKey < MAX_KEY; ++nKey)\r
+                               if ((nType & CONTROLX) && m_Config.nCommandID[nAppID][nType][nKey])\r
+                                       m_Config.nCommandID[nAppID][CONTROL]['X'] = 1; // C-x is available.\r
+               for (int nFuncID = 0; nFuncID < CDotXkeymacs::GetFunctionNumber(); ++nFuncID)\r
+                       for (int nKeyID = 0; nKeyID < CDotXkeymacs::GetKeyNumber(nFuncID, nAppID); ++nKeyID) {\r
+                               int nType, nKey;\r
+                               CDotXkeymacs::GetKey(nFuncID, nAppID, nKeyID, &nType, &nKey);\r
+                               m_Config.nFunctionID[nAppID][nType][nKey] = nFuncID;\r
+                               if (nType & CONTROLX)\r
+                                       m_Config.nCommandID[nAppID][CONTROL]['X'] = 1; // C-x is available.\r
                        }\r
-               }\r
-\r
-               pMainFrame->m_pXkeymacsDll->SetKillRingMax(nApplicationID, m_XkeymacsData[nApplicationID].GetKillRingMax());\r
-               pMainFrame->m_pXkeymacsDll->SetUseDialogSetting(nApplicationID, m_XkeymacsData[nApplicationID].GetUseDialogSetting());\r
-               pMainFrame->m_pXkeymacsDll->SetSettingStyle(nApplicationID, m_XkeymacsData[nApplicationID].GetSettingStyle());\r
-               pMainFrame->m_pXkeymacsDll->SetIgnoreUndefinedMetaCtrl(nApplicationID, m_XkeymacsData[nApplicationID].GetIgnoreUndefinedMetaCtrl());\r
-               pMainFrame->m_pXkeymacsDll->SetIgnoreUndefinedC_x(nApplicationID, m_XkeymacsData[nApplicationID].GetIgnoreUndefinedC_x());\r
-               pMainFrame->m_pXkeymacsDll->SetEnableCUA(nApplicationID, m_XkeymacsData[nApplicationID].GetEnableCUA());\r
-               pMainFrame->m_pXkeymacsDll->Set326Compatible(nApplicationID, m_XkeymacsData[nApplicationID].Get326Compatible());\r
        }\r
+       m_Config.b106Keyboard = Is106Keyboard();\r
+       CXkeymacsDll::SetConfig(m_Config);\r
+       CXkeymacsApp *pApp = static_cast<CXkeymacsApp *>(AfxGetApp());\r
+       if (!pApp->IsWow64())\r
+               return;\r
+       if (!CXkeymacsDll::SaveConfig())\r
+               return;\r
+       pApp->SendIPCMessage(XKEYMACS_RELOAD);\r
 }\r
 \r
 void CProfile::ReadKeyBind(int *const pnCommandType, int *const pnKey, LPCTSTR szKeyBind)\r
@@ -833,18 +663,18 @@ void CProfile::ReadKeyBind(int *const pnCommandType, int *const pnKey, LPCTSTR s
        *pnKey = KeyBind2Key(szKeyBind + _tcslen(CommandType2String(*pnCommandType)));\r
 }\r
 \r
-CString CProfile::WriteKeyBind(const int nCommandType, const int nKey)\r
+CString CProfile::WriteKeyBind(const int nType, const int nKey)\r
 {\r
        CString szKeyBind;\r
-       szKeyBind.Format(_T("%s%s"), CommandType2String(nCommandType), Key2String(nKey));\r
+       szKeyBind.Format(_T("%s%s"), CommandType2String(nType), Key2String(nKey));\r
        return szKeyBind;\r
 }\r
 \r
 int CProfile::KeyBind2CommandType(LPCTSTR szKeyBind)\r
 {\r
-       for (int nCommandType = MAX_COMMAND_TYPE - 1; nCommandType; --nCommandType) {\r
-               if (IsCommandType(nCommandType, szKeyBind)) {\r
-                       return nCommandType;\r
+       for (int nType = MAX_COMMAND_TYPE - 1; nType; --nType) {\r
+               if (IsCommandType(nType, szKeyBind)) {\r
+                       return nType;\r
                }\r
        }\r
        return NONE;\r
@@ -852,7 +682,7 @@ int CProfile::KeyBind2CommandType(LPCTSTR szKeyBind)
 \r
 int CProfile::KeyBind2Key(LPCTSTR szKey)\r
 {\r
-       for (int nKey = 1; nKey < 0xff; ++nKey) {\r
+       for (int nKey = 1; nKey <= 0xff; ++nKey) {\r
                if (!_tcscmp(szKey, Key2String(nKey))) {\r
                        return nKey;\r
                }\r
@@ -860,13 +690,13 @@ int CProfile::KeyBind2Key(LPCTSTR szKey)
        return 0;\r
 }\r
 \r
-LPCTSTR CProfile::CommandType2String(int nCommandType)\r
+LPCTSTR CProfile::CommandType2String(int nType)\r
 {\r
-       if (nCommandType < 0 || sizeof(CommandTypes) / sizeof(CommandTypes[0]) <= nCommandType) {\r
+       if (nType < 0 || sizeof(CommandTypes) / sizeof(CommandTypes[0]) <= nType) {\r
                ASSERT(0);\r
-               nCommandType = NONE;\r
+               nType = NONE;\r
        }\r
-       return CommandTypes[nCommandType].szCommandTypeName;\r
+       return CommandTypes[nType].szName;\r
 }\r
 \r
 LPCTSTR CProfile::Key2String(int nKey)\r
@@ -893,9 +723,9 @@ LPCTSTR CProfile::Key2String(int nKey)
        return KeyNames[nKey].name;\r
 }\r
 \r
-BOOL CProfile::IsCommandType(const int nCommandType, LPCTSTR szKeyBind)\r
+BOOL CProfile::IsCommandType(const int nType, LPCTSTR szKeyBind)\r
 {\r
-       LPCTSTR szCommandType = CommandType2String(nCommandType);\r
+       LPCTSTR szCommandType = CommandType2String(nType);\r
 \r
        if (!_tcsnicmp(szKeyBind, szCommandType, _tcslen(szCommandType))) {\r
                return TRUE;\r
@@ -904,49 +734,39 @@ BOOL CProfile::IsCommandType(const int nCommandType, LPCTSTR szKeyBind)
        return FALSE;\r
 }\r
 \r
-void CProfile::SaveKeyBind(const CString szApplicationName, const int nCommandID, const int nCommandType, const int nKey)\r
+void CProfile::SaveKeyBind(const LPCSTR szAppName, const int nComID, const int nType, const int nKey)\r
 {\r
-       if (!nCommandID) {\r
+       if (!nComID)\r
                return;\r
-       }\r
-\r
-       CString szCommandName = CXkeymacsData::GetCommandName(nCommandID);\r
-       if (szCommandName.IsEmpty()) {\r
+       const LPCSTR szComName = CCommands::GetCommandName(nComID);\r
+       if (!szComName[0])\r
                return;\r
-       }\r
-\r
-       SaveKeyBind(szApplicationName, szCommandName, nCommandType, nKey);\r
+       SaveKeyBind(szAppName, szComName, nType, nKey);\r
 }\r
 \r
-void CProfile::SaveKeyBind(const CString szApplicationName, const CString szCommandName, const int nCommandType, const int nKey)\r
+void CProfile::SaveKeyBind(const LPCSTR szAppName, const LPCSTR szComName, const int nType, const int nKey)\r
 {\r
-       CString szKeyBind = WriteKeyBind(nCommandType, nKey);\r
-       CString szSubKey(MAKEINTRESOURCE(IDS_REGSUBKEY_DATA));\r
-       szSubKey += _T("\\") + szApplicationName + _T("\\") + szCommandName;\r
-       if (!szKeyBind.IsEmpty()) {\r
+       const CString szKeyBind = WriteKeyBind(nType, nKey);\r
+       CString szSubKey = CString(MAKEINTRESOURCE(IDS_REGSUBKEY_DATA)) + _T("\\") + szAppName + _T("\\") + szComName;\r
+       if (!szKeyBind.IsEmpty())\r
                szSubKey += _T("\\") + szKeyBind;\r
-       }\r
-\r
        HKEY hKey = NULL;\r
-       if (RegCreateKeyEx(HKEY_CURRENT_USER, szSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, NULL) == ERROR_SUCCESS) {\r
+       if (RegCreateKeyEx(HKEY_CURRENT_USER, szSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, NULL) == ERROR_SUCCESS)\r
                RegCloseKey(hKey);\r
-       }\r
 }\r
 \r
-void CProfile::SaveCommand(const CString szApplicationName, const int nCommandID)\r
+void CProfile::SaveCommand(const LPCSTR szAppName, const int nComID)\r
 {\r
-       SaveKeyBind(szApplicationName, nCommandID, 0, 0);\r
+       SaveKeyBind(szAppName, nComID, 0, 0);\r
 }\r
 \r
-void CProfile::AddKeyBind2C_(const CString szApplicationName, const BYTE bVk)\r
+void CProfile::AddKeyBind2C_(const LPCSTR szAppName, const BYTE bVk)\r
 {\r
-       for (int nCommandID = 0; nCommandID < MAX_COMMAND; ++nCommandID) {\r
-               if (Commands[nCommandID].fCommand == CCommands::C_) {\r
+       int nComID;\r
+       for (nComID = 0; nComID < MAX_COMMAND; ++nComID)\r
+               if (Commands[nComID].fCommand == CCommands::C_)\r
                        break;\r
-               }\r
-       }\r
-\r
-       SaveKeyBind(szApplicationName, nCommandID, NONE, bVk);\r
+       SaveKeyBind(szAppName, nComID, NONE, bVk);\r
 }\r
 \r
 void CProfile::LevelUp()\r
@@ -961,9 +781,9 @@ void CProfile::LevelUp()
        switch (AfxGetApp()->GetProfileInt(szSection, szEntry, nDefalutLevel)) {\r
        case nDefalutLevel:\r
                {\r
-                       for (int nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
+                       for (int nAppID = 0; nAppID < MAX_APP; ++nAppID) {\r
                                CString szEntry;\r
-                               szEntry.Format(IDS_REG_ENTRY_APPLICATION, nApplicationID);\r
+                               szEntry.Format(IDS_REG_ENTRY_APPLICATION, nAppID);\r
 \r
                                CString szApplicationName;\r
                                szApplicationName = AfxGetApp()->GetProfileString(CString(MAKEINTRESOURCE(IDS_REG_SECTION_APPLICATION)), szEntry);\r
@@ -978,9 +798,9 @@ void CProfile::LevelUp()
                // Do NOT write break; here.\r
        case 1:\r
                {\r
-                       for (int nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
+                       for (int nAppID = 0; nAppID < MAX_APP; ++nAppID) {\r
                                CString szEntry;\r
-                               szEntry.Format(IDS_REG_ENTRY_APPLICATION, nApplicationID);\r
+                               szEntry.Format(IDS_REG_ENTRY_APPLICATION, nAppID);\r
 \r
                                CString szApplicationName;\r
                                szApplicationName = AfxGetApp()->GetProfileString(CString(MAKEINTRESOURCE(IDS_REG_SECTION_APPLICATION)), szEntry);\r
@@ -997,9 +817,9 @@ void CProfile::LevelUp()
                // Do NOT write break; here.\r
        case 2:\r
                {\r
-                       for (int nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
+                       for (int nAppID = 0; nAppID < MAX_APP; ++nAppID) {\r
                                CString szEntry;\r
-                               szEntry.Format(IDS_REG_ENTRY_APPLICATION, nApplicationID);\r
+                               szEntry.Format(IDS_REG_ENTRY_APPLICATION, nAppID);\r
 \r
                                CString szApplicationName;\r
                                szApplicationName = AfxGetApp()->GetProfileString(CString(MAKEINTRESOURCE(IDS_REG_SECTION_APPLICATION)), szEntry);\r
@@ -1023,9 +843,9 @@ void CProfile::LevelUp()
                // Do NOT write break; here.\r
        case 3:\r
                {\r
-                       for (int nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
+                       for (int nAppID = 0; nAppID < MAX_APP; ++nAppID) {\r
                                CString szEntry;\r
-                               szEntry.Format(IDS_REG_ENTRY_APPLICATION, nApplicationID);\r
+                               szEntry.Format(IDS_REG_ENTRY_APPLICATION, nAppID);\r
 \r
                                CString szApplicationName;\r
                                szApplicationName = AfxGetApp()->GetProfileString(CString(MAKEINTRESOURCE(IDS_REG_SECTION_APPLICATION)), szEntry);\r
@@ -1034,20 +854,20 @@ void CProfile::LevelUp()
                                }\r
 \r
                                // rename original function to remove IDS_REG_ORIGINAL_PREFIX\r
-                               for (int nFunctionID = 0; nFunctionID < CDotXkeymacs::GetFunctionNumber(); ++nFunctionID) {\r
+                               for (int nFuncID = 0; nFuncID < CDotXkeymacs::GetFunctionNumber(); ++nFuncID) {\r
                                        HKEY hKey = NULL;\r
                                        CString szSubKey(MAKEINTRESOURCE(IDS_REGSUBKEY_DATA));\r
-                                       szSubKey += _T("\\") + szApplicationName + _T("\\") + CString(MAKEINTRESOURCE(IDS_REG_ORIGINAL_PREFIX)) + CDotXkeymacs::GetFunctionSymbol(nFunctionID);\r
+                                       szSubKey += _T("\\") + szApplicationName + _T("\\") + CString(MAKEINTRESOURCE(IDS_REG_ORIGINAL_PREFIX)) + CDotXkeymacs::GetFunctionSymbol(nFuncID);\r
                                        if (RegOpenKeyEx(HKEY_CURRENT_USER, szSubKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS) {\r
                                                // Use registry data\r
                                                TCHAR szKeyBind[128] = {'\0'};\r
                                                DWORD dwKeyBind = sizeof(szKeyBind);\r
                                                FILETIME ft = {'\0'};   // not use\r
                                                for (DWORD dwIndex = 0; RegEnumKeyEx(hKey, dwIndex, szKeyBind, &dwKeyBind, NULL, NULL, NULL, &ft) == ERROR_SUCCESS; ++dwIndex) {\r
-                                                       int nCommandType = 0;\r
+                                                       int nType = 0;\r
                                                        int nKey = 0;\r
-                                                       ReadKeyBind(&nCommandType, &nKey, szKeyBind);\r
-                                                       SaveKeyBind(szApplicationName, CDotXkeymacs::GetFunctionSymbol(nFunctionID), nCommandType, nKey);\r
+                                                       ReadKeyBind(&nType, &nKey, szKeyBind);\r
+                                                       SaveKeyBind(szApplicationName, CDotXkeymacs::GetFunctionSymbol(nFuncID), nType, nKey);\r
 \r
                                                        memset(szKeyBind, 0, sizeof(szKeyBind));\r
                                                        dwKeyBind = sizeof(szKeyBind);\r
@@ -1071,35 +891,27 @@ void CProfile::LevelUp()
 \r
 void CProfile::InitDllData()\r
 {\r
-       LoadRegistryData();\r
+       LoadData();\r
        SetDllData();\r
 }\r
 \r
 void CProfile::ClearData(const CString szCurrentApplication)\r
 {\r
-       for (int nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
-               if (m_XkeymacsData[nApplicationID].GetApplicationName() == szCurrentApplication) {\r
-                       break;\r
+       for (int nAppID = 0; nAppID < MAX_APP; ++nAppID)\r
+               if (szCurrentApplication == m_Config.szSpecialApp[nAppID]) {\r
+                       ZeroMemory(m_Config.nCommandID[nAppID], sizeof(m_Config.nCommandID[nAppID]));\r
+                       ZeroMemory(m_Config.szSpecialApp[nAppID], CLASS_NAME_LENGTH);\r
+                       return;\r
                }\r
-       }\r
-       if (nApplicationID < MAX_APP) {\r
-               m_XkeymacsData[nApplicationID].ClearAll();\r
-       }\r
 }\r
 \r
 // return count of saved settings\r
 int CProfile::GetSavedSettingCount()\r
 {\r
        int nSavedSetting = 0;\r
-\r
-       for (int nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
-               CString szApplicationName;\r
-               szApplicationName = m_XkeymacsData[nApplicationID].GetApplicationName();\r
-               if (!szApplicationName.IsEmpty()) {\r
+       for (int nAppID = 0; nAppID < MAX_APP; ++nAppID)\r
+               if (m_Config.szSpecialApp[nAppID][0])\r
                        ++nSavedSetting;\r
-               }\r
-       }\r
-\r
        return nSavedSetting;\r
 }\r
 \r
@@ -1107,60 +919,23 @@ void CProfile::InitApplicationList(CComboBox *const cApplicationList)
 {\r
        cApplicationList->ResetContent();\r
 \r
-       m_dwTasks = GetTaskList(m_TaskList, MAX_TASKS);\r
+       GetTaskList();\r
 \r
        EnumWindows(EnumWindowsProc, (LPARAM)cApplicationList);\r
 \r
+       CString szListItem;\r
        for (int i = 0; i < MAX_APP; ++i) {\r
-               CString szApplicationName       = m_XkeymacsData[i].GetApplicationName();\r
-               CString szApplicationTitle      = m_XkeymacsData[i].GetApplicationTitle();\r
-\r
-               CString szListItem;\r
-               szListItem.Format(IDS_APPLICATION_LIST_ITEM, szApplicationTitle, szApplicationName);\r
-               if (IsNotSameString(cApplicationList, szListItem)\r
-                && !IsDefault(szApplicationName)\r
-                && !IsDialog(szApplicationName)\r
-                && !szApplicationName.IsEmpty()) {\r
+               const LPCTSTR szAppName = m_Config.szSpecialApp[i];\r
+               const LPCTSTR szAppTitle = m_szAppTitle[i];\r
+               if (!szAppName[0] || !_tcscmp(szAppName, _T("IME")))\r
+                       continue;\r
+               szListItem.Format(IDS_APPLICATION_LIST_ITEM, szAppTitle, szAppName);\r
+               if (IsNotSameString(cApplicationList, szListItem) &&\r
+                               !IsDefault(szAppName) && !IsDialog(szAppName))\r
                        cApplicationList->AddString(szListItem);\r
-               }\r
        }\r
 \r
-       // Add IME\r
-       HKL hKL = GetKeyboardLayout(0);\r
-       if (ImmIsIME(hKL)) {\r
-               LPTSTR szIMEDescription = NULL;\r
-               UINT nIMEDescription = ImmGetDescription(hKL, NULL, 0);\r
-               if (nIMEDescription) {\r
-                       nIMEDescription += sizeof(TCHAR);       // for NULL\r
-                       if ((szIMEDescription = new TCHAR[nIMEDescription]) != NULL) {\r
-                               ImmGetDescription(hKL, szIMEDescription, nIMEDescription);\r
-                       }\r
-//                     CUtils::Log(_T("nIMEDescription = %d, szIMEDescription = _%s_"), nIMEDescription, szIMEDescription);\r
-               }\r
-\r
-               LPTSTR szIMEFileName = NULL;\r
-               UINT nIMEFileName = ImmGetIMEFileName(hKL, NULL, 0);\r
-               if (nIMEFileName) {\r
-                       nIMEFileName += sizeof(TCHAR);\r
-                       if ((szIMEFileName = new TCHAR[nIMEFileName]) != NULL) {\r
-                               ImmGetIMEFileName(hKL, szIMEFileName, nIMEFileName);\r
-                       }\r
-//                     CUtils::Log(_T("nIMEFileName = %d, szIMEFileName = _%s_"), nIMEFileName, szIMEFileName);\r
-               }\r
-\r
-               CString szIMETitle;\r
-               CString szIME(MAKEINTRESOURCE(IDS_IME_FILE_NAME));\r
-               szIMETitle.Format(IDS_APPLICATION_LIST_ITEM, szIMEDescription ? szIMEDescription : szIME, szIMEFileName ? szIMEFileName : szIME);\r
-//             CUtils::Log(_T("szIMETitle = _%s_, szIMEDescription = _%s_, szIMEFileName = _%s_"), szIMETitle, szIMEDescription, szIMEFileName);\r
-               if (IsNotSameString(cApplicationList, szIMETitle)) {\r
-                       cApplicationList->AddString(szIMETitle);\r
-               }\r
-\r
-               delete[] szIMEDescription;\r
-               szIMEDescription = NULL;\r
-               delete[] szIMEFileName;\r
-               szIMEFileName = NULL;\r
-       }\r
+       AddIMEInfo(cApplicationList);\r
 \r
        // Add Dialog\r
        cApplicationList->InsertString(0, CString(MAKEINTRESOURCE(IDS_DIALOG_TITLE)));\r
@@ -1170,209 +945,43 @@ void CProfile::InitApplicationList(CComboBox *const cApplicationList)
        cApplicationList->SelectString(-1, CString(MAKEINTRESOURCE(IDS_DEFAULT_TITLE)));\r
 }\r
 \r
-DWORD CProfile::GetTaskList(PTASK_LIST pTask, const DWORD dwNumTasks)\r
-{\r
-       for (int i = 0; i < MAX_TASKS; ++i) {\r
-               ZeroMemory(&pTask[i], sizeof(PTASK_LIST));\r
-       }\r
-\r
-       OSVERSIONINFO verInfo = {0};\r
-       verInfo.dwOSVersionInfoSize = sizeof (verInfo);\r
-       GetVersionEx(&verInfo);\r
-       if (verInfo.dwPlatformId == VER_PLATFORM_WIN32_NT\r
-        && verInfo.dwMajorVersion < 5) {\r
-               return GetTaskListNT(pTask, dwNumTasks);\r
-       }\r
-\r
-       HMODULE hKernel = GetModuleHandle(_T("KERNEL32.DLL"));\r
-       if (!hKernel) {\r
-               return 0;\r
-       }\r
-\r
-       CREATESNAPSHOT pCreateToolhelp32Snapshot = (CREATESNAPSHOT)GetProcAddress(hKernel, "CreateToolhelp32Snapshot");\r
-       if (!pCreateToolhelp32Snapshot) {\r
-               return 0;\r
-       }\r
-\r
-       PROCESSWALK pProcess32First = (PROCESSWALK)GetProcAddress(hKernel, "Process32First");\r
-       if (!pProcess32First) {\r
-               return 0;\r
-       }\r
-\r
-       PROCESSWALK pProcess32Next = (PROCESSWALK)GetProcAddress(hKernel, "Process32Next");\r
-       if (!pProcess32Next) {\r
-               return 0;\r
-       }\r
-\r
-       HANDLE hProcessSnap = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);\r
-       if (hProcessSnap == (HANDLE)-1) {\r
-               return 0;\r
-       }\r
-\r
-       DWORD dwTaskCount = 0;\r
-       PROCESSENTRY32 processEntry32 = {sizeof(PROCESSENTRY32)};\r
-       if (pProcess32First(hProcessSnap, &processEntry32)) {\r
-               do {\r
-                       LPTSTR pCurChar = NULL;\r
-                       for (pCurChar = processEntry32.szExeFile + lstrlen(processEntry32.szExeFile); *pCurChar != _T('\\') && pCurChar != processEntry32.szExeFile; --pCurChar) {\r
-                               ;\r
-                       }\r
-                       if (*pCurChar == _T('\\')) {\r
-                               ++pCurChar;\r
-                       }\r
-\r
-                       lstrcpy(pTask->ProcessName, pCurChar);\r
-                       pTask->dwProcessId = processEntry32.th32ProcessID;\r
-\r
-                       ++dwTaskCount;\r
-                       ++pTask;\r
-               } while (dwTaskCount < dwNumTasks && pProcess32Next(hProcessSnap, &processEntry32));\r
-       }\r
-\r
-       CloseHandle(hProcessSnap);\r
-       return dwTaskCount;\r
-}\r
-\r
-LPBYTE CProfile::GetCounters()\r
+void CProfile::AddIMEInfo(CComboBox *cApplicationList)\r
 {\r
-       LANGID lid = MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL);\r
-       CString szSubKey;\r
-       szSubKey.Format(CString(MAKEINTRESOURCE(IDS_REGSUBKEY_PERF)), lid);\r
-       HKEY hKey = NULL;\r
-       if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, szSubKey, 0, KEY_READ, &hKey) != ERROR_SUCCESS) {\r
-               return NULL;\r
-       }\r
-\r
-       DWORD dwSize = 0;\r
-       if (RegQueryValueEx(hKey, CString(MAKEINTRESOURCE(IDS_REGSUBKEY_COUNTERS)), NULL, NULL, NULL, &dwSize) != ERROR_SUCCESS) {\r
-               RegCloseKey(hKey);\r
-               return NULL;\r
-       }\r
-       LPBYTE pCounters = (LPBYTE) calloc(dwSize, sizeof(BYTE));\r
-       if (pCounters == NULL) {\r
-               RegCloseKey(hKey);\r
-               return NULL;\r
-       }\r
-       if (RegQueryValueEx(hKey, CString(MAKEINTRESOURCE(IDS_REGSUBKEY_COUNTERS)), NULL, NULL, pCounters, &dwSize) != ERROR_SUCCESS) {\r
-               RegCloseKey(hKey);\r
-               free(pCounters);\r
-               return NULL;\r
-       }\r
-       RegCloseKey(hKey);\r
-       return pCounters;\r
-}\r
-\r
-BOOL CProfile::GetProcessInfo(CString *const szProcessName, DWORD *const dwProcessId)\r
-{\r
-       LPBYTE pCounters = GetCounters();\r
-       if (!pCounters) {\r
-               return FALSE;\r
-       }\r
-       LPTSTR pTopOfString = (LPTSTR)pCounters;\r
-       while (*pTopOfString) {\r
-               if (_tcsicmp(pTopOfString, CString(MAKEINTRESOURCE(IDS_PROCESS))) == 0) {\r
-                       for (LPTSTR p2 = pTopOfString - 2; _istdigit(*p2); --p2) {\r
-                               ;\r
-                       }\r
-                       szProcessName->Format(_T("%s"), p2 + 1);        // 230\r
-               } else if (_tcsicmp(pTopOfString, CString(MAKEINTRESOURCE(IDS_PROCESSID))) == 0) {\r
-                       for (LPTSTR p2 = pTopOfString - 2; _istdigit(*p2); --p2) {\r
-                               ;\r
-                       }\r
-                       *dwProcessId = _ttol(p2 + 1);                   // 784\r
+       const UINT n = GetKeyboardLayoutList(0, NULL);\r
+       if (!n)\r
+               return;\r
+       std::vector<HKL> hkls(n);\r
+       GetKeyboardLayoutList(n, &hkls[0]);\r
+       TCHAR szFileName[MAX_PATH];\r
+       TCHAR szDescription[WINDOW_TEXT_LENGTH];\r
+       for (std::vector<HKL>::const_iterator p = hkls.begin(); p != hkls.end(); ++p)\r
+               if (ImmGetDescription(*p, szDescription, WINDOW_TEXT_LENGTH) &&\r
+                               ImmGetIMEFileName(*p, szFileName, MAX_PATH)) {\r
+                       CString item;\r
+                       item.Format(IDS_APPLICATION_LIST_ITEM, szDescription, szFileName);\r
+                       if (IsNotSameString(cApplicationList, item))\r
+                               cApplicationList->AddString(item);\r
                }\r
-               pTopOfString += (_tcslen(pTopOfString) + 1);\r
-       }\r
-       free(pCounters);\r
-       return TRUE;\r
 }\r
 \r
-PPERF_DATA_BLOCK CProfile::GetPerformanceData(const CString szProcessName)\r
+void CProfile::GetTaskList()\r
 {\r
-       DWORD dwSize = INITIAL_SIZE;\r
-       PPERF_DATA_BLOCK pPerformanceData = (PPERF_DATA_BLOCK) calloc(dwSize, sizeof(BYTE));\r
-       if (pPerformanceData == NULL) {\r
-               return NULL;\r
-       }\r
-\r
-       for (;;) {\r
-               switch (RegQueryValueEx(HKEY_PERFORMANCE_DATA, szProcessName, NULL, NULL, (LPBYTE)pPerformanceData, &dwSize)) {\r
-               case ERROR_SUCCESS:\r
-                       if (0 < dwSize\r
-                        && pPerformanceData->Signature[0] == (WCHAR)'P'\r
-                        && pPerformanceData->Signature[1] == (WCHAR)'E'\r
-                        && pPerformanceData->Signature[2] == (WCHAR)'R'\r
-                        && pPerformanceData->Signature[3] == (WCHAR)'F') {\r
-                               return pPerformanceData;\r
-                       }\r
-               case ERROR_MORE_DATA:\r
-                       dwSize += EXTEND_SIZE;\r
-                       pPerformanceData = (PPERF_DATA_BLOCK) realloc(pPerformanceData, dwSize);\r
-                       if (!pPerformanceData) {\r
-                               return NULL;\r
-                       }\r
-                       memset(pPerformanceData, 0, dwSize);\r
-                       break;\r
-               default:\r
-                       free(pPerformanceData);\r
-                       return NULL;\r
-               }\r
-       }\r
-}\r
+       ZeroMemory(m_TaskList, sizeof(m_TaskList));\r
 \r
-// Add running application's names to the list\r
-// only for _Windows NT_\r
-DWORD CProfile::GetTaskListNT(PTASK_LIST pTask, DWORD dwNumTasks)\r
-{\r
-       CString szProcessName;\r
-       DWORD dwProcessIdTitle = 0;\r
-       if (!GetProcessInfo(&szProcessName, &dwProcessIdTitle)) {\r
-               return dwNumTasks;\r
-       }\r
-\r
-       PPERF_DATA_BLOCK pPerformanceData = GetPerformanceData(szProcessName);\r
-       if (!pPerformanceData) {\r
-               return dwNumTasks;\r
-       }\r
-\r
-       PPERF_OBJECT_TYPE pObj = (PPERF_OBJECT_TYPE) ((DWORD)pPerformanceData + pPerformanceData->HeaderLength);\r
-       PPERF_COUNTER_DEFINITION pCounterDef = (PPERF_COUNTER_DEFINITION) ((DWORD)pObj + pObj->HeaderLength);\r
-       DWORD dwProcessIdCounter = 0;\r
-       for (DWORD i = 0; i < pObj->NumCounters; ++i) {\r
-               if (pCounterDef->CounterNameTitleIndex == dwProcessIdTitle) {\r
-                       dwProcessIdCounter = pCounterDef->CounterOffset;\r
-                       break;\r
-               }\r
-               ++pCounterDef;\r
-       }\r
-\r
-       dwNumTasks = min(dwNumTasks - 1, (DWORD)pObj->NumInstances);\r
-       PPERF_INSTANCE_DEFINITION pInst = (PPERF_INSTANCE_DEFINITION) ((DWORD)pObj + pObj->DefinitionLength);\r
-       for (i = 0; i < dwNumTasks; ++i) {\r
-               LPCWSTR pProcessName = (LPCWSTR) ((DWORD)pInst + pInst->NameOffset);\r
-\r
-               CHAR szProcessName[MAX_PATH] = {'\0'};\r
-               if (!WideCharToMultiByte(CP_ACP, 0, pProcessName, -1, szProcessName, sizeof(szProcessName), NULL, NULL)) {\r
-                       _tcscpy(pTask->ProcessName, CString(MAKEINTRESOURCE(IDS_UNKNOWN_TASK)));\r
-               }\r
-\r
-               if (_tcslen(szProcessName)+4 <= sizeof(pTask->ProcessName)) {\r
-                       _tcscpy(pTask->ProcessName, szProcessName);\r
-                       _tcscat(pTask->ProcessName, CString(MAKEINTRESOURCE(IDS_EXTENSION_EXECUTABLE)));\r
-               }\r
-\r
-               PPERF_COUNTER_BLOCK pCounter = (PPERF_COUNTER_BLOCK) ((DWORD)pInst + pInst->ByteLength);\r
-               pTask->dwProcessId = *((LPDWORD) ((DWORD)pCounter + dwProcessIdCounter));\r
-               if (pTask->dwProcessId == 0) {\r
-                       pTask->dwProcessId = (DWORD) -2;\r
-               }\r
+       HANDLE hProcessSnap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);\r
+       if (hProcessSnap == (HANDLE)-1)\r
+               return;\r
 \r
-               ++pTask;\r
-               pInst = (PPERF_INSTANCE_DEFINITION) ((DWORD)pCounter + pCounter->ByteLength);\r
+       m_dwTasks = 0;\r
+       PROCESSENTRY32 processEntry32 = {sizeof(PROCESSENTRY32)};\r
+       if (Process32First(hProcessSnap, &processEntry32)) {\r
+               do {\r
+                       lstrcpy(m_TaskList[m_dwTasks].ProcessName, processEntry32.szExeFile);\r
+                       m_TaskList[m_dwTasks++].dwProcessId = processEntry32.th32ProcessID;\r
+               } while (m_dwTasks < MAX_TASKS && Process32Next(hProcessSnap, &processEntry32));\r
        }\r
 \r
-       free(pPerformanceData);\r
-       return dwNumTasks;\r
+       CloseHandle(hProcessSnap);\r
 }\r
 \r
 // return application index\r
@@ -1380,46 +989,67 @@ DWORD CProfile::GetTaskListNT(PTASK_LIST pTask, DWORD dwNumTasks)
 // if there is NOT the application in the data, this function takes care of it.\r
 int CProfile::GetApplicationIndex(const CString szApplicationName, const BOOL bSaveAndValidate, int *const nSettingStyle)\r
 {\r
-       if (!bSaveAndValidate) {        // SetDialogData\r
+       if (!bSaveAndValidate) // SetDialogData\r
                *nSettingStyle = SETTING_UNDEFINED;\r
-       }\r
-\r
-       int nApplicationID = GetApplicationIndex(szApplicationName);\r
-\r
-       if (nApplicationID == MAX_APP) {\r
-               if (bSaveAndValidate) { // GetDialogData\r
-                       for (nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
-                               CString sz = m_XkeymacsData[nApplicationID].GetApplicationName();\r
-                               if (sz.IsEmpty()) {\r
-                                       m_XkeymacsData[nApplicationID].SetApplicationName(szApplicationName);\r
+       int nAppID = GetApplicationIndex(szApplicationName);\r
+       if (nAppID == MAX_APP) {\r
+               if (bSaveAndValidate) { // GetDialogData\r
+                       for (nAppID = 0; nAppID < MAX_APP; ++nAppID)\r
+                               if (!m_Config.szSpecialApp[nAppID][0]) {\r
+                                       _tcsncpy_s(m_Config.szSpecialApp[nAppID], szApplicationName, _TRUNCATE);\r
                                        break;\r
                                }\r
-                       }\r
-                       if (nApplicationID == MAX_APP) {\r
-                               return nApplicationID;\r
-                       }\r
-               } else {                                // SetDialogData\r
-                       for (nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
-                               if (IsDefault(m_XkeymacsData[nApplicationID].GetApplicationName())) {\r
+                       if (nAppID == MAX_APP)\r
+                               return nAppID;\r
+               } else { // SetDialogData\r
+                       for (nAppID = 0; nAppID < MAX_APP; ++nAppID)\r
+                               if (IsDefault(m_Config.szSpecialApp[nAppID])) {\r
                                        *nSettingStyle = SETTING_DEFAULT;\r
                                        break;\r
                                }\r
-                       }\r
-                       if (nApplicationID == MAX_APP) {\r
-                               return nApplicationID;\r
-                       }\r
+                       if (nAppID == MAX_APP)\r
+                               return nAppID;\r
                }\r
        }\r
+       if (bSaveAndValidate) // GetDialogData\r
+               m_Config.nSettingStyle[nAppID] = *nSettingStyle;\r
+       else { // SetDialogData\r
+               if (*nSettingStyle == SETTING_UNDEFINED) // It means that *nSettingStyle != SETTING_DEFAULT.\r
+                       *nSettingStyle = m_Config.nSettingStyle[nAppID];\r
+       }\r
+       return nAppID;\r
+}\r
 \r
-       if (bSaveAndValidate) { // GetDialogData\r
-               m_XkeymacsData[nApplicationID].SetSettingStyle(*nSettingStyle);\r
-       } else {                                // SetDialogData\r
-               if (*nSettingStyle == SETTING_UNDEFINED) {      // It means that *nSettingStyle != SETTING_DEFAULT.\r
-                       *nSettingStyle = m_XkeymacsData[nApplicationID].GetSettingStyle();\r
+BOOL CProfile::Is106Keyboard()\r
+{\r
+       static KEYBOARD_TYPE keyboard = UNKNOWN_KEYBOARD;\r
+\r
+       if (keyboard == UNKNOWN_KEYBOARD) {\r
+               OSVERSIONINFO verInfo = {0};\r
+               verInfo.dwOSVersionInfoSize = sizeof (verInfo);\r
+               GetVersionEx(&verInfo);\r
+\r
+               DWORD subtype = 0;\r
+               DWORD cbData = sizeof(subtype);\r
+\r
+               if (verInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) {\r
+                       HKEY hKey = NULL;\r
+                       CString szSubKey(_T("SYSTEM\\CurrentControlSet\\Services\\i8042prt\\Parameters"));\r
+                       if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, szSubKey, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) {\r
+                               static const CString szValueName(_T("OverrideKeyboardSubtype"));\r
+                               if (RegQueryValueEx(hKey, szValueName, NULL, NULL, (LPBYTE)&subtype, &cbData) != ERROR_SUCCESS) {\r
+                                       subtype = 0;\r
+                               }\r
+                               RegCloseKey(hKey);\r
+                       }\r
+               } else if (verInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {\r
+                       subtype = GetPrivateProfileInt(_T("keyboard"), _T("subtype"), 0, _T("system.ini"));\r
                }\r
+\r
+               keyboard = (subtype & 0x02) ? JAPANESE_KEYBOARD : ENGLISH_KEYBOARD;\r
        }\r
 \r
-       return nApplicationID;\r
+       return keyboard == JAPANESE_KEYBOARD;\r
 }\r
 \r
 BOOL CProfile::IsTheString(const CString sz, const UINT nID)\r
@@ -1458,79 +1088,74 @@ void CProfile::GetApplicationTitle(CComboBox *const cApplicationList, CString &r
        return;\r
 }\r
 \r
-void CProfile::UpdateApplicationTitle(CComboBox *const cApplicationList, const CString szCurrentApplication, const int nApplicationID, const BOOL bSaveAndValidate)\r
+void CProfile::UpdateApplicationTitle(CComboBox *const cApplicationList, const CString szCurrentApplication, const int nAppID, const BOOL bSaveAndValidate)\r
 {\r
        static CString szApplicationTitle;\r
        if (bSaveAndValidate) { // GetDialogData\r
-               if (!CProfile::IsDefault(szCurrentApplication)) {\r
-                       m_XkeymacsData[nApplicationID].SetApplicationTitle(szApplicationTitle);\r
-               }\r
+               if (!CProfile::IsDefault(szCurrentApplication))\r
+                       _tcsncpy_s(m_szAppTitle[nAppID], szApplicationTitle, _TRUNCATE);\r
                szApplicationTitle.Empty();\r
-       } else {                                // SetDialogData\r
+       } else { // SetDialogData\r
                CString szListItem;\r
                CProfile::GetApplicationTitle(cApplicationList, szListItem);\r
-               int nEndTitle = szListItem.ReverseFind(_T('('));\r
-               if (nEndTitle > 0) {\r
+               const int nEndTitle = szListItem.ReverseFind(_T('('));\r
+               if (nEndTitle > 0)\r
                        szApplicationTitle = szListItem.Left(nEndTitle);\r
-               }\r
        }\r
 }\r
 \r
-void CProfile::SetCommandID(const int nApplicationID, const int nCommandType, const int nKey, int nCommandID)\r
+void CProfile::SetCommandID(const int nAppID, const int nType, const int nKey, int nComID)\r
 {\r
-       if (nKey == 0xf0 && Commands[nCommandID].fCommand == CCommands::C_) {\r
+       if (nKey == 0xf0 && Commands[nComID].fCommand == CCommands::C_)\r
                // Change CommandID C_Eisu\r
-               for (nCommandID = 1; nCommandID < MAX_COMMAND; ++nCommandID) {\r
-                       if (Commands[nCommandID].fCommand == CCommands::C_Eisu) {\r
+               for (nComID = 1; nComID < MAX_COMMAND; ++nComID)\r
+                       if (Commands[nComID].fCommand == CCommands::C_Eisu)\r
                                break;\r
-                       }\r
-               }\r
-       }\r
-       m_XkeymacsData[nApplicationID].SetCommandID(nCommandType, nKey, nCommandID);\r
+       m_Config.nCommandID[nAppID][nType][nKey] = nComID;\r
 }\r
 \r
-int CProfile::GetCommandID(const int nApplicationID, const int nCommandType, const int nKey)\r
+int CProfile::GetCommandID(const int nAppID, const int nType, const int nKey)\r
 {\r
-       int nCommandID = m_XkeymacsData[nApplicationID].GetCommandID(nCommandType, nKey);\r
-       if (nKey == 0xf0 && Commands[nCommandID].fCommand == CCommands::C_Eisu) {\r
+       int nComID = m_Config.nCommandID[nAppID][nType][nKey];\r
+       if (nKey == 0xf0 && Commands[nComID].fCommand == CCommands::C_Eisu)\r
                // Change CommandID C_\r
-               for (nCommandID = 1; nCommandID < MAX_COMMAND; ++nCommandID) {\r
-                       if (Commands[nCommandID].fCommand == CCommands::C_) {\r
+               for (nComID = 1; nComID < MAX_COMMAND; nComID++)\r
+                       if (Commands[nComID].fCommand == CCommands::C_)\r
                                break;\r
-                       }\r
-               }\r
-       }\r
-       return nCommandID;\r
+       return nComID;\r
 }\r
 \r
-void CProfile::SetKillRingMax(const int nApplicationID, const int nKillRingMax)\r
+void CProfile::SetKillRingMax(const int nAppID, const int nKillRingMax)\r
 {\r
-       m_XkeymacsData[nApplicationID].SetKillRingMax(nKillRingMax);\r
+       m_Config.nKillRingMax[nAppID] = nKillRingMax;\r
 }\r
 \r
-int CProfile::GetKillRingMax(const int nApplicationID)\r
+int CProfile::GetKillRingMax(const int nAppID)\r
 {\r
-       return m_XkeymacsData[nApplicationID].GetKillRingMax();\r
+       return m_Config.nKillRingMax[nAppID];\r
 }\r
 \r
-void CProfile::SetUseDialogSetting(const int nApplicationID, const BOOL bUseDialogSetting)\r
+void CProfile::SetUseDialogSetting(const int nAppID, const BOOL bUseDialogSetting)\r
 {\r
-       m_XkeymacsData[nApplicationID].SetUseDialogSetting(bUseDialogSetting);\r
+       m_Config.bUseDialogSetting[nAppID] = bUseDialogSetting;\r
 }\r
 \r
-BOOL CProfile::GetUseDialogSetting(const int nApplicationID)\r
+BOOL CProfile::GetUseDialogSetting(const int nAppID)\r
 {\r
-       return m_XkeymacsData[nApplicationID].GetUseDialogSetting();\r
+       return m_Config.bUseDialogSetting[nAppID];\r
 }\r
 \r
-void CProfile::SetWindowText(const int nApplicationID, const CString szWindowText)\r
+void CProfile::SetWindowText(const int nAppID, const CString szWindowText)\r
 {\r
-       m_XkeymacsData[nApplicationID].SetWindowText(szWindowText);\r
+       if (CUtils::GetWindowTextType(szWindowText) == IDS_WINDOW_TEXT_IGNORE)\r
+               _tcscpy_s(m_Config.szWindowText[nAppID], _T("*"));\r
+       else\r
+               _tcsncpy_s(m_Config.szWindowText[nAppID], szWindowText, _TRUNCATE);\r
 }\r
 \r
-CString CProfile::GetWindowText(const int nApplicationID)\r
+CString CProfile::GetWindowText(const int nAppID)\r
 {\r
-       return m_XkeymacsData[nApplicationID].GetWindowText();\r
+       return m_Config.szWindowText[nAppID];\r
 }\r
 \r
 void CProfile::DeleteAllRegistryData()\r
@@ -1538,7 +1163,7 @@ void CProfile::DeleteAllRegistryData()
        HKEY hkey = NULL;\r
        if (RegOpenKeyEx(HKEY_CURRENT_USER, CString(MAKEINTRESOURCE(IDS_REGSUBKEY_DATA)), 0, KEY_ALL_ACCESS, &hkey) == ERROR_SUCCESS) {\r
                // I am sure that I have to do only one time, but...\r
-               for (int nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
+               for (int nAppID = 0; nAppID < MAX_APP; ++nAppID) {\r
                        DWORD dwIndex = 0;\r
                        TCHAR szName[SUB_KEY_NAME_LENGTH] = {'\0'};\r
                        DWORD dwName = sizeof(szName);\r
@@ -1572,278 +1197,33 @@ int CProfile::GetCurrentApplicationID(CComboBox *const cApplicationList, const C
        return -1;\r
 }\r
 \r
-void CProfile::CopyData(const CString szDestinationApplication, const CString szSourceApplication)\r
+void CProfile::CopyData(const CString szDstApp, const CString szSrcApp)\r
 {\r
        int nSettingStyle = SETTING_SPECIFIC;\r
-       int nDestinationApplication = GetApplicationIndex(szDestinationApplication, TRUE, &nSettingStyle);\r
-       int nSourceApplication = GetApplicationIndex(szSourceApplication);\r
-\r
-       CString szApplicationName = m_XkeymacsData[nDestinationApplication].GetApplicationName();\r
-       CString szApplicationTitle = m_XkeymacsData[nDestinationApplication].GetApplicationTitle();\r
-       CString szWindowText = m_XkeymacsData[nDestinationApplication].GetWindowText();\r
-       int nWindowTextType = m_XkeymacsData[nDestinationApplication].GetWindowTextType();\r
+       const int nDstApp = GetApplicationIndex(szDstApp, TRUE, &nSettingStyle);\r
+       const int nSrcApp = GetApplicationIndex(szSrcApp);\r
 \r
-       m_XkeymacsData[nDestinationApplication] = m_XkeymacsData[nSourceApplication];\r
-\r
-       m_XkeymacsData[nDestinationApplication].SetApplicationName(szApplicationName);\r
-       m_XkeymacsData[nDestinationApplication].SetApplicationTitle(szApplicationTitle);\r
-       m_XkeymacsData[nDestinationApplication].SetWindowText(szWindowText);\r
-       m_XkeymacsData[nDestinationApplication].SetWindowTextType(nWindowTextType);\r
+#define CopyMember(member) CopyMemory(&m_Config. ## member ## [nDstApp], &m_Config. ## member ## [nSrcApp], sizeof(m_Config. ## member ## [nSrcApp]))\r
+       CopyMember(b326Compatible);\r
+       CopyMember(nFunctionID);\r
+       CopyMember(bEnableCUA);\r
+       CopyMember(bUseDialogSetting);\r
+       CopyMember(bIgnoreUndefinedC_x);\r
+       CopyMember(bIgnoreUndefinedMetaCtrl);\r
+       CopyMember(nKillRingMax);\r
+       CopyMember(nCommandID);\r
+#undef CopyMember\r
 }\r
 \r
 // return application index\r
 // if there is NOT the application in the data, return MAX_APP\r
 int CProfile::GetApplicationIndex(const CString szApplicationName)\r
 {\r
-       int nApplicationID = 0;\r
-       for (nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
-               if (m_XkeymacsData[nApplicationID].GetApplicationName() == szApplicationName) {\r
-                       break;\r
-               }\r
-       }\r
-       return nApplicationID;\r
-}\r
-\r
-BOOL CProfile::Is106Keyboard()\r
-{\r
-       static KEYBOARD_TYPE keyboard = UNKNOWN_KEYBOARD;\r
-\r
-       if (keyboard == UNKNOWN_KEYBOARD) {\r
-               OSVERSIONINFO verInfo = {0};\r
-               verInfo.dwOSVersionInfoSize = sizeof (verInfo);\r
-               GetVersionEx(&verInfo);\r
-\r
-               DWORD subtype = 0;\r
-               DWORD cbData = sizeof(subtype);\r
-\r
-               if (verInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) {\r
-                       HKEY hKey = NULL;\r
-                       CString szSubKey(_T("SYSTEM\\CurrentControlSet\\Services\\i8042prt\\Parameters"));\r
-                       if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, szSubKey, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) {\r
-                               static const CString szValueName(_T("OverrideKeyboardSubtype"));\r
-                               if (RegQueryValueEx(hKey, szValueName, NULL, NULL, (LPBYTE)&subtype, &cbData) != ERROR_SUCCESS) {\r
-                                       subtype = 0;\r
-                               }\r
-                               RegCloseKey(hKey);\r
-                       }\r
-               } else if (verInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {\r
-                       subtype = GetPrivateProfileInt(_T("keyboard"), _T("subtype"), 0, _T("system.ini"));\r
-               }\r
-\r
-               keyboard = (subtype & 0x02) ? JAPANESE_KEYBOARD : ENGLISH_KEYBOARD;\r
-       }\r
-\r
-       return keyboard == JAPANESE_KEYBOARD;\r
-}\r
-\r
-void CProfile::LoadScanCodeMap(const HKEY_TYPE hkeyType)\r
-{\r
-       memset(m_ScanCodeMap[hkeyType], 0, sizeof(m_ScanCodeMap[hkeyType]));\r
-       memset(m_CurrentScanCodeMap[hkeyType], 0, sizeof(m_CurrentScanCodeMap[hkeyType]));\r
-\r
-       CString szSubKey;\r
-       CString szValueName;\r
-       HKEY hKey = HKEY_LOCAL_MACHINE;\r
-       if (IsNT()) {\r
-               switch (hkeyType) {\r
-               case CURRENT_USER:\r
-                       hKey = HKEY_CURRENT_USER;\r
-                       szSubKey.LoadString(IDS_REGSUBKEY_KEYBOARD_LAYOUT);\r
-                       break;\r
-               case LOCAL_MACHINE:\r
-                       szSubKey.LoadString(IDS_REGSUBKEY_KEYBOARD_LAYOUT_ANY_USER);\r
+       int nAppID = 0;\r
+       for (nAppID = 0; nAppID < MAX_APP; ++nAppID)\r
+               if (szApplicationName == m_Config.szSpecialApp[nAppID])\r
                        break;\r
-               default:\r
-                       return;\r
-               }\r
-               szValueName.LoadString(IDS_SCANCODE_MAP);\r
-       } else if (Is9x()) {\r
-               szSubKey.LoadString(IDS_REGSUBKEY_KEY_REMAP);\r
-               szValueName.LoadString(IDS_0);\r
-       } else {\r
-               return;\r
-       }\r
-\r
-       HKEY hkResult = NULL;\r
-       if (RegOpenKeyEx(hKey, szSubKey, 0, KEY_QUERY_VALUE, &hkResult) == ERROR_SUCCESS) {\r
-               // get data size\r
-               DWORD dwType = REG_BINARY;\r
-               DWORD dwData = 0;\r
-               RegQueryValueEx(hkResult, szValueName, NULL, &dwType, NULL, &dwData);\r
-\r
-               // get data\r
-               LPBYTE lpData = new BYTE[dwData];\r
-               if (lpData) {\r
-                       RegQueryValueEx(hkResult, szValueName, NULL, &dwType, lpData, &dwData);\r
-               }\r
-               RegCloseKey(hkResult);\r
-\r
-               if (IsNT()) {\r
-                       if (lpData && dwData) {\r
-                               DWORD offset = 0;\r
-                               offset += 8;    // skip Version Information and Flags\r
-                               DWORD *pdwMappings = (DWORD *)(lpData + offset);\r
-                               offset += 4;    // skip Number of Mappings\r
-                               DWORD *pdwNullTerminator = (DWORD *)(lpData + dwData - 4);\r
-\r
-                               if (4 * *pdwMappings + 12 != dwData) {\r
-                                       // illegal data\r
-                               } else if (*pdwNullTerminator != 0) {\r
-                                       // illegal data\r
-                               } else {\r
-                                       while (offset < dwData - 4) {\r
-                                               ScanCodeMapping *pMapping = (ScanCodeMapping *)(lpData + offset);\r
-                                               offset += 4;    // go to next data\r
-                                               m_CurrentScanCodeMap[hkeyType][PrefixedScanCode2ID(pMapping->original.nPrefixedScanCode)][pMapping->original.nScanCode].nPrefixedScanCode = pMapping->current.nPrefixedScanCode;\r
-                                               m_CurrentScanCodeMap[hkeyType][PrefixedScanCode2ID(pMapping->original.nPrefixedScanCode)][pMapping->original.nScanCode].nScanCode = pMapping->current.nScanCode;\r
-                                               m_ScanCodeMap[hkeyType][PrefixedScanCode2ID(pMapping->original.nPrefixedScanCode)][pMapping->original.nScanCode].nPrefixedScanCode = pMapping->current.nPrefixedScanCode;\r
-                                               m_ScanCodeMap[hkeyType][PrefixedScanCode2ID(pMapping->original.nPrefixedScanCode)][pMapping->original.nScanCode].nScanCode = pMapping->current.nScanCode;\r
-                                       }\r
-                               }\r
-                       }\r
-               }\r
-               delete[] lpData;\r
-               lpData = NULL;\r
-       }\r
-}\r
-\r
-int CProfile::LostKeyWarning(const HKEY_TYPE hkeyType)\r
-{\r
-       if (!ChangedKeyboardLayout(hkeyType)) {\r
-               return IDOK;\r
-       }\r
-\r
-       CString szLostKeysList;\r
-\r
-       for (int nPrefixedScanCodeID = 0; nPrefixedScanCodeID < 3; ++nPrefixedScanCodeID) {\r
-               for (int nScanCode = 0; nScanCode < 256; ++nScanCode) {\r
-                       if (m_ScanCodeMap[hkeyType][nPrefixedScanCodeID][nScanCode].nScanCode) {\r
-                               BOOL lostKey = TRUE;\r
-\r
-                               for (int i = 0; i < 3 && lostKey; ++i) {\r
-                                       for (int j = 0; j < 256 && lostKey; ++j) {\r
-                                               if (m_ScanCodeMap[hkeyType][i][j].nPrefixedScanCode == nPrefixedScanCodeID\r
-                                                && m_ScanCodeMap[hkeyType][i][j].nScanCode == nScanCode) {\r
-                                                       lostKey = FALSE;\r
-                                               }\r
-                                       }\r
-                               }\r
-\r
-                               if (lostKey) {\r
-                                       for (int i = 0; i < sizeof(KeyboardLayouts)/sizeof(KeyboardLayouts[0]); ++i) {\r
-                                               if (KeyboardLayouts[i].scancode.nScanCode == nScanCode\r
-                                                       && KeyboardLayouts[i].scancode.nPrefixedScanCode == nPrefixedScanCodeID) {\r
-                                                       CString szLostKey;\r
-                                                       szLostKey.Format(IDS_ERR_LOST_KEY, CString(MAKEINTRESOURCE(GetToolTipID(KeyboardLayouts[i].nToolTipID))));\r
-                                                       szLostKeysList += szLostKey;\r
-                                                       break;\r
-                                               }\r
-                                       }\r
-                               }\r
-                       }\r
-               }\r
-       }\r
-\r
-       if (szLostKeysList.IsEmpty()) {\r
-               return IDOK;\r
-       }\r
-\r
-       return AfxMessageBox(szLostKeysList, MB_OKCANCEL | MB_ICONEXCLAMATION);\r
-}\r
-\r
-void CProfile::SaveScanCodeMap(const HKEY_TYPE hkeyType)\r
-{\r
-       CString szSubKey;\r
-       CString szValueName;\r
-       HKEY hKey = HKEY_LOCAL_MACHINE;\r
-       if (IsNT()) {\r
-               switch (hkeyType) {\r
-               case CURRENT_USER:\r
-                       hKey = HKEY_CURRENT_USER;\r
-                       szSubKey.LoadString(IDS_REGSUBKEY_KEYBOARD_LAYOUT);\r
-                       break;\r
-               case LOCAL_MACHINE:\r
-                       szSubKey.LoadString(IDS_REGSUBKEY_KEYBOARD_LAYOUT_ANY_USER);\r
-                       break;\r
-               default:\r
-                       return;\r
-               }\r
-               szValueName.LoadString(IDS_SCANCODE_MAP);\r
-       } else if (Is9x()) {\r
-               szSubKey.LoadString(IDS_REGSUBKEY_KEY_REMAP);\r
-               szValueName.LoadString(IDS_0);\r
-       } else {\r
-               return;\r
-       }\r
-\r
-       HKEY hkResult = NULL;\r
-       if (RegCreateKeyEx(hKey, szSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hkResult, NULL) == ERROR_SUCCESS) {\r
-               if (IsNT()) {\r
-                       DWORD cbData = GetScanCodeLength(hkeyType);\r
-                       if (cbData <= 16) {\r
-                               RegDeleteValue(hkResult, szValueName);\r
-                       } else {\r
-                               LPBYTE lpData = new BYTE[cbData];\r
-                               memset(lpData, 0, sizeof(BYTE) * cbData);\r
-\r
-                               {\r
-                                       DWORD dwMappings = (cbData - 12) / 4;\r
-                                       memmove(lpData + 8, &dwMappings, 4);\r
-                               }\r
-\r
-                               int offset = 12;\r
-                               for (int nPrefixedScanCodeID = 0; nPrefixedScanCodeID < 3; ++nPrefixedScanCodeID) {\r
-                                       for (int nScanCode = 0; nScanCode < 256; ++nScanCode) {\r
-                                               if (m_ScanCodeMap[hkeyType][nPrefixedScanCodeID][nScanCode].nScanCode) {\r
-                                                       ScanCodeMapping sScanCodeMapping = {'\0'};\r
-                                                       sScanCodeMapping.original.nPrefixedScanCode = PrefixedScanCodeID2Code(nPrefixedScanCodeID);\r
-                                                       sScanCodeMapping.original.nScanCode = (BYTE)nScanCode;\r
-                                                       sScanCodeMapping.current.nPrefixedScanCode = m_ScanCodeMap[hkeyType][nPrefixedScanCodeID][nScanCode].nPrefixedScanCode;\r
-                                                       sScanCodeMapping.current.nScanCode = m_ScanCodeMap[hkeyType][nPrefixedScanCodeID][nScanCode].nScanCode;\r
-                                                       memcpy(lpData + offset, &sScanCodeMapping, sizeof(sScanCodeMapping));\r
-                                                       offset += sizeof(sScanCodeMapping);\r
-                                               }\r
-                                       }\r
-                               }\r
-                               RegSetValueEx(hkResult, szValueName, 0, REG_BINARY, lpData, cbData);\r
-\r
-                               delete[] lpData;\r
-                               lpData = NULL;\r
-                       }\r
-               }\r
-               RegCloseKey(hkResult);\r
-       }\r
-\r
-       // Do you want to restart computer?\r
-       if (ChangedKeyboardLayout(hkeyType)) {\r
-               if (AfxMessageBox(CString(MAKEINTRESOURCE(IDS_RESTART_OR_NOT)), MB_YESNO | MB_ICONQUESTION) == IDYES) {\r
-                       RestartComputer();\r
-               }\r
-       }\r
-}\r
-\r
-// Return True if Windows 95, Windows 98, or Windows Me. \r
-BOOL CProfile::Is9x()\r
-{\r
-       OSVERSIONINFO info = {sizeof(OSVERSIONINFO)};\r
-       GetVersionEx(&info);\r
-\r
-       if (info.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {\r
-               return TRUE;\r
-       }\r
-       return FALSE;\r
-}\r
-\r
-// Return True if Windows NT 4.0, Windows 2000, Windows XP, Windows 2003 or Windows Vista.\r
-BOOL CProfile::IsNT()\r
-{\r
-       OSVERSIONINFO info = {sizeof(OSVERSIONINFO)};\r
-       GetVersionEx(&info);\r
-\r
-       if (info.dwPlatformId == VER_PLATFORM_WIN32_NT) {\r
-               return TRUE;\r
-       }\r
-       return FALSE;\r
+       return nAppID;\r
 }\r
 \r
 // Return True if Windows Vista or later.\r
@@ -1867,205 +1247,28 @@ void CProfile::RestartComputer()
        ExitWindowsEx(EWX_REBOOT, 0);\r
 }\r
 \r
-int CProfile::GetControlID(const ScanCode scancode, const BOOL bBase)\r
-{\r
-       for (int i = 0; ; ++i) {\r
-               if (KeyboardLayouts[i].scancode.nPrefixedScanCode == scancode.nPrefixedScanCode\r
-                && KeyboardLayouts[i].scancode.nScanCode == scancode.nScanCode) {\r
-                       if (bBase) {\r
-                               return KeyboardLayouts[i].nBaseControlID;\r
-                       } else {\r
-                               return KeyboardLayouts[i].nCurrentControlID;\r
-                       }\r
-               }\r
-       }\r
-       return 0;\r
-}\r
-\r
-int CProfile::GetBaseControlID(const ScanCode scancode)\r
-{\r
-       return GetControlID(scancode, TRUE);\r
-}\r
-\r
-int CProfile::GetCurrentControlID(const ScanCode scancode)\r
-{\r
-       return GetControlID(scancode, FALSE);\r
-}\r
-\r
-BOOL CProfile::GetScanCodeMap(const HKEY_TYPE hkeyType, const ScanCode original, ScanCode *const current)\r
-{\r
-       if (!current) {\r
-               return FALSE;\r
-       }\r
-       *current = m_ScanCodeMap[hkeyType][PrefixedScanCode2ID(original.nPrefixedScanCode)][original.nScanCode];\r
-       return 0 < current->nScanCode;\r
-}\r
-\r
-void CProfile::SetScanCodeMap(const HKEY_TYPE hkeyType, const ScanCodeMapping ScanCodeMappeing)\r
-{\r
-       m_ScanCodeMap[hkeyType][PrefixedScanCode2ID(ScanCodeMappeing.original.nPrefixedScanCode)][ScanCodeMappeing.original.nScanCode] = ScanCodeMappeing.current;\r
-}\r
-\r
-int CProfile::PrefixedScanCode2ID(const BYTE nPrefixedScanCode)\r
-{\r
-       int nID = 0;\r
-\r
-       switch (nPrefixedScanCode) {\r
-       case 0x00:\r
-               nID = 0;\r
-               break;\r
-       case 0xe0:\r
-               nID = 1;\r
-               break;\r
-       case 0xe1:\r
-               nID = 2;\r
-               break;\r
-       default:\r
-               // invalid scan code\r
-               nID = 3;\r
-               break;\r
-       }\r
-\r
-       return nID;\r
-}\r
-\r
-BYTE CProfile::PrefixedScanCodeID2Code(const int nPrefixedScanCodeID)\r
-{\r
-       BYTE nCode = 0;\r
-\r
-       switch (nPrefixedScanCodeID) {\r
-       case 0:\r
-               nCode = 0x00;\r
-               break;\r
-       case 1:\r
-               nCode = 0xe0;\r
-               break;\r
-       case 2:\r
-               nCode = 0xe1;\r
-               break;\r
-       default:\r
-               ASSERT(0);\r
-               break;\r
-       }\r
-\r
-       return nCode;\r
-}\r
-\r
-DWORD CProfile::GetScanCodeLength(const HKEY_TYPE hkeyType)\r
-{\r
-       DWORD dwScanCodeLength = 0;\r
-       dwScanCodeLength += 4;  // Header: Version Information\r
-       dwScanCodeLength += 4;  // Header: Flags\r
-       dwScanCodeLength += 4;  // Header: Number of Mappings\r
-       for (int nPrefixedScanCodeID = 0; nPrefixedScanCodeID < 3; ++nPrefixedScanCodeID) {\r
-               for (int nScanCode = 0; nScanCode < 256; ++nScanCode) {\r
-                       if (m_ScanCodeMap[hkeyType][nPrefixedScanCodeID][nScanCode].nScanCode) {\r
-                               dwScanCodeLength += 4;  // Individual Mappings\r
-                       }\r
-               }\r
-       }\r
-       dwScanCodeLength += 4;  // Null Terminator (0x00000000)\r
-       return dwScanCodeLength;\r
-}\r
-\r
-BOOL CProfile::ChangedKeyboardLayout(const HKEY_TYPE hkeyType)\r
-{\r
-       for (int nPrefixedScanCodeID = 0; nPrefixedScanCodeID < 3; ++nPrefixedScanCodeID) {\r
-               for (int nScanCode = 0; nScanCode < 256; ++nScanCode) {\r
-                       if (m_ScanCodeMap[hkeyType][nPrefixedScanCodeID][nScanCode].nPrefixedScanCode   != m_CurrentScanCodeMap[hkeyType][nPrefixedScanCodeID][nScanCode].nPrefixedScanCode\r
-                        || m_ScanCodeMap[hkeyType][nPrefixedScanCodeID][nScanCode].nScanCode                   != m_CurrentScanCodeMap[hkeyType][nPrefixedScanCodeID][nScanCode].nScanCode) {\r
-                               return TRUE;\r
-                       }\r
-               }\r
-       }\r
-\r
-       return FALSE;\r
-}\r
-\r
-void CProfile::SetDraggingCursor()\r
-{\r
-       HCURSOR hCursor = (HCURSOR)LoadImage(AfxGetApp()->m_hInstance, MAKEINTRESOURCE(IDC_DRAG_CURSOR),\r
-                                                                                IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED);\r
-       SetCursor(hCursor);\r
-}\r
-\r
-void CProfile::SetNormalCursor()\r
-{\r
-       HCURSOR hCursor = (HCURSOR)LoadImage(NULL, MAKEINTRESOURCE(IDC_ARROW),\r
-                                                                                IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED);\r
-       SetCursor(hCursor);\r
-}\r
-\r
-void CProfile::SetNoCursor()\r
-{\r
-       HCURSOR hCursor = (HCURSOR)LoadImage(NULL, MAKEINTRESOURCE(IDC_NO),\r
-                                                                                IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED);\r
-       SetCursor(hCursor);\r
-}\r
-\r
-int CProfile::GetToolTipID(int nToolTipID)\r
-{\r
-       if (Is106Keyboard()) {\r
-               switch (nToolTipID) {\r
-               case IDS_EQUAL:                 // ^\r
-                       nToolTipID = IDS_CARET;\r
-                       break;\r
-               case IDS_SQUARE_BRA:    // @\r
-                       nToolTipID = IDS_AT_MARK;\r
-                       break;\r
-               case IDS_SQUARE_CKET:   // [\r
-                       nToolTipID = IDS_SQUARE_BRA;\r
-                       break;\r
-               case IDS_QUOTE:                 // :\r
-                       nToolTipID = IDS_COLON;\r
-                       break;\r
-               case IDS_BACK_QUOTE:    // Hankaku/Zenkaku\r
-                       nToolTipID = IDS_HANKAKU;\r
-                       break;\r
-               case IDS_BACKSLASH:             // ]\r
-                       nToolTipID = IDS_SQUARE_CKET;\r
-                       break;\r
-               }\r
-       }\r
-\r
-       return nToolTipID;\r
-}\r
-\r
-KeyboardLayout* CProfile::GetKeyboardLayouts(const int nKey)\r
-{\r
-       for (int i = 0; i < sizeof(KeyboardLayouts) / sizeof(KeyboardLayouts[0]); ++i) {\r
-               if (KeyboardLayouts[i].nBaseControlID == nKey\r
-                || KeyboardLayouts[i].nCurrentControlID == nKey) {\r
-                       return &KeyboardLayouts[i];\r
-               }\r
-       }\r
-       return NULL;\r
-}\r
-\r
 BOOL CProfile::AdjustTokenPrivileges(LPCTSTR lpName)\r
 {\r
        BOOL rc = TRUE;\r
 \r
-       if (IsNT()) {\r
-               HANDLE hToken;\r
-               if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) {\r
-                       LUID luid;\r
-                       if (LookupPrivilegeValue(NULL, lpName, &luid)) {\r
-                               TOKEN_PRIVILEGES tp;\r
-                               tp.PrivilegeCount = 1;\r
-                               tp.Privileges[0].Luid = luid;\r
-                               tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;\r
-\r
-                               if (!::AdjustTokenPrivileges(hToken, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), NULL, NULL)) {\r
-                                       rc = FALSE;\r
-                               }\r
-                       } else {\r
+       HANDLE hToken;\r
+       if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) {\r
+               LUID luid;\r
+               if (LookupPrivilegeValue(NULL, lpName, &luid)) {\r
+                       TOKEN_PRIVILEGES tp;\r
+                       tp.PrivilegeCount = 1;\r
+                       tp.Privileges[0].Luid = luid;\r
+                       tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;\r
+\r
+                       if (!::AdjustTokenPrivileges(hToken, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), NULL, NULL)) {\r
                                rc = FALSE;\r
                        }\r
-                       CloseHandle(hToken);\r
                } else {\r
                        rc = FALSE;\r
                }\r
+               CloseHandle(hToken);\r
+       } else {\r
+               rc = FALSE;\r
        }\r
 \r
        return rc;\r
@@ -2075,16 +1278,14 @@ BOOL CProfile::DiableTokenPrivileges()
 {\r
        BOOL rc = TRUE;\r
 \r
-       if (IsNT()) {\r
-               HANDLE hToken;\r
-               if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) {\r
-                       if (!::AdjustTokenPrivileges(hToken, TRUE, NULL, NULL, NULL, NULL)) {\r
-                               rc = FALSE;\r
-                       }\r
-                       CloseHandle(hToken);\r
-               } else {\r
+       HANDLE hToken;\r
+       if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) {\r
+               if (!::AdjustTokenPrivileges(hToken, TRUE, NULL, NULL, NULL, NULL)) {\r
                        rc = FALSE;\r
                }\r
+               CloseHandle(hToken);\r
+       } else {\r
+               rc = FALSE;\r
        }\r
 \r
        return rc;\r
@@ -2124,14 +1325,14 @@ void CProfile::ImportProperties()
        return;\r
 }\r
 \r
-BOOL CProfile::GetEnableCUA(const int nApplicationID)\r
+BOOL CProfile::GetEnableCUA(const int nAppID)\r
 {\r
-       return m_XkeymacsData[nApplicationID].GetEnableCUA();\r
+       return m_Config.bEnableCUA[nAppID];\r
 }\r
 \r
-void CProfile::SetEnableCUA(const int nApplicationID, const BOOL bEnableCUA)\r
+void CProfile::SetEnableCUA(const int nAppID, const BOOL bEnableCUA)\r
 {\r
-       m_XkeymacsData[nApplicationID].SetEnableCUA(bEnableCUA);\r
+       m_Config.bEnableCUA[nAppID] = bEnableCUA;\r
 }\r
 \r
 int CProfile::GetKeyboardSpeed()\r