Tera TermRevision: 7362
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7362
Author: zmatsuo
Date: 2018-12-24 01:26:43 +0900 (Mon, 24 Dec 2018)
Log Message:
-----------
get_OPENFILENAME_SIZEW()追加、get_OPENFILENAME_SIZE()はマクロとした
Modified Paths:
--------------
branches/cmake/teraterm/common/ttlib.c
branches/cmake/teraterm/common/ttlib.h
branches/cmake/teraterm/teraterm/addsetting.cpp
branches/cmake/ttssh2/ttxssh/ttxssh.c
-------------- next part --------------
Modified: branches/cmake/teraterm/common/ttlib.c
===================================================================
--- branches/cmake/teraterm/common/ttlib.c 2018-12-23 16:26:30 UTC (rev 7361)
+++ branches/cmake/teraterm/common/ttlib.c 2018-12-23 16:26:43 UTC (rev 7362)
@@ -1529,7 +1529,7 @@
#endif
// OPENFILENAMEA.lStructSize \x82ɑ\xE3\x93\xFC\x82\xB7\x82\xE9\x92l
-DWORD get_OPENFILENAME_SIZE()
+DWORD get_OPENFILENAME_SIZEA()
{
if (IsWindows2000OrLater()) {
return sizeof(OPENFILENAMEA);
@@ -1537,6 +1537,17 @@
return OPENFILENAME_SIZE_VERSION_400A;
}
+#if defined(UNICODE)
+// OPENFILENAMEW.lStructSize \x82ɑ\xE3\x93\xFC\x82\xB7\x82\xE9\x92l
+DWORD get_OPENFILENAME_SIZEW()
+{
+ if (IsWindows2000OrLater()) {
+ return sizeof(OPENFILENAMEW);
+ }
+ return OPENFILENAME_SIZE_VERSION_400W;
+}
+#endif
+
// convert table for KanjiCodeID and ListID
// cf. KanjiList,KanjiListSend
// KoreanList,KoreanListSend
Modified: branches/cmake/teraterm/common/ttlib.h
===================================================================
--- branches/cmake/teraterm/common/ttlib.h 2018-12-23 16:26:30 UTC (rev 7361)
+++ branches/cmake/teraterm/common/ttlib.h 2018-12-23 16:26:43 UTC (rev 7362)
@@ -96,8 +96,9 @@
DllExport BOOL doSelectFolderW(HWND hWnd, wchar_t *path, int pathlen, const wchar_t *def, const wchar_t *msg);
#endif
DllExport void OutputDebugPrintf(const char *fmt, ...);
+DllExport DWORD get_OPENFILENAME_SIZEA();
+DllExport DWORD get_OPENFILENAME_SIZEW();
DllExport BOOL is_NT4();
-DllExport DWORD get_OPENFILENAME_SIZE();
DllExport BOOL IsWindows95();
DllExport BOOL IsWindowsMe();
DllExport BOOL IsWindowsNT4();
@@ -136,9 +137,11 @@
#if defined(_UNICODE)
#define doSelectFolderT(p1, p2, p3, p4, p5) doSelectFolderW(p1, p2, p3, p4, p5)
#define get_lang_msgT(p1, p2, p3, p4, p5) get_lang_msgW(p1, p2, p3, p4, p5)
+#define get_OPENFILENAME_SIZE() get_OPENFILENAME_SIZEW()
#else
#define doSelectFolderT(p1, p2, p3, p4, p5) doSelectFolder(p1, p2, p3, p4, p5)
#define get_lang_msgT(p1, p2, p3, p4, p5) get_lang_msg(p1, p2, p3, p4, p5)
+#define get_OPENFILENAME_SIZE() get_OPENFILENAME_SIZEA()
#endif
#ifdef __cplusplus
Modified: branches/cmake/teraterm/teraterm/addsetting.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/addsetting.cpp 2018-12-23 16:26:30 UTC (rev 7361)
+++ branches/cmake/teraterm/teraterm/addsetting.cpp 2018-12-23 16:26:43 UTC (rev 7362)
@@ -501,7 +501,7 @@
OPENFILENAMEA ofn;
memset(&ofn, 0, sizeof(ofn));
- ofn.lStructSize = get_OPENFILENAME_SIZE();
+ ofn.lStructSize = get_OPENFILENAME_SIZEA();
ofn.hwndOwner = GetSafeHwnd();
get_lang_msg("FILEDLG_SELECT_CONFIRM_STRING_APP_FILTER", ts.UIMsg, sizeof(ts.UIMsg),
"txt(*.txt)\\0*.txt\\0all(*.*)\\0*.*\\0\\0", ts.UILanguageFile);
@@ -826,7 +826,7 @@
memset(&ofn, 0, sizeof(ofn));
memset(szFile, 0, sizeof(szFile));
- ofn.lStructSize = get_OPENFILENAME_SIZE();
+ ofn.lStructSize = get_OPENFILENAME_SIZEA();
ofn.hwndOwner = m_pSheet->m_hWnd;
ofn.lpstrFilter = "Image Files(*.jpg;*.jpeg;*.bmp)\0*.jpg;*.jpeg;*.bmp\0All Files(*.*)\0*.*\0";
ofn.lpstrFile = szFile;
@@ -1192,7 +1192,7 @@
OPENFILENAMEA ofn;
ZeroMemory(&ofn, sizeof(ofn));
- ofn.lStructSize = get_OPENFILENAME_SIZE();
+ ofn.lStructSize = get_OPENFILENAME_SIZEA();
ofn.hwndOwner = GetSafeHwnd();
get_lang_msg("FILEDLG_SELECT_LOGVIEW_APP_FILTER", ts.UIMsg, sizeof(ts.UIMsg),
"exe(*.exe)\\0*.exe\\0all(*.*)\\0*.*\\0\\0", ts.UILanguageFile);
Modified: branches/cmake/ttssh2/ttxssh/ttxssh.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/ttxssh.c 2018-12-23 16:26:30 UTC (rev 7361)
+++ branches/cmake/ttssh2/ttxssh/ttxssh.c 2018-12-23 16:26:43 UTC (rev 7362)
@@ -4149,7 +4149,7 @@
OPENFILENAMEA ofn;
ZeroMemory(&ofn, sizeof(ofn));
- ofn.lStructSize = get_OPENFILENAME_SIZE();
+ ofn.lStructSize = get_OPENFILENAME_SIZEA();
ofn.hwndOwner = dlg;
#if 0
get_lang_msg("FILEDLG_SELECT_LOGVIEW_APP_FILTER", ts.UIMsg, sizeof(ts.UIMsg),