Revision: 10705 https://osdn.net/projects/ttssh2/scm/svn/commits/10705 Author: zmatsuo Date: 2023-05-15 00:37:21 +0900 (Mon, 15 May 2023) Log Message: ----------- ttpmenu の ttssh.exe 考慮部分を削除 - ttssh.exe の使用を考慮していたコードを削除 - ttssh.exe は現在使用していない Modified Paths: -------------- trunk/ttpmenu/ttpmenu.cpp trunk/ttpmenu/ttpmenu.h -------------- next part -------------- Modified: trunk/ttpmenu/ttpmenu.cpp =================================================================== --- trunk/ttpmenu/ttpmenu.cpp 2023-05-14 15:37:10 UTC (rev 10704) +++ trunk/ttpmenu/ttpmenu.cpp 2023-05-14 15:37:21 UTC (rev 10705) @@ -316,7 +316,7 @@ if (bRet == FALSE || ::lstrlen(szPath) == 0) { RegGetDword(hKey, KEY_TTSSH, (LPDWORD) &bTtssh); ::GetProfileString("Tera Term Pro", "Path", szDefault, szTTermPath, MAX_PATH); - ::wsprintf(szPath, "%s\\%s", szTTermPath, bTtssh ? TTSSH : TERATERM); + ::wsprintf(szPath, "%s\\%s", szTTermPath, TERATERM); } RegClose(hKey); @@ -897,10 +897,10 @@ if (::lstrlen(g_JobInfo.szTeraTerm) == 0) { ::GetProfileString("Tera Term Pro", "Path", szDefault, szTTermPath, MAX_PATH); - ::wsprintf(g_JobInfo.szTeraTerm, "%s\\%s", szTTermPath, g_JobInfo.bTtssh ? TTSSH : TERATERM); + ::wsprintf(g_JobInfo.szTeraTerm, "%s\\%s", szTTermPath, TERATERM); } - if (g_JobInfo.bTtssh == TRUE && lstrstri(g_JobInfo.szTeraTerm, TTSSH) == NULL) - ::wsprintf(g_JobInfo.szTeraTerm, "%s\\%s", szTTermPath, TTSSH); + if (g_JobInfo.bTtssh == TRUE && lstrstri(g_JobInfo.szTeraTerm, TERATERM) == NULL) + ::wsprintf(g_JobInfo.szTeraTerm, "%s\\%s", szTTermPath, TERATERM); if (::lstrlen(g_JobInfo.szLoginPrompt) == 0) { ::lstrcpy(g_JobInfo.szLoginPrompt, LOGIN_PROMPT); } @@ -988,7 +988,7 @@ char szTTermPath[MAX_PATH]; ::GetProfileString("Tera Term Pro", "Path", szDefault, szTTermPath, MAX_PATH); - ::wsprintf(szTTermPath, "%s\\%s", szTTermPath, g_JobInfo.bTtssh ? TTSSH : TERATERM); + ::wsprintf(szTTermPath, "%s\\%s", szTTermPath, TERATERM); ::SetDlgItemText(hWnd, EDIT_TTMPATH, szTTermPath); ::SetDlgItemText(hWnd, EDIT_INITFILE, ""); @@ -1250,7 +1250,7 @@ if (::lstrlen(jobInfo.szTeraTerm) == 0) { ::GetProfileString("Tera Term Pro", "Path", szDefault, jobInfo.szTeraTerm, MAX_PATH); - ::wsprintf(jobInfo.szTeraTerm, "%s\\%s", jobInfo.szTeraTerm, jobInfo.bTtssh ? TTSSH : TERATERM); + ::wsprintf(jobInfo.szTeraTerm, "%s\\%s", jobInfo.szTeraTerm, TERATERM); } ::lstrcpy(szHostName, jobInfo.szHostName); @@ -1789,12 +1789,12 @@ g_JobInfo.bStartup = (BOOL) ::IsDlgButtonChecked(hWnd, CHECK_STARTUP); g_JobInfo.bTtssh = (BOOL) ::IsDlgButtonChecked(hWnd, CHECK_TTSSH); - if (g_JobInfo.bTtssh == TRUE && lstrstri(g_JobInfo.szTeraTerm, TTSSH) == NULL) { + if (g_JobInfo.bTtssh == TRUE && lstrstri(g_JobInfo.szTeraTerm, TERATERM) == NULL) { ::GetProfileString("Tera Term Pro", "Path", szDefault, szTTermPath, MAX_PATH); - ::wsprintf(g_JobInfo.szTeraTerm, "%s\\%s", szTTermPath, TTSSH); + ::wsprintf(g_JobInfo.szTeraTerm, "%s\\%s", szTTermPath, TERATERM); } else if (::lstrlen(g_JobInfo.szTeraTerm) == 0) { ::GetProfileString("Tera Term Pro", "Path", szDefault, szTTermPath, MAX_PATH); - ::wsprintf(g_JobInfo.szTeraTerm, "%s\\%s", szTTermPath, g_JobInfo.bTtssh ? TTSSH : TERATERM); + ::wsprintf(g_JobInfo.szTeraTerm, "%s\\%s", szTTermPath, TERATERM); } GetCurrentDirectory(sizeof(cur), cur); @@ -2103,8 +2103,8 @@ g_JobInfo.bTtssh = ::IsDlgButtonChecked(hWnd, CHECK_TTSSH); if (::DialogBox(g_hI, (LPCTSTR) DIALOG_ETC, hWnd, DlgCallBack_Etc) == TRUE) { ::CheckDlgButton(hWnd, CHECK_TTSSH, 0); - if ((pt = lstrstri(g_JobInfo.szTeraTerm, TTSSH)) != NULL) - if (::lstrcmpi(pt, TTSSH) == 0) + if ((pt = lstrstri(g_JobInfo.szTeraTerm, TERATERM)) != NULL) + if (::lstrcmpi(pt, TERATERM) == 0) ::CheckDlgButton(hWnd, CHECK_TTSSH, 1); } return TRUE; Modified: trunk/ttpmenu/ttpmenu.h =================================================================== --- trunk/ttpmenu/ttpmenu.h 2023-05-14 15:37:10 UTC (rev 10704) +++ trunk/ttpmenu/ttpmenu.h 2023-05-14 15:37:21 UTC (rev 10705) @@ -24,7 +24,6 @@ #define LISTBOX_HEIGHT 18 #define LISTBOX_WIDTH 20 #define TERATERM "ttermpro.exe" -#define TTSSH TERATERM #define TTERM_KEY "Software\\ShinpeiTools\\TTermMenu" #define LOGIN_PROMPT "login:" #define PASSWORD_PROMPT "Password:"