From svnnotify ＠ sourceforge.jp Sun Oct 2 12:57:27 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 02 Oct 2011 12:57:27 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2NjVdICBBY2NlcHRCcm9hZGNhc3Qg44Gu?= =?utf-8?b?6Kit5a6a44GMIFJlYWx0aW1lIG1vZGUg44Gn44Gv54Sh5Yq544Gn44GC44KL?= =?utf-8?b?44GT44Go44KSIEFkZGl0aW9uYWwgc2V0dGluZ3Mg44GuIEFjY2VwdCBicm9h?= =?utf-8?b?ZGNhc3Qg44Gu6Kqs5piO44Gr44KC6KiY6L+w?= Message-ID: <1317527847.669726.22225.nullmailer@users.sourceforge.jp> Revision: 4665 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4665 Author: maya Date: 2011-10-02 12:57:27 +0900 (Sun, 02 Oct 2011) Log Message: ----------- AcceptBroadcast ??┃絎?? Realtime mode ?с??≦??с??????? Additional settings ??Accept broadcast ?????????菴? Modified Paths: -------------- trunk/doc/en/html/menu/setup-additional.html trunk/doc/ja/html/menu/setup-additional.html -------------- next part -------------- Modified: trunk/doc/en/html/menu/setup-additional.html =================================================================== --- trunk/doc/en/html/menu/setup-additional.html 2011-09-28 04:45:27 UTC (rev 4664) +++ trunk/doc/en/html/menu/setup-additional.html 2011-10-02 03:57:27 UTC (rev 4665) @@ -26,7 +26,8 @@
Accept broadcast
- Accept the broadcast command. + Accept the broadcast command.
+
Mouse wheel scroll line
Modified: trunk/doc/ja/html/menu/setup-additional.html =================================================================== --- trunk/doc/ja/html/menu/setup-additional.html 2011-09-28 04:45:27 UTC (rev 4664) +++ trunk/doc/ja/html/menu/setup-additional.html 2011-10-02 03:57:27 UTC (rev 4665) @@ -26,7 +26,8 @@
Accept broadcast
- ???????????????????? + ????????????????????
+ ????? "Realtime mode" ? off ????????????????????"Realtime mode" ? on ???????????????????????????????
Mouse wheel scroll line
From svnnotify ＠ sourceforge.jp Sun Oct 2 14:50:50 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 02 Oct 2011 14:50:50 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2NjZdICDjg5fjg63jgrfjg7zjgrjjg6M=?= =?utf-8?b?5ZCN44KS5aSJ5pu0?= Message-ID: <1317534650.368600.2589.nullmailer@users.sourceforge.jp> Revision: 4666 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4666 Author: maya Date: 2011-10-02 14:50:50 +0900 (Sun, 02 Oct 2011) Log Message: ----------- ????激??吾????紊?? Modified Paths: -------------- trunk/teraterm/teraterm/vtwin.cpp -------------- next part -------------- Modified: trunk/teraterm/teraterm/vtwin.cpp =================================================================== --- trunk/teraterm/teraterm/vtwin.cpp 2011-10-02 03:57:27 UTC (rev 4665) +++ trunk/teraterm/teraterm/vtwin.cpp 2011-10-02 05:50:50 UTC (rev 4666) @@ -4399,10 +4399,10 @@ // ?????????????????????? // ?????????????????????? -static WNDPROC OrigHostnameEditProc; // Original window procedure +static WNDPROC OrigBroadcastEditProc; // Original window procedure static HWND BroadcastWindowList; -static LRESULT CALLBACK HostnameEditProc(HWND dlg, UINT msg, - WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK BroadcastEditProc(HWND dlg, UINT msg, + WPARAM wParam, LPARAM lParam) { char buf[1024]; int len; @@ -4435,7 +4435,7 @@ int i; HWND hd; int count; - +OutputDebugPrintf("msg=%d wParam=%d lParam=%d\n", msg, wParam, lParam); if (wParam == 0x0d) { // Enter key SetWindowText(dlg, ""); SendMessage(dlg, EM_SETSEL, 0, 0); @@ -4464,7 +4464,7 @@ break; default: - return CallWindowProc(OrigHostnameEditProc, dlg, msg, wParam, lParam); + return CallWindowProc(OrigBroadcastEditProc, dlg, msg, wParam, lParam); } return FALSE; @@ -4643,8 +4643,8 @@ HFONT font; char uimsg[MAX_UIMSG]; char historyfile[MAX_PATH]; - static HWND hwndHostname = NULL; // HOSTNAME dropdown - static HWND hwndHostnameEdit = NULL; // Edit control on HOSTNAME dropdown + static HWND hwndBroadcast = NULL; // Broadcast dropdown + static HWND hwndBroadcastEdit = NULL; // Edit control on Broadcast dropdown // for resize RECT rc_dlg, rc, rc_ok; POINT p; @@ -4682,10 +4682,10 @@ SetFocus(GetDlgItem(hWnd, IDC_COMMAND_EDIT)); // ????????????????????? (2008.1.21 yutaka) - hwndHostname = GetDlgItem(hWnd, IDC_COMMAND_EDIT); - hwndHostnameEdit = GetWindow(hwndHostname, GW_CHILD); - OrigHostnameEditProc = (WNDPROC)GetWindowLong(hwndHostnameEdit, GWL_WNDPROC); - SetWindowLong(hwndHostnameEdit, GWL_WNDPROC, (LONG)HostnameEditProc); + hwndBroadcast = GetDlgItem(hWnd, IDC_COMMAND_EDIT); + hwndBroadcastEdit = GetWindow(hwndBroadcast, GW_CHILD); + OrigBroadcastEditProc = (WNDPROC)GetWindowLong(hwndBroadcastEdit, GWL_WNDPROC); + SetWindowLong(hwndBroadcastEdit, GWL_WNDPROC, (LONG)BroadcastEditProc); // ??????on????disable? SendMessage(GetDlgItem(hWnd, IDC_REALTIME_CHECK), BM_SETCHECK, BST_CHECKED, 0); // default on EnableWindow(GetDlgItem(hWnd, IDC_HISTORY_CHECK), FALSE); @@ -4794,10 +4794,10 @@ checked = SendMessage(GetDlgItem(hWnd, IDC_REALTIME_CHECK), BM_GETCHECK, 0, 0); if (checked & BST_CHECKED) { // check?? // new handler - hwndHostname = GetDlgItem(hWnd, IDC_COMMAND_EDIT); - hwndHostnameEdit = GetWindow(hwndHostname, GW_CHILD); - OrigHostnameEditProc = (WNDPROC)GetWindowLong(hwndHostnameEdit, GWL_WNDPROC); - SetWindowLong(hwndHostnameEdit, GWL_WNDPROC, (LONG)HostnameEditProc); + hwndBroadcast = GetDlgItem(hWnd, IDC_COMMAND_EDIT); + hwndBroadcastEdit = GetWindow(hwndBroadcast, GW_CHILD); + OrigBroadcastEditProc = (WNDPROC)GetWindowLong(hwndBroadcastEdit, GWL_WNDPROC); + SetWindowLong(hwndBroadcastEdit, GWL_WNDPROC, (LONG)BroadcastEditProc); EnableWindow(GetDlgItem(hWnd, IDC_HISTORY_CHECK), FALSE); EnableWindow(GetDlgItem(hWnd, IDC_RADIO_CRLF), FALSE); @@ -4808,7 +4808,7 @@ EnableWindow(GetDlgItem(hWnd, IDC_LIST), TRUE); // true } else { // restore old handler - SetWindowLong(hwndHostnameEdit, GWL_WNDPROC, (LONG)OrigHostnameEditProc); + SetWindowLong(hwndBroadcastEdit, GWL_WNDPROC, (LONG)OrigBroadcastEditProc); EnableWindow(GetDlgItem(hWnd, IDC_HISTORY_CHECK), TRUE); EnableWindow(GetDlgItem(hWnd, IDC_RADIO_CRLF), TRUE); @@ -4883,7 +4883,7 @@ // ??????????????????????????????????? // ????????????????????????????????????(yutaka) #if 0 - SetWindowLong(hwndHostnameEdit, GWL_WNDPROC, (LONG)OrigHostnameEditProc); + SetWindowLong(hwndBroadcastEdit, GWL_WNDPROC, (LONG)OrigBroadcastEditProc); #endif //EndDialog(hDlgWnd, IDOK); From svnnotify ＠ sourceforge.jp Mon Oct 3 21:16:12 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 03 Oct 2011 21:16:12 +0900 Subject: [Ttssh2-commit] =?utf-8?q?=5B4667=5D__Realtime_mode_=E3=81=8C_off?= =?utf-8?b?IOOBp+OCguOCpuOCo+ODs+ODieOCpuODquOCueODiOOBp+mBuOaKnuOBlQ==?= =?utf-8?b?44KM44Gf44Km44Kj44Oz44OJ44Km44Gr44Gu44G/44OW44Ot44O844OJ44Kt?= =?utf-8?b?44Oj44K544OI6YCB5L+h44GV44KM44KL44Gu44Gn6KiY6L+w44KS6L+95Yqg?= Message-ID: <1317644172.973199.5260.nullmailer@users.sourceforge.jp> Revision: 4667 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4667 Author: maya Date: 2011-10-03 21:16:12 +0900 (Mon, 03 Oct 2011) Log Message: ----------- Realtime mode ??off ?с?????潟?????鴻??ч???????????潟???????????若?????鴻???拭???????ц?菴違?菴遵? Modified Paths: -------------- trunk/doc/en/html/menu/control-broadcast.html trunk/doc/ja/html/menu/control-broadcast.html -------------- next part -------------- Modified: trunk/doc/en/html/menu/control-broadcast.html =================================================================== --- trunk/doc/en/html/menu/control-broadcast.html 2011-10-02 05:50:50 UTC (rev 4666) +++ trunk/doc/en/html/menu/control-broadcast.html 2011-10-03 12:16:12 UTC (rev 4667) @@ -38,6 +38,11 @@
If this option is chosen, the command will be transmitted only to the Tera Term window where "Broadcast command" dialog is specified.
+ +
Windows List
+
+ Choose the windows where the commands will be transmitted. +
Modified: trunk/doc/ja/html/menu/control-broadcast.html =================================================================== --- trunk/doc/ja/html/menu/control-broadcast.html 2011-10-02 05:50:50 UTC (rev 4666) +++ trunk/doc/ja/html/menu/control-broadcast.html 2011-10-03 12:16:12 UTC (rev 4667) @@ -38,6 +38,11 @@
?????????????? "Broadcast command" ???????????Tera Term ???????????????????
+ +
????????
+
+ ????????????????????? +
From svnnotify ＠ sourceforge.jp Tue Oct 4 00:12:10 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 04 Oct 2011 00:12:10 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2NjhdICDoi7HoqLPjgpLov73liqDjgII=?= Message-ID: <1317654730.728276.26588.nullmailer@users.sourceforge.jp> Revision: 4668 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4668 Author: yutakapon Date: 2011-10-04 00:12:10 +0900 (Tue, 04 Oct 2011) Log Message: ----------- ?沿┳??申??? Modified Paths: -------------- trunk/doc/en/html/menu/setup-additional.html -------------- next part -------------- Modified: trunk/doc/en/html/menu/setup-additional.html =================================================================== --- trunk/doc/en/html/menu/setup-additional.html 2011-10-03 12:16:12 UTC (rev 4667) +++ trunk/doc/en/html/menu/setup-additional.html 2011-10-03 15:12:10 UTC (rev 4668) @@ -27,7 +27,7 @@
Accept broadcast
Accept the broadcast command.
- + Can be only enabled when the "Realtime mode" is off. However, this option is always ignored when the "Realtime mode" is on.
Mouse wheel scroll line
From svnnotify ＠ sourceforge.jp Wed Oct 12 20:17:16 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 12 Oct 2011 20:17:16 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2NjldIE9wZW5TU0wgMS4wLiAwZeOBrg==?= =?utf-8?b?44OT44Or44OJ44Gr6Zai44GZ44KL5rOo5oSP5LqL6aCF44KS6L+95Yqg44GX?= =?utf-8?b?44Gf44CC?= Message-ID: <1318418236.001042.10613.nullmailer@users.sourceforge.jp> Revision: 4669 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4669 Author: yutakapon Date: 2011-10-12 20:17:15 +0900 (Wed, 12 Oct 2011) Log Message: ----------- OpenSSL 1.0.0e????????????羈??篋????申?????? Modified Paths: -------------- trunk/doc/en/html/reference/develop.txt trunk/doc/ja/html/reference/develop.txt -------------- next part -------------- Modified: trunk/doc/en/html/reference/develop.txt =================================================================== --- trunk/doc/en/html/reference/develop.txt 2011-10-03 15:12:10 UTC (rev 4668) +++ trunk/doc/en/html/reference/develop.txt 2011-10-12 11:17:15 UTC (rev 4669) @@ -91,8 +91,9 @@ 3. OpenSSL (used by TTSSH and TTProxy) (1) Extract openssl source into libs/openssl directory. - (2) Launch 'Visual Studio 2005 Command Prompt' batch file from start menu. - (3) Move 'libs' directory on the command prompt. And run buildopenssl.bat. + (2) Delete the libs/openssl/Makefile.bak file manually on the OpenSSL 1.0.0e or later. + (3) Launch 'Visual Studio 2005 Command Prompt' batch file from start menu. + (4) Move 'libs' directory on the command prompt. And run buildopenssl.bat. 4. Zlib (used by TTSSH) (1) Extract zlib source into libs/zlib directory. Modified: trunk/doc/ja/html/reference/develop.txt =================================================================== --- trunk/doc/ja/html/reference/develop.txt 2011-10-03 15:12:10 UTC (rev 4668) +++ trunk/doc/ja/html/reference/develop.txt 2011-10-12 11:17:15 UTC (rev 4669) @@ -103,8 +103,9 @@ 3. OpenSSL (used by TTSSH and TTProxy) (1) openssl ????? libs/openssl ???????? - (2) ???????????Visual Studio 2005 ???? ???????????? - (3) ????????????libs ???????????buildopenssl.bat ?ﾀ???? + (2) OpenSSL 1.0.0e ???????? libs/openssl/Makefile.bak ?????????B + (3) ???????????Visual Studio 2005 ???? ???????????? + (4) ????????????libs ???????????buildopenssl.bat ?ﾀ???? 4. Zlib (used by TTSSH) (1) zlib ????? libs/zlib ???????? From svnnotify ＠ sourceforge.jp Thu Oct 13 19:22:39 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 13 Oct 2011 19:22:39 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2NzBdICDlhajpg6jliJfmjJnjgZfjgaY=?= =?utf-8?b?44GE44KL44Gu44GnIGV0YyDjgafjga/jgarjgYQ=?= Message-ID: <1318501359.319347.17497.nullmailer@users.sourceforge.jp> Revision: 4670 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4670 Author: maya Date: 2011-10-13 19:22:39 +0900 (Thu, 13 Oct 2011) Log Message: ----------- 全部列挙しているので etc ではない Modified Paths: -------------- trunk/installer/release/TERATERM.INI -------------- next part -------------- Modified: trunk/installer/release/TERATERM.INI =================================================================== --- trunk/installer/release/TERATERM.INI 2011-10-12 11:17:15 UTC (rev 4669) +++ trunk/installer/release/TERATERM.INI 2011-10-13 10:22:39 UTC (rev 4670) @@ -619,13 +619,13 @@ DefaultForwarding= ; Cipher algorithm order -; (2...DES(SSH1), 3...3DES(SSH1), 6...Blowfish(SSH1), 7...3DES-CBC, +; 2...DES(SSH1), 3...3DES(SSH1), 6...Blowfish(SSH1), 7...3DES-CBC, ; 8...AES128-CBC, 9...AES192-CBC, :...AES256-CBC, ;...Blowfish-CBC, ; <...AES128-CTR, =...AES192-CTR, >...AES256-CTR, ?...Arcfour, ; @...Arcfour128, A...Arcfour256, B...CAST128-CBC, C...3DES-CTR, ; D...Blowfish-CTR, E...CAST128-CTR, F...Camellia128-CBC, ; G...Camellia192-CBC, H...Camellia256-CBC, I...Camellia128-CTR, -; J...Camellia192-CTR, K...Camellia256-CTR, etc) +; J...Camellia192-CTR, K...Camellia256-CTR ; 0...Ciphers below this line are disabled. CipherOrder=K>H:J=G9I Revision: 4671 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4671 Author: maya Date: 2011-10-13 19:23:09 +0900 (Thu, 13 Oct 2011) Log Message: ----------- getspecialfolder マクロコマンドを追加 Modified Paths: -------------- trunk/teraterm/common/helpid.h trunk/teraterm/ttpmacro/ttl.c trunk/teraterm/ttpmacro/ttmlib.c trunk/teraterm/ttpmacro/ttmlib.h trunk/teraterm/ttpmacro/ttmparse.c trunk/teraterm/ttpmacro/ttmparse.h -------------- next part -------------- Modified: trunk/teraterm/common/helpid.h =================================================================== --- trunk/teraterm/common/helpid.h 2011-10-13 10:22:39 UTC (rev 4670) +++ trunk/teraterm/common/helpid.h 2011-10-13 10:23:09 UTC (rev 4671) @@ -221,6 +221,7 @@ #define HlpMacroCommandGetfileattr 92189 #define HlpMacroCommandGethostname 92141 #define HlpMacroCommandGetpassword 92046 +#define HlpMacroCommandGetspecialfolder 92195 #define HlpMacroCommandGettime 92047 #define HlpMacroCommandGettitle 92048 #define HlpMacroCommandGetttdir 92140 Modified: trunk/teraterm/ttpmacro/ttl.c =================================================================== --- trunk/teraterm/ttpmacro/ttl.c 2011-10-13 10:22:39 UTC (rev 4670) +++ trunk/teraterm/ttpmacro/ttl.c 2011-10-13 10:23:09 UTC (rev 4671) @@ -2069,6 +2069,30 @@ return Err; } +WORD TTLGetSpecialFolder() +{ + WORD Err; + TVarId VarId; + TStrVal type; + int result; + + Err = 0; + GetStrVar(&VarId,&Err); + if (Err!=0) return Err; + + GetStrVal(type,&Err); + if ((Err==0) && (GetFirstChar()!=0)) + Err = ErrSyntax; + if (Err!=0) { + return Err; + } + + result = GetSpecialFolder(StrVarPtr(VarId), sizeof(TStrVal), type); + SetResult(result); + + return Err; +} + WORD TTLGetTime(WORD mode) { WORD Err; @@ -4887,6 +4911,8 @@ Err = TTLGetHostname(); break; case RsvGetPassword: Err = TTLGetPassword(); break; + case RsvGetSpecialFolder: + Err = TTLGetSpecialFolder(); break; case RsvGetTitle: Err = TTLGetTitle(); break; case RsvGetTTDir: Modified: trunk/teraterm/ttpmacro/ttmlib.c =================================================================== --- trunk/teraterm/ttpmacro/ttmlib.c 2011-10-13 10:22:39 UTC (rev 4670) +++ trunk/teraterm/ttpmacro/ttmlib.c 2011-10-13 10:23:09 UTC (rev 4671) @@ -8,7 +8,8 @@ #include "ttlib.h" #include #include - +#include +#include static char CurrentDir[MAXPATHLEN]; void CalcTextExtent(HDC DC, PCHAR Text, LPSIZE s) @@ -84,3 +85,134 @@ strncat_s(FName,destlen,Temp,_TRUNCATE); return TRUE; } + +int DoGetSpecialFolder(int CSIDL, PCHAR KEY, PCHAR dest, int dest_len) +{ + OSVERSIONINFO osvi; + LONG result; + HKEY hKey; + DWORD disposition, len, type; + + char Path[MAX_PATH] = ""; + LPITEMIDLIST pidl; + + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&osvi); + if ( (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion == 4) || + (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) ) { + switch (CSIDL) { + case CSIDL_COMMON_DESKTOPDIRECTORY: + case CSIDL_COMMON_STARTMENU: + case CSIDL_COMMON_PROGRAMS: + case CSIDL_COMMON_STARTUP: + return 0; + } + result = RegCreateKeyEx(HKEY_CURRENT_USER, + "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", + 0, + "", + REG_OPTION_NON_VOLATILE, + KEY_READ, + NULL, + &hKey, + &disposition); + if (result != ERROR_SUCCESS) { + return 0; + } + + len = sizeof(Path); + result = RegQueryValueEx(hKey, KEY, NULL, &type, Path, &len); + if (result != ERROR_SUCCESS) { + return 0; + } + + RegCloseKey(hKey); + } + else { + if (SHGetSpecialFolderLocation(NULL, CSIDL, &pidl) != NOERROR) { + return 0; + } + + SHGetPathFromIDList(pidl, Path); + CoTaskMemFree(pidl); + } + + strncpy_s(dest, dest_len, Path, _TRUNCATE); + return 1; +} + +int GetSpecialFolder(PCHAR dest, int dest_len, PCHAR type) +{ + int CSIDL; + char REGKEY[256]; + + if (_stricmp(type, "AllUsersDesktop") == 0) { + CSIDL = CSIDL_COMMON_DESKTOPDIRECTORY; + strncpy_s(REGKEY, sizeof(REGKEY), "", _TRUNCATE); + } + else if (_stricmp(type, "AllUsersStartMenu") == 0) { + CSIDL = CSIDL_COMMON_STARTMENU; + strncpy_s(REGKEY, sizeof(REGKEY), "", _TRUNCATE); + } + else if (_stricmp(type, "AllUsersPrograms") == 0) { + CSIDL = CSIDL_COMMON_PROGRAMS; + strncpy_s(REGKEY, sizeof(REGKEY), "", _TRUNCATE); + } + else if (_stricmp(type, "AllUsersStartup") == 0) { + CSIDL = CSIDL_COMMON_STARTUP; + strncpy_s(REGKEY, sizeof(REGKEY), "", _TRUNCATE); + } + else if (_stricmp(type, "Desktop") == 0) { + CSIDL = CSIDL_DESKTOPDIRECTORY; + strncpy_s(REGKEY, sizeof(REGKEY), "Desktop", _TRUNCATE); + } + else if (_stricmp(type, "Favorites") == 0) { + CSIDL = CSIDL_FAVORITES; + strncpy_s(REGKEY, sizeof(REGKEY), "Favorites", _TRUNCATE); + } + else if (_stricmp(type, "Fonts") == 0) { + CSIDL = CSIDL_FONTS; + strncpy_s(REGKEY, sizeof(REGKEY), "Fonts", _TRUNCATE); + } + else if (_stricmp(type, "MyDocuments") == 0) { + CSIDL = CSIDL_PERSONAL; + strncpy_s(REGKEY, sizeof(REGKEY), "Personal", _TRUNCATE); + } + else if (_stricmp(type, "NetHood") == 0) { + CSIDL = CSIDL_NETHOOD; + strncpy_s(REGKEY, sizeof(REGKEY), "NetHood", _TRUNCATE); + } + else if (_stricmp(type, "PrintHood") == 0) { + CSIDL = CSIDL_PRINTHOOD; + strncpy_s(REGKEY, sizeof(REGKEY), "PrintHood", _TRUNCATE); + } + else if (_stricmp(type, "Programs") == 0) { + CSIDL = CSIDL_PROGRAMS; + strncpy_s(REGKEY, sizeof(REGKEY), "Programs", _TRUNCATE); + } + else if (_stricmp(type, "Recent") == 0) { + CSIDL = CSIDL_RECENT; + strncpy_s(REGKEY, sizeof(REGKEY), "Recent", _TRUNCATE); + } + else if (_stricmp(type, "SendTo") == 0) { + CSIDL = CSIDL_SENDTO; + strncpy_s(REGKEY, sizeof(REGKEY), "SendTo", _TRUNCATE); + } + else if (_stricmp(type, "StartMenu") == 0) { + CSIDL = CSIDL_STARTMENU; + strncpy_s(REGKEY, sizeof(REGKEY), "Start Menu", _TRUNCATE); + } + else if (_stricmp(type, "Startup") == 0) { + CSIDL = CSIDL_STARTUP; + strncpy_s(REGKEY, sizeof(REGKEY), "Startup", _TRUNCATE); + } + else if (_stricmp(type, "Templates") == 0) { + CSIDL = CSIDL_TEMPLATES; + strncpy_s(REGKEY, sizeof(REGKEY), "Templates", _TRUNCATE); + } + + if (!DoGetSpecialFolder(CSIDL, REGKEY, dest, dest_len)) { + return 0; + } + return 1; +} Modified: trunk/teraterm/ttpmacro/ttmlib.h =================================================================== --- trunk/teraterm/ttpmacro/ttmlib.h 2011-10-13 10:22:39 UTC (rev 4670) +++ trunk/teraterm/ttpmacro/ttmlib.h 2011-10-13 10:23:09 UTC (rev 4671) @@ -14,6 +14,7 @@ void TTMGetDir(PCHAR Dir, int destlen); void TTMSetDir(PCHAR Dir); int GetAbsPath(PCHAR FName, int destlen); +int GetSpecialFolder(PCHAR Text); #ifdef __cplusplus } Modified: trunk/teraterm/ttpmacro/ttmparse.c =================================================================== --- trunk/teraterm/ttpmacro/ttmparse.c 2011-10-13 10:22:39 UTC (rev 4670) +++ trunk/teraterm/ttpmacro/ttmparse.c 2011-10-13 10:23:09 UTC (rev 4671) @@ -223,6 +223,7 @@ else if (_stricmp(Str,"getfileattr")==0) *WordId = RsvGetFileAttr; else if (_stricmp(Str,"gethostname")==0) *WordId = RsvGetHostname; else if (_stricmp(Str,"getpassword")==0) *WordId = RsvGetPassword; + else if (_stricmp(Str,"getspecialfolder")==0) *WordId = RsvGetSpecialFolder; else if (_stricmp(Str,"gettime")==0) *WordId = RsvGetTime; else if (_stricmp(Str,"gettitle")==0) *WordId = RsvGetTitle; else if (_stricmp(Str,"getttdir")==0) *WordId = RsvGetTTDir; Modified: trunk/teraterm/ttpmacro/ttmparse.h =================================================================== --- trunk/teraterm/ttpmacro/ttmparse.h 2011-10-13 10:22:39 UTC (rev 4670) +++ trunk/teraterm/ttpmacro/ttmparse.h 2011-10-13 10:23:09 UTC (rev 4671) @@ -217,6 +217,7 @@ #define RsvFolderDelete 192 #define RsvFolderSearch 193 #define RsvExpandEnv 194 +#define RsvGetSpecialFolder 195 #define RsvOperator 1000 #define RsvBNot 1001 From svnnotify ＠ sourceforge.jp Thu Oct 13 19:33:18 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 13 Oct 2011 19:33:18 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2NzJdICDkuI3opoHjgarjgrPjg7zjg4k=?= =?utf-8?b?44KS5YmK6Zmk?= Message-ID: <1318501998.094813.29849.nullmailer@users.sourceforge.jp> Revision: 4672 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4672 Author: maya Date: 2011-10-13 19:33:18 +0900 (Thu, 13 Oct 2011) Log Message: ----------- 不要なコードを削除 Modified Paths: -------------- trunk/teraterm/ttpmacro/ttmlib.c -------------- next part -------------- Modified: trunk/teraterm/ttpmacro/ttmlib.c =================================================================== --- trunk/teraterm/ttpmacro/ttmlib.c 2011-10-13 10:23:09 UTC (rev 4671) +++ trunk/teraterm/ttpmacro/ttmlib.c 2011-10-13 10:33:18 UTC (rev 4672) @@ -9,7 +9,7 @@ #include #include #include -#include + static char CurrentDir[MAXPATHLEN]; void CalcTextExtent(HDC DC, PCHAR Text, LPSIZE s) @@ -91,7 +91,7 @@ OSVERSIONINFO osvi; LONG result; HKEY hKey; - DWORD disposition, len, type; + DWORD disposition, len; char Path[MAX_PATH] = ""; LPITEMIDLIST pidl; @@ -121,7 +121,7 @@ } len = sizeof(Path); - result = RegQueryValueEx(hKey, KEY, NULL, &type, Path, &len); + result = RegQueryValueEx(hKey, KEY, NULL, NULL, Path, &len); if (result != ERROR_SUCCESS) { return 0; } From svnnotify ＠ sourceforge.jp Thu Oct 13 23:31:58 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 13 Oct 2011 23:31:58 +0900 Subject: [Ttssh2-commit] [4673] typo fix. Message-ID: <1318516318.421290.7607.nullmailer@users.sourceforge.jp> Revision: 4673 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4673 Author: maya Date: 2011-10-13 23:31:58 +0900 (Thu, 13 Oct 2011) Log Message: ----------- typo fix. Modified Paths: -------------- trunk/doc/en/html/macro/command/expandenv.html trunk/doc/en/html/macro/command/filenamebox.html trunk/doc/en/html/macro/command/getfileattr.html trunk/doc/en/html/macro/command/inputbox.html trunk/doc/en/html/macro/command/passwordbox.html trunk/doc/en/html/macro/command/setfileattr.html trunk/doc/en/html/macro/command/strspecial.html trunk/doc/en/html/macro/command/yesnobox.html -------------- next part -------------- Modified: trunk/doc/en/html/macro/command/expandenv.html =================================================================== --- trunk/doc/en/html/macro/command/expandenv.html 2011-10-13 10:33:18 UTC (rev 4672) +++ trunk/doc/en/html/macro/command/expandenv.html 2011-10-13 14:31:58 UTC (rev 4673) @@ -26,19 +26,19 @@

