[ttssh2-commit] [9976] ダイアログプロシージャ(DLGPROC)に関するコンパイラの警告が出ないよう修正

アーカイブの一覧に戻る
scmno****@osdn***** scmno****@osdn*****
2022年 5月 29日 (日) 23:43:07 JST


Revision: 9976
          https://osdn.net/projects/ttssh2/scm/svn/commits/9976
Author:   zmatsuo
Date:     2022-05-29 23:43:07 +0900 (Sun, 29 May 2022)
Log Message:
-----------
ダイアログプロシージャ(DLGPROC)に関するコンパイラの警告が出ないよう修正

- warning: passing argument 4 of 'TTDialogBoxParam' from incompatible pointer type
- warning: passing NULL to non-pointer argument 5 of 'INT_PTR TTDialogBoxParam(...'

Modified Paths:
--------------
    branches/adjust_icon/teraterm/common/dlglib_cpp.cpp
    branches/adjust_icon/ttssh2/ttxssh/fwdui.c

-------------- next part --------------
Modified: branches/adjust_icon/teraterm/common/dlglib_cpp.cpp
===================================================================
--- branches/adjust_icon/teraterm/common/dlglib_cpp.cpp	2022-05-29 14:42:58 UTC (rev 9975)
+++ branches/adjust_icon/teraterm/common/dlglib_cpp.cpp	2022-05-29 14:43:07 UTC (rev 9976)
@@ -92,7 +92,7 @@
 	DLGPROC lpDialogFunc)
 {
 	return TTCreateDialogParam(hInstance, lpTemplateName,
-							   hWndParent, lpDialogFunc, NULL);
+							   hWndParent, lpDialogFunc, (LPARAM)NULL);
 }
 
 /**
@@ -116,7 +116,7 @@
  */
 INT_PTR TTDialogBox(HINSTANCE hInstance, LPCTSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogFunc)
 {
-	return TTDialogBoxParam(hInstance, lpTemplateName, hWndParent, lpDialogFunc, NULL);
+	return TTDialogBoxParam(hInstance, lpTemplateName, hWndParent, lpDialogFunc, (LPARAM)NULL);
 }
 
 /**

Modified: branches/adjust_icon/ttssh2/ttxssh/fwdui.c
===================================================================
--- branches/adjust_icon/ttssh2/ttxssh/fwdui.c	2022-05-29 14:42:58 UTC (rev 9975)
+++ branches/adjust_icon/ttssh2/ttxssh/fwdui.c	2022-05-29 14:43:07 UTC (rev 9976)
@@ -933,8 +933,7 @@
 	return TRUE;
 }
 
-static UINT_PTR CALLBACK fwd_edit_dlg_proc(HWND dlg, UINT msg, WPARAM wParam,
-                                       LPARAM lParam)
+static INT_PTR CALLBACK fwd_edit_dlg_proc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	FWDEditClosure *closure;
 	PTInstVar pvar;
@@ -1059,8 +1058,7 @@
 	}
 }
 
-static UINT_PTR CALLBACK fwd_dlg_proc(HWND dlg, UINT msg, WPARAM wParam,
-                                  LPARAM lParam)
+static INT_PTR CALLBACK fwd_dlg_proc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	PTInstVar pvar;
 	BOOL ret;


ttssh2-commit メーリングリストの案内
アーカイブの一覧に戻る