• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision7237 (tree)
Time2018-09-13 23:47:31
Authorzmatsuo

Log Message

TTXGetUIHooks() を呼び忘れていた

Change Summary

Incremental Difference

--- branches/cmake/teraterm/teraterm/ttdialog.c (revision 7236)
+++ branches/cmake/teraterm/teraterm/ttdialog.c (revision 7237)
@@ -31,15 +31,10 @@
3131 #include "teraterm.h"
3232 #include "tttypes.h"
3333 #include "ttplug.h" /* TTPLUG */
34-#include "ttutil.h"
3534 #include "ttdlg.h"
3635
3736 #include "ttdialog.h"
38-#include "ttwinman.h"
3937
40-static HMODULE HTTDLG = NULL;
41-static int TTDLGUseCount = 0;
42-
4338 PSetupTerminal SetupTerminal = _SetupTerminal;
4439 PSetupWin SetupWin = _SetupWin;
4540 PSetupKeyboard SetupKeyboard = _SetupKeyboard;
@@ -53,46 +48,9 @@
5348 PWindowWindow WindowWindow = _WindowWindow;
5449 PTTDLGSetUILanguageFile TTDLGSetUILanguageFile = _TTDLGSetUILanguageFile;
5550
56-#if 0
57-PSetupTerminal SetupTerminal;
58-PSetupWin SetupWin;
59-PSetupKeyboard SetupKeyboard;
60-PSetupSerialPort SetupSerialPort;
61-PSetupTCPIP SetupTCPIP;
62-PGetHostName GetHostName;
63-PChangeDirectory ChangeDirectory;
64-PAboutDialog AboutDialog;
65-PChooseFontDlg ChooseFontDlg;
66-PSetupGeneral SetupGeneral;
67-PWindowWindow WindowWindow;
68-PTTDLGSetUILanguageFile TTDLGSetUILanguageFile;
69-#endif
70-
71-static const GetProcAddressList ProcList[] = {
72- { &SetupTerminal, "SetupTerminal", 8 },
73- { &SetupWin, "SetupWin", 8 },
74- { &SetupKeyboard, "SetupKeyboard", 8 },
75- { &SetupSerialPort, "SetupSerialPort", 8 },
76- { &SetupTCPIP, "SetupTCPIP", 8 },
77- { &GetHostName, "GetHostName", 8 },
78- { &ChangeDirectory, "ChangeDirectory", 8 },
79- { &AboutDialog, "AboutDialog", 4 },
80- { &ChooseFontDlg, "ChooseFontDlg", 12 },
81- { &SetupGeneral, "SetupGeneral", 8 },
82- { &WindowWindow, "WindowWindow", 8 },
83- { &TTDLGSetUILanguageFile, "TTDLGSetUILanguageFile", 4 },
84-};
85-
86-static void FreeTTDLGCommon()
87-{
88- FreeLibrary(HTTDLG);
89- HTTDLG = NULL;
90-
91- ClearProcAddressses(ProcList, _countof(ProcList));
92-}
93-
9451 BOOL LoadTTDLG()
9552 {
53+ TTXGetUIHooks(); /* TTPLUG */
9654 return TRUE;
9755 }
9856
@@ -100,39 +58,3 @@
10058 {
10159 return TRUE;
10260 }
103-
104-#if 0
105-BOOL LoadTTDLG()
106-{
107- if (TTDLGUseCount == 0) {
108- BOOL ret;
109-
110- HTTDLG = LoadHomeDLL("TTPDLG.DLL");
111- if (HTTDLG==NULL) return FALSE;
112-
113- ret = GetProcAddressses(HTTDLG, ProcList, _countof(ProcList));
114- if (!ret) {
115- FreeTTDLGCommon();
116- return FALSE;
117- }
118-
119- TTDLGSetUILanguageFile(ts.UILanguageFile);
120- TTXGetUIHooks(); /* TTPLUG */
121- }
122- TTDLGUseCount++;
123- return TRUE;
124-}
125-
126-BOOL FreeTTDLG()
127-{
128- if (TTDLGUseCount == 0) {
129- return FALSE;
130- }
131- TTDLGUseCount--;
132- if (TTDLGUseCount == 0) {
133- FreeTTDLGCommon();
134- }
135- return TRUE;
136-}
137-#endif
138-
Show on old repository browser