Parameters

-
string valiable <strvar>
+
string variable <strvar>
The specified string is expanded.
- When the second argument(<strval>) is given, the result expanding the argument stores into the string valiable <strvar>.
+ When the second argument(<strval>) is given, the result expanding the argument stores into the string variable <strvar>.
string <strval> (optional)
-
When this argument is given, the result expanding the argument stores into the string valiable <strvar>.
+
When this argument is given, the result expanding the argument stores into the string variable <strvar>.

Return Value

-
System valiable <result>
+
System variable <result>
The expanded string stores.
Modified: trunk/doc/en/html/macro/command/filenamebox.html =================================================================== --- trunk/doc/en/html/macro/command/filenamebox.html 2011-10-13 10:33:18 UTC (rev 4672) +++ trunk/doc/en/html/macro/command/filenamebox.html 2011-10-13 14:31:58 UTC (rev 4673) @@ -36,11 +36,11 @@

Return Value

-
System valiable <result> (version 4.65 or later)
+
System variable <result> (version 4.65 or later)
If the user specifies a file name and clicks OK button, set to nonzero. The file name is stored in "inputstr."
If the user cancels or closes the dialog, set to zero.
-
System valiable <inputstr>
+
System variable <inputstr>
The file name entered by the user
Modified: trunk/doc/en/html/macro/command/getfileattr.html =================================================================== --- trunk/doc/en/html/macro/command/getfileattr.html 2011-10-13 10:33:18 UTC (rev 4672) +++ trunk/doc/en/html/macro/command/getfileattr.html 2011-10-13 14:31:58 UTC (rev 4673) @@ -31,7 +31,7 @@

