scmno****@osdn*****
scmno****@osdn*****
2018年 8月 16日 (木) 23:25:36 JST
Tera TermRevision: 7178
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7178
Author: zmatsuo
Date: 2018-08-16 23:25:35 +0900 (Thu, 16 Aug 2018)
Log Message:
-----------
警告など対策
- const 追加
- 不要変数削除
- 関数の引数調整
- include調整
- i18n関連
- ログにコメントを追加ダイアログの修正
- 未初期化変数
Modified Paths:
--------------
branches/cmake/teraterm/common/dlglib.c
branches/cmake/teraterm/common/dlglib.h
branches/cmake/teraterm/teraterm/CMakeLists.txt
branches/cmake/teraterm/teraterm/addsetting.cpp
branches/cmake/teraterm/teraterm/addsetting.h
branches/cmake/teraterm/teraterm/buffer.c
branches/cmake/teraterm/teraterm/clipboar.c
branches/cmake/teraterm/teraterm/dnddlg.cpp
branches/cmake/teraterm/teraterm/prnabort.cpp
branches/cmake/teraterm/teraterm/prnabort.h
branches/cmake/teraterm/teraterm/protodlg.cpp
branches/cmake/teraterm/teraterm/tekwin.cpp
branches/cmake/teraterm/teraterm/tekwin.h
branches/cmake/teraterm/teraterm/ttdialog.c
branches/cmake/teraterm/teraterm/ttdialog.h
branches/cmake/teraterm/teraterm/vtwin.cpp
branches/cmake/teraterm/teraterm/vtwin.h
branches/cmake/teraterm/ttpfile/ttfile.c
-------------- next part --------------
Modified: branches/cmake/teraterm/common/dlglib.c
===================================================================
--- branches/cmake/teraterm/common/dlglib.c 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/common/dlglib.c 2018-08-16 14:25:35 UTC (rev 7178)
@@ -361,7 +361,7 @@
{
int i;
for (i = 0 ; i < infoCount; i++) {
- char *key = infos[i].key;
+ const char *key = infos[i].key;
char uimsg[MAX_UIMSG];
get_lang_msg(key, uimsg, sizeof(uimsg), "", UILanguageFile);
if (uimsg[0] != '\0') {
Modified: branches/cmake/teraterm/common/dlglib.h
===================================================================
--- branches/cmake/teraterm/common/dlglib.h 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/common/dlglib.h 2018-08-16 14:25:35 UTC (rev 7178)
@@ -50,7 +50,7 @@
void SetEditboxSubclass(HWND hDlg, int nID, BOOL ComboBox);
typedef struct {
int nIDDlgItem;
- char *key;
+ const char *key;
} DlgTextInfo;
void SetDlgTexts(HWND hDlgWnd, const DlgTextInfo *infos, int infoCount, const char *UILanguageFile);
HFONT SetDlgFonts(HWND hDlg, const int nIDDlgItems[], int nIDDlgItemCount,
Modified: branches/cmake/teraterm/teraterm/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/teraterm/CMakeLists.txt 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/teraterm/CMakeLists.txt 2018-08-16 14:25:35 UTC (rev 7178)
@@ -102,6 +102,7 @@
include_directories(
../common
../ttpfile
+ ../ttpdlg
${SFMT_INCLUDE_DIRS}
.
)
@@ -115,10 +116,16 @@
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:nafxcw.lib /NODEFAULTLIB:LIBCMT.lib")
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:nafxcwd.lib /NODEFAULTLIB:LIBCMTD.lib")
-if (${MSVC})
+if (MSVC)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:imagehlp.dll /DELAYLOAD:user32.dll /DELAYLOAD:shell32.dll")
endif()
+if(MINGW)
+ link_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp
+ )
+endif()
+
add_executable(
teraterm WIN32
${SRC}
@@ -137,6 +144,7 @@
debug LIBCMTD.lib
optimized onig.lib
debug onigd.lib
+ Comctl32.lib
ws2_32.lib
imm32.lib
imagehlp.lib
Modified: branches/cmake/teraterm/teraterm/addsetting.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/addsetting.cpp 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/teraterm/addsetting.cpp 2018-08-16 14:25:35 UTC (rev 7178)
@@ -52,7 +52,7 @@
#define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
-mouse_cursor_t MouseCursor[] = {
+const mouse_cursor_t MouseCursor[] = {
{"ARROW", IDC_ARROW},
{"IBEAM", IDC_IBEAM},
{"CROSS", IDC_CROSS},
Modified: branches/cmake/teraterm/teraterm/addsetting.h
===================================================================
--- branches/cmake/teraterm/teraterm/addsetting.h 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/teraterm/addsetting.h 2018-08-16 14:25:35 UTC (rev 7178)
@@ -33,10 +33,12 @@
#include "teraterm.h"
typedef struct {
- char *name;
+ const char *name;
LPCTSTR id;
} mouse_cursor_t;
+extern const mouse_cursor_t MouseCursor[];
+
// General Page
class CGeneralPropPageDlg : public TTCPropertyPage
{
Modified: branches/cmake/teraterm/teraterm/buffer.c
===================================================================
--- branches/cmake/teraterm/teraterm/buffer.c 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/teraterm/buffer.c 2018-08-16 14:25:35 UTC (rev 7178)
@@ -33,6 +33,7 @@
#include "tttypes.h"
#include <string.h>
#include <stdio.h>
+#include <windows.h>
#include "ttwinman.h"
#include "teraprn.h"
Modified: branches/cmake/teraterm/teraterm/clipboar.c
===================================================================
--- branches/cmake/teraterm/teraterm/clipboar.c 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/teraterm/clipboar.c 2018-08-16 14:25:35 UTC (rev 7178)
@@ -813,7 +813,7 @@
char *buf;
int wide_len;
HGLOBAL wide_hMem;
- LPWSTR wide_buf;
+ LPWSTR wide_buf = 0;
if (OpenClipboard(owner) == 0)
return FALSE;
@@ -860,7 +860,11 @@
static LRESULT CALLBACK OnClipboardDlgProc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp)
{
- char uimsg[MAX_UIMSG];
+ static const DlgTextInfo TextInfos[] = {
+ { 0, "DLG_CLIPBOARD_TITLE" },
+ { IDCANCEL, "BTN_CANCEL" },
+ { IDOK, "BTN_OK" },
+ };
POINT p;
RECT rc_dsk, rc_dlg;
int dlg_height, dlg_width;
@@ -868,19 +872,11 @@
RECT rc_edit, rc_ok, rc_cancel;
// for status bar
static HWND hStatus = NULL;
- static init_width, init_height;
+ static int init_width, init_height;
switch (msg) {
case WM_INITDIALOG:
- GetWindowText(hDlgWnd, uimsg, sizeof(uimsg));
- get_lang_msg("DLG_CLIPBOARD_TITLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
- SetWindowText(hDlgWnd, ts.UIMsg);
- GetDlgItemText(hDlgWnd, IDCANCEL, uimsg, sizeof(uimsg));
- get_lang_msg("BTN_CANCEL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
- SetDlgItemText(hDlgWnd, IDCANCEL, ts.UIMsg);
- GetDlgItemText(hDlgWnd, IDOK, uimsg, sizeof(uimsg));
- get_lang_msg("BTN_OK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
- SetDlgItemText(hDlgWnd, IDOK, ts.UIMsg);
+ SetDlgTexts(hDlgWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
SendMessage(GetDlgItem(hDlgWnd, IDC_EDIT), WM_SETTEXT, 0, (LPARAM)CBMemPtr);
Modified: branches/cmake/teraterm/teraterm/dnddlg.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/dnddlg.cpp 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/teraterm/dnddlg.cpp 2018-08-16 14:25:35 UTC (rev 7178)
@@ -56,27 +56,11 @@
};
struct DrapDropDlgData {
-#if 0
- HFONT hNewFont;
-#endif
DrapDropDlgParam *Param;
};
static LRESULT CALLBACK OnDragDropDlgProc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp)
{
-#if 0
- static const int FontIDs[] = {
- IDC_FILENAME_EDIT,
- IDC_DAD_STATIC,
- IDC_SCP_RADIO, IDC_SENDFILE_RADIO, IDC_PASTE_RADIO,
- IDC_SCP_PATH_LABEL, IDC_SCP_PATH, IDC_SCP_PATH_NOTE,
- IDC_BINARY_CHECK,
- IDC_ESCAPE_CHECK, IDC_NEWLINE_RADIO, IDC_SPACE_RADIO,
- IDC_SAME_PROCESS_CHECK, IDC_SAME_PROCESS_NEXTDROP_CHECK, IDC_DONTSHOW_CHECK,
- IDC_DAD_NOTE,
- IDOK, IDCANCEL,
- };
-#endif
static const DlgTextInfo TextInfos[] = {
{ 0, "DLG_DANDD_TITLE" },
{ IDC_DAD_STATIC, "DLG_DANDD_TEXT" },
@@ -105,9 +89,6 @@
SetWindowLongPtr(hDlgWnd, DWLP_USER, (LONG_PTR)DlgData);
DrapDropDlgParam *Param = (DrapDropDlgParam *)lp;
DlgData->Param = Param;
-#if 0
- DlgData->hNewFont = SetDlgFonts(hDlgWnd, FontIDs, _countof(FontIDs), Param->UILanguageFile, NULL);
-#endif
SetDlgTexts(hDlgWnd, TextInfos, _countof(TextInfos), Param->UILanguageFile);
// target file
@@ -258,12 +239,6 @@
return FALSE;
}
case WM_NCDESTROY:
-#if 0
- if (DlgData->hNewFont != NULL) {
- DeleteObject(DlgData->hNewFont);
- DlgData->hNewFont = NULL;
- }
-#endif
free(DlgData);
break;
Modified: branches/cmake/teraterm/teraterm/prnabort.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/prnabort.cpp 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/teraterm/prnabort.cpp 2018-08-16 14:25:35 UTC (rev 7178)
@@ -63,13 +63,7 @@
{ IDC_PRNABORT_PRINTING, "DLG_PRNABORT_PRINTING" },
{ IDCANCEL, "BTN_CANCEL" },
};
- static const int FontIDs[] = {
- IDC_PRNABORT_PRINTING, IDCANCEL
- };
SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), m_ts->UILanguageFile);
- m_hNewFont =
- SetDlgFonts(m_hWnd, FontIDs, _countof(FontIDs),
- m_ts->UILanguageFile, "DLG_SYSTEM_FONT");
}
void CPrnAbortDlg::OnCancel()
@@ -80,6 +74,5 @@
void CPrnAbortDlg::PostNcDestroy()
{
- ::DeleteObject(m_hNewFont);
TTCDialog::DestroyWindow();
}
Modified: branches/cmake/teraterm/teraterm/prnabort.h
===================================================================
--- branches/cmake/teraterm/teraterm/prnabort.h 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/teraterm/prnabort.h 2018-08-16 14:25:35 UTC (rev 7178)
@@ -47,5 +47,4 @@
private:
BOOL *m_pAbort;
TTTSet *m_ts;
- HFONT m_hNewFont;
};
Modified: branches/cmake/teraterm/teraterm/protodlg.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/protodlg.cpp 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/teraterm/protodlg.cpp 2018-08-16 14:25:35 UTC (rev 7178)
@@ -61,8 +61,6 @@
void CProtoDlg::OnInitDialog()
{
- TTTSet *ts = m_pts;
-
static const DlgTextInfo TextInfos[] = {
{ IDC_PROT_FILENAME, "DLG_PROT_FILENAME" },
{ IDC_PROT_PROT, "DLG_PROT_PROTO" },
Modified: branches/cmake/teraterm/teraterm/tekwin.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/tekwin.cpp 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/teraterm/tekwin.cpp 2018-08-16 14:25:35 UTC (rev 7178)
@@ -571,7 +571,7 @@
}
}
-void CTEKWindow::OnTimer(UINT nIDEvent)
+void CTEKWindow::OnTimer(UINT_PTR nIDEvent)
{
UINT T;
@@ -590,7 +590,7 @@
}
}
-LONG CTEKWindow::OnAccelCommand(UINT wParam, LONG lParam)
+LRESULT CTEKWindow::OnAccelCommand(WPARAM wParam, LPARAM lParam)
{
switch (wParam) {
case IdPrint:
@@ -632,7 +632,7 @@
return 0;
}
-LONG CTEKWindow::OnChangeMenu(UINT wParam, LONG lParam)
+LRESULT CTEKWindow::OnChangeMenu(WPARAM wParam, LPARAM lParam)
{
HMENU SysMenu;
BOOL Show, B1, B2;
@@ -685,7 +685,7 @@
return 0;
}
-LONG CTEKWindow::OnChangeTBar(UINT wParam, LONG lParam)
+LRESULT CTEKWindow::OnChangeTBar(WPARAM wParam, LPARAM lParam)
{
BOOL TBar;
DWORD Style;
@@ -719,13 +719,13 @@
return 0;
}
-LONG CTEKWindow::OnDlgHelp(UINT wParam, LONG lParam)
+LRESULT CTEKWindow::OnDlgHelp(WPARAM wParam, LPARAM lParam)
{
OpenHelp(HH_HELP_CONTEXT, HelpId, ts.UILanguageFile);
return 0;
}
-LONG CTEKWindow::OnGetSerialNo(UINT wParam, LONG lParam)
+LRESULT CTEKWindow::OnGetSerialNo(WPARAM wParam, LPARAM lParam)
{
return (LONG)SerialNo;
}
Modified: branches/cmake/teraterm/teraterm/tekwin.h
===================================================================
--- branches/cmake/teraterm/teraterm/tekwin.h 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/teraterm/tekwin.h 2018-08-16 14:25:35 UTC (rev 7178)
@@ -82,12 +82,12 @@
afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
afx_msg void OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
afx_msg void OnSysKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
- afx_msg void OnTimer(UINT nIDEvent);
- afx_msg LONG OnAccelCommand(UINT wParam, LONG lParam);
- afx_msg LONG OnChangeMenu(UINT wParam, LONG lParam);
- afx_msg LONG OnChangeTBar(UINT wParam, LONG lParam);
- afx_msg LONG OnDlgHelp(UINT wParam, LONG lParam);
- afx_msg LONG OnGetSerialNo(UINT wParam, LONG lParam);
+ afx_msg void OnTimer(UINT_PTR nIDEvent);
+ afx_msg LRESULT OnAccelCommand(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnChangeMenu(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnChangeTBar(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnDlgHelp(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnGetSerialNo(WPARAM wParam, LPARAM lParam);
afx_msg void OnFilePrint();
afx_msg void OnFileExit();
afx_msg void OnEditCopy();
Modified: branches/cmake/teraterm/teraterm/ttdialog.c
===================================================================
--- branches/cmake/teraterm/teraterm/ttdialog.c 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/teraterm/ttdialog.c 2018-08-16 14:25:35 UTC (rev 7178)
@@ -31,7 +31,7 @@
#include "teraterm.h"
#include "tttypes.h"
#include "ttplug.h" /* TTPLUG */
-
+#include "ttdlg.h"
#include "ttdialog.h"
#include "ttwinman.h"
Modified: branches/cmake/teraterm/teraterm/ttdialog.h
===================================================================
--- branches/cmake/teraterm/teraterm/ttdialog.h 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/teraterm/ttdialog.h 2018-08-16 14:25:35 UTC (rev 7178)
@@ -67,8 +67,6 @@
extern PSetupGeneral SetupGeneral;
extern PWindowWindow WindowWindow;
-extern void PASCAL TTDLGSetUILanguageFile(char *file);
-
/* proto types */
BOOL LoadTTDLG();
BOOL FreeTTDLG();
Modified: branches/cmake/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/vtwin.cpp 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/teraterm/vtwin.cpp 2018-08-16 14:25:35 UTC (rev 7178)
@@ -102,10 +102,6 @@
#define BROADCAST_LOGFILE "broadcast.log"
-static HFONT DlgBroadcastFont;
-static HFONT DlgCommentFont;
-static HFONT DlgSetupdirFont;
-
static BOOL TCPLocalEchoUsed = FALSE;
static BOOL TCPCRSendUsed = FALSE;
@@ -115,9 +111,6 @@
static int AutoDisconnectedPort = -1;
-// \x96{\x91̂\xCD addsetting.cpp
-extern mouse_cursor_t MouseCursor[];
-
/////////////////////////////////////////////////////////////////////////////
// CVTWindow
@@ -386,7 +379,7 @@
// (2007.9.30 yutaka)
//
// \x97\xE1\x8AO\x83R\x81[\x83h\x82\x9A\x97\xF1\x82֕ϊ\xB7\x82\xB7\x82\xE9
-static char *GetExceptionString(int exception)
+static const char *GetExceptionString(int exception)
{
#define EXCEPTION(x) case EXCEPTION_##x: return (#x);
static char buf[16];
@@ -1972,7 +1965,7 @@
}
// \x8FI\x97\xB9\x96₢\x8D\x87\x82킹\x82Ȃ\xB5\x82\xC9Tera Term\x82\xF0\x8FI\x97\xB9\x82\xB7\x82\xE9\x81BOnAllClose()\x8E\xF3\x90M\x97p\x81B
-LONG CVTWindow::OnNonConfirmClose(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnNonConfirmClose(WPARAM wParam, LPARAM lParam)
{
// \x82\xB1\x82\xB1\x82\xC5 ts \x82̓\xE0\x97e\x82\xF0\x88Ӑ}\x93I\x82ɏ\x91\x82\xAB\x8A\xB7\x82\xA6\x82Ă\xE0\x81A\x8FI\x97\xB9\x8E\x9E\x82Ɏ\xA9\x93\xAE\x83Z\x81[\x83u\x82\xB3\x82\xEA\x82\xE9\x82킯\x82ł͂Ȃ\xA2\x82̂ŁA\x93\xC1\x82ɖ\xE2\x91\xE8\x82Ȃ\xB5\x81B
ts.PortFlag &= ~PF_CONFIRMDISCONN;
@@ -2121,7 +2114,7 @@
}
}
-LONG CVTWindow::OnDropNotify(UINT ShowDialog, LONG lParam)
+LRESULT CVTWindow::OnDropNotify(WPARAM ShowDialog, LPARAM lParam)
{
// ini\x82ɕۑ\xB6\x82\xB3\x82\xEA\x82Ȃ\xA2\x81A\x8D\xA1\x8E\xC0\x8Ds\x82\xB5\x82Ă\xA2\x82\xE9Tera Term\x82ł̂ݗL\x8C\xF8\x82Ȑݒ\xE8
static enum drop_type DefaultDropType = DROP_TYPE_CANCEL;
@@ -2286,11 +2279,11 @@
{
// send by scp
char **FileNames = &DropLists[i];
- int FileCount = DoSameProcess ? DropListCount - i : 1;
- if (!SendScp(FileNames, FileCount, ts.ScpSendDir)) {
+ int FileCountScp = DoSameProcess ? DropListCount - i : 1;
+ if (!SendScp(FileNames, FileCountScp, ts.ScpSendDir)) {
goto finish;
}
- i += FileCount - 1;
+ i += FileCountScp - 1;
break;
}
}
@@ -2952,7 +2945,7 @@
}
}
-void CVTWindow::OnTimer(UINT nIDEvent)
+void CVTWindow::OnTimer(UINT_PTR nIDEvent)
{
POINT Point;
WORD PortType;
@@ -3154,7 +3147,7 @@
}
//<!--by AKASI
-LONG CVTWindow::OnWindowPosChanging(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnWindowPosChanging(WPARAM wParam, LPARAM lParam)
{
#ifdef ALPHABLEND_TYPE2
if(BGEnable && BGNoCopyBits) {
@@ -3165,7 +3158,7 @@
return CFrameWnd::DefWindowProc(WM_WINDOWPOSCHANGING,wParam,lParam);
}
-LONG CVTWindow::OnSettingChange(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnSettingChange(WPARAM wParam, LPARAM lParam)
{
#ifdef ALPHABLEND_TYPE2
BGOnSettingChange();
@@ -3173,7 +3166,7 @@
return CFrameWnd::DefWindowProc(WM_SETTINGCHANGE,wParam,lParam);
}
-LONG CVTWindow::OnEnterSizeMove(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnEnterSizeMove(WPARAM wParam, LPARAM lParam)
{
EnableSizeTip(1);
@@ -3183,7 +3176,7 @@
return CFrameWnd::DefWindowProc(WM_ENTERSIZEMOVE,wParam,lParam);
}
-LONG CVTWindow::OnExitSizeMove(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnExitSizeMove(WPARAM wParam, LPARAM lParam)
{
#ifdef ALPHABLEND_TYPE2
BGOnExitSizeMove();
@@ -3195,7 +3188,7 @@
}
//-->
-LONG CVTWindow::OnIMEComposition(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnIMEComposition(WPARAM wParam, LPARAM lParam)
{
HGLOBAL hstr;
//LPSTR lpstr;
@@ -3253,7 +3246,7 @@
return CFrameWnd::DefWindowProc(WM_IME_COMPOSITION,wParam,lParam);
}
-LONG CVTWindow::OnIMEInputChange(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnIMEInputChange(WPARAM wParam, LPARAM lParam)
{
ChangeCaret();
@@ -3260,7 +3253,7 @@
return CFrameWnd::DefWindowProc(WM_INPUTLANGCHANGE,wParam,lParam);
}
-LONG CVTWindow::OnIMENotify(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnIMENotify(WPARAM wParam, LPARAM lParam)
{
if (wParam == IMN_SETOPENSTATUS) {
ChangeCaret();
@@ -3276,7 +3269,7 @@
// http://27213143.at.webry.info/201202/article_2.html
// http://webcache.googleusercontent.com/search?q=cache:WzlX3ouMscIJ:anago.2ch.net/test/read.cgi/software/1325573999/82+IMR_DOCUMENTFEED&cd=13&hl=ja&ct=clnk&gl=jp
// (2012.5.9 yutaka)
-LONG CVTWindow::OnIMERequest(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnIMERequest(WPARAM wParam, LPARAM lParam)
{
static int complen, newsize;
static char comp[512];
@@ -3338,7 +3331,7 @@
return CFrameWnd::DefWindowProc(WM_IME_REQUEST,wParam,lParam);
}
-LONG CVTWindow::OnAccelCommand(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnAccelCommand(WPARAM wParam, LPARAM lParam)
{
switch (wParam) {
case IdHold:
@@ -3431,7 +3424,7 @@
return 0;
}
-LONG CVTWindow::OnChangeMenu(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnChangeMenu(WPARAM wParam, LPARAM lParam)
{
HMENU SysMenu;
BOOL Show, B1, B2;
@@ -3493,7 +3486,7 @@
return 0;
}
-LONG CVTWindow::OnChangeTBar(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnChangeTBar(WPARAM wParam, LPARAM lParam)
{
BOOL TBar;
DWORD Style,ExStyle;
@@ -3555,7 +3548,7 @@
return 0;
}
-LONG CVTWindow::OnCommNotify(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnCommNotify(WPARAM wParam, LPARAM lParam)
{
switch (LOWORD(lParam)) {
case FD_READ: // TCP/IP
@@ -3585,7 +3578,7 @@
return 0;
}
-LONG CVTWindow::OnCommOpen(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnCommOpen(WPARAM wParam, LPARAM lParam)
{
AutoDisconnectedPort = -1;
@@ -3680,7 +3673,7 @@
return 0;
}
-LONG CVTWindow::OnCommStart(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnCommStart(WPARAM wParam, LPARAM lParam)
{
// \x8E\xA9\x93\xAE\x90ڑ\xB1\x82\xAA\x96\xB3\x8C\xF8\x82̂Ƃ\xAB\x82\xE0\x90ڑ\xB1\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8Fo\x82\xB7\x82悤\x82ɂ\xB5\x82\xBD (2006.9.15 maya)
if (((ts.PortType!=IdSerial) && (ts.HostName[0]==0)) ||
@@ -3706,7 +3699,7 @@
return 0;
}
-LONG CVTWindow::OnDdeEnd(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnDdeEnd(WPARAM wParam, LPARAM lParam)
{
EndDDE();
if (CloseTT) {
@@ -3715,42 +3708,42 @@
return 0;
}
-LONG CVTWindow::OnDlgHelp(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnDlgHelp(WPARAM wParam, LPARAM lParam)
{
OpenHelp(HH_HELP_CONTEXT, HelpId, ts.UILanguageFile);
return 0;
}
-LONG CVTWindow::OnFileTransEnd(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnFileTransEnd(WPARAM wParam, LPARAM lParam)
{
FileTransEnd(wParam);
return 0;
}
-LONG CVTWindow::OnGetSerialNo(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnGetSerialNo(WPARAM wParam, LPARAM lParam)
{
return (LONG)SerialNo;
}
-LONG CVTWindow::OnKeyCode(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnKeyCode(WPARAM wParam, LPARAM lParam)
{
KeyCodeSend(wParam,(WORD)lParam);
return 0;
}
-LONG CVTWindow::OnProtoEnd(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnProtoEnd(WPARAM wParam, LPARAM lParam)
{
ProtoDlgCancel();
return 0;
}
-LONG CVTWindow::OnChangeTitle(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnChangeTitle(WPARAM wParam, LPARAM lParam)
{
ChangeTitle();
return 0;
}
-LONG CVTWindow::OnNotifyIcon(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnNotifyIcon(WPARAM wParam, LPARAM lParam)
{
if (wParam == 1) {
switch (lParam) {
@@ -3994,7 +3987,7 @@
char file[MAX_PATH], *filename;
char c, *envptr, *envbuff=NULL;
int envbufflen;
- char *exename = "cygterm.exe";
+ const char *exename = "cygterm.exe";
char cygterm[MAX_PATH];
STARTUPINFO si;
PROCESS_INFORMATION pi;
@@ -4078,7 +4071,7 @@
//
void CVTWindow::OnTTMenuLaunch()
{
- char *exename = "ttpmenu.exe";
+ const char *exename = "ttpmenu.exe";
STARTUPINFO si;
PROCESS_INFORMATION pi;
@@ -4086,7 +4079,7 @@
GetStartupInfo(&si);
memset(&pi, 0, sizeof(pi));
- if (CreateProcess(NULL, exename, NULL, NULL, FALSE, 0,
+ if (CreateProcess(NULL, (LPSTR)exename, NULL, NULL, FALSE, 0,
NULL, NULL, &si, &pi) == 0) {
char buf[80];
char uimsg[MAX_UIMSG];
@@ -4137,35 +4130,18 @@
static LRESULT CALLBACK OnCommentDlgProc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp)
{
+ static const DlgTextInfo TextInfos[] = {
+ { 0, "DLG_COMMENT_TITLE" },
+ { IDOK, "BTN_OK" }
+ };
char buf[256];
UINT ret;
- LOGFONT logfont;
- HFONT font;
- char uimsg[MAX_UIMSG];
switch (msg) {
case WM_INITDIALOG:
- //SetDlgItemText(hDlgWnd, IDC_EDIT_COMMENT, "\x83T\x83\x93\x83v\x83\x8B");
// \x83G\x83f\x83B\x83b\x83g\x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x82Ƀt\x83H\x81[\x83J\x83X\x82\xF0\x82\xA0\x82Ă\xE9
SetFocus(GetDlgItem(hDlgWnd, IDC_EDIT_COMMENT));
-
- font = (HFONT)SendMessage(hDlgWnd, WM_GETFONT, 0, 0);
- GetObject(font, sizeof(LOGFONT), &logfont);
- if (get_lang_font("DLG_SYSTEM_FONT", hDlgWnd, &logfont, &DlgCommentFont, ts.UILanguageFile)) {
- SendDlgItemMessage(hDlgWnd, IDC_EDIT_COMMENT, WM_SETFONT, (WPARAM)DlgCommentFont, MAKELPARAM(TRUE,0));
- SendDlgItemMessage(hDlgWnd, IDOK, WM_SETFONT, (WPARAM)DlgCommentFont, MAKELPARAM(TRUE,0));
- }
- else {
- DlgCommentFont = NULL;
- }
-
- GetWindowText(hDlgWnd, uimsg, sizeof(uimsg));
- get_lang_msg("DLG_COMMENT_TITLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
- SetWindowText(hDlgWnd, ts.UIMsg);
- GetDlgItemText(hDlgWnd, IDOK, uimsg, sizeof(uimsg));
- get_lang_msg("BTN_OK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
- SetDlgItemText(hDlgWnd, IDOK, ts.UIMsg);
-
+ SetDlgTexts(hDlgWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
return FALSE;
case WM_COMMAND:
@@ -4177,16 +4153,13 @@
//buf[sizeof(buf) - 1] = '\0'; // null-terminate
CommentLogToFile(buf, ret);
}
- if (DlgCommentFont != NULL) {
- DeleteObject(DlgCommentFont);
- }
- EndDialog(hDlgWnd, IDOK);
+ TTEndDialog(hDlgWnd, IDOK);
break;
default:
return FALSE;
}
case WM_CLOSE:
- EndDialog(hDlgWnd, 0);
+ TTEndDialog(hDlgWnd, 0);
return TRUE;
default:
@@ -4197,18 +4170,11 @@
void CVTWindow::OnCommentToLog()
{
- DWORD ret;
-
// \x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82փR\x83\x81\x83\x93\x83g\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9 (2004.8.6 yutaka)
- ret = DialogBox(hInst, MAKEINTRESOURCE(IDD_COMMENT_DIALOG),
- HVTWin, (DLGPROC)OnCommentDlgProc);
- if (ret == 0 || ret == -1) {
- ret = GetLastError();
- }
-
+ TTDialogBox(hInst, MAKEINTRESOURCE(IDD_COMMENT_DIALOG),
+ HVTWin, (DLGPROC)OnCommentDlgProc);
}
-
// \x83\x8D\x83O\x82̉{\x97\x97 (2005.1.29 yutaka)
void CVTWindow::OnViewLog()
{
@@ -4255,7 +4221,7 @@
OPENFILENAME ofn;
char szFile[MAX_PATH];
char Command[MAX_PATH] = "notepad.exe";
- char *exec = "ttermpro";
+ const char *exec = "ttermpro";
STARTUPINFO si;
PROCESS_INFORMATION pi;
char uimsg[MAX_UIMSG];
@@ -4973,11 +4939,18 @@
static LRESULT CALLBACK OnSetupDirectoryDlgProc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp)
{
+ static const DlgTextInfo TextInfos[] = {
+ { 0, "DLG_SETUPDIR_TITLE" },
+ { IDC_INI_SETUPDIR_GROUP, "DLG_SETUPDIR_INIFILE" },
+ { IDC_KEYCNF_SETUPDIR_GROUP, "DLG_SETUPDIR_KEYBOARDFILE" },
+ { IDC_CYGTERM_SETUPDIR_GROUP, "DLG_SETUPDIR_CYGTERMFILE" },
+ { IDC_SSH_SETUPDIR_GROUP, "DLG_SETUPDIR_KNOWNHOSTSFILE" },
+ };
static char teratermexepath[MAX_PATH];
static char inipath[MAX_PATH], inifilename[MAX_PATH], inipath_vstore[1024];
static char keycnfpath[MAX_PATH], keycnffilename[MAX_PATH], keycnfpath_vstore[1024];
static char cygtermpath[MAX_PATH], cygtermfilename[MAX_PATH], cygtermpath_vstore[1024];
- static char eterm1path[MAX_PATH], eterm1filename[MAX_PATH], eterm1path_vstore[1024];
+// static char eterm1path[MAX_PATH], eterm1filename[MAX_PATH], eterm1path_vstore[1024];
char temp[MAX_PATH];
char tmpbuf[1024];
typedef int (CALLBACK *PSSH_read_known_hosts_file)(char *, int);
@@ -4988,31 +4961,12 @@
BOOL open_dir, ret;
int button_pressed;
HWND hWnd;
- char uimsg[MAX_UIMSG];
switch (msg) {
case WM_INITDIALOG:
// I18N
- GetWindowText(hDlgWnd, uimsg, sizeof(uimsg));
- get_lang_msg("DLG_SETUPDIR_TITLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
- SetWindowText(hDlgWnd, ts.UIMsg);
+ SetDlgTexts(hDlgWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
- GetDlgItemText(hDlgWnd, IDC_INI_SETUPDIR_GROUP, uimsg, sizeof(uimsg));
- get_lang_msg("DLG_SETUPDIR_INIFILE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
- SetDlgItemText(hDlgWnd, IDC_INI_SETUPDIR_GROUP, ts.UIMsg);
-
- GetDlgItemText(hDlgWnd, IDC_KEYCNF_SETUPDIR_GROUP, uimsg, sizeof(uimsg));
- get_lang_msg("DLG_SETUPDIR_KEYBOARDFILE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
- SetDlgItemText(hDlgWnd, IDC_KEYCNF_SETUPDIR_GROUP, ts.UIMsg);
-
- GetDlgItemText(hDlgWnd, IDC_CYGTERM_SETUPDIR_GROUP, uimsg, sizeof(uimsg));
- get_lang_msg("DLG_SETUPDIR_CYGTERMFILE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
- SetDlgItemText(hDlgWnd, IDC_CYGTERM_SETUPDIR_GROUP, ts.UIMsg);
-
- GetDlgItemText(hDlgWnd, IDC_SSH_SETUPDIR_GROUP, uimsg, sizeof(uimsg));
- get_lang_msg("DLG_SETUPDIR_KNOWNHOSTSFILE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
- SetDlgItemText(hDlgWnd, IDC_SSH_SETUPDIR_GROUP, ts.UIMsg);
-
if (GetModuleFileName(NULL, temp, sizeof(temp)) != 0) {
ExtractDirName(temp, teratermexepath);
}
@@ -5227,9 +5181,6 @@
break;
case IDCANCEL:
- if (DlgSetupdirFont != NULL) {
- DeleteObject(DlgSetupdirFont);
- }
TTEndDialog(hDlgWnd, IDCANCEL);
break;
@@ -5590,13 +5541,19 @@
//
static LRESULT CALLBACK BroadcastCommandDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
{
+ static const DlgTextInfo TextInfos[] = {
+ { 0, "DLG_BROADCAST_TITLE" },
+ { IDC_HISTORY_CHECK, "DLG_BROADCAST_HISTORY" },
+ { IDC_ENTERKEY_CHECK, "DLG_BROADCAST_ENTER" },
+ { IDC_PARENT_ONLY, "DLG_BROADCAST_PARENTONLY" },
+ { IDC_REALTIME_CHECK, "DLG_BROADCAST_REALTIME" },
+ { IDOK, "DLG_BROADCAST_SUBMIT" },
+ { IDCANCEL, "BTN_CLOSE" },
+ };
char buf[256 + 3];
UINT ret;
LRESULT checked;
LRESULT history;
- LOGFONT logfont;
- HFONT font;
- char uimsg[MAX_UIMSG];
char historyfile[MAX_PATH];
static HWND hwndBroadcast = NULL; // Broadcast dropdown
static HWND hwndBroadcastEdit = NULL; // Edit control on Broadcast dropdown
@@ -5654,44 +5611,8 @@
BroadcastWindowList = GetDlgItem(hWnd, IDC_LIST);
UpdateBroadcastWindowList(BroadcastWindowList);
- font = (HFONT)SendMessage(hWnd, WM_GETFONT, 0, 0);
- GetObject(font, sizeof(LOGFONT), &logfont);
- if (get_lang_font("DLG_SYSTEM_FONT", hWnd, &logfont, &DlgBroadcastFont, ts.UILanguageFile)) {
- SendDlgItemMessage(hWnd, IDC_COMMAND_EDIT, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
- SendDlgItemMessage(hWnd, IDC_HISTORY_CHECK, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
- SendDlgItemMessage(hWnd, IDC_RADIO_CRLF, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
- SendDlgItemMessage(hWnd, IDC_RADIO_CR, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
- SendDlgItemMessage(hWnd, IDC_RADIO_LF, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
- SendDlgItemMessage(hWnd, IDC_ENTERKEY_CHECK, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
- SendDlgItemMessage(hWnd, IDC_PARENT_ONLY, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0)); // 337: 2007/03/20
- SendDlgItemMessage(hWnd, IDC_REALTIME_CHECK, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
- SendDlgItemMessage(hWnd, IDOK, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
- SendDlgItemMessage(hWnd, IDCANCEL, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
- }
- else {
- DlgBroadcastFont = NULL;
- }
- GetWindowText(hWnd, uimsg, sizeof(uimsg));
- get_lang_msg("DLG_BROADCAST_TITLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
- SetWindowText(hWnd, ts.UIMsg);
- GetDlgItemText(hWnd, IDC_HISTORY_CHECK, uimsg, sizeof(uimsg));
- get_lang_msg("DLG_BROADCAST_HISTORY", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
- SetDlgItemText(hWnd, IDC_HISTORY_CHECK, ts.UIMsg);
- GetDlgItemText(hWnd, IDC_ENTERKEY_CHECK, uimsg, sizeof(uimsg));
- get_lang_msg("DLG_BROADCAST_ENTER", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
- SetDlgItemText(hWnd, IDC_ENTERKEY_CHECK, ts.UIMsg);
- GetDlgItemText(hWnd, IDC_PARENT_ONLY, uimsg, sizeof(uimsg));
- get_lang_msg("DLG_BROADCAST_PARENTONLY", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
- SetDlgItemText(hWnd, IDC_PARENT_ONLY, ts.UIMsg);
- GetDlgItemText(hWnd, IDC_REALTIME_CHECK, uimsg, sizeof(uimsg));
- get_lang_msg("DLG_BROADCAST_REALTIME", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
- SetDlgItemText(hWnd, IDC_REALTIME_CHECK, ts.UIMsg);
- GetDlgItemText(hWnd, IDOK, uimsg, sizeof(uimsg));
- get_lang_msg("DLG_BROADCAST_SUBMIT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
- SetDlgItemText(hWnd, IDOK, ts.UIMsg);
- GetDlgItemText(hWnd, IDCANCEL, uimsg, sizeof(uimsg));
- get_lang_msg("BTN_CLOSE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
- SetDlgItemText(hWnd, IDCANCEL, ts.UIMsg);
+ // I18N
+ SetDlgTexts(hWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
// \x83_\x83C\x83A\x83\x8D\x83O\x82̏\x89\x8A\xFA\x83T\x83C\x83Y\x82\xF0\x95ۑ\xB6
GetWindowRect(hWnd, &rc_dlg);
@@ -5890,9 +5811,6 @@
case WM_CLOSE:
//DestroyWindow(hWnd);
EndDialog(hWnd, 0);
- if (DlgBroadcastFont != NULL) {
- DeleteObject(DlgBroadcastFont);
- }
return TRUE;
case WM_SIZE:
@@ -6031,7 +5949,7 @@
}
// WM_COPYDATA\x82̎\xF3\x90M
-LONG CVTWindow::OnReceiveIpcMessage(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnReceiveIpcMessage(WPARAM wParam, LPARAM lParam)
{
COPYDATASTRUCT *cds;
char *buf, *msg, *name;
Modified: branches/cmake/teraterm/teraterm/vtwin.h
===================================================================
--- branches/cmake/teraterm/teraterm/vtwin.h 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/teraterm/vtwin.h 2018-08-16 14:25:35 UTC (rev 7178)
@@ -122,35 +122,35 @@
afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
afx_msg void OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
afx_msg void OnSysKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
- afx_msg void OnTimer(UINT nIDEvent);
+ afx_msg void OnTimer(UINT_PTR nIDEvent);
afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
afx_msg BOOL OnDeviceChange(UINT nEventType, DWORD_PTR dwData);
//<!--by AKASI
- afx_msg LONG OnWindowPosChanging(UINT wParam, LONG lParam);
- afx_msg LONG OnSettingChange(UINT wParam, LONG lParam);
- afx_msg LONG OnEnterSizeMove(UINT wParam, LONG lParam);
- afx_msg LONG OnExitSizeMove(UINT wParam, LONG lParam);
+ afx_msg LRESULT OnWindowPosChanging(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnSettingChange(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnEnterSizeMove(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnExitSizeMove(WPARAM wParam, LPARAM lParam);
//-->
- afx_msg LONG OnIMEComposition(UINT wParam, LONG lParam);
- afx_msg LONG OnIMEInputChange(UINT wParam, LONG lParam);
- afx_msg LONG OnIMENotify(UINT wParam, LONG lParam);
- afx_msg LONG OnIMERequest(UINT wParam, LONG lParam);
- afx_msg LONG OnAccelCommand(UINT wParam, LONG lParam);
- afx_msg LONG OnChangeMenu(UINT wParam, LONG lParam);
- afx_msg LONG OnChangeTBar(UINT wParam, LONG lParam);
- afx_msg LONG OnCommNotify(UINT wParam, LONG lParam);
- afx_msg LONG OnCommOpen(UINT wParam, LONG lParam);
- afx_msg LONG OnCommStart(UINT wParam, LONG lParam);
- afx_msg LONG OnDdeEnd(UINT wParam, LONG lParam);
- afx_msg LONG OnDlgHelp(UINT wParam, LONG lParam);
- afx_msg LONG OnFileTransEnd(UINT wParam, LONG lParam);
- afx_msg LONG OnGetSerialNo(UINT wParam, LONG lParam);
- afx_msg LONG OnKeyCode(UINT wParam, LONG lParam);
- afx_msg LONG OnProtoEnd(UINT wParam, LONG lParam);
- afx_msg LONG OnChangeTitle(UINT wParam, LONG lParam);
- afx_msg LONG OnReceiveIpcMessage(UINT wParam, LONG lParam);
- afx_msg LONG OnNonConfirmClose(UINT wParam, LONG lParam);
- afx_msg LONG OnNotifyIcon(UINT wParam, LONG lParam);
+ afx_msg LRESULT OnIMEComposition(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnIMEInputChange(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnIMENotify(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnIMERequest(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnAccelCommand(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnChangeMenu(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnChangeTBar(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnCommNotify(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnCommOpen(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnCommStart(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnDdeEnd(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnDlgHelp(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnFileTransEnd(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnGetSerialNo(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnKeyCode(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnProtoEnd(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnChangeTitle(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnReceiveIpcMessage(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnNonConfirmClose(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnNotifyIcon(WPARAM wParam, LPARAM lParam);
afx_msg void OnFileNewConnection();
afx_msg void OnDuplicateSession();
afx_msg void OnCygwinConnection();
@@ -221,7 +221,7 @@
afx_msg void OnHelpIndex();
afx_msg void OnHelpUsing();
afx_msg void OnHelpAbout();
- afx_msg LONG OnDropNotify(UINT ShowMenu, LONG lParam);
+ afx_msg LRESULT OnDropNotify(WPARAM ShowMenu, LPARAM lParam);
//}}AFX_MSG
DECLARE_MESSAGE_MAP();
void Disconnect(BOOL confirm);
Modified: branches/cmake/teraterm/ttpfile/ttfile.c
===================================================================
--- branches/cmake/teraterm/ttpfile/ttfile.c 2018-08-15 15:02:54 UTC (rev 7177)
+++ branches/cmake/teraterm/ttpfile/ttfile.c 2018-08-16 14:25:35 UTC (rev 7178)
@@ -329,6 +329,7 @@
}
// timestamp\x83`\x83F\x83b\x83N\x83{\x83b\x83N\x83X (2006.7.23 maya)
+ TsFlag = FALSE;
ShowDlgItem(Dialog, IDC_TIMESTAMP, IDC_TIMESTAMP);
if (BinFlag) {
// Binary\x83t\x83\x89\x83O\x82\xAA\x97L\x8C\xF8\x82ȂƂ\xAB\x82̓`\x83F\x83b\x83N\x82ł\xAB\x82Ȃ\xA2