Tera TermRevision: 9384
https://osdn.net/projects/ttssh2/scm/svn/commits/9384
Author: zmatsuo
Date: 2021-08-29 00:32:58 +0900 (Sun, 29 Aug 2021)
Log Message:
-----------
FreeTTDLG() を削除
- ttpdlg.dll を unload するための関数
- 現在は ttermpro.exe に統合
Modified Paths:
--------------
trunk/teraterm/teraterm/tekwin.cpp
trunk/teraterm/teraterm/ttdialog.c
trunk/teraterm/teraterm/ttdialog.h
trunk/teraterm/teraterm/vtdisp.c
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/ttptek/tttek.c
-------------- next part --------------
Modified: trunk/teraterm/teraterm/tekwin.cpp
===================================================================
--- trunk/teraterm/teraterm/tekwin.cpp 2021-08-28 15:32:45 UTC (rev 9383)
+++ trunk/teraterm/teraterm/tekwin.cpp 2021-08-28 15:32:58 UTC (rev 9384)
@@ -731,7 +731,6 @@
SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet,
ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
Ok = (*SetupWin)(HTEKWin, &ts);
- FreeTTDLG();
if (Ok) {
(*TEKResetWin)(&tk,&ts,OldEmu);
ChangeTitle();
@@ -750,7 +749,6 @@
return;
}
Ok = (*ChooseFontDlg)(HTEKWin,&tk.TEKlf,&ts);
- FreeTTDLG();
if (! Ok) {
return;
}
@@ -774,7 +772,6 @@
SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet,
ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
(*WindowWindow)(HTEKWin,&Close);
- FreeTTDLG();
if (Close) {
OnClose();
}
@@ -791,7 +788,6 @@
return;
}
(*AboutDialog)(tk.HWin);
- FreeTTDLG();
}
LRESULT CTEKWindow::Proc(UINT msg, WPARAM wp, LPARAM lp)
Modified: trunk/teraterm/teraterm/ttdialog.c
===================================================================
--- trunk/teraterm/teraterm/ttdialog.c 2021-08-28 15:32:45 UTC (rev 9383)
+++ trunk/teraterm/teraterm/ttdialog.c 2021-08-28 15:32:58 UTC (rev 9384)
@@ -69,9 +69,3 @@
return TRUE;
}
-
-BOOL FreeTTDLG()
-{
- return TRUE;
-}
-
Modified: trunk/teraterm/teraterm/ttdialog.h
===================================================================
--- trunk/teraterm/teraterm/ttdialog.h 2021-08-28 15:32:45 UTC (rev 9383)
+++ trunk/teraterm/teraterm/ttdialog.h 2021-08-28 15:32:58 UTC (rev 9384)
@@ -72,7 +72,6 @@
/* proto types */
BOOL LoadTTDLG();
-BOOL FreeTTDLG();
#ifdef __cplusplus
}
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c 2021-08-28 15:32:45 UTC (rev 9383)
+++ trunk/teraterm/teraterm/vtdisp.c 2021-08-28 15:32:58 UTC (rev 9384)
@@ -3373,7 +3373,6 @@
if (! LoadTTDLG()) return;
SetLogFont(&VTlf, FALSE);
Ok = ChooseFontDlg(HVTWin,&VTlf,&ts);
- FreeTTDLG();
if (! Ok) return;
strncpy_s(ts.VTFont, sizeof(ts.VTFont),VTlf.lfFaceName, _TRUNCATE);
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2021-08-28 15:32:45 UTC (rev 9383)
+++ trunk/teraterm/teraterm/vtwin.cpp 2021-08-28 15:32:58 UTC (rev 9384)
@@ -1494,10 +1494,6 @@
FreeIME(HVTWin);
FreeTTSET();
-#if 0 // free\x82Ɏ\xB8\x94s\x82\xB7\x82\xE9\x82܂\xC5free\x82\xB5\x91\xB1\x82\xAF\x82\xE9
- do { }
- while (FreeTTDLG());
-#endif
#if 0
do { }
@@ -3575,8 +3571,6 @@
SetDdeComReady(0);
}
}
-
- FreeTTDLG();
}
@@ -4138,7 +4132,6 @@
SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet,
ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
(*ChangeDirectory)(HVTWin,ts.FileDir);
- FreeTTDLG();
}
void CVTWindow::OnFilePrint()
@@ -4335,7 +4328,6 @@
SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet,
ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
Ok = (*SetupTerminal)(HVTWin, &ts);
- FreeTTDLG();
if (Ok) {
SetupTerm();
}
@@ -4358,7 +4350,6 @@
ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
strncpy_s(orgTitle, sizeof(orgTitle), ts.Title, _TRUNCATE);
Ok = (*SetupWin)(HVTWin, &ts);
- FreeTTDLG();
if (Ok) {
// Eterm lookfeel\x82̉\xE6\x96ʏ\xEE\x95\xF1\x82\xE0\x8DX\x90V\x82\xB7\x82邱\x82ƂŁA\x83\x8A\x83A\x83\x8B\x83^\x83C\x83\x80\x82ł̔w\x8Ci\x90F\x95ύX\x82\xAA
@@ -4460,7 +4451,6 @@
SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet,
ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
Ok = (*SetupKeyboard)(HVTWin, &ts);
- FreeTTDLG();
if (Ok) {
// ResetKeypadMode(TRUE);
@@ -4482,7 +4472,6 @@
SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet,
ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
Ok = (*SetupSerialPort)(HVTWin, &ts);
- FreeTTDLG();
if (Ok && ts.ComPort > 0) {
/*
@@ -4541,7 +4530,6 @@
if ((*SetupTCPIP)(HVTWin, &ts)) {
TelUpdateKeepAliveInterval();
}
- FreeTTDLG();
}
void CVTWindow::OnSetupGeneral()
@@ -4556,7 +4544,6 @@
ResetCharSet();
ResetIME();
}
- FreeTTDLG();
}
/* GetSetupFname function id */
@@ -4913,7 +4900,6 @@
SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet,
ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
(*WindowWindow)(HVTWin,&Close);
- FreeTTDLG();
if (Close) {
OnClose();
}
@@ -4962,7 +4948,6 @@
SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet,
ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
(*AboutDialog)(HVTWin);
- FreeTTDLG();
}
LRESULT CVTWindow::OnDpiChanged(WPARAM wp, LPARAM)
Modified: trunk/teraterm/ttptek/tttek.c
===================================================================
--- trunk/teraterm/ttptek/tttek.c 2021-08-28 15:32:45 UTC (rev 9383)
+++ trunk/teraterm/ttptek/tttek.c 2021-08-28 15:32:58 UTC (rev 9384)
@@ -789,7 +789,6 @@
// if (! LoadTTDLG()) return;
// Ok = (*ChooseFontDlg)(tk->HWin,&tk->TEKlf,NULL);
-// FreeTTDLG();
// if (! Ok) return;
strncpy_s(ts->TEKFont, sizeof(ts->TEKFont), tk->TEKlf.lfFaceName, _TRUNCATE);
@@ -883,7 +882,6 @@
if (! LoadTTDLG()) return FALSE;
OldEmu = ts->TEKColorEmu;
Ok = (*SetupWin)(tk->HWin, ts);
- FreeTTDLG();
if (Ok) TEKResetWin(tk,ts,OldEmu);
return Ok;