Return Value

-
System valiable <result>
+
System variable <result>
When this command fails, -1 is stored.
When the command succeeds, the returned value is in the following:
Modified: trunk/doc/en/html/macro/command/inputbox.html =================================================================== --- trunk/doc/en/html/macro/command/inputbox.html 2011-10-13 10:33:18 UTC (rev 4672) +++ trunk/doc/en/html/macro/command/inputbox.html 2011-10-13 14:31:58 UTC (rev 4673) @@ -64,7 +64,7 @@

Return Value

-
System valiable <inputstr>
+
System variable <inputstr>
The string entered by the user is returned.
Modified: trunk/doc/en/html/macro/command/passwordbox.html =================================================================== --- trunk/doc/en/html/macro/command/passwordbox.html 2011-10-13 10:33:18 UTC (rev 4672) +++ trunk/doc/en/html/macro/command/passwordbox.html 2011-10-13 14:31:58 UTC (rev 4673) @@ -60,7 +60,7 @@

Return Value

-
System valiable <inputstr>
+
System variable <inputstr>
The string entered by the user is returned.
Modified: trunk/doc/en/html/macro/command/setfileattr.html =================================================================== --- trunk/doc/en/html/macro/command/setfileattr.html 2011-10-13 10:33:18 UTC (rev 4672) +++ trunk/doc/en/html/macro/command/setfileattr.html 2011-10-13 14:31:58 UTC (rev 4673) @@ -74,7 +74,7 @@

Return Value

-
System valiable <result>
+
System variable <result>
When the command fails, 0 is stored.
When the command succeeds, 1 is stored.
Modified: trunk/doc/en/html/macro/command/strspecial.html =================================================================== --- trunk/doc/en/html/macro/command/strspecial.html 2011-10-13 10:33:18 UTC (rev 4672) +++ trunk/doc/en/html/macro/command/strspecial.html 2011-10-13 14:31:58 UTC (rev 4673) @@ -26,19 +26,19 @@

Parameters

-
string valiable <strvar>
+
string variable <strvar>
The specified string is converted.
- When the second argument(<strval>) is given, the result converting the argument stores into the string valiable <strvar>.
+ When the second argument(<strval>) is given, the result converting the argument stores into the string variable <strvar>.
string <strval> (optional)
-
When this argument is given, the result converting the argument stores into the string valiable <strvar>.
+
When this argument is given, the result converting the argument stores into the string variable <strvar>.

Return Value

-
System valiable <result>
+
System variable <result>
The expanded string stores.
Modified: trunk/doc/en/html/macro/command/yesnobox.html =================================================================== --- trunk/doc/en/html/macro/command/yesnobox.html 2011-10-13 10:33:18 UTC (rev 4672) +++ trunk/doc/en/html/macro/command/yesnobox.html 2011-10-13 14:31:58 UTC (rev 4673) @@ -60,7 +60,7 @@

Return Value

-
System valiable <result>
+
System variable <result>
If the user clicks on the "Yes" button, it is set to 1.
If the user clicks on the "No" button, it is set to zero.
From svnnotify ＠ sourceforge.jp Fri Oct 14 23:19:14 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 14 Oct 2011 23:19:14 +0900 Subject: [Ttssh2-commit] =?utf-8?q?=5B4674=5D__getspecialfolder_=E3=81=AE?= =?utf-8?b?44OJ44Kt44Ol44Oh44Oz44OI44KS6L+95Yqg?= Message-ID: <1318601954.337600.18444.nullmailer@users.sourceforge.jp> Revision: 4674 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4674 Author: maya Date: 2011-10-14 23:19:14 +0900 (Fri, 14 Oct 2011) Log Message: ----------- getspecialfolder ???????＜????菴遵? Modified Paths: -------------- trunk/doc/en/html/macro/command/index.html trunk/doc/en/teraterm.hhc trunk/doc/en/teraterm.hhp trunk/doc/ja/html/macro/command/index.html trunk/doc/ja/teraterm.hhc trunk/doc/ja/teraterm.hhp Added Paths: ----------- trunk/doc/en/html/macro/command/getspecialfolder.html trunk/doc/ja/html/macro/command/getspecialfolder.html -------------- next part -------------- Added: trunk/doc/en/html/macro/command/getspecialfolder.html =================================================================== --- trunk/doc/en/html/macro/command/getspecialfolder.html (rev 0) +++ trunk/doc/en/html/macro/command/getspecialfolder.html 2011-10-14 14:19:14 UTC (rev 4674) @@ -0,0 +1,131 @@ + + + + + getspecialfolder + + + + + + + +

getspecialfolder

+ +

+ +

+ +

Format

+ +
+getspecialfolder <strvar> <foldertype>
+
+ +

Parameters

+ +
+
string valiable <strvar>
+
+ +
string <foldertype>
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AllUsersDesktopdirectory that contains files and folders that appear on the desktop for all users
AllUsersStartMenudirectory that contains the programs and folders that appear on the Start menu for all users
AllUsersProgramsdirectory that contains the directories for the common program groups that appear on the Start menu for all users
AllUsersStartupdirectory that contains the programs that appear in the Startup folder for all users
Desktopvirtual folder that represents the Windows desktop
Favoritesdirectory that serves as a common repository for the user's favorite items
Fontsvirtual folder that contains fonts
MyDocumentsvirtual folder that represents the My Documents desktop item
NetHooddirectory that contains the link objects that may exist in the My Network Places virtual folder
PrintHooddirectory that contains the link objects that can exist in the Printers virtual folder
Programsdirectory that contains the user's program groups
Recentdirectory that contains shortcuts to the user's most recently used documents
SendTodirectory that contains Send To menu items
StartMenudirectory that contains Start menu items
Startupdirectory that corresponds to the user's Startup program group
Templatesdirectory that serves as a common repository for document templates
+ cf. CSIDL +
+ +
+ +

Return Value

+ +
+
string variable <strvar>
+ + +
System variable <result>
+
When the command fails, 0 is stored.
+ When the command succeeds, 1 is stored.
+ +
+ +

Remarks

+ +

+ +

+ +

Example

+ +
+getspecialfolder str "Desktop"
+messagebox str "Desktop"
+
+ + + Modified: trunk/doc/en/html/macro/command/index.html =================================================================== --- trunk/doc/en/html/macro/command/index.html 2011-10-13 14:31:58 UTC (rev 4673) +++ trunk/doc/en/html/macro/command/index.html 2011-10-14 14:19:14 UTC (rev 4674) @@ -185,6 +185,7 @@
  • filenamebox (version 4.54 or later)
  • getdate
  • getenv +
  • getspecialfolder (version 4.72 or later)
  • gettime
  • getttdir (version 4.60 or later)
  • getver (version 4.58 or later) Modified: trunk/doc/en/teraterm.hhc =================================================================== --- trunk/doc/en/teraterm.hhc 2011-10-13 14:31:58 UTC (rev 4673) +++ trunk/doc/en/teraterm.hhc 2011-10-14 14:19:14 UTC (rev 4674) @@ -1352,6 +1352,11 @@
  • + + + + +
  • Modified: trunk/doc/en/teraterm.hhp =================================================================== --- trunk/doc/en/teraterm.hhp 2011-10-13 14:31:58 UTC (rev 4673) +++ trunk/doc/en/teraterm.hhp 2011-10-14 14:19:14 UTC (rev 4674) @@ -212,6 +212,7 @@ HlpMacroCommandGetfileattr=html\macro\command\getfileattr.html HlpMacroCommandGethostname=html\macro\command\gethostname.html HlpMacroCommandGetpassword=html\macro\command\getpassword.html +HlpMacroCommandGetspecialfolder=html\macro\command\getspecialfolder.html HlpMacroCommandGettime=html\macro\command\gettime.html HlpMacroCommandGettitle=html\macro\command\gettitle.html HlpMacroCommandGetttdir=html\macro\command\getttdir.html Added: trunk/doc/ja/html/macro/command/getspecialfolder.html =================================================================== --- trunk/doc/ja/html/macro/command/getspecialfolder.html (rev 0) +++ trunk/doc/ja/html/macro/command/getspecialfolder.html 2011-10-14 14:19:14 UTC (rev 4674) @@ -0,0 +1,131 @@ + + + + + getspecialfolder + + + + + + + +

    getspecialfolder

    + +

    +??????????????? +

    + +

    ?ｮ

    + +
    +getspecialfolder <strvar> <foldertype>
+
    + +

    ?????

    + +
    +
    ????? <strvar>
    +
    ?????????????????????????
    + +
    ??? <foldertype>
    +
    ???????????????????????? <strvar>???????
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    AllUsersDesktopAll Users???????????????
    AllUsersStartMenuAll Users?????????????????
    AllUsersProgramsAll Users???????????????????????
    AllUsersStartupAll Users?????????????????????????
    Desktop??????????????
    Favorites?????????????
    Fonts????????????
    MyDocuments??? ?????????????
    NetHood????????????????
    PrintHood????????????
    Programs??????????????????????
    Recent?????????????????
    SendTo?????????????????????
    StartMenu????????????????
    Startup????????????????????????
    Templates??????????????
    + cf. CSIDL +
    + +
    + +

    ???

    + +
    +
    ????? <strvar>
    +
    ???????????????
    + +
    ?????? <result>
    +
    ???ｸ????0???????
    + ?????1???????
    + +
    + +

    ??

    + +

    +Windows ???????????? <strvar> ??????? +

    + +

    ?

    + +
    +getspecialfolder str "Desktop"
+messagebox str "Desktop"
+
    + + + Modified: trunk/doc/ja/html/macro/command/index.html =================================================================== --- trunk/doc/ja/html/macro/command/index.html 2011-10-13 14:31:58 UTC (rev 4673) +++ trunk/doc/ja/html/macro/command/index.html 2011-10-14 14:19:14 UTC (rev 4674) @@ -185,6 +185,7 @@
  • filenamebox (?????4.54??)
  • getdate
  • getenv +
  • getspecialfolder (?????4.72??)
  • gettime
  • getttdir (?????4.60??)
  • getver (?????4.58??) Modified: trunk/doc/ja/teraterm.hhc =================================================================== --- trunk/doc/ja/teraterm.hhc 2011-10-13 14:31:58 UTC (rev 4673) +++ trunk/doc/ja/teraterm.hhc 2011-10-14 14:19:14 UTC (rev 4674) @@ -1365,6 +1365,11 @@
  • + + + + +
  • Modified: trunk/doc/ja/teraterm.hhp =================================================================== --- trunk/doc/ja/teraterm.hhp 2011-10-13 14:31:58 UTC (rev 4673) +++ trunk/doc/ja/teraterm.hhp 2011-10-14 14:19:14 UTC (rev 4674) @@ -222,6 +222,7 @@ HlpMacroCommandGetfileattr=html\macro\command\getfileattr.html HlpMacroCommandGethostname=html\macro\command\gethostname.html HlpMacroCommandGetpassword=html\macro\command\getpassword.html +HlpMacroCommandGetspecialfolder=html\macro\command\getspecialfolder.html HlpMacroCommandGettime=html\macro\command\gettime.html HlpMacroCommandGettitle=html\macro\command\gettitle.html HlpMacroCommandGetttdir=html\macro\command\getttdir.html From svnnotify ＠ sourceforge.jp Sun Oct 16 00:54:29 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 16 Oct 2011 00:54:29 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2NzVdICDoi7HoqLPjgpLov73liqDjgII=?= Message-ID: <1318694069.085381.27066.nullmailer@users.sourceforge.jp> Revision: 4675 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4675 Author: yutakapon Date: 2011-10-16 00:54:29 +0900 (Sun, 16 Oct 2011) Log Message: ----------- ?沿┳??申??? Modified Paths: -------------- trunk/doc/en/html/macro/command/getspecialfolder.html trunk/doc/ja/html/macro/command/getspecialfolder.html -------------- next part -------------- Modified: trunk/doc/en/html/macro/command/getspecialfolder.html =================================================================== --- trunk/doc/en/html/macro/command/getspecialfolder.html 2011-10-14 14:19:14 UTC (rev 4674) +++ trunk/doc/en/html/macro/command/getspecialfolder.html 2011-10-15 15:54:29 UTC (rev 4675) @@ -14,7 +14,7 @@

    getspecialfolder

    - +Retrieves the path of a special folder.

    Format

    @@ -23,14 +23,17 @@ getspecialfolder <strvar> <foldertype> +

    Remarks

    + +

    +Stores a Windows special folder to the <strvar> string variable. +

    +

    Parameters

    -
    string valiable <strvar>
    -
    -
    string <foldertype>
    -
    +
    The drive and path of the specified folder by the string <foldertype> stores into the <strvar> string variable. @@ -97,7 +100,7 @@
    AllUsersDesktopdirectory that serves as a common repository for document templates
    - cf. CSIDL + cf. CSIDL(MSDN library)
    @@ -106,7 +109,7 @@
    string variable <strvar>
    - +
    Returns into the got string.
    System variable <result>
    When the command fails, 0 is stored.
    @@ -114,17 +117,14 @@
    -

    Remarks

    -

    - -

    -

    Example

     getspecialfolder str "Desktop"
