Tera TermRevision: 7417
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7417
Author: zmatsuo
Date: 2019-01-28 23:15:46 +0900 (Mon, 28 Jan 2019)
Log Message:
-----------
警告対策
Modified Paths:
--------------
branches/cmake/teraterm/common/tttypes.h
branches/cmake/teraterm/ttpdlg/ttdlg.c
branches/cmake/ttssh2/ttxssh/auth.c
-------------- next part --------------
Modified: branches/cmake/teraterm/common/tttypes.h
===================================================================
--- branches/cmake/teraterm/common/tttypes.h 2019-01-28 14:15:35 UTC (rev 7416)
+++ branches/cmake/teraterm/common/tttypes.h 2019-01-28 14:15:46 UTC (rev 7417)
@@ -1019,7 +1019,7 @@
BOOL Open;
WORD PortType;
WORD ComPort;
- unsigned int s; /* SOCKET */
+ UINT_PTR s; /* SOCKET */
WORD RetryCount;
HANDLE ComID;
BOOL CanSend, RRQ;
Modified: branches/cmake/teraterm/ttpdlg/ttdlg.c
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttdlg.c 2019-01-28 14:15:35 UTC (rev 7416)
+++ branches/cmake/teraterm/ttpdlg/ttdlg.c 2019-01-28 14:15:46 UTC (rev 7417)
@@ -122,7 +122,7 @@
"230400", "460800", "921600", NULL};
-static BOOL CALLBACK TermDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK TermDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
{
static const DlgTextInfo TextInfosCom[] = {
{ 0, "DLG_TERM_TITLE" },
@@ -519,7 +519,7 @@
}
}
-static BOOL CALLBACK WinDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK WinDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
{
static const DlgTextInfo TextInfos[] = {
{ 0, "DLG_WIN_TITLE" },
@@ -1029,7 +1029,7 @@
return FALSE;
}
-static BOOL CALLBACK KeybDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK KeybDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
{
static const DlgTextInfo TextInfos[] = {
{ 0, "DLG_KEYB_TITLE" },
@@ -1113,7 +1113,7 @@
static const char *StopList[] = {"1 bit", "1.5 bit", "2 bit", NULL};
static const char *FlowList[] = {"Xon/Xoff","hardware","none",NULL};
-static BOOL CALLBACK SerialDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK SerialDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
{
static const DlgTextInfo TextInfos[] = {
{ 0, "DLG_SERIAL_TITLE" },
@@ -1261,7 +1261,7 @@
return FALSE;
}
-static BOOL CALLBACK TCPIPDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK TCPIPDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
{
static const DlgTextInfo TextInfos[] = {
{ 0, "DLG_TCPIP_TITLE" },
@@ -1497,7 +1497,7 @@
return FALSE;
}
-static BOOL CALLBACK HostDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK HostDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
{
static const DlgTextInfo TextInfos[] = {
{ 0, "DLG_HOST_TITLE" },
@@ -1725,7 +1725,7 @@
return FALSE;
}
-static BOOL CALLBACK DirDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DirDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
{
static const DlgTextInfo TextInfos[] = {
{ 0, "DLG_DIR_TITLE" },
@@ -2150,7 +2150,7 @@
}
#endif
-static BOOL CALLBACK AboutDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK AboutDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
{
static const DlgTextInfo TextInfos[] = {
{ 0, "DLG_ABOUT_TITLE" },
Modified: branches/cmake/ttssh2/ttxssh/auth.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/auth.c 2019-01-28 14:15:35 UTC (rev 7416)
+++ branches/cmake/ttssh2/ttxssh/auth.c 2019-01-28 14:15:46 UTC (rev 7417)
@@ -747,8 +747,8 @@
}
BOOL autologin_sent_none;
-static BOOL CALLBACK auth_dlg_proc(HWND dlg, UINT msg, WPARAM wParam,
- LPARAM lParam)
+static INT_PTR CALLBACK auth_dlg_proc(HWND dlg, UINT msg, WPARAM wParam,
+ LPARAM lParam)
{
const int IDC_TIMER1 = 300; // \x8E\xA9\x93\xAE\x83\x8D\x83O\x83C\x83\x93\x82\xAA\x97L\x8C\xF8\x82ȂƂ\xAB
const int IDC_TIMER2 = 301; // \x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82郁\x83\\x83b\x83h\x82\xF0\x8E\xA9\x93\xAE\x83`\x83F\x83b\x83N(CheckAuthListFirst)
@@ -1213,8 +1213,8 @@
return TRUE;
}
-static BOOL CALLBACK TIS_dlg_proc(HWND dlg, UINT msg, WPARAM wParam,
- LPARAM lParam)
+static INT_PTR CALLBACK TIS_dlg_proc(HWND dlg, UINT msg, WPARAM wParam,
+ LPARAM lParam)
{
PTInstVar pvar;
// LOGFONT logfont;
@@ -1455,8 +1455,8 @@
return TRUE;
}
-static BOOL CALLBACK default_auth_dlg_proc(HWND dlg, UINT msg,
- WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK default_auth_dlg_proc(HWND dlg, UINT msg,
+ WPARAM wParam, LPARAM lParam)
{
PTInstVar pvar;
// LOGFONT logfont;