Diff of /trunk/teraterm/teraterm/addsetting.cpp

OSDN > Find Software > Tera Term

 Browse Subversion Repository



/[ttssh2]/trunk/teraterm/teraterm/addsetting.cpp




Diff of /trunk/teraterm/teraterm/addsetting.cpp



 Parent Directory

|  Revision Log



|  Patch














revision 7818 by zmatsuo,
Thu Jun 27 16:51:51 2019 UTC




revision 7938 by zmatsuo,
Sun Aug 11 11:29:29 2019 UTC






#

Line 37 



Line 37 













37
 #include <commctrl.h>
 #include <commctrl.h>

















38
 #include <time.h>
 #include <time.h>

















39
 #include <tchar.h>
 #include <tchar.h>












40
 
 #include <crtdbg.h>












41
 
 














 #include "addsetting.h"
 













42
 #include "teraterm.h"
 #include "teraterm.h"

















43
 #include "tttypes.h"
 #include "tttypes.h"

















44
 #include "ttwinman.h"   // for ts
 #include "ttwinman.h"   // for ts











#

Line 46 



Line 46 













46
 #include "ttftypes.h"
 #include "ttftypes.h"

















47
 #include "dlglib.h"
 #include "dlglib.h"

















48
 #include "compat_win.h"
 #include "compat_win.h"












49
 
 #include "addsetting.h"












50
 
 















51


 #undef GetDlgItemText


 #ifdef _DEBUG













52


 #define GetDlgItemText GetDlgItemTextA


 #define free(p)         _free_dbg((p), _NORMAL_BLOCK)













53


 #undef SetDlgItemText


 #define _strdup(s)      _strdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)













54


 #define SetDlgItemText SetDlgItemTextA


 #define _wcsdup(s)      _wcsdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)













55


 


 #undef _tcsdup













56


 


 #ifdef _UNICODE













57


 


 #define _tcsdup(s)      _wcsdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)













58


 


 #else













59


 


 #define _tcsdup(s)      _strdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)













60


 


 #endif













61


 


 #endif















62
 
 

