-messagebox str "Desktop"
+if result then
+	messagebox str "Desktop"   ; C:\Documents and Settings\user\desktop
+endif
    Modified: trunk/doc/ja/html/macro/command/getspecialfolder.html =================================================================== --- trunk/doc/ja/html/macro/command/getspecialfolder.html 2011-10-14 14:19:14 UTC (rev 4674) +++ trunk/doc/ja/html/macro/command/getspecialfolder.html 2011-10-15 15:54:29 UTC (rev 4675) @@ -23,38 +23,41 @@ getspecialfolder <strvar> <foldertype> +

    ??

    + +

    +Windows ???????????? <strvar> ??????? +

    +

    ?????

    -
    ????? <strvar>
    -
    ?????????????????????????
    -
    ??? <foldertype>
    ???????????????????????? <strvar>???????
    - + - + - + - + - + - + @@ -74,30 +77,30 @@ - + - + - + - + - + - +
    AllUsersDesktopAll Users???????????????All Users?????????????
    AllUsersStartMenuAll Users?????????????????All Users???????????????
    AllUsersProgramsAll Users???????????????????????All Users?????????????????????
    AllUsersStartupAll Users?????????????????????????All Users???????????????????????
    Desktop????????????????????????????
    Favorites????????????????????????
    Fonts
    Programs??????????????????????????????????????????
    Recent????????????????????????????????
    SendTo????????????????????????????????????????
    StartMenu??????????????????????????????
    Startup??????????????????????????????????????????????
    Templates??????????????????????????
    - cf. CSIDL + cf. CSIDL(MSDN library)
    @@ -114,17 +117,13 @@ -

    ??

    - -

    -Windows ???????????? <strvar> ??????? -

    -

    ?

     getspecialfolder str "Desktop"
-messagebox str "Desktop"
+if result then
+	messagebox str "Desktop"   ; C:\Documents and Settings\user\desktop
+endif
    From svnnotify ＠ sourceforge.jp Sun Oct 16 14:59:57 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 16 Oct 2011 14:59:57 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2NzZdICDjg57jgq/jg63jgrPjg57jg7M=?= =?utf-8?b?44OJ44Gu44OJ44Kt44Ol44Oh44Oz44OI44Gn44CB57WQ5p6c44KS5Y+X44GR?= =?utf-8?b?5Y+W44KL5byV5pWw44Gr44Gk44GE44GmICIg44OR44Op44Oh44O844K/ICIg?= =?utf-8?b?44GoICIg6L+U44KK5YCkICIg44Gr5Lih5pa56KiY6L+w44GZ44KL44Gu44KS?= =?utf-8?b?44KE44KB44CBICIg44OR44Op44Oh44O844K/ICIg44Gr44Gu44G/5pu444GP?= =?utf-8?b?44KI44GG44Gr44GX44Gf44CC?= Message-ID: <1318744797.063501.22335.nullmailer@users.sourceforge.jp> Revision: 4676 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4676 Author: maya Date: 2011-10-16 14:59:56 +0900 (Sun, 16 Oct 2011) Log Message: ----------- ????????????????ャ??潟??с?腟?????????綣????????"????＜?????菴??????検?壕?菴違??????????"????＜???????炊??????????? Modified Paths: -------------- trunk/doc/en/html/macro/command/expandenv.html trunk/doc/en/html/macro/command/getspecialfolder.html trunk/doc/en/html/macro/command/strspecial.html trunk/doc/ja/html/macro/command/expandenv.html trunk/doc/ja/html/macro/command/getspecialfolder.html trunk/doc/ja/html/macro/command/strspecial.html -------------- next part -------------- Modified: trunk/doc/en/html/macro/command/expandenv.html =================================================================== --- trunk/doc/en/html/macro/command/expandenv.html 2011-10-15 15:54:29 UTC (rev 4675) +++ trunk/doc/en/html/macro/command/expandenv.html 2011-10-16 05:59:56 UTC (rev 4676) @@ -35,14 +35,6 @@ -

    Return Value

    - -
    -
    System variable <result>
    -
    The expanded string stores.
    - -
    -

    Remarks

    Modified: trunk/doc/en/html/macro/command/getspecialfolder.html =================================================================== --- trunk/doc/en/html/macro/command/getspecialfolder.html 2011-10-15 15:54:29 UTC (rev 4675) +++ trunk/doc/en/html/macro/command/getspecialfolder.html 2011-10-16 05:59:56 UTC (rev 4676) @@ -32,6 +32,9 @@

    Parameters

    +
    string variable <strvar>
    +
    Returns into the got string.
    +
    string <foldertype>
    The drive and path of the specified folder by the string <foldertype> stores into the <strvar> string variable. @@ -108,16 +111,12 @@

    Return Value

    -
    string variable <strvar>
    -
    Returns into the got string.
    -
    System variable <result>
    When the command fails, 0 is stored.
    When the command succeeds, 1 is stored.
    -

    Example

    
Modified: trunk/doc/en/html/macro/command/strspecial.html
===================================================================
--- trunk/doc/en/html/macro/command/strspecial.html	2011-10-15 15:54:29 UTC (rev 4675)
+++ trunk/doc/en/html/macro/command/strspecial.html	2011-10-16 05:59:56 UTC (rev 4676)
@@ -35,14 +35,6 @@
 
 
 
-
    Return Value
    
-
-
    
-	
    System variable <result>
    
-	
    The expanded string stores.
    
-	
-
    
-
 
    Remarks
    
 
 
    

Modified: trunk/doc/ja/html/macro/command/expandenv.html
===================================================================
--- trunk/doc/ja/html/macro/command/expandenv.html	2011-10-15 15:54:29 UTC (rev 4675)
+++ trunk/doc/ja/html/macro/command/expandenv.html	2011-10-16 05:59:56 UTC (rev 4676)
@@ -35,14 +35,6 @@
 
 
 
-
    ???
    
-
-
    
-	
    ????? <strvar>
    
-	
    ??????????????
    
-	
-
    
-
 
    ??
    
 
 
    

Modified: trunk/doc/ja/html/macro/command/getspecialfolder.html
===================================================================
--- trunk/doc/ja/html/macro/command/getspecialfolder.html	2011-10-15 15:54:29 UTC (rev 4675)
+++ trunk/doc/ja/html/macro/command/getspecialfolder.html	2011-10-16 05:59:56 UTC (rev 4676)
@@ -32,6 +32,9 @@
 
    ?????
    
 
 
    
+	
    ????? <strvar>
    
+	
    ???????????????
    
