Commit: dd6b078bb17f6a03cf8e6a5c3413e17e91550dcc - xkeymacs64 (git)

XKeymacs for 64bit Windows

Commit MetaInfo

• Révision: dd6b078bb17f6a03cf8e6a5c3413e17e91550dcc (tree)
• l'heure: 2011-05-27 08:36:10
• Auteur: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Message de Log

Rewrite CProfile::GetTaskList.

Delete PROCESS_SIZE macro. Make m_TaskList and m_dwTasks in CProfile
private. GetTaskList operates them directly. Remove arguments and
the return value of it. Remove code to delete directory names in it.

Change Summary

• modified: xkeymacs/profile.cpp
• modified: xkeymacs/profile.h

Modification

--- a/xkeymacs/profile.cpp
+++ b/xkeymacs/profile.cpp
@@ -1108,7 +1108,7 @@ void CProfile::InitApplicationList(CComboBox *const cApplicationList)
 {
 	cApplicationList->ResetContent();
 
-	m_dwTasks = GetTaskList(m_TaskList, MAX_TASKS);
+	GetTaskList();
 
 	EnumWindows(EnumWindowsProc, (LPARAM)cApplicationList);
 
@@ -1171,39 +1171,24 @@ void CProfile::InitApplicationList(CComboBox *const cApplicationList)
 	cApplicationList->SelectString(-1, CString(MAKEINTRESOURCE(IDS_DEFAULT_TITLE)));
 }
 
-DWORD CProfile::GetTaskList(PTASK_LIST pTask, const DWORD dwNumTasks)
+void CProfile::GetTaskList()
 {
-	for (int i = 0; i < MAX_TASKS; ++i) {
-		ZeroMemory(&pTask[i], sizeof(PTASK_LIST));
-	}
+	ZeroMemory(m_TaskList, sizeof(m_TaskList));
 
 	HANDLE hProcessSnap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-	if (hProcessSnap == (HANDLE)-1) {
-		return 0;
-	}
+	if (hProcessSnap == (HANDLE)-1)
+		return;
 
-	DWORD dwTaskCount = 0;
+	m_dwTasks = 0;
 	PROCESSENTRY32 processEntry32 = {sizeof(PROCESSENTRY32)};
 	if (Process32First(hProcessSnap, &processEntry32)) {
 		do {
-			LPTSTR pCurChar = NULL;
-			for (pCurChar = processEntry32.szExeFile + lstrlen(processEntry32.szExeFile); *pCurChar != _T('\\') && pCurChar != processEntry32.szExeFile; --pCurChar) {
-				;
-			}
-			if (*pCurChar == _T('\\')) {
-				++pCurChar;
-			}
-
-			lstrcpy(pTask->ProcessName, pCurChar);
-			pTask->dwProcessId = processEntry32.th32ProcessID;
-
-			++dwTaskCount;
-			++pTask;
-		} while (dwTaskCount < dwNumTasks && Process32Next(hProcessSnap, &processEntry32));
+			lstrcpy(m_TaskList[m_dwTasks].ProcessName, processEntry32.szExeFile);
+			m_TaskList[m_dwTasks++].dwProcessId = processEntry32.th32ProcessID;
+		} while (m_dwTasks < MAX_TASKS && Process32Next(hProcessSnap, &processEntry32));
 	}
 
 	CloseHandle(hProcessSnap);
-	return dwTaskCount;
 }
 
 // return application index

--- a/xkeymacs/profile.h
+++ b/xkeymacs/profile.h
@@ -12,11 +12,9 @@
 #include <winperf.h>   // for Windows NT
 #include "resource.h"
 
-#define PROCESS_SIZE        MAX_PATH
-
 struct TASK_LIST {
     DWORD dwProcessId;
-    CHAR ProcessName[PROCESS_SIZE];
+    CHAR ProcessName[MAX_PATH];
 };
 typedef TASK_LIST *PTASK_LIST;
 
@@ -206,8 +204,6 @@ public:
 	static void GetApplicationTitle(CComboBox *cApplicationList, CString &rList, int nIndex = -1);
 	static BOOL IsDefault(CString sz);
 	static int GetApplicationIndex(CString szApplicationName, BOOL bSaveAndValidate, int *nSettingStyle);
-	static TASK_LIST m_TaskList[MAX_TASKS];
-	static DWORD m_dwTasks;
 	static void InitApplicationList(CComboBox *cApplicationList);
 	static int GetSavedSettingCount();
 	static void ClearData(CString szCurrentApplication);
@@ -242,7 +238,9 @@ private:
 	static void SetDllData();
 	static CXkeymacsData m_XkeymacsData[MAX_APP];
 	static void DeleteAllRegistryData();
-	static DWORD GetTaskList(PTASK_LIST pTask, DWORD dwNumTasks);
+	static TASK_LIST m_TaskList[MAX_TASKS];
+	static DWORD m_dwTasks;
+	static void GetTaskList();
 	static BOOL IsCommandType(int nCommandType, LPCTSTR szKeyBind);
 	static int KeyBind2Key(LPCTSTR szKey);
 	static int KeyBind2CommandType(LPCTSTR szKeyBind);