Tera TermRevision: 7917
https://osdn.net/projects/ttssh2/scm/svn/commits/7917
Author: zmatsuo
Date: 2019-08-06 00:35:58 +0900 (Tue, 06 Aug 2019)
Log Message:
-----------
不要コメント削除、未使用関数削除、関数の型の修正、不要キャスト削除
Modified Paths:
--------------
trunk/teraterm/ttpdlg/ttdlg.c
-------------- next part --------------
Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c 2019-08-05 15:35:47 UTC (rev 7916)
+++ trunk/teraterm/ttpdlg/ttdlg.c 2019-08-05 15:35:58 UTC (rev 7917)
@@ -57,8 +57,6 @@
#undef EFFECT_ENABLED // \x83G\x83t\x83F\x83N\x83g\x82̗L\x8C\xF8\x89\xDB
#undef TEXTURE_ENABLED // \x83e\x83N\x83X\x83`\x83\x83\x82̗L\x8C\xF8\x89\xDB
-//#include "compat_w95.h"
-
#ifdef _DEBUG
#define calloc(c, s) _calloc_dbg((c), (s), _NORMAL_BLOCK, __FILE__, __LINE__)
#define free(p) _free_dbg((p), _NORMAL_BLOCK)
@@ -75,10 +73,9 @@
#define EndDialog(p1,p2) \
TTEndDialog(p1, p2)
-//static HANDLE hInst;
extern HANDLE hInst;
-char UILanguageFile[MAX_PATH];
+static char UILanguageFile[MAX_PATH];
static const char *ProtocolFamilyList[] = { "UNSPEC", "IPv6", "IPv4", NULL };
static PCHAR NLListRcv[] = {"CR","CR+LF", "LF", "AUTO", NULL};
@@ -2552,7 +2549,7 @@
return (n + 1); // 1origin
}
-static BOOL CALLBACK GenDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK GenDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
{
static const DlgTextInfo TextInfos[] = {
{ 0, "DLG_GEN_TITLE" },
@@ -2680,7 +2677,7 @@
return FALSE;
}
-static BOOL CALLBACK WinListDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK WinListDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
{
static const DlgTextInfo TextInfos[] = {
{ 0, "DLG_WINLIST_TITLE" },
@@ -2917,7 +2914,7 @@
return
(BOOL)DialogBoxParam(hInst,
MAKEINTRESOURCE(IDD_GENDLG),
- WndParent, (DLGPROC)&GenDlg, (LPARAM)ts);
+ WndParent, GenDlg, (LPARAM)ts);
}
BOOL WINAPI _WindowWindow(HWND WndParent, PBOOL Close)
@@ -2927,7 +2924,7 @@
(BOOL)DialogBoxParam(hInst,
MAKEINTRESOURCE(IDD_WINLISTDLG),
WndParent,
- (DLGPROC)&WinListDlg, (LPARAM)Close);
+ WinListDlg, (LPARAM)Close);
}
BOOL WINAPI _TTDLGSetUILanguageFile(char *file)
@@ -2935,28 +2932,3 @@
strncpy_s(UILanguageFile, sizeof(UILanguageFile), file, _TRUNCATE);
return TRUE;
}
-
-#if 0
-BOOL WINAPI DllMain(HANDLE hInstance,
- ULONG ul_reason_for_call,
- LPVOID lpReserved)
-{
- hInst = hInstance;
- switch (ul_reason_for_call) {
- case DLL_THREAD_ATTACH:
- /* do thread initialization */
- break;
- case DLL_THREAD_DETACH:
- /* do thread cleanup */
- break;
- case DLL_PROCESS_ATTACH:
- /* do process initialization */
- DoCover_IsDebuggerPresent();
- break;
- case DLL_PROCESS_DETACH:
- /* do process cleanup */
- break;
- }
- return TRUE;
-}
-#endif