Tera Term

[Ttssh2-commit] [4352] インストーラからの起動チェックのため、グローバルミューテックスも作成するようにした

svnno****@sourc***** svnno****@sourc*****
2011年 2月 28日 (月) 18:10:09 JST

• 前の記事 [Ttssh2-commit] [4351] CygTerm+ v1.07_21
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 4352
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4352
Author:   maya
Date:     2011-02-28 18:10:09 +0900 (Mon, 28 Feb 2011)

Log Message:
-----------
インストーラからの起動チェックのため、グローバルミューテックスも作成するようにした
  http://www.jrsoftware.org/iskb.php?mutexsessions

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/installer/teraterm.iss
    trunk/teraterm/keycode/keycode.c
    trunk/teraterm/teraterm/teraterm.cpp
    trunk/teraterm/ttpmacro/ttmacro.cpp
    trunk/ttpmenu/ttpmenu.cpp


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2011-02-28 09:07:19 UTC (rev 4351)
+++ trunk/doc/en/html/about/history.html	2011-02-28 09:10:09 UTC (rev 4352)
@@ -75,7 +75,9 @@
     <ul>
       <li>upgraded TTSSH version supporting SSH2 to <a href="#ttssh_2.56">2.56</a></li>
       <li>upgraded TTProxy to <a href="#ttproxy_1.0.0.18">1.0.0.18</a></li>
+      <li>upgraded CygTerm+ to <a href="#cygterm_1.07_21">1.07_21</a></li>
       <li>upgraded LogMeTT to 2.9.8</li>
+      <li>Add mutex object for running check by installer.</li>
     </ul>
   </li>
 
@@ -2252,6 +2254,12 @@
 
 
 <h2><a name="cygterm">CygTerm+</a></h2>
+
+<h3><a name="cygterm_1.07_21">v1.07_21 2011/02/28 (by maya)</a></h3>
+<ul class="history">
+      <li>Add mutex object for running check by installer.</li>
+</ul>
+
 <h3><a name="cygterm_1.07_20">v1.07_20 2010/10/20 (by doda)</a></h3>
 <ul class="history">
       <li>Security fix: A directory move timing delays by using -d option.</li>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2011-02-28 09:07:19 UTC (rev 4351)
+++ trunk/doc/ja/html/about/history.html	2011-02-28 09:10:09 UTC (rev 4352)
@@ -74,7 +74,9 @@
     <ul>
       <li><a href="#ttssh_2.56">SSH2‘ΉžTTSSH(2.56)</a>‚֍·‚µ‘Ö‚¦‚½B</li>
       <li><a href="#ttproxy_1.0.0.18">TTProxy(1.0.0.18)</a>‚֍·‚µ‘Ö‚¦‚½B</li>
+      <li><a href="#cygterm_1.07_21">CygTerm+ 1.07_21</a>‚֍·‚µ‘Ö‚¦‚½B</li>
       <li>LogMeTT 2.9.8‚֍·‚µ‘Ö‚¦‚½B</li>