+
 	
    ??? <foldertype>
    
 	
    ???????????????????????? <strvar>???????
    @@ -108,9 +111,6 @@

    ???

    -
    ????? <strvar>
    -
    ???????????????
    -
    ?????? <result>
    ???ｸ????0???????
    ?????1???????
    Modified: trunk/doc/ja/html/macro/command/strspecial.html =================================================================== --- trunk/doc/ja/html/macro/command/strspecial.html 2011-10-15 15:54:29 UTC (rev 4675) +++ trunk/doc/ja/html/macro/command/strspecial.html 2011-10-16 05:59:56 UTC (rev 4676) @@ -35,14 +35,6 @@
    -

    ???

    - -
    -
    ????? <strvar>
    -
    ??????????????
    - -
    -

    ??

    From svnnotify ＠ sourceforge.jp Sun Oct 16 15:04:53 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 16 Oct 2011 15:04:53 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2NzddICDmlLnooYzjgrPjg7zjg4njgpI=?= =?utf-8?b?5L+u5q2j?= Message-ID: <1318745093.070190.29471.nullmailer@users.sourceforge.jp> Revision: 4677 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4677 Author: maya Date: 2011-10-16 15:04:53 +0900 (Sun, 16 Oct 2011) Log Message: ----------- ?壕??潟????篆?? Modified Paths: -------------- trunk/doc/ja/html/macro/command/expandenv.html trunk/doc/ja/html/macro/command/getspecialfolder.html trunk/doc/ja/html/macro/command/strspecial.html -------------- next part -------------- Modified: trunk/doc/ja/html/macro/command/expandenv.html =================================================================== --- trunk/doc/ja/html/macro/command/expandenv.html 2011-10-16 05:59:56 UTC (rev 4676) +++ trunk/doc/ja/html/macro/command/expandenv.html 2011-10-16 06:04:53 UTC (rev 4677) @@ -23,14 +23,14 @@ expandenv <strvar> [<strval>] -

    ?????

    +

    ?????

    -
    ????? <strvar>
    +
    ????? <strvar>
    ???????????????????
    ?2??(<strval>)???????A???????????????????
    -
    ??? <strval> (?????)
    +
    ??? <strval> (?????)
    ???????????A?????????????????? <strvar>???????
    Modified: trunk/doc/ja/html/macro/command/getspecialfolder.html =================================================================== --- trunk/doc/ja/html/macro/command/getspecialfolder.html 2011-10-16 05:59:56 UTC (rev 4676) +++ trunk/doc/ja/html/macro/command/getspecialfolder.html 2011-10-16 06:04:53 UTC (rev 4677) @@ -29,13 +29,13 @@ Windows ???????????? <strvar> ???????

    -

    ?????

    +

    ?????

    ????? <strvar>
    ???????????????
    -
    ??? <foldertype>
    +
    ??? <foldertype>
    ???????????????????????? <strvar>???????
    Modified: trunk/doc/ja/html/macro/command/strspecial.html =================================================================== --- trunk/doc/ja/html/macro/command/strspecial.html 2011-10-16 05:59:56 UTC (rev 4676) +++ trunk/doc/ja/html/macro/command/strspecial.html 2011-10-16 06:04:53 UTC (rev 4677) @@ -23,14 +23,14 @@ strspecial <strvar> [<strval>] -

    ?????

    +

    ?????

    ????? <strvar>
    ???????????????????
    ?2??(<strval>)???????A???????????????????
    - -
    ??? <strval> (?????)
    + +
    ??? <strval> (?????)
    ???????????A?????????????????? <strvar>???????
    From svnnotify ＠ sourceforge.jp Sun Oct 16 15:27:43 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 16 Oct 2011 15:27:43 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2NzhdICDjg5jjg4Pjg4Djga7kv67mraM=?= =?utf-8?b?5b+Y44KM?= Message-ID: <1318746463.199365.25904.nullmailer@users.sourceforge.jp> Revision: 4678 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4678 Author: maya Date: 2011-10-16 15:27:43 +0900 (Sun, 16 Oct 2011) Log Message: ----------- ヘッダの修正忘れ Modified Paths: -------------- trunk/teraterm/ttpmacro/ttmlib.h -------------- next part -------------- Modified: trunk/teraterm/ttpmacro/ttmlib.h =================================================================== --- trunk/teraterm/ttpmacro/ttmlib.h 2011-10-16 06:04:53 UTC (rev 4677) +++ trunk/teraterm/ttpmacro/ttmlib.h 2011-10-16 06:27:43 UTC (rev 4678) @@ -14,7 +14,7 @@ void TTMGetDir(PCHAR Dir, int destlen); void TTMSetDir(PCHAR Dir); int GetAbsPath(PCHAR FName, int destlen); -int GetSpecialFolder(PCHAR Text); +int GetSpecialFolder(PCHAR dest, int dest_len, PCHAR type); #ifdef __cplusplus } From svnnotify ＠ sourceforge.jp Mon Oct 17 22:48:30 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 17 Oct 2011 22:48:30 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2NzldICBTU0hGUCBSUiDjgYzlvJXjgZE=?= =?utf-8?b?44Gq44GE5pmC44Gr6JC944Gh44KL44Gu44KS5L+u5q2j44CC?= Message-ID: <1318859310.496723.29416.nullmailer@users.sourceforge.jp> Revision: 4679 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4679 Author: doda Date: 2011-10-17 22:48:29 +0900 (Mon, 17 Oct 2011) Log Message: ----------- SSHFP RR が引けない時に落ちるのを修正。 # デバッグビルドでは構造体が 0 で初期化されるため問題が出ないので気づかなかった… orz Modified Paths: -------------- trunk/ttssh2/ttxssh/dns.c -------------- next part -------------- Modified: trunk/ttssh2/ttxssh/dns.c =================================================================== --- trunk/ttssh2/ttxssh/dns.c 2011-10-16 06:27:43 UTC (rev 4678) +++ trunk/ttssh2/ttxssh/dns.c 2011-10-17 13:48:29 UTC (rev 4679) @@ -131,9 +131,9 @@ } } } + DnsRecordListFree(rec, DnsFreeRecordList); } free(hostkey_digest); - DnsRecordListFree(rec, DnsFreeRecordList); return found; } From svnnotify ＠ sourceforge.jp Mon Oct 17 22:50:29 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 17 Oct 2011 22:50:29 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2ODBdICDjg4fjg5Xjgqnjg6vjg4jjgpI=?= =?utf-8?b?54Sh5Yq544Gr5aSJ5pu044CC?= Message-ID: <1318859429.704186.32569.nullmailer@users.sourceforge.jp> Revision: 4680 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4680 Author: doda Date: 2011-10-17 22:50:29 +0900 (Mon, 17 Oct 2011) Log Message: ----------- デフォルトを無効に変更。 Modified Paths: -------------- trunk/installer/release/TERATERM.INI -------------- next part -------------- Modified: trunk/installer/release/TERATERM.INI =================================================================== --- trunk/installer/release/TERATERM.INI 2011-10-17 13:48:29 UTC (rev 4679) +++ trunk/installer/release/TERATERM.INI 2011-10-17 13:50:29 UTC (rev 4680) @@ -710,7 +710,7 @@ ForwardAgentConfirm=1 ; Verify host key by DNS (1=enabled 0=disabled) -VerifyHostKeyDNS=1 +VerifyHostKeyDNS=0 [TTProxy] ConnectionTimeout="10" From svnnotify ＠ sourceforge.jp Tue Oct 18 00:48:21 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 18 Oct 2011 00:48:21 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2ODFdICDlpInmm7TlsaXmrbTmm7TmlrA=?= Message-ID: <1318866501.798387.20300.nullmailer@users.sourceforge.jp> Revision: 4681 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4681 Author: maya Date: 2011-10-18 00:48:21 +0900 (Tue, 18 Oct 2011) Log Message: ----------- 紊??絮ユ??贋? getspecialfolder Modified Paths: -------------- trunk/doc/en/html/about/history.html trunk/doc/ja/html/about/history.html -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-10-17 13:50:29 UTC (rev 4680) +++ trunk/doc/en/html/about/history.html 2011-10-17 15:48:21 UTC (rev 4681) @@ -37,6 +37,7 @@
    • added support for OSC 10 (Change VT window text foreground color), 11 (Change VT window text background color), 15 (Change TEK window text foreground color) and 16 (Change TEK window text background color) control string.
    • added the [Minimize All] and the [Restore All] menu into the [Window] menu.
      • +
    • added the "getspecialfolder" macro command.
    • adjusted the up and down space size of the shown message at the "messagebox", "inputbox" and "statusbox" macro commands.
    Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2011-10-17 13:50:29 UTC (rev 4680) +++ trunk/doc/ja/html/about/history.html 2011-10-17 15:48:21 UTC (rev 4681) @@ -37,6 +37,7 @@ From svnnotify ＠ sourceforge.jp Sat Oct 22 00:58:49 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 22 Oct 2011 00:58:49 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2ODJdICDjgq/jg6njgqTjgqLjg7Pjg4g=?= =?utf-8?b?44Go44K144O844OQ44Gu44OQ44O844K444On44Oz44GM5LiA6Ie044GX44Gq?= =?utf-8?b?44GE5aC05ZCI44Gr5o6l57aa44GX44Gq44GE44KI44GG44Gr44GX44Gf?= Message-ID: <1319212729.791041.23851.nullmailer@users.sourceforge.jp> Revision: 4682 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4682 Author: maya Date: 2011-10-22 00:58:49 +0900 (Sat, 22 Oct 2011) Log Message: ----------- ????ゃ??潟?????若?????若??с?????眼?????翫???･膓?????????????????ゃ??潟???SSH1 ?с??若???1.99 ?????? SSH2 ?ф･膓??????馹??篆?? http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=26566 Modified Paths: -------------- trunk/doc/en/html/about/history.html trunk/doc/ja/html/about/history.html trunk/installer/release/lang/English.lng trunk/installer/release/lang/French.lng trunk/installer/release/lang/German.lng trunk/installer/release/lang/Japanese.lng trunk/ttssh2/ttxssh/ssh.c -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-10-17 15:48:21 UTC (rev 4681) +++ trunk/doc/en/html/about/history.html 2011-10-21 15:58:49 UTC (rev 4682) @@ -1745,9 +1745,16 @@

    2011.11.xx (Ver 2.59)

      +
    • Changes +
        + +
      +
      • +
    • Bug fixes
      • The control characters(^A-^_) can be inputed as the password string on the key generator dialog.
        • +
      • Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2011-10-17 15:48:21 UTC (rev 4681) +++ trunk/doc/ja/html/about/history.html 2011-10-21 15:58:49 UTC (rev 4682) @@ -1746,9 +1746,16 @@

      2011.11.xx (Ver 2.59)

        +
      • ?? +
          +
        • ??????????????????? SSH ??????????????A???????????
          • +
        +
        • +
      • ????
        • ???????????????????(^A-^_)????????????
          • +
        • ??????????????? 1.99 ????A?????? SSH1 ?????? SSH2 ?????????????B
        • Modified: trunk/installer/release/lang/English.lng =================================================================== --- trunk/installer/release/lang/English.lng 2011-10-17 15:48:21 UTC (rev 4681) +++ trunk/installer/release/lang/English.lng 2011-10-21 15:58:49 UTC (rev 4682) @@ -744,6 +744,7 @@ MSG_SSH_SERVER_DISCON_ERROR=Server disconnected with message '%s'.%s MSG_SSH_SERVER_DISCON_NORES_ERROR=Server disconnected (no reason given).%s MSG_SSH_VERSION_ERROR=This program does not understand the server's version of the protocol. +MSG_SSH_VERSION_MISMATCH=Protocol version mismatch. server:%d.%d client:%d MSG_SSH_SEND_ID_ERROR=An error occurred while sending the SSH ID string.\nThe connection will close. MSG_SSH_UNEXP_MSG2_ERROR=Unexpected SSH2 message(%d) on current stage(%d) MSG_SSH_UNEXP_MSG_ERROR=Unexpected packet type received: %d Modified: trunk/installer/release/lang/French.lng =================================================================== --- trunk/installer/release/lang/French.lng 2011-10-17 15:48:21 UTC (rev 4681) +++ trunk/installer/release/lang/French.lng 2011-10-21 15:58:49 UTC (rev 4682) @@ -736,6 +736,7 @@ MSG_SSH_SERVER_DISCON_ERROR=Serveur d?onnect?avec le message '%s'.%s MSG_SSH_SERVER_DISCON_NORES_ERROR=Serveur d?onnect?(cause inconnue).%s MSG_SSH_VERSION_ERROR=Ce programme ne comprend pas la version de protocole du serveur. +MSG_SSH_VERSION_MISMATCH=Protocol version mismatch. server:%d.%d client:%d MSG_SSH_SEND_ID_ERROR=Une erreur est survenue en cours d'envoi du SSH ID.\nConnexion coup?. MSG_SSH_UNEXP_MSG2_ERROR=Message inattendu de SSH2(%d) ?l'?ape courante (%d) MSG_SSH_UNEXP_MSG_ERROR=Re? un type de paquet inattendu: %d Modified: trunk/installer/release/lang/German.lng =================================================================== --- trunk/installer/release/lang/German.lng 2011-10-17 15:48:21 UTC (rev 4681) +++ trunk/installer/release/lang/German.lng 2011-10-21 15:58:49 UTC (rev 4682) @@ -734,6 +734,7 @@ MSG_SSH_SERVER_DISCON_ERROR=Server disconnected with message '%s'.%s MSG_SSH_SERVER_DISCON_NORES_ERROR=Server disconnected (no reason given).%s MSG_SSH_VERSION_ERROR=This program does not understand the server's version of the protocol. +MSG_SSH_VERSION_MISMATCH=Protocol version mismatch. server:%d.%d client:%d MSG_SSH_SEND_ID_ERROR=An error occurred while sending the SSH ID string.\nThe connection will close. MSG_SSH_UNEXP_MSG2_ERROR=Unexpected SSH2 message(%d) on current stage(%d) MSG_SSH_UNEXP_MSG_ERROR=Unexpected packet type received: %d Modified: trunk/installer/release/lang/Japanese.lng =================================================================== --- trunk/installer/release/lang/Japanese.lng 2011-10-17 15:48:21 UTC (rev 4681) +++ trunk/installer/release/lang/Japanese.lng 2011-10-21 15:58:49 UTC (rev 4682) @@ -744,6 +744,7 @@ MSG_SSH_SERVER_DISCON_ERROR=????????????????. '%s'.%s MSG_SSH_SERVER_DISCON_NORES_ERROR=???????????? (??????????). %s MSG_SSH_VERSION_ERROR=???????????????????. +MSG_SSH_VERSION_MISMATCH=?????????????????. ???:%d.%d ??????:%d MSG_SSH_SEND_ID_ERROR=SSH ID ?????????????????. \n?????. MSG_SSH_UNEXP_MSG2_ERROR=?????????????SSH2 ?????(%d) ??. (%d) MSG_SSH_UNEXP_MSG_ERROR=??????????????????: %d Modified: trunk/ttssh2/ttxssh/ssh.c =================================================================== --- trunk/ttssh2/ttxssh/ssh.c 2011-10-17 15:48:21 UTC (rev 4681) +++ trunk/ttssh2/ttxssh/ssh.c 2011-10-21 15:58:49 UTC (rev 4682) @@ -1605,21 +1605,6 @@ pvar->protocol_major = atoi(ID + 4); pvar->protocol_minor = atoi(str + 1); - // for SSH2(yutaka) - // 1.99??SSH2??????? - if (pvar->protocol_major == 1 && pvar->protocol_minor == 99) { - // ???? SSH2 ??????????? - if (pvar->settings.ssh_protocol_version == 2) { - pvar->protocol_major = 2; - pvar->protocol_minor = 0; - } - - } - - // SSH ?????? teraterm ??????? - // SCP ??????? (2008.2.3 maya) - pvar->cv->isSSH = pvar->protocol_major; - for (str = str + 1; *str >= '0' && *str <= '9'; str++) { } @@ -1631,22 +1616,41 @@ protocol number. We replace the fields with the protocol number we will actually use, or return FALSE if there is no usable protocol version. */ -static BOOL negotiate_protocol(PTInstVar pvar) +static int negotiate_protocol(PTInstVar pvar) { switch (pvar->protocol_major) { case 1: + if (pvar->protocol_minor == 99 && + pvar->settings.ssh_protocol_version == 2) { + // ???? 1.99 ????? SSH2 ??????????? + // 2.0 ????? + pvar->protocol_major = 2; + pvar->protocol_minor = 0; + return 0; + } + + if (pvar->settings.ssh_protocol_version == 2) { + // ??????? + return -1; + } + if (pvar->protocol_minor > 5) { pvar->protocol_minor = 5; } - return TRUE; + return 0; // for SSH2(yutaka) case 2: - return TRUE; // SSH2 support + if (pvar->settings.ssh_protocol_version == 1) { + // ??????? + return -1; + } + return 0; // SSH2 support + default: - return FALSE; + return 1; } } @@ -1705,6 +1709,8 @@ BOOL SSH_handle_server_ID(PTInstVar pvar, char FAR * ID, int ID_len) { static char prefix[64]; + int negotiate; + char uimsg[MAX_UIMSG]; // initialize SSH2 memory dump (2005.3.7 yutaka) init_memdump(); @@ -1753,15 +1759,32 @@ pvar->ssh_state.server_ID = _strdup(ID); - if (!parse_protocol_ID(pvar, ID) || !negotiate_protocol(pvar)) { + if (!parse_protocol_ID(pvar, ID)) { UTIL_get_lang_msg("MSG_SSH_VERSION_ERROR", pvar, "This program does not understand the server's version of the protocol."); notify_fatal_error(pvar, pvar->ts->UIMsg); - } else { + } + else if ((negotiate = negotiate_protocol(pvar)) == 1) { + UTIL_get_lang_msg("MSG_SSH_VERSION_ERROR", pvar, + "This program does not understand the server's version of the protocol."); + notify_fatal_error(pvar, pvar->ts->UIMsg); + } + else if (negotiate == -1) { + UTIL_get_lang_msg("MSG_SSH_VERSION_MISMATCH", pvar, + "Protocol version mismatch. server:%d.%d client:%d"); + _snprintf_s(uimsg, sizeof(uimsg), _TRUNCATE, pvar->ts->UIMsg, + pvar->protocol_major, pvar->protocol_minor, pvar->settings.ssh_protocol_version); + notify_fatal_error(pvar, uimsg); + } + else { char TTSSH_ID[1024]; int TTSSH_ID_len; int a, b, c, d; + // SSH ?????? teraterm ??????? + // SCP ??????? (2008.2.3 maya) + pvar->cv->isSSH = pvar->protocol_major; + // ｩ?ｩ???????????? (2005.3.3 yutaka) get_file_version("ttxssh.dll", &a, &b, &c, &d); From svnnotify ＠ sourceforge.jp Sat Oct 22 23:07:13 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 22 Oct 2011 23:07:13 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2ODNdICDoi7HoqLPjgpLov73liqDjgII=?= Message-ID: <1319292433.257551.19073.nullmailer@users.sourceforge.jp> Revision: 4683 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4683 Author: yutakapon Date: 2011-10-22 23:07:13 +0900 (Sat, 22 Oct 2011) Log Message: ----------- ?沿┳??申??? Modified Paths: -------------- trunk/doc/en/html/about/history.html -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-10-21 15:58:49 UTC (rev 4682) +++ trunk/doc/en/html/about/history.html 2011-10-22 14:07:13 UTC (rev 4683) @@ -1747,14 +1747,14 @@
        • Changes
            - +
          • When the SSH version of the TTSSH does not match the server protocol version, a user can not connect.
        • Bug fixes
          • The control characters(^A-^_) can be inputed as the password string on the key generator dialog.
            • - +
          • When the server protocol is 1.99, Tera Term will connect with the SSH2 protocol by using the SSH1 specified protocol.
          • From svnnotify ＠ sourceforge.jp Mon Oct 24 10:16:46 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 24 Oct 2011 10:16:46 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2ODRdICDjg4njgq3jg6Xjg6Hjg7Pjg4g=?= =?utf-8?b?5pu05paw?= Message-ID: <1319419006.645233.5496.nullmailer@users.sourceforge.jp> Revision: 4684 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4684 Author: doda Date: 2011-10-24 10:16:46 +0900 (Mon, 24 Oct 2011) Log Message: ----------- ????ャ??潟??贋? Modified Paths: -------------- trunk/doc/en/html/about/history.html trunk/doc/ja/html/about/history.html -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-10-22 14:07:13 UTC (rev 4683) +++ trunk/doc/en/html/about/history.html 2011-10-24 01:16:46 UTC (rev 4684) @@ -1748,6 +1748,11 @@
        • Changes
          • When the SSH version of the TTSSH does not match the server protocol version, a user can not connect.
            • +
          • @@ -1755,6 +1760,7 @@
          • The control characters(^A-^_) can be inputed as the password string on the key generator dialog.
          • When the server protocol is 1.99, Tera Term will connect with the SSH2 protocol by using the SSH1 specified protocol.
            • +
          Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2011-10-22 14:07:13 UTC (rev 4683) +++ trunk/doc/ja/html/about/history.html 2011-10-24 01:16:46 UTC (rev 4684) @@ -1749,6 +1749,11 @@
        • ??
          • @@ -1756,6 +1761,7 @@
          • ???????????????????(^A-^_)????????????
          • ??????????????? 1.99 ????A?????? SSH1 ?????? SSH2 ?????????????B
            • +
          • ?????SSHFP???L?????????SSHFP RR ???????????????????????????B
          From svnnotify ＠ sourceforge.jp Mon Oct 24 20:36:04 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 24 Oct 2011 20:36:04 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2ODVdIC9GPSAg44Kq44OX44K344On44Oz?= =?utf-8?b?44KS6KaL44KL44KI44GG44Gr44GX44Gf44CC?= Message-ID: <1319456164.510029.7605.nullmailer@users.sourceforge.jp> Revision: 4685 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4685 Author: doda Date: 2011-10-24 20:36:04 +0900 (Mon, 24 Oct 2011) Log Message: ----------- /F= ????激??潟?荀??????????? http://logmett.com/forum/viewtopic.php?f=2&t=1827 Modified Paths: -------------- trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c -------------- next part -------------- Modified: trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c =================================================================== --- trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c 2011-10-24 01:16:46 UTC (rev 4684) +++ trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c 2011-10-24 11:36:04 UTC (rev 4685) @@ -1,5 +1,6 @@ #include #include +#include #include "teraterm.h" #include "tttypes.h" #include "ttplugin.h" @@ -31,6 +32,7 @@ PComVar cv; Tsend origPsend; TWriteFile origPWriteFile; + PParseParam origParseParam; PReadIniFile origReadIniFile; PWriteIniFile origWriteIniFile; HMENU SetupMenu; @@ -326,21 +328,39 @@ // // TTXReadIniFile, TTXWriteIniFile -- ??????????? // -static void PASCAL FAR TTXReadIniFile(PCHAR fn, PTTSet ts) { - pvar->origReadIniFile(fn, ts); +void ReadINI(PCHAR fn, PTTSet ts) { + char buff[256]; + char *p; - GetPrivateProfileString(SECTION, "Command", "", pvar->orgCommand, sizeof(pvar->orgCommand), fn); + if (fn[0] == '\\' || fn[0] == '/' || (fn[0] != 0 && fn[1] == ':')) { + strncpy_s(buff, sizeof(buff), fn, _TRUNCATE); + } + else { + GetModuleFileName(NULL, buff, sizeof(buff)); + p = strrchr(buff, '\\'); + if (!p) { + return; + } + strncpy_s(p+1, sizeof(buff) - ((p+1)-buff), fn, _TRUNCATE); + } + + GetPrivateProfileString(SECTION, "Command", "", pvar->orgCommand, sizeof(pvar->orgCommand), buff); strncpy_s(pvar->command, sizeof(pvar->command), pvar->orgCommand, _TRUNCATE); UnEscapeStr(pvar->command); pvar->cmdLen = (int)strlen(pvar->command); - pvar->interval = GetPrivateProfileInt(SECTION, "Interval", DEFAULT_INTERVAL, fn); + pvar->interval = GetPrivateProfileInt(SECTION, "Interval", DEFAULT_INTERVAL, buff); if (pvar->interval < MINIMUM_INTERVAL) { pvar->interval = MINIMUM_INTERVAL; } - pvar->enable = GetOnOff(SECTION, "Enable", fn, FALSE); + pvar->enable = GetOnOff(SECTION, "Enable", buff, FALSE); +} +static void PASCAL FAR TTXReadIniFile(PCHAR fn, PTTSet ts) { + pvar->origReadIniFile(fn, ts); + ReadINI(fn, ts); + return; } @@ -359,12 +379,65 @@ return; } +// +// TTXParseParam -- ??????????????ﾟ +// ????????????????????????(???) +// /F= ??????????????????? +// + +PCHAR GetParam(PCHAR buff, int size, PCHAR param) { + int i = 0; + BOOL quoted = FALSE; + + while (*param == ' ' || *param == '\t') { + param++; + } + + if (*param == '\0' || *param == ';') { + return NULL; + } + + while (*param != '\0' && (quoted || (*param != ';' && *param != ' ' && *param != '\t'))) { + if (*param == '"' && (*++param != '"' || !quoted)) { + quoted = !quoted; + continue; + } + else if (i < size - 1) { + buff[i++] = *param; + } + param++; + } + + buff[i] = '\0'; + return param; +} + +static void PASCAL FAR TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) { + char buff[1024]; + PCHAR next; + pvar->origParseParam(Param, ts, DDETopic); + + next = Param; + while (next = GetParam(buff, sizeof(buff), next)) { + if (_strnicmp(buff, "/F=", 3) == 0) { + ReadINI(&buff[3], ts); + } + } + + return; +} + static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks) { pvar->origReadIniFile = *hooks->ReadIniFile; *hooks->ReadIniFile = TTXReadIniFile; pvar->origWriteIniFile = *hooks->WriteIniFile; *hooks->WriteIniFile = TTXWriteIniFile; + + pvar->origParseParam = *hooks->ParseParam; + *hooks->ParseParam = TTXParseParam; + + return; } // From svnnotify ＠ sourceforge.jp Mon Oct 24 20:46:46 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 24 Oct 2011 20:46:46 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2ODZdICDjg4njgq3jg6Xjg6Hjg7Pjg4g=?= =?utf-8?b?5pu05paw?= Message-ID: <1319456806.874195.21600.nullmailer@users.sourceforge.jp> Revision: 4686 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4686 Author: doda Date: 2011-10-24 20:46:46 +0900 (Mon, 24 Oct 2011) Log Message: ----------- ????ャ??潟??贋? Modified Paths: -------------- trunk/doc/en/html/about/history.html trunk/doc/ja/html/about/history.html -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-10-24 11:36:04 UTC (rev 4685) +++ trunk/doc/en/html/about/history.html 2011-10-24 11:46:46 UTC (rev 4686) @@ -2912,6 +2912,7 @@

          2011.xx.xx (Ver 1.02)

          • added the menu id to enable and disable for the macro command.
            • +

          2010.2.10 (Ver 1.01)

          Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2011-10-24 11:36:04 UTC (rev 4685) +++ trunk/doc/ja/html/about/history.html 2011-10-24 11:46:46 UTC (rev 4686) @@ -2915,6 +2915,7 @@

          2011.xx.xx (Ver 1.02)

          • ??/???????????ID??????(????)
            • +
          • /F= ???????????????????????

          2010.2.10 (Ver 1.01)

          From svnnotify ＠ sourceforge.jp Mon Oct 24 21:36:52 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 24 Oct 2011 21:36:52 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2ODddICDjgr/jg5bjgrnjg4jjg4Pjg5c=?= =?utf-8?b?6Kit5a6aIChIVFMpLyDliYrpmaQgKFRCQykg5Yi25b6h44K344O844Kx44Oz?= =?utf-8?b?44K544KS5Y+X44GR5LuY44GR44KL44GL6Kit5a6a44Gn44GN44KL44KI44GG?= =?utf-8?b?44Gr44GX44Gf44CC?= Message-ID: <1319459812.834369.28105.nullmailer@users.sourceforge.jp> Revision: 4687 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4687 Author: doda Date: 2011-10-24 21:36:52 +0900 (Mon, 24 Oct 2011) Log Message: ----------- ?帥??鴻????荐??(HTS)/???(TBC)?九勝?激??宴??鴻????篁?????荐???с????????????筝祉???????TabStopModifySequence=HTS7,TBC ??????8?????? HTS (0x88) ????鴻????篋?? # SJIS 篁ュ???┃絎?????茯ゃ???CP932 ?????????茵?ず???????帥?篏?舟??刊?????????????????? Modified Paths: -------------- trunk/installer/release/TERATERM.INI trunk/teraterm/common/ttlib.c trunk/teraterm/common/ttlib.h trunk/teraterm/common/tttypes.h trunk/teraterm/teraterm/buffer.c trunk/teraterm/teraterm/vtterm.c trunk/teraterm/ttpset/ttset.c -------------- next part -------------- Modified: trunk/installer/release/TERATERM.INI =================================================================== --- trunk/installer/release/TERATERM.INI 2011-10-24 11:46:46 UTC (rev 4686) +++ trunk/installer/release/TERATERM.INI 2011-10-24 12:36:52 UTC (rev 4687) @@ -493,6 +493,9 @@ ; Strict Key Mapping StrictKeyMapping=off +; Tab Stop Modify Sequence (on/off/combination of HTS,HTS7,HTS8,TBC,TBC0,TBC3) +TabStopModifySequence=on + ; TEK mouse code TEKGINMouseCode=32 Modified: trunk/teraterm/common/ttlib.c =================================================================== --- trunk/teraterm/common/ttlib.c 2011-10-24 11:46:46 UTC (rev 4686) +++ trunk/teraterm/common/ttlib.c 2011-10-24 12:36:52 UTC (rev 4687) @@ -581,27 +581,28 @@ memcpy(Text, buf, size); } -void GetNthString(PCHAR Source, int Nth, int Size, PCHAR Dest) +BOOL GetNthString(PCHAR Source, int Nth, int Size, PCHAR Dest) { int i, j, k; - char c; i = 1; j = 0; k = 0; - do { - c = Source[j]; - if ( c==',' ) { + + while (i=Nth); } void GetNthNum(PCHAR Source, int Nth, int far *Num) @@ -884,4 +885,4 @@ LocalTime.wYear); return strtime; -} \ No newline at end of file +} Modified: trunk/teraterm/common/ttlib.h =================================================================== --- trunk/teraterm/common/ttlib.h 2011-10-24 11:46:46 UTC (rev 4686) +++ trunk/teraterm/common/ttlib.h 2011-10-24 12:36:52 UTC (rev 4687) @@ -31,7 +31,7 @@ void ParseStrftimeFileName(PCHAR FName, int destlen); void ConvFName(PCHAR HomeDir, PCHAR Temp, int templen, PCHAR DefExt, PCHAR FName, int destlen); void RestoreNewLine(PCHAR Text); -void GetNthString(PCHAR Source, int Nth, int Size, PCHAR Dest); +BOOL GetNthString(PCHAR Source, int Nth, int Size, PCHAR Dest); void GetNthNum(PCHAR Source, int Nth, int far *Num); void WINAPI GetDefaultFName(char *home, char *file, char *dest, int destlen); void GetDefaultSetupFName(char *home, char *dest, int destlen); Modified: trunk/teraterm/common/tttypes.h =================================================================== --- trunk/teraterm/common/tttypes.h 2011-10-24 11:46:46 UTC (rev 4686) +++ trunk/teraterm/common/tttypes.h 2011-10-24 12:36:52 UTC (rev 4687) @@ -247,6 +247,16 @@ #define WF_TITLEREPORT 24 // (8 | 16) #define WF_IMECURSORCHANGE 32 +// Tab Stop flags (used in ts.TabStopFlag) +#define TABF_NONE 0 +#define TABF_HTS7 1 +#define TABF_HTS8 2 +#define TABF_TBC0 4 +#define TABF_TBC3 8 +#define TABF_HTS (TABF_HTS7 | TABF_HTS8) +#define TABF_TBC (TABF_TBC0 | TABF_TBC3) +#define TABF_ALL (TABF_HTS | TABF_TBC) + // Title Reporting Type #define IdTitleReportIgnore 0 #define IdTitleReportAccept 8 @@ -523,6 +533,7 @@ char TerminalUID[9]; WORD ConfirmChangePasteCR; WORD JumpList; + WORD TabStopFlag; }; typedef struct tttset TTTSet, *PTTSet; @@ -967,6 +978,9 @@ * Increment the number of this macro value * when you change TMap or member of TMap. * + * - At version 4.72, ttset_memfilemap was replaced with ttset_memfilemap_17. + * added tttset.TabStopFlag. + * * - At version 4.70, ttset_memfilemap was replaced with ttset_memfilemap_16. * added tttset.JumpList. * @@ -1065,4 +1079,4 @@ * added tttset.VTCompatTab. */ -#define TT_FILEMAPNAME "ttset_memfilemap_16" +#define TT_FILEMAPNAME "ttset_memfilemap_17" Modified: trunk/teraterm/teraterm/buffer.c =================================================================== --- trunk/teraterm/teraterm/buffer.c 2011-10-24 11:46:46 UTC (rev 4686) +++ trunk/teraterm/teraterm/buffer.c 2011-10-24 12:36:52 UTC (rev 4687) @@ -3061,7 +3061,8 @@ if (NTabStops>0) { switch (Ps) { - case 0: + case 0: + if (ts.TabStopFlag & TABF_TBC0) { i = 0; while ((TabStops[i]!=CursorX) && (iMinimize = 0; @@ -1418,6 +1418,29 @@ // Jump List ts->JumpList = GetOnOff(Section, "JumpList", FName, TRUE); + GetPrivateProfileString(Section, "TabStopModifySequence", "on", Temp, sizeof(Temp), FName); + if (_stricmp(Temp, "on") == 0 || _stricmp(Temp, "all") == 0) + ts->TabStopFlag = TABF_ALL; + else if (_stricmp(Temp, "off") == 0 || _stricmp(Temp, "none") == 0) + ts->TabStopFlag = TABF_NONE; + else { + ts->TabStopFlag = TABF_NONE; + for (i=1; GetNthString(Temp, i, sizeof(Temp2), Temp2); i++) { + if (_stricmp(Temp2, "HTS") == 0) + ts->TabStopFlag |= TABF_HTS; + else if (_stricmp(Temp2, "HTS7") == 0) + ts->TabStopFlag |= TABF_HTS7; + else if (_stricmp(Temp2, "HTS8") == 0) + ts->TabStopFlag |= TABF_HTS8; + else if (_stricmp(Temp2, "TBC") == 0) + ts->TabStopFlag |= TABF_TBC; + else if (_stricmp(Temp2, "TBC0") == 0) + ts->TabStopFlag |= TABF_TBC0; + else if (_stricmp(Temp2, "TBC3") == 0) + ts->TabStopFlag |= TABF_TBC3; + } + } + // Use invalid DECRPSS (for testing) if (GetOnOff(Section, "UseInvalidDECRQSSResponse", FName, FALSE)) ts->TermFlag |= TF_INVALIDDECRPSS; @@ -2467,6 +2490,40 @@ // Confirm PasteCR WriteOnOff(Section, "JumpList", FName, ts->JumpList); + + // TabStopModifySequence + switch (ts->TabStopFlag) { + case TABF_ALL: + strncpy_s(Temp, sizeof(Temp), "on", _TRUNCATE); + break; + case TABF_NONE: + strncpy_s(Temp, sizeof(Temp), "off", _TRUNCATE); + break; + default: + switch (ts->TabStopFlag & TABF_HTS) { + case TABF_HTS7: strncpy_s(Temp, sizeof(Temp), "HTS7", _TRUNCATE); break; + case TABF_HTS8: strncpy_s(Temp, sizeof(Temp), "HTS8", _TRUNCATE); break; + case TABF_HTS: strncpy_s(Temp, sizeof(Temp), "HTS", _TRUNCATE); break; + default: Temp[0] = 0; break; + } + + if (ts->TabStopFlag & TABF_TBC) { + if (Temp[0] != 0) { + strncat_s(Temp, sizeof(Temp), ",", _TRUNCATE); + } + switch (ts->TabStopFlag & TABF_TBC) { + case TABF_TBC0: strncat_s(Temp, sizeof(Temp), "TBC0", _TRUNCATE); break; + case TABF_TBC3: strncat_s(Temp, sizeof(Temp), "TBC3", _TRUNCATE); break; + case TABF_TBC: strncat_s(Temp, sizeof(Temp), "TBC", _TRUNCATE); break; + } + } + + if (Temp[0] == 0) { // ???????????? + strncpy_s(Temp, sizeof(Temp), "off", _TRUNCATE); + } + break; + } + WritePrivateProfileString(Section, "TabStopModifySequence", Temp, FName); } #define VTEditor "VT editor keypad" From svnnotify ＠ sourceforge.jp Tue Oct 25 15:00:28 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 25 Oct 2011 15:00:28 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2ODhdICDjgqrjg6rjgrjjg4rjg6sgMSAu?= =?utf-8?b?NS4gNCDjga4gQ29weXJpZ2h0IOW5tOOBjOmWk+mBleOBo+OBpuOBhOOCiw==?= =?utf-8?b?44Gu44KS5L+u5q2j?= Message-ID: <1319522428.257256.7114.nullmailer@users.sourceforge.jp> Revision: 4688 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4688 Author: maya Date: 2011-10-25 15:00:28 +0900 (Tue, 25 Oct 2011) Log Message: ----------- オリジナル 1.5.4 の Copyright 年が間違っているのを修正 Modified Paths: -------------- trunk/ttssh2/ttxssh/ttxssh.rc -------------- next part -------------- Modified: trunk/ttssh2/ttxssh/ttxssh.rc =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.rc 2011-10-24 12:36:52 UTC (rev 4687) +++ trunk/ttssh2/ttxssh/ttxssh.rc 2011-10-25 06:00:28 UTC (rev 4688) @@ -60,7 +60,7 @@ LTEXT "Tera Term Secure Shell extension, ",IDC_TTSSH_VERSION,6,7,220,15 ICON "",IDC_TTSSH_ICON,234,7,21,20 LTEXT "Compatible with SSH protocol version 1.5 and 2.0",IDC_SSHVERSIONS,6,23,206,11 - LTEXT "Includes:\r\nTTSSH 1.5.4 (Robert O'Callahan roc+tt ＠ cs.cmu.edu), 1998-1999\r\nIPv6 extention version 0.81 (kato ＠ win6.jp), 2000-2003\r\nSSH2 support (Tera Term Project), 2004-2011",IDC_INCLUDES,6,36,248,34 + LTEXT "Includes:\r\nTTSSH 1.5.4 (Robert O'Callahan roc+tt ＠ cs.cmu.edu), 1998-2001\r\nIPv6 extention version 0.81 (kato ＠ win6.jp), 2000-2003\r\nSSH2 support (Tera Term Project), 2004-2011",IDC_INCLUDES,6,36,248,34 LTEXT "OpenSSL:",IDC_OPENSSL_VERSION,6,69,175,8 LTEXT "zlib:",IDC_ZLIB_VERSION,6,78,181,8 LTEXT "PuTTY:",IDC_PUTTY_VERSION,6,87,207,8 From svnnotify ＠ sourceforge.jp Wed Oct 26 20:27:56 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 26 Oct 2011 20:27:56 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2ODldICDoi7HoqLPjgpLov73liqDjgII=?= Message-ID: <1319628476.476391.29622.nullmailer@users.sourceforge.jp> Revision: 4689 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4689 Author: yutakapon Date: 2011-10-26 20:27:56 +0900 (Wed, 26 Oct 2011) Log Message: ----------- ?沿┳??申??? Modified Paths: -------------- trunk/doc/en/html/about/history.html trunk/doc/ja/html/about/history.html -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-10-25 06:00:28 UTC (rev 4688) +++ trunk/doc/en/html/about/history.html 2011-10-26 11:27:56 UTC (rev 4689) @@ -1748,11 +1748,11 @@
        • Changes
          • When the SSH version of the TTSSH does not match the server protocol version, a user can not connect.
            • - +
          • @@ -1760,7 +1760,7 @@
          • The control characters(^A-^_) can be inputed as the password string on the key generator dialog.
          • When the server protocol is 1.99, Tera Term will connect with the SSH2 protocol by using the SSH1 specified protocol.
            • - +
          • When the SSHFP verification is enabled and the SSHFP RR does not query, the application fault will occur.
          @@ -2912,7 +2912,7 @@

          2011.xx.xx (Ver 1.02)

          • added the menu id to enable and disable for the macro command.
            • - +
          • added support for the reading the configuration file by using the /F= option.

          2010.2.10 (Ver 1.01)

          Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2011-10-25 06:00:28 UTC (rev 4688) +++ trunk/doc/ja/html/about/history.html 2011-10-26 11:27:56 UTC (rev 4689) @@ -1751,7 +1751,7 @@
        • ??????????????????? SSH ??????????????A???????????
        • ???????(????????)??????DNS?SSHFP RR????????\ｦ??????????
            -
          • "SSH ??" ????????????????????
          • +
          • "SSH ??" ??????????????(Verify hostkey fingerprint by DNS)??????
        From svnnotify ＠ sourceforge.jp Thu Oct 27 23:59:30 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 27 Oct 2011 23:59:30 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2OTBdICDjgrnjgq/jg6rjg7zjg7Pnlao=?= =?utf-8?b?5Y+344Go44GX44Gm44OH44Kj44K544OX44Os44Kk55Wq5Y+344KS5L2/44Gj?= =?utf-8?b?44Gm44GE44Gf44Gu44KS5L+u5q2j44CC?= Message-ID: <1319727570.644482.13208.nullmailer@users.sourceforge.jp> Revision: 4690 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4690 Author: doda Date: 2011-10-27 23:59:30 +0900 (Thu, 27 Oct 2011) Log Message: ----------- ?鴻?????括??激????????鴻??????垩?篏帥?????????信罩ｃ? Modified Paths: -------------- trunk/installer/release/lang/English.lng trunk/installer/release/lang/French.lng trunk/installer/release/lang/German.lng trunk/installer/release/lang/Japanese.lng trunk/ttssh2/ttxssh/fwd.c trunk/ttssh2/ttxssh/fwd.h trunk/ttssh2/ttxssh/fwdui.c trunk/ttssh2/ttxssh/x11util.c trunk/ttssh2/ttxssh/x11util.h -------------- next part -------------- Modified: trunk/installer/release/lang/English.lng =================================================================== --- trunk/installer/release/lang/English.lng 2011-10-26 11:27:56 UTC (rev 4689) +++ trunk/installer/release/lang/English.lng 2011-10-27 14:59:30 UTC (rev 4690) @@ -565,7 +565,7 @@ DLG_FWDSETUP_XAPP=Display remote &X applications on local X server MSG_FWD_REMOTE_XSERVER=remote X server -MSG_FWD_REMOTE_XSCREEN=X server (screen %d) +MSG_FWD_REMOTE_XSCREEN=X server (display %d:%d) MSG_FWD_REMOTE=Remote "%s" port %s to local "%s" port %s MSG_FWD_LOCAL=Local "%s" port %s to remote "%s" port %s MSG_FWD_X=Remote X applications to local X server @@ -693,7 +693,7 @@ MSG_FWD_ADDRNOTFOUTD_ERROR=No address was found for the machine MSG_FWD_CONNECT_ERROR=The forwarding connection could not be established MSG_FWD_CHANNEL_ERROR=Communications error %s forwarded local %s.\n%s (code %d).\nThe forwarded connection will be closed. -MSG_FWD_CHANNEL_OPEN_X_ERROR=The server attempted to forward a connection through this machine.\nIt requested a connection to the X server on %s (screen %d).\n%s.\nThe forwarded connection will be closed. +MSG_FWD_CHANNEL_OPEN_X_ERROR=The server attempted to forward a connection through this machine.\nIt requested a connection to the X server on %s (display %d:%d).\n%s.\nThe forwarded connection will be closed. MSG_FWD_CHANNEL_OPEN_ERROR=The server attempted to forward a connection through this machine.\nIt requested a connection to %s (port %s).\n%s.\nThe forwarded connection will be closed. DLG_FWDMON_TITLE=TTSSH Port Forwarding Monitor MSG_FWD_HOSTILE_ATTACK_ERROR=Host with IP number %s tried to connect to forwarded local port %d.\nThis could be some kind of hostile attack. Modified: trunk/installer/release/lang/French.lng =================================================================== --- trunk/installer/release/lang/French.lng 2011-10-26 11:27:56 UTC (rev 4689) +++ trunk/installer/release/lang/French.lng 2011-10-27 14:59:30 UTC (rev 4690) @@ -564,7 +564,7 @@ DLG_FWDSETUP_XAPP=Afficher les applis distantes sur les serveur X local MSG_FWD_REMOTE_XSERVER=serveur X distant -MSG_FWD_REMOTE_XSCREEN=serveur X (screen %d) +MSG_FWD_REMOTE_XSCREEN=serveur X (display %d:%d) MSG_FWD_REMOTE=Distant "%s" port %s au Local "%s" port %s MSG_FWD_LOCAL=Local "%s" port %s ?Distant "%s" port %s MSG_FWD_X=Applications X distantes au serveur X local @@ -685,7 +685,7 @@ MSG_FWD_ADDRNOTFOUTD_ERROR=Pas d'adresse trouv? pour la machine MSG_FWD_CONNECT_ERROR=La connexion n'a pas pu ?re ?ablie MSG_FWD_CHANNEL_ERROR=Erreur de communication %s redirig?en local %s.\n%s (code %d).\nLa connexion redirig? va ?re ferm?. -MSG_FWD_CHANNEL_OPEN_X_ERROR=Le serveur a essay?de rediriger une connexion ?travers cette machine.\nIl a demand?une connexion au serveur X sur %s (screen %d).\n%s.\nLa connection redirig? va ?re ferm?. +MSG_FWD_CHANNEL_OPEN_X_ERROR=Le serveur a essay?de rediriger une connexion ?travers cette machine.\nIl a demand?une connexion au serveur X sur %s (display %d:%d).\n%s.\nLa connection redirig? va ?re ferm?. MSG_FWD_CHANNEL_OPEN_ERROR=Le serveur a essay?de rediriger une connexion ?travers cette machine.\nIl a demand?une connexion sur %s (port %s).\n%s.\nLa connection redirig? va ?re ferm?. DLG_FWDMON_TITLE=Moniteur de redirection de port TTSSH MSG_FWD_HOSTILE_ATTACK_ERROR=L4h?e d'adresse IP %s a essay?de se connecter au port local redirig?%d.\nC'est peut-?re une forme d'attaque hostile. Modified: trunk/installer/release/lang/German.lng =================================================================== --- trunk/installer/release/lang/German.lng 2011-10-26 11:27:56 UTC (rev 4689) +++ trunk/installer/release/lang/German.lng 2011-10-27 14:59:30 UTC (rev 4690) @@ -563,7 +563,7 @@ DLG_FWDSETUP_XAPP=Remote-X-Sitzungen auf dem lokalen X-Server anzeigen. MSG_FWD_REMOTE_XSERVER=Remote-X-Server -MSG_FWD_REMOTE_XSCREEN=X-Server (screen %d) +MSG_FWD_REMOTE_XSCREEN=X-Server (anzeige %d:%d) MSG_FWD_REMOTE=Remote "%s" port %s to local "%s" port %s MSG_FWD_LOCAL=Local "%s" port %s to remote "%s" port %s MSG_FWD_X=Remote X applications to local X server @@ -683,7 +683,7 @@ MSG_FWD_ADDRNOTFOUTD_ERROR=No address was found for the machine MSG_FWD_CONNECT_ERROR=The forwarding connection could not be established MSG_FWD_CHANNEL_ERROR=Communications error %s forwarded local %s.\n%s (code %d).\nThe forwarded connection will be closed. -MSG_FWD_CHANNEL_OPEN_X_ERROR=The server attempted to forward a connection through this machine.\nIt requested a connection to the X server on %s (screen %d).\n%s.\nThe forwarded connection will be closed. +MSG_FWD_CHANNEL_OPEN_X_ERROR=The server attempted to forward a connection through this machine.\nIt requested a connection to the X server on %s (anzeige %d:%d).\n%s.\nThe forwarded connection will be closed. MSG_FWD_CHANNEL_OPEN_ERROR=The server attempted to forward a connection through this machine.\nIt requested a connection to %s (port %s).\n%s.\nThe forwarded connection will be closed. DLG_FWDMON_TITLE=TTSSH Port Forwarding Monitor MSG_FWD_HOSTILE_ATTACK_ERROR=Host with IP number %s tried to connect to forwarded local port %d.\nThis could be some kind of hostile attack. Modified: trunk/installer/release/lang/Japanese.lng =================================================================== --- trunk/installer/release/lang/Japanese.lng 2011-10-26 11:27:56 UTC (rev 4689) +++ trunk/installer/release/lang/Japanese.lng 2011-10-27 14:59:30 UTC (rev 4690) @@ -565,7 +565,7 @@ DLG_FWDSETUP_XAPP=?????(&X)??????????????X?????ｦ?? MSG_FWD_REMOTE_XSERVER=????X ??? -MSG_FWD_REMOTE_XSCREEN=X ??? (?? %d) +MSG_FWD_REMOTE_XSCREEN=X ??? (?????? %d:%d) MSG_FWD_REMOTE=????? "%s" ???? %s ?????????? "%s" ???? %s MSG_FWD_LOCAL=????? "%s" ???? %s ?? ???????? "%s" ???? %s MSG_FWD_X=?????X???????????????X??? @@ -693,7 +693,7 @@ MSG_FWD_ADDRNOTFOUTD_ERROR=?????????????? MSG_FWD_CONNECT_ERROR=??????????????? MSG_FWD_CHANNEL_ERROR=????? %s forwarded local %s.\n%s (??? %d).\n?????????? -MSG_FWD_CHANNEL_OPEN_X_ERROR=??????????????????.\n%s ???????????????? (?? %d). \n?????????? +MSG_FWD_CHANNEL_OPEN_X_ERROR=??????????????????.\n%s ???????????????? (?????? %d:%d). \n?????????? MSG_FWD_CHANNEL_OPEN_ERROR=??????????????????.\n%s ??????????? (??? %s).\n%s.\n?????????? DLG_FWDMON_TITLE=TTSSH ???????? MSG_FWD_HOSTILE_ATTACK_ERROR=IP ?? %s ?????, ??????? %d ???????????.\n??????????????? Modified: trunk/ttssh2/ttxssh/fwd.c =================================================================== --- trunk/ttssh2/ttxssh/fwd.c 2011-10-26 11:27:56 UTC (rev 4689) +++ trunk/ttssh2/ttxssh/fwd.c 2011-10-27 14:59:30 UTC (rev 4690) @@ -449,11 +449,11 @@ if (request->spec.type == FWD_REMOTE_X11_TO_LOCAL) { UTIL_get_lang_msg("MSG_FWD_CHANNEL_OPEN_X_ERROR", pvar, "The server attempted to forward a connection through this machine.\n" - "It requested a connection to the X server on %s (screen %d).\n" + "It requested a connection to the X server on %s (display %d:%d).\n" "%s.\n" "The forwarded connection will be closed."); _snprintf_s(buf, sizeof(buf), _TRUNCATE, pvar->ts->UIMsg, - request->spec.to_host, request->spec.to_port - 6000, + request->spec.to_host, request->spec.to_port - 6000, request->spec.x11_screen, uimsg); } else { UTIL_get_lang_msg("MSG_FWD_CHANNEL_OPEN_ERROR", pvar, @@ -1464,7 +1464,7 @@ num_server_listening_requests++; break; case FWD_REMOTE_X11_TO_LOCAL:{ - int screen_num = request->spec.to_port - 6000; + int screen_num = request->spec.x11_screen; pvar->fwd_state.X11_auth_data = X11_load_local_auth_data(screen_num); Modified: trunk/ttssh2/ttxssh/fwd.h =================================================================== --- trunk/ttssh2/ttxssh/fwd.h 2011-10-26 11:27:56 UTC (rev 4689) +++ trunk/ttssh2/ttxssh/fwd.h 2011-10-27 14:59:30 UTC (rev 4690) @@ -79,7 +79,7 @@ #define FWD_REMOTE_X11_TO_LOCAL 3 /* If 'type' is FWD_REMOTE_X11_TO_LOCAL, then from_port must be - -1, to_port must be 6000 + screen number, and to_host must + -1, to_port must be 6000 + display number, and to_host must be the desired X server host. There can be no more than one spec of a given type and from_port @@ -93,6 +93,7 @@ char to_port_name[32]; char to_host[256]; char bind_address[256]; + int x11_screen; } FWDRequestSpec; #define FWD_DELETED 0x01 Modified: trunk/ttssh2/ttxssh/fwdui.c =================================================================== --- trunk/ttssh2/ttxssh/fwdui.c 2011-10-26 11:27:56 UTC (rev 4689) +++ trunk/ttssh2/ttxssh/fwdui.c 2011-10-27 14:59:30 UTC (rev 4690) @@ -371,13 +371,13 @@ spec->type = FWD_REMOTE_X11_TO_LOCAL; spec->from_port = -1; X11_get_DISPLAY_info(spec->to_host, sizeof(spec->to_host), - &spec->to_port); + &spec->to_port, &spec->x11_screen); UTIL_get_lang_msg("MSG_FWD_REMOTE_XSERVER", pvar, "remote X server"); strncpy_s(spec->from_port_name, sizeof(spec->from_port_name), pvar->ts->UIMsg, _TRUNCATE); - UTIL_get_lang_msg("MSG_FWD_REMOTE_XSCREEN", pvar, "X server (screen %d)"); + UTIL_get_lang_msg("MSG_FWD_REMOTE_XSCREEN", pvar, "X server (display %d:%d)"); _snprintf_s(spec->to_port_name, sizeof(spec->to_port_name), _TRUNCATE, - pvar->ts->UIMsg, spec->to_port - 6000); + pvar->ts->UIMsg, spec->to_port - 6000, spec->x11_screen); } static BOOL is_service_name_char(char ch) Modified: trunk/ttssh2/ttxssh/x11util.c =================================================================== --- trunk/ttssh2/ttxssh/x11util.c 2011-10-26 11:27:56 UTC (rev 4689) +++ trunk/ttssh2/ttxssh/x11util.c 2011-10-27 14:59:30 UTC (rev 4690) @@ -42,12 +42,13 @@ } X11UnspoofingFilterClosure; void X11_get_DISPLAY_info(char FAR * name_buf, int name_buf_len, - int FAR * port) + int FAR * port, int FAR * screen) { char FAR *DISPLAY = getenv("DISPLAY"); strncpy_s(name_buf, name_buf_len, "localhost", _TRUNCATE); *port = 6000; + *screen = 0; if (DISPLAY != NULL) { int i; @@ -63,7 +64,13 @@ } if (DISPLAY[i] == ':') { - *port = atoi(DISPLAY + i + 1) + 6000; + *port = atoi(&DISPLAY[++i]) + 6000; + while (DISPLAY[i] >= '0' && DISPLAY[i] <= '9') { + i++; + } + if (DISPLAY[i] == '.' && DISPLAY[i+1] != 0) { + *screen = atoi(&DISPLAY[++i]); + } } } } Modified: trunk/ttssh2/ttxssh/x11util.h =================================================================== --- trunk/ttssh2/ttxssh/x11util.h 2011-10-26 11:27:56 UTC (rev 4689) +++ trunk/ttssh2/ttxssh/x11util.h 2011-10-27 14:59:30 UTC (rev 4690) @@ -49,7 +49,7 @@ #define X11_get_spoofed_protocol_data(d) ((d)->spoofed_data) #define X11_get_spoofed_protocol_data_len(d) ((d)->spoofed_data_len) -void X11_get_DISPLAY_info(char FAR * name_buf, int name_buf_len, int FAR * port); +void X11_get_DISPLAY_info(char FAR * name_buf, int name_buf_len, int FAR * port, int FAR * screen); X11AuthData FAR * X11_load_local_auth_data(int screen_num); void FAR * X11_init_unspoofing_filter(struct _TInstVar FAR * pvar, X11AuthData FAR * auth_data); From svnnotify ＠ sourceforge.jp Fri Oct 28 00:06:55 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 28 Oct 2011 00:06:55 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2OTFdICDlpInmm7TlsaXmrbTmm7TmlrA=?= Message-ID: <1319728015.245131.22968.nullmailer@users.sourceforge.jp> Revision: 4691 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4691 Author: doda Date: 2011-10-28 00:06:55 +0900 (Fri, 28 Oct 2011) Log Message: ----------- 紊??絮ユ??贋? Modified Paths: -------------- trunk/doc/en/html/about/history.html trunk/doc/ja/html/about/history.html -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-10-27 14:59:30 UTC (rev 4690) +++ trunk/doc/en/html/about/history.html 2011-10-27 15:06:55 UTC (rev 4691) @@ -1761,6 +1761,7 @@
      • The control characters(^A-^_) can be inputed as the password string on the key generator dialog.
      • When the server protocol is 1.99, Tera Term will connect with the SSH2 protocol by using the SSH1 specified protocol.
      • When the SSHFP verification is enabled and the SSHFP RR does not query, the application fault will occur.
        • +
      Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2011-10-27 14:59:30 UTC (rev 4690) +++ trunk/doc/ja/html/about/history.html 2011-10-27 15:06:55 UTC (rev 4691) @@ -1762,6 +1762,7 @@
    • ???????????????????(^A-^_)????????????
    • ??????????????? 1.99 ????A?????? SSH1 ?????? SSH2 ?????????????B
    • ?????SSHFP???L?????????SSHFP RR ???????????????????????????B
      • +
    • X11?????????????????0???????????????????C????
    From svnnotify ＠ sourceforge.jp Sat Oct 29 21:43:21 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 29 Oct 2011 21:43:21 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2OTJdICDoi7HoqLPjgpLov73liqDjgII=?= Message-ID: <1319892201.772402.17302.nullmailer@users.sourceforge.jp> Revision: 4692 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4692 Author: yutakapon Date: 2011-10-29 21:43:21 +0900 (Sat, 29 Oct 2011) Log Message: ----------- ?沿┳??申??? Modified Paths: -------------- trunk/doc/en/html/about/history.html -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-10-27 15:06:55 UTC (rev 4691) +++ trunk/doc/en/html/about/history.html 2011-10-29 12:43:21 UTC (rev 4692) @@ -1761,7 +1761,7 @@
  • The control characters(^A-^_) can be inputed as the password string on the key generator dialog.
  • When the server protocol is 1.99, Tera Term will connect with the SSH2 protocol by using the SSH1 specified protocol.
  • When the SSHFP verification is enabled and the SSHFP RR does not query, the application fault will occur.
    • - +
  • When the transfering display number is an integer other than zero, the X11 forwaring does not work well.
    • From svnnotify ＠ sourceforge.jp Sun Oct 30 19:42:48 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 30 Oct 2011 19:42:48 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2OTNdICBJUHY244Gr6Zai44GZ44KL6KiY?= =?utf-8?b?6LyJ44KS6L+95Yqg44GX44Gf44CC?= Message-ID: <1319971368.959741.27266.nullmailer@users.sourceforge.jp> Revision: 4693 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4693 Author: yutakapon Date: 2011-10-30 19:42:48 +0900 (Sun, 30 Oct 2011) Log Message: ----------- IPv6??????荐????申?????? Modified Paths: -------------- trunk/doc/en/html/menu/file-new.html trunk/doc/ja/html/menu/file-new.html -------------- next part -------------- Modified: trunk/doc/en/html/menu/file-new.html =================================================================== --- trunk/doc/en/html/menu/file-new.html 2011-10-29 12:43:21 UTC (rev 4692) +++ trunk/doc/en/html/menu/file-new.html 2011-10-30 10:42:48 UTC (rev 4693) @@ -21,12 +21,13 @@
    Host
    - Enter the host name or IP address, or select one from the host list. + Enter the host name or IP address(IPv4 and IPv6), or select one from the host list. To edit the host list, use the - [Setup] TCP/IP command. + [Setup] TCP/IP command.
    + The IPv6 address is surround with the bracket. (Refer to RFC3986 / RFC5952)
    You can enter not only the host name or address, but also the command line parameters - like the following: + like the following:
         myhost.mydomain                     Host name only.
