Tera TermRevision: 7937
https://osdn.net/projects/ttssh2/scm/svn/commits/7937
Author: zmatsuo
Date: 2019-08-10 16:32:54 +0900 (Sat, 10 Aug 2019)
Log Message:
-----------
不要なDLGPROCキャストを削除
Modified Paths:
--------------
trunk/teraterm/common/tmfc.cpp
trunk/teraterm/common/tmfc.h
-------------- next part --------------
Modified: trunk/teraterm/common/tmfc.cpp
===================================================================
--- trunk/teraterm/common/tmfc.cpp 2019-08-10 07:32:44 UTC (rev 7936)
+++ trunk/teraterm/common/tmfc.cpp 2019-08-10 07:32:54 UTC (rev 7937)
@@ -516,13 +516,13 @@
TTDialogBoxParam(hInstance,
MAKEINTRESOURCE(idd),
hParent,
- (DLGPROC)&DlgProcStub, (LPARAM)this);
+ &DlgProcStub, (LPARAM)this);
#else
INT_PTR result =
DialogBoxParam(hInstance,
MAKEINTRESOURCE(idd),
hParent,
- (DLGPROC)&DlgProcStub, (LPARAM)this);
+ &DlgProcStub, (LPARAM)this);
#endif
pseudoPtr = nullptr;
return result;
@@ -542,7 +542,7 @@
HANDLE hDlgTemplate = ::LoadResource(hInstance, hResource);
DLGTEMPLATE *lpTemplate = (DLGTEMPLATE *)::LockResource(hDlgTemplate);
#endif
- DLGPROC dlgproc = (DLGPROC)DlgProcStub;
+ DLGPROC dlgproc = DlgProcStub;
const wchar_t *dialog_class = TTGetClassName(lpTemplate);
if (dialog_class != nullptr) {
// Modaless Dialog & Dialog application
@@ -571,7 +571,7 @@
* @retval TRUE \x83\x81\x83b\x83Z\x81[\x83W\x82\xF0\x8F\x88\x97\x9D\x82\xB5\x82\xBD\x8E\x9E
* @retval FALSE \x83\x81\x83b\x83Z\x81[\x83W\x82\xF0\x8F\x88\x97\x9D\x82\xB5\x82Ȃ\xA9\x82\xC1\x82\xBD\x8E\x9E
*/
-LRESULT CALLBACK TTCDialog::DlgProcStub(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
+INT_PTR CALLBACK TTCDialog::DlgProcStub(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
{
TTCDialog *self = (TTCDialog *)::GetWindowLongPtr(hWnd, DWLP_USER);
if (self == nullptr) {
Modified: trunk/teraterm/common/tmfc.h
===================================================================
--- trunk/teraterm/common/tmfc.h 2019-08-10 07:32:44 UTC (rev 7936)
+++ trunk/teraterm/common/tmfc.h 2019-08-10 07:32:54 UTC (rev 7937)
@@ -146,7 +146,7 @@
virtual BOOL PostNcDestroy();
virtual LRESULT DlgProc(UINT msg, WPARAM wp, LPARAM lp);
- static LRESULT CALLBACK DlgProcStub(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
+ static INT_PTR CALLBACK DlgProcStub(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
static LRESULT CALLBACK WndProcStub(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
private: