_WIN32_WINNTをコンパイルオプションで指定
- Tera Term は _WIN32_WINNT >= 0x0501 でビルドすることが前提となっている
- teraterm_conf.h を削除
- Visual Studio 2005 では次のSDKでビルドできることを確認済み
- Tera Term は Visual Studio 2005 以上をサポート
@@ -9,3 +9,7 @@ | ||
9 | 9 | /GTAGS |
10 | 10 | /GPATH |
11 | 11 | /GRTAGS |
12 | +*.ncb | |
13 | +*.suo | |
14 | +*.user | |
15 | +*.map |
@@ -19,46 +19,51 @@ | ||
19 | 19 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) |
20 | 20 | set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) |
21 | 21 | |
22 | -# _WIN32_WINNT_WIN10 0x0a00 | |
23 | -set(_WIN32_WINNT "0x0a00") | |
22 | +#set(_WIN32_WINNT "0x0a00") # 0x0a00=_WIN32_WINNT_WIN10 | |
23 | +#set(_WIN32_WINNT "0x0501") # Tera Term がビルドできる最小値 | |
24 | +if(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005" OR ${CMAKE_GENERATOR} MATCHES "Visual Studio 9 2008") | |
25 | + set(_WIN32_WINNT "0x0501") | |
26 | +endif() | |
27 | + | |
24 | 28 | if(MSVC) |
25 | 29 | # https://www.leeholmes.com/blog/2017/02/27/differences-between-visual-studio-2012-2013-and-2015/ |
26 | - if(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005" OR ${CMAKE_GENERATOR} MATCHES "Visual Studio 9 2008") | |
27 | - set(_WIN32_WINNT "0x0501") | |
30 | + if(_WIN32_WINNT) | |
31 | + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_WIN32_WINNT=${_WIN32_WINNT}") | |
32 | + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_WIN32_WINNT=${_WIN32_WINNT}") | |
28 | 33 | endif() |
29 | - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_WIN32_WINNT=${_WIN32_WINNT}") | |
30 | - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_WIN32_WINNT=${_WIN32_WINNT}") | |
31 | 34 | string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) |
32 | 35 | string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) |
33 | 36 | string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) |
34 | 37 | string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) |
35 | 38 | if (MORE_WARNING) |
39 | + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4") | |
36 | 40 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") |
37 | - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4") | |
38 | 41 | if(${MSVC_VERSION} GREATER_EQUAL 1910) # Visual Studio 2017以上の時 |
42 | + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /analyze") | |
39 | 43 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /analyze") |
40 | - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /analyze") | |
41 | 44 | endif() |
42 | 45 | else() |
46 | + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_CRT_SECURE_NO_DEPRECATE") | |
43 | 47 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_CRT_SECURE_NO_DEPRECATE") |
44 | - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_CRT_SECURE_NO_DEPRECATE") | |
48 | + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3") | |
45 | 49 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3") |
46 | - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3") | |
47 | 50 | endif() |
51 | + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /GF /Gy") | |
48 | 52 | set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GF /Gy") |
49 | - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /GF /Gy") | |
53 | + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP") | |
50 | 54 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") |
51 | - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP") | |
52 | 55 | if(${MSVC_VERSION} GREATER_EQUAL 1910) |
53 | 56 | # Visual Studio 2017以上の時 |
57 | + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /ZI") | |
54 | 58 | set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /ZI") |
55 | - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /ZI") | |
56 | 59 | set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") |
57 | 60 | set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO") |
58 | 61 | endif() |
59 | 62 | elseif(MINGW) |
60 | - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WIN32_WINNT=${_WIN32_WINNT}") | |
61 | - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WIN32_WINNT=${_WIN32_WINNT}") | |
63 | + if(_WIN32_WINNT) | |
64 | + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WIN32_WINNT=${_WIN32_WINNT}") | |
65 | + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WIN32_WINNT=${_WIN32_WINNT}") | |
66 | + endif() | |
62 | 67 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__USE_MINGW_ANSI_STDIO=0") |
63 | 68 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__USE_MINGW_ANSI_STDIO=0") |
64 | 69 | set(CMAKE_C_CXX_WARNING_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-sign-compare") |
@@ -1,92 +0,0 @@ | ||
1 | -/* | |
2 | - * (C) 2019- TeraTerm Project | |
3 | - * All rights reserved. | |
4 | - * | |
5 | - * Redistribution and use in source and binary forms, with or without | |
6 | - * modification, are permitted provided that the following conditions | |
7 | - * are met: | |
8 | - * | |
9 | - * 1. Redistributions of source code must retain the above copyright | |
10 | - * notice, this list of conditions and the following disclaimer. | |
11 | - * 2. Redistributions in binary form must reproduce the above copyright | |
12 | - * notice, this list of conditions and the following disclaimer in the | |
13 | - * documentation and/or other materials provided with the distribution. | |
14 | - * 3. The name of the author may not be used to endorse or promote products | |
15 | - * derived from this software without specific prior written permission. | |
16 | - * | |
17 | - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR | |
18 | - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
19 | - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
20 | - * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, | |
21 | - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |
22 | - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
23 | - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
24 | - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
25 | - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | |
26 | - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
27 | - */ | |
28 | - | |
29 | -/* teraterm_conf.h */ | |
30 | - | |
31 | -/* | |
32 | - * windows.h などを include する前に include するファイル | |
33 | - * 必要な定義を行う | |
34 | - */ | |
35 | - | |
36 | -#pragma once | |
37 | - | |
38 | -/* 使用する Windows SDK のバージョンを指定する | |
39 | - * ・Windows SDK(header)内の各種定義のバージョンを指定する | |
40 | - * ・Tera Term 内で使用している各種定義がSDKになければ | |
41 | - * compat_win.h で定義される | |
42 | - */ | |
43 | -#if !defined(_WIN32_WINNT) | |
44 | -//#define _WIN32_WINNT 0x0a00 // _WINNT_WIN10 Windows 10 | |
45 | -#define _WIN32_WINNT 0x0501 // _WINNT_WINXP Windows XP ↑build ok | |
46 | -//#define _WIN32_WINNT 0x0500 // _WINNT_WIN2K Windows 2000 ↓build ng | |
47 | -//#define _WIN32_WINNT 0x0400 // _WINNT_NT4 Windows NT 4.0(95) | |
48 | -#endif | |
49 | - | |
50 | -/* | |
51 | - * VS2005を使っている場合、 | |
52 | - * _WIN32_WINNT が 0x0501 でなければエラーを出す | |
53 | - */ | |
54 | -#if _MSC_VER == 1400 // VS2005 | |
55 | -#if _WIN32_WINNT != 0x0501 | |
56 | -#error check _WIN32_WINNT | |
57 | -#endif | |
58 | -#endif | |
59 | - | |
60 | -/* | |
61 | - * _WIN32_WINNTから次のdefineを適切に設定する | |
62 | - * NTDDI_VERSION | |
63 | - * WINVER | |
64 | - * _WIN32_IE | |
65 | - * このdefineは定義されない | |
66 | - * _WIN32_WINDOWS | |
67 | - */ | |
68 | -//#include <sdkddkver.h> | |
69 | - | |
70 | - | |
71 | -/* | |
72 | - * SDK 7.0 | |
73 | - * Windows Server 2003 R2 Platform SDK | |
74 | - * (Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1) | |
75 | - * SDK 7.1 | |
76 | - * Microsoft Windows SDK for Windows 7 and .NET Framework 4 | |
77 | - */ | |
78 | -/* | |
79 | - * SDK 7.0 対策 | |
80 | - * 7.0 は 7.1 以降と次の違いがある | |
81 | - * - _WIN32_WINNT が定義されていない場合、自動で設定しない | |
82 | - * _WIN32_IEなども自動で設定されない | |
83 | - * - sdkddkver.h が存在しない | |
84 | - * _WIN32_WINNT から _WIN32_IE などを適切な値に自動設定するヘッダ | |
85 | - * 手動で設定する | |
86 | - * - WinSDKVer.h が存在しない | |
87 | - * _WIN32_WINNT_MAXVER がない | |
88 | - * 使用している SDK のバージョンのヒントを得られない | |
89 | - */ | |
90 | -#if !defined(_WIN32_IE) | |
91 | -#define _WIN32_IE 0x0600 // _WIN32_IE_XP | |
92 | -#endif |
@@ -39,7 +39,6 @@ | ||
39 | 39 | #include <mbctype.h> // for _ismbblead |
40 | 40 | #include <assert.h> |
41 | 41 | |
42 | -#include "teraterm_conf.h" | |
43 | 42 | #include "teraterm.h" |
44 | 43 | #include "tttypes.h" |
45 | 44 | #include "compat_win.h" |
@@ -38,7 +38,6 @@ | ||
38 | 38 | #include <ctype.h> |
39 | 39 | #include <assert.h> |
40 | 40 | |
41 | -#include "teraterm_conf.h" | |
42 | 41 | #include "teraterm.h" |
43 | 42 | #include "tttypes.h" |
44 | 43 | #include "compat_win.h" |
@@ -29,7 +29,6 @@ | ||
29 | 29 | /* |
30 | 30 | * Additional settings dialog |
31 | 31 | */ |
32 | -#include "teraterm_conf.h" | |
33 | 32 | |
34 | 33 | #include <stdio.h> |
35 | 34 | #include <windows.h> |
@@ -28,7 +28,6 @@ | ||
28 | 28 | |
29 | 29 | // vtwinから分離 |
30 | 30 | |
31 | -#include "teraterm_conf.h" | |
32 | 31 | #include "teraterm.h" |
33 | 32 | #include "tttypes.h" |
34 | 33 | #include "ttcommon.h" |
@@ -28,7 +28,6 @@ | ||
28 | 28 | */ |
29 | 29 | |
30 | 30 | /* TERATERM.EXE, file transfer dialog box */ |
31 | -#include "teraterm_conf.h" | |
32 | 31 | |
33 | 32 | #include <stdio.h> |
34 | 33 | #include <windows.h> |
@@ -27,7 +27,6 @@ | ||
27 | 27 | */ |
28 | 28 | |
29 | 29 | /* TERATERM.EXE, file transfer dialog box lite */ |
30 | -#include "teraterm_conf.h" | |
31 | 30 | |
32 | 31 | #include <stdio.h> |
33 | 32 | #include <windows.h> |
@@ -29,11 +29,8 @@ | ||
29 | 29 | |
30 | 30 | /* TERATERM.EXE, main */ |
31 | 31 | |
32 | -#include "teraterm_conf.h" | |
33 | - | |
34 | 32 | #include <stdio.h> |
35 | 33 | #include <crtdbg.h> |
36 | -#include <io.h> // for access() | |
37 | 34 | #include <windows.h> |
38 | 35 | #include <htmlhelp.h> |
39 | 36 | #include "teraterm.h" |
@@ -130,9 +130,11 @@ | ||
130 | 130 | } |
131 | 131 | // 言語ファイルによるメッセージの国際化を行っているが、この時点では設定が |
132 | 132 | // まだ読み込まれていない為、メッセージが英語のままとなる。要検討。 |
133 | - static const TTMessageBoxInfoW info = {"Tera Term", "MSG_TT_ERROR", L"Tera Term: Error", "MSG_LOAD_EXT_ERROR", | |
134 | - L"Cannot load extension %s (%d, %s)"}; | |
135 | - TTMessageBoxW(NULL, &info, MB_OK | MB_ICONEXCLAMATION, ts.UILanguageFile, fileName, err, sub_message); | |
133 | + { | |
134 | + static const TTMessageBoxInfoW info = {"Tera Term", "MSG_TT_ERROR", L"Tera Term: Error", "MSG_LOAD_EXT_ERROR", | |
135 | + L"Cannot load extension %s (%d, %s)"}; | |
136 | + TTMessageBoxW(NULL, &info, MB_OK | MB_ICONEXCLAMATION, ts.UILanguageFile, fileName, err, sub_message); | |
137 | + } | |
136 | 138 | } |
137 | 139 | |
138 | 140 | void PASCAL TTXInit(PTTSet ts_, PComVar cv_) |
@@ -30,7 +30,13 @@ | ||
30 | 30 | |
31 | 31 | /* TERATERM.EXE, VT window */ |
32 | 32 | |
33 | -#include "teraterm_conf.h" | |
33 | +// SDK7.0の場合、WIN32_IEが適切に定義されない | |
34 | +#if _MSC_VER == 1400 // VS2005の場合のみ | |
35 | +#if !defined(_WIN32_IE) | |
36 | +#define _WIN32_IE 0x0501 | |
37 | +#endif | |
38 | +#endif | |
39 | + | |
34 | 40 | #include "teraterm.h" |
35 | 41 | #include "tttypes.h" |
36 | 42 |
@@ -65,16 +71,17 @@ | ||
65 | 71 | #include <crtdbg.h> |
66 | 72 | #include <string.h> |
67 | 73 | #include <locale.h> |
68 | - | |
69 | -#include <shlobj.h> | |
70 | 74 | #include <io.h> |
71 | 75 | #include <errno.h> |
72 | 76 | |
77 | +#include <shlobj.h> | |
78 | +#include <windows.h> | |
73 | 79 | #include <windowsx.h> |
74 | 80 | #include <imm.h> |
75 | 81 | #include <dbt.h> |
76 | 82 | #include <assert.h> |
77 | 83 | #include <wchar.h> |
84 | +#include <htmlhelp.h> | |
78 | 85 | |
79 | 86 | #include "tt_res.h" |
80 | 87 | #include "vtwin.h" |
@@ -83,7 +90,6 @@ | ||
83 | 90 | #include "sizetip.h" |
84 | 91 | #include "dnddlg.h" |
85 | 92 | #include "tekwin.h" |
86 | -#include <htmlhelp.h> | |
87 | 93 | #include "compat_win.h" |
88 | 94 | #include "unicode_test.h" |
89 | 95 | #if UNICODE_DEBUG |
@@ -46,8 +46,6 @@ | ||
46 | 46 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
47 | 47 | */ |
48 | 48 | |
49 | -#include "teraterm_conf.h" | |
50 | - | |
51 | 49 | #include <windows.h> |
52 | 50 | #include <assert.h> |
53 | 51 | #include <stdio.h> |
@@ -58,6 +56,13 @@ | ||
58 | 56 | #endif |
59 | 57 | #include <stdlib.h> |
60 | 58 | #include <crtdbg.h> |
59 | +#include <initguid.h> | |
60 | +#if defined(__MINGW32__) || defined(_INC_SDKDDKVER) | |
61 | +#define HAS_PROPKEY_H 1 | |
62 | +#endif | |
63 | +#if defined(HAS_PROPKEY_H) | |
64 | +#include <propkey.h> | |
65 | +#endif | |
61 | 66 | |
62 | 67 | #include "winjump.h" |
63 | 68 | #include "teraterm.h" |
@@ -81,15 +86,13 @@ | ||
81 | 86 | #define _REFPROPVARIANT_DEFINED |
82 | 87 | typedef PROPVARIANT *REFPROPVARIANT; |
83 | 88 | #endif |
84 | -/* MinGW doesn't define this yet: */ | |
85 | -#ifndef _PROPVARIANTINIT_DEFINED_ | |
86 | -#define _PROPVARIANTINIT_DEFINED_ | |
87 | -#define PropVariantInit(pvar) memset((pvar),0,sizeof(PROPVARIANT)) | |
88 | -#endif | |
89 | 89 | |
90 | 90 | #ifndef __ICustomDestinationList_INTERFACE_DEFINED__ |
91 | -#define __ICustomDestinationList_INTERFACE_DEFINED__ | |
92 | -// #if !(_MSC_VER >= 1600) // VC2010(VC10.0) or later | |
91 | + | |
92 | +static const IID IID_ICustomDestinationList = { | |
93 | + 0x6332debf, 0x87b5, 0x4670, {0x90,0xc0,0x5e,0x57,0xb4,0x08,0xa4,0x9e} | |
94 | +}; | |
95 | + | |
93 | 96 | typedef struct ICustomDestinationListVtbl { |
94 | 97 | HRESULT ( __stdcall *QueryInterface ) ( |
95 | 98 | /* [in] ICustomDestinationList*/ void *This, |
@@ -149,7 +152,11 @@ | ||
149 | 152 | #endif |
150 | 153 | |
151 | 154 | #ifndef __IObjectArray_INTERFACE_DEFINED__ |
152 | -#define __IObjectArray_INTERFACE_DEFINED__ | |
155 | + | |
156 | +static const IID IID_IObjectArray = { | |
157 | + 0x92ca9dcd, 0x5622, 0x4bba, {0xa8,0x05,0x5e,0x9f,0x54,0x1b,0xd8,0xc9} | |
158 | +}; | |
159 | + | |
153 | 160 | typedef struct IObjectArrayVtbl |
154 | 161 | { |
155 | 162 | HRESULT ( __stdcall *QueryInterface )( |
@@ -331,8 +338,11 @@ | ||
331 | 338 | #endif |
332 | 339 | |
333 | 340 | #ifndef __IPropertyStore_INTERFACE_DEFINED__ |
334 | -#define __IPropertyStore_INTERFACE_DEFINED__ | |
335 | -// #if !(_MSC_VER >= 1500) // VC2008(VC9.0) or later | |
341 | + | |
342 | +static const IID IID_IPropertyStore = { | |
343 | + 0x886d8eeb, 0x8cf2, 0x4446, {0x8d,0x02,0xcd,0xba,0x1d,0xbd,0xcf,0x99} | |
344 | +}; | |
345 | + | |
336 | 346 | typedef struct IPropertyStoreVtbl |
337 | 347 | { |
338 | 348 | HRESULT ( __stdcall *QueryInterface )( |
@@ -375,7 +385,7 @@ | ||
375 | 385 | } IPropertyStore; |
376 | 386 | #endif |
377 | 387 | |
378 | -#if !defined(__MINGW32__) | |
388 | +#if !defined(__MINGW32__) && !defined(__ShellCoreObjects_LIBRARY_DEFINED__) | |
379 | 389 | static const CLSID CLSID_DestinationList = { |
380 | 390 | 0x77f10cf0, 0x3db5, 0x4966, {0xb5,0x20,0xb7,0xc5,0x4f,0xd3,0x5e,0xd6} |
381 | 391 | }; |
@@ -392,23 +402,13 @@ | ||
392 | 402 | 0x000214ee, 0x0000, 0x0000, {0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} |
393 | 403 | }; |
394 | 404 | #endif |
395 | -#if (_WIN32_WINNT < 0x0601) // _WIN32_WINNT_WIN7 | |
396 | -static const IID IID_ICustomDestinationList = { | |
397 | - 0x6332debf, 0x87b5, 0x4670, {0x90,0xc0,0x5e,0x57,0xb4,0x08,0xa4,0x9e} | |
398 | -}; | |
399 | -#endif | |
400 | -#if !defined(__MINGW32__) | |
401 | -static const IID IID_IObjectArray = { | |
402 | - 0x92ca9dcd, 0x5622, 0x4bba, {0xa8,0x05,0x5e,0x9f,0x54,0x1b,0xd8,0xc9} | |
403 | -}; | |
404 | -static const IID IID_IPropertyStore = { | |
405 | - 0x886d8eeb, 0x8cf2, 0x4446, {0x8d,0x02,0xcd,0xba,0x1d,0xbd,0xcf,0x99} | |
406 | -}; | |
407 | -#endif | |
405 | + | |
406 | +#if !defined(HAS_PROPKEY_H) | |
408 | 407 | static const PROPERTYKEY PKEY_Title = { |
409 | 408 | {0xf29f85e0, 0x4ff9, 0x1068, {0xab,0x91,0x08,0x00,0x2b,0x27,0xb3,0xd9}}, |
410 | 409 | 0x00000002 |
411 | 410 | }; |
411 | +#endif | |
412 | 412 | |
413 | 413 | /* Type-checking macro to provide arguments for CoCreateInstance() etc. |
414 | 414 | * The pointer arithmetic is a compile-time pointer type check that 'obj' |
@@ -27,10 +27,6 @@ | ||
27 | 27 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
28 | 28 | */ |
29 | 29 | |
30 | -#ifndef _WIN32_IE | |
31 | -#define _WIN32_IE 0x501 | |
32 | -#endif | |
33 | - | |
34 | 30 | /* TTCMN.DLL, main */ |
35 | 31 | #include <direct.h> |
36 | 32 | #include <string.h> |
@@ -28,7 +28,14 @@ | ||
28 | 28 | |
29 | 29 | /* TTCMN.DLL, notify icon */ |
30 | 30 | |
31 | -#define _WIN32_IE 0x0600 | |
31 | +// SDK7.0の場合、WIN32_IEが適切に定義されない | |
32 | +#if _MSC_VER == 1400 // VS2005の場合のみ | |
33 | +#if !defined(_WIN32_IE) | |
34 | +#define _WIN32_IE 0x0501 | |
35 | +//#define _WIN32_IE 0x0600 | |
36 | +#endif | |
37 | +#endif | |
38 | + | |
32 | 39 | #include <string.h> |
33 | 40 | #include <windows.h> |
34 | 41 | #include <wchar.h> |
@@ -29,7 +29,6 @@ | ||
29 | 29 | /* IPv6 modification is Copyright(C) 2000 Jun-ya Kato <kato@win6.jp> */ |
30 | 30 | |
31 | 31 | /* TTDLG.DLL, dialog boxes */ |
32 | -#include "teraterm_conf.h" | |
33 | 32 | #include "teraterm.h" |
34 | 33 | #include <stdio.h> |
35 | 34 | #include <string.h> |
@@ -33,7 +33,6 @@ | ||
33 | 33 | Tera Term by Takashi Teranishi (teranishi@rikaxp.riken.go.jp) |
34 | 34 | */ |
35 | 35 | |
36 | -#include "teraterm_conf.h" | |
37 | 36 | #include "ttxssh.h" |
38 | 37 | #include "fwdui.h" |
39 | 38 | #include "util.h" |
@@ -2273,14 +2272,6 @@ | ||
2273 | 2272 | SendMessage(GetDlgItem(dlg, IDC_PUTTY_VERSION), WM_SETTEXT, 0, (LPARAM)buf); |
2274 | 2273 | } |
2275 | 2274 | |
2276 | -#if 0 | |
2277 | -// WM_MOUSEWHEEL は winuser.h ヘッダで宣言されていますが、#define _WIN32_WINNT 0x0400 が宣言されていないと認識されません。 | |
2278 | -#define WM_MOUSEWHEEL 0x020A1 | |
2279 | -#define WHEEL_DELTA 120 | |
2280 | -#define GET_WHEEL_DELTA_WPARAM(wParam) ((short)HIWORD(wParam)) | |
2281 | -#define GET_KEYSTATE_WPARAM(wParam) (LOWORD(wParam)) | |
2282 | -#endif | |
2283 | - | |
2284 | 2275 | static WNDPROC g_defAboutDlgEditWndProc; // Edit Controlのサブクラス化用 |
2285 | 2276 | static int g_deltaSumAboutDlg = 0; // マウスホイールのDelta累積用 |
2286 | 2277 |