Commit: 6d0ba6d7e3d96d3503c139ee1d04c4eb1dd06bea - xkeymacs64 (git)

XKeymacs for 64bit Windows

Commit MetaInfo

• Revisão: 6d0ba6d7e3d96d3503c139ee1d04c4eb1dd06bea (tree)
• Hora: 2011-05-27 08:38:38
• Autor: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Mensagem de Log

Remove typedef of Translate_t and the declaration of struct
Translate and enum Instance in xkeymacs/xkeymacs.h. Remove
m_Instance in CXkeymacsApp. Remove CXkeymacsApp::OnAppAbout.

Mudança Sumário

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

Diff

--- a/xkeymacs/dotxkeymacs.cpp
+++ b/xkeymacs/dotxkeymacs.cpp
@@ -5,7 +5,6 @@
 #include "stdafx.h"
 #include <direct.h>
 #include <Shlwapi.h>
-#include "xkeymacs.h"
 #include "DotXkeymacs.h"
 
 #ifdef _DEBUG
@@ -276,10 +275,13 @@ LPCTSTR CDotXkeymacs::GetLanguage()
 		LPVOID lpData = malloc(dwLen);
 
 		if (lpData && GetFileVersionInfo(lptstrFilename, NULL, dwLen, lpData)) {
-			Translate_t *lpTranslate;
+			struct Translate {
+				WORD wLanguage;
+				WORD wCodePage;
+			} *lpTranslate;
 			UINT cbTranslate = 0;
 
-			if (VerQueryValue(lpData, _T("\\VarFileInfo\\Translation"), (LPVOID*)&lpTranslate, &cbTranslate) && sizeof(Translate_t) <= cbTranslate) {
+			if (VerQueryValue(lpData, _T("\\VarFileInfo\\Translation"), (LPVOID*)&lpTranslate, &cbTranslate) && sizeof(Translate) <= cbTranslate) {
 				for (int i = 0; i < sizeof(Languages)/sizeof(Languages[0]); ++i) {
 					if (Languages[i].wLanguage == lpTranslate->wLanguage) {
 						szLanguage = Languages[i].szLanguage;

--- a/xkeymacs/xkeymacs.cpp
+++ b/xkeymacs/xkeymacs.cpp
@@ -17,13 +17,9 @@ static char THIS_FILE[] = __FILE__;
 
 BEGIN_MESSAGE_MAP(CXkeymacsApp, CWinApp)
 	//{{AFX_MSG_MAP(CXkeymacsApp)
-	ON_COMMAND(ID_APP_ABOUT, OnAppAbout)
 		// NOTE - the ClassWizard will add and remove mapping macros here.
 		//    DO NOT EDIT what you see in these blocks of generated code!
 	//}}AFX_MSG_MAP
-	// Standard file based document commands
-	ON_COMMAND(ID_FILE_NEW, CWinApp::OnFileNew)
-	ON_COMMAND(ID_FILE_OPEN, CWinApp::OnFileOpen)
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -31,7 +27,7 @@ END_MESSAGE_MAP()
 
 CXkeymacsApp::CXkeymacsApp()
 {
-	m_Instance = FirstInstance;
+	m_hMutex = NULL;
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -55,10 +51,9 @@ BOOL CXkeymacsApp::InitInstance()
 #else
 	m_hMutex = CreateMutex(FALSE, 0, CString(MAKEINTRESOURCE(AFX_IDS_APP_TITLE)));
 #endif
-
-    if (::GetLastError() == ERROR_ALREADY_EXISTS) {
-		m_Instance = SecondInstance;
-        CloseHandle( m_hMutex );
+    if (GetLastError() == ERROR_ALREADY_EXISTS) {
+        CloseHandle(m_hMutex);
+		m_hMutex = NULL;
         return FALSE;
     }
 
@@ -129,9 +124,12 @@ CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
 				wRevisionVersion	= (WORD)((pInfo->dwProductVersionLS      ) & 0xffff);
 			}
 
-			Translate_t *lpTranslate = NULL;
+			struct Translate {
+				WORD wLanguage;
+				WORD wCodePage;
+			} *lpTranslate = NULL;
 			UINT cbTranslate = 0;
-			if (VerQueryValue(lpData, _T("\\VarFileInfo\\Translation"), (LPVOID*)&lpTranslate, &cbTranslate) && sizeof(Translate_t) <= cbTranslate) {
+			if (VerQueryValue(lpData, _T("\\VarFileInfo\\Translation"), (LPVOID*)&lpTranslate, &cbTranslate) && sizeof(Translate) <= cbTranslate) {
 				LPVOID lpLegalCopyright = NULL;
 				UINT uLen = 0;
 				CString SubBlock;
@@ -180,22 +178,15 @@ BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-// App command to run the dialog
-void CXkeymacsApp::OnAppAbout()
-{
-	CAboutDlg aboutDlg;
-	aboutDlg.DoModal();
-}
-
 /////////////////////////////////////////////////////////////////////////////
 // CXkeymacsApp message handlers
 
 
 int CXkeymacsApp::ExitInstance() 
 {
-	if (m_Instance == FirstInstance) {
-	    ReleaseMutex( m_hMutex );
-		CloseHandle( m_hMutex );
+	if (m_hMutex) {
+		ReleaseMutex(m_hMutex);
+		CloseHandle(m_hMutex);
 
 		m_pMainWnd->DestroyWindow();
 		delete m_pMainWnd;

--- a/xkeymacs/xkeymacs.h
+++ b/xkeymacs/xkeymacs.h
@@ -14,13 +14,6 @@
 
 #include "resource.h"       // main symbols
 
-enum Instance
-{
-	FirstInstance,
-	SecondInstance,
-};
-
-
 /////////////////////////////////////////////////////////////////////////////
 // CXkeymacsApp:
 // See xkeymacs.cpp for the implementation of this class
@@ -41,13 +34,11 @@ public:
 
 // Implementation
 	//{{AFX_MSG(CXkeymacsApp)
-	afx_msg void OnAppAbout();
 		// NOTE - the ClassWizard will add and remove member functions here.
 		//    DO NOT EDIT what you see in these blocks of generated code !
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 private:
-	Instance m_Instance;
 	HANDLE m_hMutex;
 };
 
@@ -87,11 +78,6 @@ protected:
 
 /////////////////////////////////////////////////////////////////////////////
 
-typedef struct Translate {
-	WORD wLanguage;
-	WORD wCodePage;
-} Translate_t;
-
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.