[Ttssh2-commit] [7266] クリップボード周り修正、バージョンリソースがおかしかったので修正

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2018年 11月 18日 (日) 00:44:05 JST


Revision: 7266
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7266
Author:   zmatsuo
Date:     2018-11-18 00:44:05 +0900 (Sun, 18 Nov 2018)
Log Message:
-----------
クリップボード周り修正、バージョンリソースがおかしかったので修正

Modified Paths:
--------------
    branches/cmake/teraterm/teraterm/CMakeLists.txt
    branches/cmake/teraterm/teraterm/clipboar.c
    branches/cmake/teraterm/teraterm/ttermpro.rc
    branches/cmake/teraterm/ttpdlg/ttpdlg.rc

-------------- next part --------------
Modified: branches/cmake/teraterm/teraterm/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/teraterm/CMakeLists.txt	2018-11-17 15:43:54 UTC (rev 7265)
+++ branches/cmake/teraterm/teraterm/CMakeLists.txt	2018-11-17 15:44:05 UTC (rev 7266)
@@ -106,7 +106,6 @@
   ttplug.h
   ttsetup.c
   ttsetup.h
-  tt-version.rc
   ttwinman.c
   ttwinman.h
   ttwsk.c

Modified: branches/cmake/teraterm/teraterm/clipboar.c
===================================================================
--- branches/cmake/teraterm/teraterm/clipboar.c	2018-11-17 15:43:54 UTC (rev 7265)
+++ branches/cmake/teraterm/teraterm/clipboar.c	2018-11-17 15:44:05 UTC (rev 7266)
@@ -1015,7 +1015,7 @@
 						if (CBMemPtr == NULL) {
 							CBMemPtr = GlobalLock(CBMemHandle);
 						}
-						GetDlgItemTextA(hDlgWnd, IDC_EDIT, GlobalSize(CBMemHandle), (LPARAM)CBMemPtr);
+						GetDlgItemTextA(hDlgWnd, IDC_EDIT, CBMemPtr, GlobalSize(CBMemHandle));
 						result = IDOK;
 					}
 

Modified: branches/cmake/teraterm/teraterm/ttermpro.rc
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.rc	2018-11-17 15:43:54 UTC (rev 7265)
+++ branches/cmake/teraterm/teraterm/ttermpro.rc	2018-11-17 15:44:05 UTC (rev 7266)
@@ -470,6 +470,7 @@
 
 3 TEXTINCLUDE 
 BEGIN
+    "#include ""tt-version.rc""\r\n"
     "\0"
 END
 
@@ -681,3 +682,13 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+#include "tt-version.rc"
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

Modified: branches/cmake/teraterm/ttpdlg/ttpdlg.rc
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.rc	2018-11-17 15:43:54 UTC (rev 7265)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.rc	2018-11-17 15:44:05 UTC (rev 7266)
@@ -42,7 +42,6 @@
 
 3 TEXTINCLUDE 
 BEGIN
-    "#include ""ttpdlg-version.rc""\r\n"
     "\0"
 END
 
@@ -454,7 +453,6 @@
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-#include "ttpdlg-version.rc"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED


Ttssh2-commit メーリングリストの案内
Back to archive index