Tera TermRevision: 7361
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7361
Author: zmatsuo
Date: 2018-12-24 01:26:30 +0900 (Mon, 24 Dec 2018)
Log Message:
-----------
Merge branch 'trunk' into cmake
Modified Paths:
--------------
branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.c
branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.c
branches/cmake/teraterm/common/ttftypes.h
branches/cmake/teraterm/common/ttlib.c
branches/cmake/teraterm/common/ttlib.h
branches/cmake/teraterm/common/win16api.c
branches/cmake/teraterm/common/win16api.h
branches/cmake/teraterm/ttpfile/ttfile.c
branches/cmake/teraterm/ttpmacro/ttl.cpp
branches/cmake/teraterm/ttpmacro/ttpmacro.v12.vcxproj
branches/cmake/teraterm/ttpmacro/ttpmacro.v14.vcxproj
branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj
branches/cmake/ttssh2/ttxssh/auth.c
branches/cmake/ttssh2/ttxssh/ttxssh.c
-------------- next part --------------
Modified: branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.c
===================================================================
--- branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.c 2018-12-23 16:13:05 UTC (rev 7360)
+++ branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.c 2018-12-23 16:26:30 UTC (rev 7361)
@@ -387,7 +387,7 @@
case ID_MENU_REPLAY:
if (!pvar->enable) {
memset(&ofn, 0, sizeof(ofn));
- ofn.lStructSize = sizeof(ofn);
+ ofn.lStructSize = get_OPENFILENAME_SIZE();
ofn.hwndOwner = hWin;
ofn.lpstrFilter = "ttyrec(*.tty)\0*.tty\0All files(*.*)\0*.*\0\0";
ofn.lpstrFile = pvar->openfn;
Modified: branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.c
===================================================================
--- branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.c 2018-12-23 16:13:05 UTC (rev 7360)
+++ branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.c 2018-12-23 16:26:30 UTC (rev 7361)
@@ -212,7 +212,7 @@
}
memset(&ofn, 0, sizeof(ofn));
- ofn.lStructSize = sizeof(ofn);
+ ofn.lStructSize = get_OPENFILENAME_SIZE();
ofn.hwndOwner = hWin;
ofn.lpstrFilter = "ttyrec(*.tty)\0*.tty\0All files(*.*)\0*.*\0\0";
ofn.lpstrFile = fname;
Modified: branches/cmake/teraterm/common/ttftypes.h
===================================================================
--- branches/cmake/teraterm/common/ttftypes.h 2018-12-23 16:13:05 UTC (rev 7360)
+++ branches/cmake/teraterm/common/ttftypes.h 2018-12-23 16:26:30 UTC (rev 7361)
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 1994-1998 T. Teranishi
* (C) 2007-2017 TeraTerm Project
* All rights reserved.
Modified: branches/cmake/teraterm/common/ttlib.c
===================================================================
--- branches/cmake/teraterm/common/ttlib.c 2018-12-23 16:13:05 UTC (rev 7360)
+++ branches/cmake/teraterm/common/ttlib.c 2018-12-23 16:26:30 UTC (rev 7361)
@@ -1524,14 +1524,17 @@
return IsWindows2000OrLater() || IsWindowsMe();
}
-// TODO check unicode
-int get_OPENFILENAME_SIZE()
+#if !defined(OPENFILENAME_SIZE_VERSION_400A)
+#define OPENFILENAME_SIZE_VERSION_400A 76
+#endif
+
+// OPENFILENAMEA.lStructSize \x82ɑ\xE3\x93\xFC\x82\xB7\x82\xE9\x92l
+DWORD get_OPENFILENAME_SIZE()
{
if (IsWindows2000OrLater()) {
- return sizeof(OPENFILENAME);
+ return sizeof(OPENFILENAMEA);
}
- //return OPENFILENAME_SIZE_VERSION_400;
- return 76;
+ return OPENFILENAME_SIZE_VERSION_400A;
}
// convert table for KanjiCodeID and ListID
Modified: branches/cmake/teraterm/common/ttlib.h
===================================================================
--- branches/cmake/teraterm/common/ttlib.h 2018-12-23 16:13:05 UTC (rev 7360)
+++ branches/cmake/teraterm/common/ttlib.h 2018-12-23 16:26:30 UTC (rev 7361)
@@ -97,7 +97,7 @@
#endif
DllExport void OutputDebugPrintf(const char *fmt, ...);
DllExport BOOL is_NT4();
-int get_OPENFILENAME_SIZE();
+DllExport DWORD get_OPENFILENAME_SIZE();
DllExport BOOL IsWindows95();
DllExport BOOL IsWindowsMe();
DllExport BOOL IsWindowsNT4();
Modified: branches/cmake/teraterm/common/win16api.c
===================================================================
--- branches/cmake/teraterm/common/win16api.c 2018-12-23 16:13:05 UTC (rev 7360)
+++ branches/cmake/teraterm/common/win16api.c 2018-12-23 16:26:30 UTC (rev 7361)
@@ -1,12 +1,11 @@
-
#include <windows.h>
#include <assert.h>
/**
- * @param[in] iAttribute teratermでは0しか使用しない
+ * @param[in] iAttribute teraterm\x82ł\xCD0\x82\xB5\x82\xA9\x8Eg\x97p\x82\xB5\x82Ȃ\xA2
* @retval handle
- * @retval INVALID_HANDLE_VALUE((HANDLE)(LONG_PTR)-1) オープンできなかった
- * (実際のAPIはHFILE_ERROR((HFILE)-1)を返す)
+ * @retval INVALID_HANDLE_VALUE((HANDLE)(LONG_PTR)-1) \x83I\x81[\x83v\x83\x93\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD
+ * (\x8E\xC0\x8Dۂ\xCCAPI\x82\xCDHFILE_ERROR((HFILE)-1)\x82\xF0\x95Ԃ\xB7)
*/
HANDLE win16_lcreat(const char *FileName, int iAttribute)
{
@@ -20,8 +19,8 @@
/**
* @retval handle
- * @retval INVALID_HANDLE_VALUE((HANDLE)(LONG_PTR)-1) オープンできなかった
- * (実際のAPIはHFILE_ERROR((HFILE)-1)を返す)
+ * @retval INVALID_HANDLE_VALUE((HANDLE)(LONG_PTR)-1) \x83I\x81[\x83v\x83\x93\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD
+ * (\x8E\xC0\x8Dۂ\xCCAPI\x82\xCDHFILE_ERROR((HFILE)-1)\x82\xF0\x95Ԃ\xB7)
*/
HANDLE win16_lopen(const char *FileName, int iReadWrite)
{
@@ -40,7 +39,7 @@
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
break;
case OF_READWRITE:
- // read/write (teratermではttpmacro/ttl.c内の1箇所のみで使用されている
+ // read/write (teraterm\x82ł\xCDttpmacro/ttl.c\x93\xE0\x82\xCC1\x89ӏ\x8A\x82݂̂Ŏg\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9
handle = CreateFileA(FileName,
GENERIC_WRITE|GENERIC_READ, FILE_SHARE_WRITE, NULL,
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -54,8 +53,8 @@
}
/**
- * @retval なし
- * (実際のAPIはオープンしていたHFILEを返す)
+ * @retval \x82Ȃ\xB5
+ * (\x8E\xC0\x8Dۂ\xCCAPI\x82̓I\x81[\x83v\x83\x93\x82\xB5\x82Ă\xA2\x82\xBDHFILE\x82\xF0\x95Ԃ\xB7)
*/
void win16_lclose(HANDLE hFile)
{
@@ -63,7 +62,7 @@
}
/**
- * @retval 読み込みバイト数
+ * @retval \x93ǂݍ\x9E\x82݃o\x83C\x83g\x90\x94
*/
UINT win16_lread(HANDLE hFile, LPVOID lpBuffer, UINT uBytes)
{
@@ -76,7 +75,7 @@
}
/**
- * @retval 書き込みバイト数
+ * @retval \x8F\x91\x82\xAB\x8D\x9E\x82݃o\x83C\x83g\x90\x94
*/
UINT win16_lwrite(HANDLE hFile, const char*buf, UINT length)
{
@@ -93,9 +92,9 @@
* @arg 0(FILE_BEGIN)
* @arg 1(FILE_CURRENT)
* @arg 2(FILE_END)
- * @retval ファイル位置
- * @retval HFILE_ERROR((HFILE)-1) エラー
- * @retval INVALID_SET_FILE_POINTER((DWORD)-1) エラー
+ * @retval \x83t\x83@\x83C\x83\x8B\x88ʒu
+ * @retval HFILE_ERROR((HFILE)-1) \x83G\x83\x89\x81[
+ * @retval INVALID_SET_FILE_POINTER((DWORD)-1) \x83G\x83\x89\x81[
*/
LONG win16_llseek(HANDLE hFile, LONG lOffset, int iOrigin)
{
Modified: branches/cmake/teraterm/common/win16api.h
===================================================================
--- branches/cmake/teraterm/common/win16api.h 2018-12-23 16:13:05 UTC (rev 7360)
+++ branches/cmake/teraterm/common/win16api.h 2018-12-23 16:26:30 UTC (rev 7361)
@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <windows.h>
#ifdef __cplusplus
extern "C" {
Modified: branches/cmake/teraterm/ttpfile/ttfile.c
===================================================================
--- branches/cmake/teraterm/ttpfile/ttfile.c 2018-12-23 16:13:05 UTC (rev 7360)
+++ branches/cmake/teraterm/ttpfile/ttfile.c 2018-12-23 16:26:30 UTC (rev 7361)
@@ -107,7 +107,7 @@
/* OPENFILENAME record */
memset(&ofn, 0, sizeof(OPENFILENAME));
- ofn.lStructSize = sizeof(OPENFILENAME);
+ ofn.lStructSize = get_OPENFILENAME_SIZE();
ofn.hwndOwner = HWin;
ofn.lpstrFile = Name;
ofn.nMaxFile = sizeof(Name);
@@ -499,7 +499,7 @@
ExtractFileName(fv->FullName, FileName ,sizeof(FileName));
strncpy_s(fv->FullName, sizeof(fv->FullName), FileName, _TRUNCATE);
- ofn.lStructSize = sizeof(OPENFILENAME);
+ ofn.lStructSize = get_OPENFILENAME_SIZE();
ofn.hwndOwner = fv->HMainWin;
ofn.lpstrFilter = FNFilter;
ofn.nFilterIndex = 1;
@@ -728,7 +728,7 @@
memcpy(pf, uimsg, sizeof(FNFilter) - (pf - FNFilter + 2));
memset(&ofn, 0, sizeof(OPENFILENAME));
- ofn.lStructSize = sizeof(OPENFILENAME);
+ ofn.lStructSize = get_OPENFILENAME_SIZE();
ofn.hwndOwner = fv->HMainWin;
ofn.lpstrFilter = FNFilter;
ofn.nFilterIndex = 1;
@@ -1158,7 +1158,7 @@
// \0\0 \x82ŏI\x82\xED\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE9\x82̂\xC5 2 \x83o\x83C\x83g
memcpy(pf, uimsg, sizeof(FNFilter) - (pf - FNFilter + 2));
- ofn.lStructSize = sizeof(OPENFILENAME);
+ ofn.lStructSize = get_OPENFILENAME_SIZE();
ofn.hwndOwner = HWin;
ofn.lpstrFilter = FNFilter;
ofn.nFilterIndex = 1;
Modified: branches/cmake/teraterm/ttpmacro/ttl.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttl.cpp 2018-12-23 16:13:05 UTC (rev 7360)
+++ branches/cmake/teraterm/ttpmacro/ttl.cpp 2018-12-23 16:26:30 UTC (rev 7361)
@@ -1582,7 +1582,7 @@
if (CheckVar("inputstr", &ValType, &VarId) &&
(ValType==TypString)) {
memset(&ofn, 0, sizeof(OPENFILENAME));
- ofn.lStructSize = sizeof(OPENFILENAME);
+ ofn.lStructSize = get_OPENFILENAME_SIZE();
ofn.hwndOwner = HMainWin;
ofn.lpstrTitle = Str1;
ofn.lpstrFile = StrVarPtr(VarId);
Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v12.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v12.vcxproj 2018-12-23 16:13:05 UTC (rev 7360)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v12.vcxproj 2018-12-23 16:26:30 UTC (rev 7361)
@@ -153,7 +153,6 @@
<ClInclude Include="..\common\ttddecmnd.h" />
<ClInclude Include="..\common\ttlib.h" />
<ClInclude Include="..\common\win16api.h" />
- <ClInclude Include="..\common\ttddecmnd.h" />
<ClInclude Include="errdlg.h" />
<ClInclude Include="fileread.h" />
<ClInclude Include="inpdlg.h" />
Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v14.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v14.vcxproj 2018-12-23 16:13:05 UTC (rev 7360)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v14.vcxproj 2018-12-23 16:26:30 UTC (rev 7361)
@@ -153,7 +153,6 @@
<ClInclude Include="..\common\ttddecmnd.h" />
<ClInclude Include="..\common\ttlib.h" />
<ClInclude Include="..\common\win16api.h" />
- <ClInclude Include="..\common\ttddecmnd.h" />
<ClInclude Include="errdlg.h" />
<ClInclude Include="fileread.h" />
<ClInclude Include="inpdlg.h" />
Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj 2018-12-23 16:13:05 UTC (rev 7360)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj 2018-12-23 16:26:30 UTC (rev 7361)
@@ -156,7 +156,6 @@
<ClInclude Include="..\common\ttddecmnd.h" />
<ClInclude Include="..\common\ttlib.h" />
<ClInclude Include="..\common\win16api.h" />
- <ClInclude Include="..\common\ttddecmnd.h" />
<ClInclude Include="errdlg.h" />
<ClInclude Include="fileread.h" />
<ClInclude Include="inpdlg.h" />
Modified: branches/cmake/ttssh2/ttxssh/auth.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/auth.c 2018-12-23 16:13:05 UTC (rev 7360)
+++ branches/cmake/ttssh2/ttxssh/auth.c 2018-12-23 16:26:30 UTC (rev 7361)
@@ -33,6 +33,7 @@
#include "key.h"
#include "dlglib.h"
#include "codeconv.h"
+#include "ttlib.h"
#include <io.h>
#include <fcntl.h>
@@ -433,7 +434,7 @@
TCHAR uimsg[MAX_UIMSG];
ZeroMemory(¶ms, sizeof(params));
- params.lStructSize = sizeof(OPENFILENAME);
+ params.lStructSize = get_OPENFILENAME_SIZE();
params.hwndOwner = parent;
// \x83t\x83B\x83\x8B\x83^\x82̒lj\xC1 (2004.12.19 yutaka)
// 3\x83t\x83@\x83C\x83\x8B\x83t\x83B\x83\x8B\x83^\x82̒lj\xC1 (2005.4.26 yutaka)
Modified: branches/cmake/ttssh2/ttxssh/ttxssh.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/ttxssh.c 2018-12-23 16:13:05 UTC (rev 7360)
+++ branches/cmake/ttssh2/ttxssh/ttxssh.c 2018-12-23 16:26:30 UTC (rev 7361)
@@ -3421,7 +3421,7 @@
TCHAR fullname_buf[2048] = _T("ssh_known_hosts");
TCHAR title[MAX_UIMSG];
- params.lStructSize = sizeof(OPENFILENAME);
+ params.lStructSize = get_OPENFILENAME_SIZE();
params.hwndOwner = parent;
params.lpstrFilter = NULL;
params.lpstrCustomFilter = NULL;
@@ -4149,7 +4149,7 @@
OPENFILENAMEA ofn;
ZeroMemory(&ofn, sizeof(ofn));
- ofn.lStructSize = sizeof(OPENFILENAME);
+ ofn.lStructSize = get_OPENFILENAME_SIZE();
ofn.hwndOwner = dlg;
#if 0
get_lang_msg("FILEDLG_SELECT_LOGVIEW_APP_FILTER", ts.UIMsg, sizeof(ts.UIMsg),
@@ -4884,7 +4884,7 @@
// saving file dialog
ZeroMemory(&ofn, sizeof(ofn));
- ofn.lStructSize = sizeof(ofn);
+ ofn.lStructSize = get_OPENFILENAME_SIZE();
ofn.hwndOwner = dlg;
switch (public_key.type) {
case KEY_RSA1:
@@ -5108,7 +5108,7 @@
// saving file dialog
ZeroMemory(&ofn, sizeof(ofn));
- ofn.lStructSize = sizeof(ofn);
+ ofn.lStructSize = get_OPENFILENAME_SIZE();
ofn.hwndOwner = dlg;
switch (private_key.type) {
case KEY_RSA1: