Tera TermRevision: 9337
https://osdn.net/projects/ttssh2/scm/svn/commits/9337
Author: zmatsuo
Date: 2021-08-01 14:36:29 +0900 (Sun, 01 Aug 2021)
Log Message:
-----------
chmファイル名をUnicode化
- chm は Unicode ファイル名は開けない?
Modified Paths:
--------------
trunk/teraterm/ttpcmn/ttcmn.c
-------------- next part --------------
Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c 2021-08-01 05:36:18 UTC (rev 9336)
+++ trunk/teraterm/ttpcmn/ttcmn.c 2021-08-01 05:36:29 UTC (rev 9337)
@@ -47,6 +47,7 @@
#include "tt_res.h"
#include "codeconv.h"
#include "compat_win.h"
+#include "asprintf.h"
#define DllExport __declspec(dllexport)
#include "ttcommon.h"
@@ -492,21 +493,19 @@
void WINAPI OpenHelp(UINT Command, DWORD Data, char *UILanguageFile)
{
- char HomeDir[MAX_PATH];
- char Temp[MAX_PATH];
+ wchar_t Temp[MAX_PATH];
HWND HWin;
- wchar_t HelpFN[MAX_PATH];
+ wchar_t *HelpFN;
wchar_t uimsg[MAX_UIMSG];
wchar_t *HomeDirW;
- /* Get home directory */
- if (GetModuleFileNameA(NULL,Temp,_countof(Temp)) == 0) {
+ /* Get home directory TODO ts.HomeDirW \x82\xE8\x91ւ\xA6 */
+ if (GetModuleFileNameW(NULL,Temp,_countof(Temp)) == 0) {
return;
}
- ExtractDirName(Temp, HomeDir);
- HomeDirW = ToWcharA(HomeDir);
+ HomeDirW = ExtractDirNameW(Temp);
get_lang_msgW("HELPFILE", uimsg, _countof(uimsg), L"teraterm.chm", UILanguageFile);
- _snwprintf_s(HelpFN, _countof(HelpFN), _TRUNCATE, L"%s\\%s", HomeDirW, uimsg);
+ aswprintf(&HelpFN, L"%s\\%s", HomeDirW, uimsg);
free(HomeDirW);
// \x83w\x83\x8B\x83v\x82̃I\x81[\x83i\x81[\x82͏\xED\x82Ƀf\x83X\x83N\x83g\x83b\x83v\x82ɂȂ\xE9 (2007.5.12 maya)
@@ -518,8 +517,8 @@
NULL, L"Tera Term: HTML help",
"MSG_OPENHELP_ERROR", L"Can't open HTML help file(%s)." };
TTMessageBoxW(HWin, &info, MB_OK | MB_ICONERROR, UILanguageFile, HelpFN);
- return;
}
+ free(HelpFN);
}
HWND WINAPI GetNthWin(int n)