@@ -34,6 +35,10 @@
     foohost.foodomain /F=FOOHOST.INI    Host name & setup file name.
     /C=1                                Specifies the serial port connection.
     /R=LOG.DAT                          Replays the log file.
+    [2001:db8:1:2:8401:2ff:fe03:405]    IPv6 address
+    [fe80::8401:2ff:fe03:405%3]:8022    IPv6 address and Port number
+    user ＠ myhost.example.com:10022 /ssh  SSH connection to a port number other than 22
+    ssh://user ＠ myhost.example.com       SSH connection to the SSH protocol(ssh://)
    Modified: trunk/doc/ja/html/menu/file-new.html =================================================================== --- trunk/doc/ja/html/menu/file-new.html 2011-10-29 12:43:21 UTC (rev 4692) +++ trunk/doc/ja/html/menu/file-new.html 2011-10-30 10:42:48 UTC (rev 4693) @@ -21,12 +21,13 @@
    Host
    - ??????????? IP address ????????????????? + ??????????? IP address(IPv4 & IPv6) ????????????????? ??????????????????????????- [Setup] TCP/IP ????????? + [Setup] TCP/IP ?????????
    + IPv6???????????????????RFC3986 / RFC5952 ??j?
    ??????????????????? ??????? - ???????????????? + ????????????????
         myhost.mydomain                     ???z?????? IP address ??