63
 const mouse_cursor_t MouseCursor[] = {
 const mouse_cursor_t MouseCursor[] = {

















64
         {"ARROW", IDC_ARROW},
         {"ARROW", IDC_ARROW},











#

Line 1182 
 void CLogPropPageDlg::OnInitDialog()


Line 1190 
 void CLogPropPageDlg::OnInitDialog()












1190
 BOOL CLogPropPageDlg::OnCommand(WPARAM wParam, LPARAM lParam)
 BOOL CLogPropPageDlg::OnCommand(WPARAM wParam, LPARAM lParam)

















1191
 {
 {

















1192
         char uimsg[MAX_UIMSG];
         char uimsg[MAX_UIMSG];














         char buf[MAX_PATH];
 










         char buf2[MAX_PATH];
 













1193
 
 

















1194
         switch (wParam) {
         switch (wParam) {

















1195
                 case IDC_VIEWLOG_PATH | (BN_CLICKED << 16):
                 case IDC_VIEWLOG_PATH | (BN_CLICKED << 16):











#

Line 1212 
 BOOL CLogPropPageDlg::OnCommand(WPARAM w


Line 1218 
 BOOL CLogPropPageDlg::OnCommand(WPARAM w












1218
                         // ログディレクトリの選択ダイアログ
                         // ログディレクトリの選択ダイアログ

















1219
                         get_lang_msg("FILEDLG_SELECT_LOGDIR_TITLE", ts.UIMsg, sizeof(ts.UIMsg),
                         get_lang_msg("FILEDLG_SELECT_LOGDIR_TITLE", ts.UIMsg, sizeof(ts.UIMsg),

















1220
                                      "Select log folder", ts.UILanguageFile);
                                      "Select log folder", ts.UILanguageFile);















1221


                         GetDlgItemText(IDC_DEFAULTPATH_EDITOR, buf, sizeof(buf));


                         {













1222


                         if (doSelectFolder(GetSafeHwnd(), buf2, sizeof(buf2), buf, ts.UIMsg)) {


                                 char buf[MAX_PATH];













1223


                                 SetDlgItemText(IDC_DEFAULTPATH_EDITOR, buf2);


                                 char buf2[MAX_PATH];













1224


 


                                 GetDlgItemTextA(IDC_DEFAULTPATH_EDITOR, buf, sizeof(buf));













1225


 


                                 if (doSelectFolder(GetSafeHwnd(), buf2, sizeof(buf2), buf, ts.UIMsg)) {













1226


 


                                         SetDlgItemTextA(IDC_DEFAULTPATH_EDITOR, buf2);













1227


 


                                 }















1228
                         }
                         }

















1229
 
 

















1230
                         return TRUE;
                         return TRUE;











#

Line 1278 
 void CLogPropPageDlg::OnOK()


Line 1288 
 void CLogPropPageDlg::OnOK()












1288
         TCHAR uimsg2[MAX_UIMSG];
         TCHAR uimsg2[MAX_UIMSG];

















1289
 
 

















1290
         // Viewlog Editor path (2005.1.29 yutaka)
         // Viewlog Editor path (2005.1.29 yutaka)















1291


         GetDlgItemText(IDC_VIEWLOG_EDITOR, ts.ViewlogEditor, _countof(ts.ViewlogEditor));


         GetDlgItemTextA(IDC_VIEWLOG_EDITOR, ts.ViewlogEditor, _countof(ts.ViewlogEditor));















1292
 
 

















1293
         // Log Default File Name (2006.8.28 maya)
         // Log Default File Name (2006.8.28 maya)

















1294
         GetDlgItemTextA(IDC_DEFAULTNAME_EDITOR, buf, sizeof(buf));
         GetDlgItemTextA(IDC_DEFAULTNAME_EDITOR, buf, sizeof(buf));











#

Line 1311 
 void CLogPropPageDlg::OnOK()


Line 1321 
 void CLogPropPageDlg::OnOK()












1321
         strncpy_s(ts.LogDefaultName, sizeof(ts.LogDefaultName), buf, _TRUNCATE);
         strncpy_s(ts.LogDefaultName, sizeof(ts.LogDefaultName), buf, _TRUNCATE);

















1322
 
 

















1323
         // Log Default File Path (2007.5.30 maya)
         // Log Default File Path (2007.5.30 maya)















1324


         GetDlgItemText(IDC_DEFAULTPATH_EDITOR, ts.LogDefaultPath, _countof(ts.LogDefaultPath));


         GetDlgItemTextA(IDC_DEFAULTPATH_EDITOR, ts.LogDefaultPath, _countof(ts.LogDefaultPath));















1325
 
 

















1326
         /* Auto start logging (2007.5.31 maya) */
         /* Auto start logging (2007.5.31 maya) */

















1327
         ts.LogAutoStart = GetCheck(IDC_AUTOSTART);
         ts.LogAutoStart = GetCheck(IDC_AUTOSTART);











#

Line 1319 
 void CLogPropPageDlg::OnOK()


Line 1329 
 void CLogPropPageDlg::OnOK()












1329
         /* Log Rotate */
         /* Log Rotate */

















1330
         if (GetCheck(IDC_LOG_ROTATE)) {  /* on */
         if (GetCheck(IDC_LOG_ROTATE)) {  /* on */

















1331
                 ts.LogRotate = ROTATE_SIZE;
                 ts.LogRotate = ROTATE_SIZE;















1332


                 GetDlgItemText(IDC_ROTATE_SIZE_TYPE, buf, _countof(buf));


                 GetDlgItemTextA(IDC_ROTATE_SIZE_TYPE, buf, _countof(buf));















1333
                 ts.LogRotateSizeType = 0;
                 ts.LogRotateSizeType = 0;

















1334
                 for (int i = 0 ; i < LOG_ROTATE_SIZETYPE_NUM ; i++) {
                 for (int i = 0 ; i < LOG_ROTATE_SIZETYPE_NUM ; i++) {

















1335
                         if (strcmp(buf, LogRotateSizeType[i]) == 0) {
                         if (strcmp(buf, LogRotateSizeType[i]) == 0) {





























Legend:



Removed from v.7818
 


changed lines


 
Added in v.7938













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[ttssh2]/trunk/teraterm/teraterm/addsetting.cpp
-revision 7818 by zmatsuo,
Thu Jun 27 16:51:51 2019 UTC
+revision 7938 by zmatsuo,
Sun Aug 11 11:29:29 2019 UTC
 Line 37
  #include <commctrl.h>
  #include <time.h>
  #include <tchar.h>
+ #include <crtdbg.h>
- #include "addsetting.h"
  #include "teraterm.h"
  #include "tttypes.h"
  #include "ttwinman.h"   // for ts
 Line 46
  #include "ttftypes.h"
  #include "dlglib.h"
  #include "compat_win.h"
+ #include "addsetting.h"
- #undef GetDlgItemText
+ #ifdef _DEBUG
- #define GetDlgItemText GetDlgItemTextA
+ #define free(p)         _free_dbg((p), _NORMAL_BLOCK)
- #undef SetDlgItemText
+ #define _strdup(s)      _strdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
- #define SetDlgItemText SetDlgItemTextA
+ #define _wcsdup(s)      _wcsdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
+ #undef _tcsdup
+ #ifdef _UNICODE
+ #define _tcsdup(s)      _wcsdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
+ #else
+ #define _tcsdup(s)      _strdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
+ #endif
+ #endif
  const mouse_cursor_t MouseCursor[] = {
          {"ARROW", IDC_ARROW},
-Line 1182 
 void CLogPropPageDlg::OnInitDialog()
+Line 1190 
 void CLogPropPageDlg::OnInitDialog()
  BOOL CLogPropPageDlg::OnCommand(WPARAM wParam, LPARAM lParam)
  {
          char uimsg[MAX_UIMSG];
-         char buf[MAX_PATH];
-         char buf2[MAX_PATH];
          switch (wParam) {
                  case IDC_VIEWLOG_PATH | (BN_CLICKED << 16):
-Line 1212 
 BOOL CLogPropPageDlg::OnCommand(WPARAM w
+Line 1218 
 BOOL CLogPropPageDlg::OnCommand(WPARAM w
                          // ログディレクトリの選択ダイアログ
                          get_lang_msg("FILEDLG_SELECT_LOGDIR_TITLE", ts.UIMsg, sizeof(ts.UIMsg),
                                       "Select log folder", ts.UILanguageFile);
-                         GetDlgItemText(IDC_DEFAULTPATH_EDITOR, buf, sizeof(buf));
+                         {
-                         if (doSelectFolder(GetSafeHwnd(), buf2, sizeof(buf2), buf, ts.UIMsg)) {
+                                 char buf[MAX_PATH];
-                                 SetDlgItemText(IDC_DEFAULTPATH_EDITOR, buf2);
+                                 char buf2[MAX_PATH];
+                                 GetDlgItemTextA(IDC_DEFAULTPATH_EDITOR, buf, sizeof(buf));
+                                 if (doSelectFolder(GetSafeHwnd(), buf2, sizeof(buf2), buf, ts.UIMsg)) {
+                                         SetDlgItemTextA(IDC_DEFAULTPATH_EDITOR, buf2);
+                                 }
                          }
                          return TRUE;
-Line 1278 
 void CLogPropPageDlg::OnOK()
+Line 1288 
 void CLogPropPageDlg::OnOK()
          TCHAR uimsg2[MAX_UIMSG];
          // Viewlog Editor path (2005.1.29 yutaka)
-         GetDlgItemText(IDC_VIEWLOG_EDITOR, ts.ViewlogEditor, _countof(ts.ViewlogEditor));
+         GetDlgItemTextA(IDC_VIEWLOG_EDITOR, ts.ViewlogEditor, _countof(ts.ViewlogEditor));
          // Log Default File Name (2006.8.28 maya)
          GetDlgItemTextA(IDC_DEFAULTNAME_EDITOR, buf, sizeof(buf));
-Line 1311 
 void CLogPropPageDlg::OnOK()
+Line 1321 
 void CLogPropPageDlg::OnOK()
          strncpy_s(ts.LogDefaultName, sizeof(ts.LogDefaultName), buf, _TRUNCATE);
          // Log Default File Path (2007.5.30 maya)
-         GetDlgItemText(IDC_DEFAULTPATH_EDITOR, ts.LogDefaultPath, _countof(ts.LogDefaultPath));
+         GetDlgItemTextA(IDC_DEFAULTPATH_EDITOR, ts.LogDefaultPath, _countof(ts.LogDefaultPath));
          /* Auto start logging (2007.5.31 maya) */
          ts.LogAutoStart = GetCheck(IDC_AUTOSTART);
-Line 1319 
 void CLogPropPageDlg::OnOK()
+Line 1329 
 void CLogPropPageDlg::OnOK()
          /* Log Rotate */
          if (GetCheck(IDC_LOG_ROTATE)) {  /* on */
                  ts.LogRotate = ROTATE_SIZE;
-                 GetDlgItemText(IDC_ROTATE_SIZE_TYPE, buf, _countof(buf));
+                 GetDlgItemTextA(IDC_ROTATE_SIZE_TYPE, buf, _countof(buf));
                  ts.LogRotateSizeType = 0;
                  for (int i = 0 ; i < LOG_ROTATE_SIZETYPE_NUM ; i++) {
                          if (strcmp(buf, LogRotateSizeType[i]) == 0) {
 Legend:



Removed from v.7818
 


changed lines


 
Added in v.7938
 Legend:



Removed from v.7818
 


changed lines


 
Added in v.7938
-Removed from v.7818
+Added in v.7938
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

Tera Term

Browse Subversion Repository