+      <li>ƒCƒ“ƒXƒg[ƒ‰‚©‚ç‹N“®ƒ`ƒFƒbƒN‚ð‚·‚é‚½‚ß‚Ì mutex ‚ð’ljÁ‚µ‚½B</li>
     </ul>
   </li>
 
@@ -2254,6 +2256,11 @@
 
 <h2><a name="cygterm">CygTerm+</a></h2>
 
+<h3><a name="cygterm_1.07_21">v1.07_21 2011/02/28 (by maya)</a></h3>
+<ul class="history">
+      <li>ƒCƒ“ƒXƒg[ƒ‰‚©‚ç‹N“®ƒ`ƒFƒbƒN‚ð‚·‚é‚½‚ß‚Ì mutex ‚ð’ljÁ‚µ‚½B</li>
+</ul>
+
 <h3><a name="cygterm_1.07_20">v1.07_20 2010/10/20 (by doda)</a></h3>
 <ul class="history">
       <li>ƒZƒLƒ…ƒŠƒeƒBC³: '-d' ƒIƒvƒVƒ‡ƒ“‚ł̃fƒBƒŒƒNƒgƒŠˆÚ“®‚̃^ƒCƒ~ƒ“ƒO‚ð’x‚点‚½B</li>

Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2011-02-28 09:07:19 UTC (rev 4351)
+++ trunk/installer/teraterm.iss	2011-02-28 09:10:09 UTC (rev 4352)
@@ -16,7 +16,7 @@
 ShowLanguageDialog=yes
 AllowNoIcons=true
 UninstallDisplayIcon={app}\ttermpro.exe
-AppMutex=TeraTermProAppMutex, TeraTermProMacroAppMutex, TeraTermProKeycodeAppMutex, TeraTermMenuAppMutex, CygTermAppMutex
+AppMutex=TeraTermProAppMutex, TeraTermProMacroAppMutex, TeraTermProKeycodeAppMutex, TeraTermMenuAppMutex, CygTermAppMutex, Global\TeraTermProAppMutex, Global\TeraTermProMacroAppMutex, Global\TeraTermProKeycodeAppMutex, Global\TeraTermMenuAppMutex, Global\CygTermAppMutex
 #ifndef snapshot
 OutputBaseFilename=teraterm-{#AppVer}
 #else

Modified: trunk/teraterm/keycode/keycode.c
===================================================================
--- trunk/teraterm/keycode/keycode.c	2011-02-28 09:07:19 UTC (rev 4351)
+++ trunk/teraterm/keycode/keycode.c	2011-02-28 09:10:09 UTC (rev 4352)
@@ -33,8 +33,16 @@
 
 	// ƒCƒ“ƒXƒg[ƒ‰‚ÅŽÀs‚ðŒŸo‚·‚邽‚ß‚É mutex ‚ðì¬‚·‚é (2006.8.12 maya)
 	// 2d‹N“®–hŽ~‚Ì‚½‚ß‚Å‚Í‚È‚¢‚̂ŁA“Á‚É•Ô‚è’l‚ÍŒ©‚È‚¢
-	HANDLE hMutex;
-	hMutex = CreateMutex(NULL, TRUE, "TeraTermProKeycodeAppMutex");
+	SECURITY_DESCRIPTOR sd;
+	SECURITY_ATTRIBUTES sa;
+	HANDLE hMutex, hMutex2;
+	InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION);
+	SetSecurityDescriptorDacl(&sd, TRUE, NULL, FALSE);
+	sa.nLength = sizeof(sa);
+	sa.lpSecurityDescriptor = &sd;
+	sa.bInheritHandle = FALSE;
+	hMutex = CreateMutex(&sa, FALSE, "TeraTermProKeycodeAppMutex");
+	hMutex2 = CreateMutex(&sa, FALSE, "Global\\TeraTermProKeycodeAppMutex");
 
 	DoCover_IsDebuggerPresent();
 

Modified: trunk/teraterm/teraterm/teraterm.cpp
===================================================================
--- trunk/teraterm/teraterm/teraterm.cpp	2011-02-28 09:07:19 UTC (rev 4351)
+++ trunk/teraterm/teraterm/teraterm.cpp	2011-02-28 09:10:09 UTC (rev 4352)
@@ -51,8 +51,16 @@
 {
 	// ƒCƒ“ƒXƒg[ƒ‰‚ÅŽÀs‚ðŒŸo‚·‚邽‚ß‚É mutex ‚ðì¬‚·‚é (2006.8.12 maya)
 	// 2d‹N“®–hŽ~‚Ì‚½‚ß‚Å‚Í‚È‚¢‚̂ŁA“Á‚É•Ô‚è’l‚ÍŒ©‚È‚¢
-	HANDLE hMutex;
-	hMutex = CreateMutex(NULL, TRUE, "TeraTermProAppMutex");
+	SECURITY_DESCRIPTOR sd;
+	SECURITY_ATTRIBUTES sa;
+	HANDLE hMutex, hMutex2;
+	InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION);
+	SetSecurityDescriptorDacl(&sd, TRUE, NULL, FALSE);
+	sa.nLength = sizeof(sa);
+	sa.lpSecurityDescriptor = &sd;
+	sa.bInheritHandle = FALSE;
+	hMutex = CreateMutex(&sa, FALSE, "TeraTermProAppMutex");
+	hMutex2 = CreateMutex(&sa, FALSE, "Global\\TeraTermProAppMutex");
 
 	hInst = m_hInstance;
 	m_pMainWnd = new CVTWindow();

Modified: trunk/teraterm/ttpmacro/ttmacro.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttmacro.cpp	2011-02-28 09:07:19 UTC (rev 4351)
+++ trunk/teraterm/ttpmacro/ttmacro.cpp	2011-02-28 09:10:09 UTC (rev 4352)
@@ -51,8 +51,16 @@
 
 	// ƒCƒ“ƒXƒg[ƒ‰‚ÅŽÀs‚ðŒŸo‚·‚邽‚ß‚É mutex ‚ðì¬‚·‚é (2006.8.12 maya)
 	// 2d‹N“®–hŽ~‚Ì‚½‚ß‚Å‚Í‚È‚¢‚̂ŁA“Á‚É•Ô‚è’l‚ÍŒ©‚È‚¢
-	HANDLE hMutex;
-	hMutex = CreateMutex(NULL, TRUE, "TeraTermProMacroAppMutex");
+	SECURITY_DESCRIPTOR sd;
+	SECURITY_ATTRIBUTES sa;
+	HANDLE hMutex, hMutex2;
+	InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION);
+	SetSecurityDescriptorDacl(&sd, TRUE, NULL, FALSE);
+	sa.nLength = sizeof(sa);
+	sa.lpSecurityDescriptor = &sd;
+	sa.bInheritHandle = FALSE;
+	hMutex = CreateMutex(&sa, FALSE, "TeraTermProMacroAppMutex");
+	hMutex2 = CreateMutex(&sa, FALSE, "Global\\TeraTermProMacroAppMutex");
 
 	GetUILanguageFile(UILanguageFile, sizeof(UILanguageFile));
 

