[Ttssh2-commit] [9332] vs2005でビルドできなくなっていたので修正

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2021年 8月 1日 (日) 14:35:39 JST


Revision: 9332
          https://osdn.net/projects/ttssh2/scm/svn/commits/9332
Author:   zmatsuo
Date:     2021-08-01 14:35:38 +0900 (Sun, 01 Aug 2021)
Log Message:
-----------
vs2005でビルドできなくなっていたので修正

- r9330
- r9331

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9330
    https://osdn.net/projects/ttssh2/scm/svn/commits/9331

Modified Paths:
--------------
    trunk/teraterm/common/compat_win.cpp
    trunk/teraterm/common/layer_for_unicode/layer_for_unicode.v8.vcproj

-------------- next part --------------
Modified: trunk/teraterm/common/compat_win.cpp
===================================================================
--- trunk/teraterm/common/compat_win.cpp	2021-07-03 04:08:22 UTC (rev 9331)
+++ trunk/teraterm/common/compat_win.cpp	2021-08-01 05:35:38 UTC (rev 9332)
@@ -353,8 +353,13 @@
 	if (done) return;
 	done = TRUE;
 
+#if _WIN32_IE >= 0x600
+	// _WIN32_IE < 0x600 \x82̂Ƃ\xAB guidItem \x82\xAA\x8Eg\x97p\x82ł\xAB\x82\xB8
+	// FIELD_OFFSET(NOTIFYICONDATAA, guidItem) \x82Ȃǂ\xAA\x83G\x83\x89\x81[\x82ƂȂ\xE9\x82̂\xC5
+	// >= 0x600 \x82̂Ƃ\xAB\x82̂\xDD
 	assert(sizeof(TT_NOTIFYICONDATAA_V2) == NOTIFYICONDATAA_V2_SIZE);
 	assert(sizeof(TT_NOTIFYICONDATAW_V2) == NOTIFYICONDATAW_V2_SIZE);
+#endif
 #if defined(_WIN64)
 	assert(sizeof(TT_NOTIFYICONDATAA_V2) == 504);
 	assert(sizeof(TT_NOTIFYICONDATAW_V2) == 952);

Modified: trunk/teraterm/common/layer_for_unicode/layer_for_unicode.v8.vcproj
===================================================================
--- trunk/teraterm/common/layer_for_unicode/layer_for_unicode.v8.vcproj	2021-07-03 04:08:22 UTC (rev 9331)
+++ trunk/teraterm/common/layer_for_unicode/layer_for_unicode.v8.vcproj	2021-08-01 05:35:38 UTC (rev 9332)
@@ -143,10 +143,6 @@
 			Name="asm"
 			>
 			<File
-				RelativePath=".\AddFontResourceExW.obj"
-				>
-			</File>
-			<File
 				RelativePath=".\AddFontResourceW.obj"
 				>
 			</File>
@@ -303,10 +299,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\RemoveFontResourceExW.obj"
-				>
-			</File>
-			<File
 				RelativePath=".\RemoveFontResourceW.obj"
 				>
 			</File>
@@ -356,9 +348,21 @@
 			>
 		</File>
 		<File
+			RelativePath="..\layer_for_unicode.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\layer_for_unicode.h"
+			>
+		</File>
+		<File
 			RelativePath="..\layer_for_unicode.md"
 			>
 		</File>
+		<File
+			RelativePath="..\layer_for_unicode_comctl32.cpp"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>


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