Tera TermRevision: 10987
https://osdn.net/projects/ttssh2/scm/svn/commits/10987
Author: nmaya
Date: 2023-10-11 07:29:35 +0900 (Wed, 11 Oct 2023)
Log Message:
-----------
Visual Studio 2005 でビルドできない問題を修正
trunk は Visual Studio 2005 でビルドしないが、4-stable とソースをそろえておく
merge from 4-stable: r10985, r10986
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/10985
https://osdn.net/projects/ttssh2/scm/svn/commits/10986
Modified Paths:
--------------
trunk/teraterm/common/ttlib.c
trunk/ttssh2/ttxssh/ssh.c
-------------- next part --------------
Modified: trunk/teraterm/common/ttlib.c
===================================================================
--- trunk/teraterm/common/ttlib.c 2023-10-10 22:14:40 UTC (rev 10986)
+++ trunk/teraterm/common/ttlib.c 2023-10-10 22:29:35 UTC (rev 10987)
@@ -899,7 +899,6 @@
SYSTEMTIME systime;
const size_t sizeof_strtime = 29;
char *strtime = malloc(sizeof_strtime);
- *strtime = '\0';
static const char week[][4] = {
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
};
@@ -910,6 +909,7 @@
char tmp[5];
unsigned int i = strlen(format);
+ *strtime = '\0';
if (utc_flag) {
GetSystemTime(&systime);
}
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c 2023-10-10 22:14:40 UTC (rev 10986)
+++ trunk/ttssh2/ttxssh/ssh.c 2023-10-10 22:29:35 UTC (rev 10987)
@@ -8500,11 +8500,12 @@
static void CALLBACK do_SSH2_adjust_window_size_timer(
HWND hWnd, UINT uMsg, UINT_PTR nIDEvent, DWORD dwTime)
{
+ Channel_t *c = (Channel_t *)nIDEvent;
+ PTInstVar pvar = c->scp.pvar;
+
(void)hWnd;
(void)uMsg;
(void)dwTime;
- Channel_t *c = (Channel_t *)nIDEvent;
- PTInstVar pvar = c->scp.pvar;
if (pvar->recv.data_finished) {
// \x91\x97\x90M\x8FI\x97\xB9\x82\xB5\x82\xBD\x82̂Ƀ\x81\x83b\x83Z\x81[\x83W\x82\xAA\x8Ec\x82\xC1\x82Ă\xA2\x82\xBD\x8E\x9E\x91\xF4