Modified: trunk/ttpmenu/ttpmenu.cpp
===================================================================
--- trunk/ttpmenu/ttpmenu.cpp	2011-02-28 09:07:19 UTC (rev 4351)
+++ trunk/ttpmenu/ttpmenu.cpp	2011-02-28 09:10:09 UTC (rev 4352)
@@ -2585,8 +2585,16 @@
 
 	// ƒCƒ“ƒXƒg[ƒ‰‚ÅŽÀs‚ðŒŸo‚·‚邽‚ß‚É mutex ‚ðì¬‚·‚é (2006.8.12 maya)
 	// 2d‹N“®–hŽ~‚Ì‚½‚ß‚Å‚Í‚È‚¢‚̂ŁA“Á‚É•Ô‚è’l‚ÍŒ©‚È‚¢
-	HANDLE hMutex;
-	hMutex = CreateMutex(NULL, TRUE, "TeraTermMenuAppMutex");
+	SECURITY_DESCRIPTOR sd;
+	SECURITY_ATTRIBUTES sa;
+	HANDLE hMutex, hMutex2;
+	InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION);
+	SetSecurityDescriptorDacl(&sd, TRUE, NULL, FALSE);
+	sa.nLength = sizeof(sa);
+	sa.lpSecurityDescriptor = &sd;
+	sa.bInheritHandle = FALSE;
+	hMutex = CreateMutex(&sa, FALSE, "TeraTermMenuAppMutex");
+	hMutex2 = CreateMutex(&sa, FALSE, "Global\\TeraTermMenuAppMutex");
 
 	checkIniFile();		//INIƒtƒ@ƒCƒ‹/ƒŒƒWƒXƒgƒŠØ‘Ö
 

• 前の記事 [Ttssh2-commit] [4351] CygTerm+ v1.07_21
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]