OSDN Git Service

add log on fail to escape NLS keys
authorU-i7\gimy <gimy@users.sourceforge.jp>
Tue, 18 Aug 2009 23:12:16 +0000 (08:12 +0900)
committerU-i7\gimy <gimy@users.sourceforge.jp>
Tue, 18 Aug 2009 23:12:16 +0000 (08:12 +0900)
mayu.cpp

index 67dea01..836bf46 100644 (file)
--- a/mayu.cpp
+++ b/mayu.cpp
@@ -331,7 +331,12 @@ private:
                                        if (This->m_isConsoleConnected == false) {\r
                                                This->m_isConsoleConnected = true;\r
                                                if (This->m_escapeNlsKeys) {\r
-                                                       This->m_fixScancodeMap.fix();\r
+                                                       int ret;\r
+                                                       \r
+                                                       ret = This->m_fixScancodeMap.fix();\r
+                                                       if (ret) {\r
+                                                               This->m_log << _T("escape NLS keys failed: ") << ret << std::endl;\r
+                                                       }\r
                                                }\r
                                        }\r
                                        m = "WTS_CONSOLE_CONNECT";\r
@@ -354,7 +359,12 @@ private:
                                        break;\r
                                case WTS_SESSION_LOCK: {\r
                                        if (This->m_escapeNlsKeys) {\r
-                                               This->m_fixScancodeMap.restore();\r
+                                               int ret;\r
+\r
+                                               ret = This->m_fixScancodeMap.restore();\r
+                                               if (ret) {\r
+                                                       This->m_log << _T("restore NLS keys failed: ") << ret << std::endl;\r
+                                               }\r
                                        }\r
                                        m = "WTS_SESSION_LOCK";\r
                                        break;\r
@@ -362,7 +372,12 @@ private:
                                case WTS_SESSION_UNLOCK: {\r
                                        if (This->m_isConsoleConnected == true) {\r
                                                if (This->m_escapeNlsKeys) {\r
-                                                       This->m_fixScancodeMap.fix();\r
+                                                       int ret;\r
+\r
+                                                       ret = This->m_fixScancodeMap.fix();\r
+                                                       if (ret) {\r
+                                                               This->m_log << _T("escape NLS keys failed: ") << ret << std::endl;\r
+                                                       }\r
                                                }\r
                                        }\r
                                        m = "WTS_SESSION_UNLOCK";\r
@@ -634,7 +649,11 @@ private:
                                        This->m_usingSN = false;\r
                                }\r
                                if (This->m_escapeNlsKeys) {\r
-                                       This->m_fixScancodeMap.restore();\r
+                                       int err;\r
+                                       err = This->m_fixScancodeMap.restore();\r
+                                       if (err) {\r
+                                               This->errorDialogWithCode(IDS_escapeNlsKeysFailed, err);\r
+                                       }\r
                                }\r
                                return 0;\r
 \r