@@ -34,6 +35,10 @@
     foohost.foodomain /F=FOOHOST.INI    ????+??????????
     /C=1                                ?????????????????
     /R=LOG.DAT                          ??????????????????????????
+    [2001:db8:1:2:8401:2ff:fe03:405]    IPv6????
+    [fe80::8401:2ff:fe03:405%3]:8022    IPv6???? + ?????
+    user ＠ myhost.example.com:10022 /ssh  22????????SSH??
+    ssh://user ＠ myhost.example.com       SSH?????(ssh://)????
    From svnnotify ＠ sourceforge.jp Sun Oct 30 21:55:38 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 30 Oct 2011 21:55:38 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2OTRdICDjg5bjg63jg7zjg4njgq3jg6M=?= =?utf-8?b?44K544OI44Kz44Oe44Oz44OJ44Gu44Oq44Ki44Or44K/44Kk44Og44Oi44O8?= =?utf-8?b?44OJ44Gn44Gv44CB5YWl5Yqb44GX44Gf5paH5a2X44GM44Ko44OH44Kj44OD?= =?utf-8?b?44OI44Kz44Oz44OI44Ot44O844Or44Gr5q6L44KJ44Gq44GE44KI44GG44Gr?= =?utf-8?b?44GX44Gf?= Message-ID: <1319979338.464935.25018.nullmailer@users.sourceforge.jp> Revision: 4694 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4694 Author: maya Date: 2011-10-30 21:55:38 +0900 (Sun, 30 Oct 2011) Log Message: ----------- ????若?????鴻??潟??潟?????≪??帥?????若??с??????????絖??????ｃ?????潟???????罧????????????? http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=26449 Modified Paths: -------------- trunk/doc/en/html/about/history.html trunk/doc/ja/html/about/history.html trunk/teraterm/teraterm/vtwin.cpp -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-10-30 10:42:48 UTC (rev 4693) +++ trunk/doc/en/html/about/history.html 2011-10-30 12:55:38 UTC (rev 4694) @@ -37,6 +37,7 @@
    • added support for OSC 10 (Change VT window text foreground color), 11 (Change VT window text background color), 15 (Change TEK window text foreground color) and 16 (Change TEK window text background color) control string.
    • added the [Minimize All] and the [Restore All] menu into the [Window] menu.
      • +
    • added the "getspecialfolder" macro command.
    • adjusted the up and down space size of the shown message at the "messagebox", "inputbox" and "statusbox" macro commands.
    Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2011-10-30 10:42:48 UTC (rev 4693) +++ trunk/doc/ja/html/about/history.html 2011-10-30 12:55:38 UTC (rev 4694) @@ -37,6 +37,7 @@ Modified: trunk/teraterm/teraterm/vtwin.cpp =================================================================== --- trunk/teraterm/teraterm/vtwin.cpp 2011-10-30 10:42:48 UTC (rev 4693) +++ trunk/teraterm/teraterm/vtwin.cpp 2011-10-30 12:55:38 UTC (rev 4694) @@ -4435,7 +4435,7 @@ int i; HWND hd; int count; -OutputDebugPrintf("msg=%d wParam=%d lParam=%d\n", msg, wParam, lParam); + if (wParam == 0x0d) { // Enter key SetWindowText(dlg, ""); SendMessage(dlg, EM_SETSEL, 0, 0); @@ -4463,6 +4463,19 @@ } break; + case WM_CHAR: +#if 0 + switch (wParam) { + case VK_RETURN: + case VK_ESCAPE: + // ????????????+ return FALSE; + } + // not break; +#endif + // ????????IDC_COMMAND_EDIT????????ﾌ?? + return FALSE; + default: return CallWindowProc(OrigBroadcastEditProc, dlg, msg, wParam, lParam); } From svnnotify ＠ sourceforge.jp Sun Oct 30 22:54:39 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 30 Oct 2011 22:54:39 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2OTVdICDoi7HoqLPjgpLov73liqDjgII=?= Message-ID: <1319982879.434411.464.nullmailer@users.sourceforge.jp> Revision: 4695 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4695 Author: yutakapon Date: 2011-10-30 22:54:39 +0900 (Sun, 30 Oct 2011) Log Message: ----------- ?沿┳??申??? Modified Paths: -------------- trunk/doc/en/html/about/history.html -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-10-30 12:55:38 UTC (rev 4694) +++ trunk/doc/en/html/about/history.html 2011-10-30 13:54:39 UTC (rev 4695) @@ -37,7 +37,7 @@
    • added support for OSC 10 (Change VT window text foreground color), 11 (Change VT window text background color), 15 (Change TEK window text foreground color) and 16 (Change TEK window text background color) control string.
    • added the [Minimize All] and the [Restore All] menu into the [Window] menu.
      • - +
    • Broadcast Command: When a user uses the real time mode, the input characters does not show on the edit control.
    • added the "getspecialfolder" macro command.
    • adjusted the up and down space size of the shown message at the "messagebox", "inputbox" and "statusbox" macro commands.