• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision9230 (tree)
Time2021-05-04 00:04:42
Authorzmatsuo

Log Message

_WIN32_WINNTをコンパイルオプションで指定

- Tera Term は _WIN32_WINNT >= 0x0501 でビルドすることが前提となっている

- 0x0501=_WIN32_WINNT_WINXP
- Windows XP
- Windows Server 2003
- Visual Studio 2005 のプロジェクトファイルに /D_WIN32_WINNT=0x0501 追加済み(r9191)

- teraterm_conf.h を削除

- WIN32_WINNT をコンパイルオプションで指定するため r7554 で追加した
- コマンドラインで明示的に指定するようになったた不要となった
- SDK 7.0 では _WIN32_WINNT が自動で設定されない
- SDK 7.0 より新しいSDKでは、特に指定されていない場合、自動で設定される
- SDKのバージョンによって自動で設定される_WIN32_WINNT の値は異なっている
- SDK 7.1 の場合 0x0601
- SDK 10.0.18362.0 の場合 0x0A00
- sdkddkver.h 内で設定される
- MinGWの場合は _mingw.h

- Visual Studio 2005 では次のSDKでビルドできることを確認済み

- SDK 7.0
- SDK 7.1

- Tera Term は Visual Studio 2005 以上をサポート

- MSC_VER >= 1400

Change Summary

Incremental Difference

--- trunk/.gitignore (revision 9229)
+++ trunk/.gitignore (revision 9230)
@@ -9,3 +9,7 @@
99 /GTAGS
1010 /GPATH
1111 /GRTAGS
12+*.ncb
13+*.suo
14+*.user
15+*.map
--- trunk/CMakeLists.txt (revision 9229)
+++ trunk/CMakeLists.txt (revision 9230)
@@ -19,46 +19,51 @@
1919 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
2020 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
2121
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+
2428 if(MSVC)
2529 # 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}")
2833 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}")
3134 string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
3235 string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
3336 string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
3437 string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
3538 if (MORE_WARNING)
39+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
3640 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
37- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
3841 if(${MSVC_VERSION} GREATER_EQUAL 1910) # Visual Studio 2017以上の時
42+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /analyze")
3943 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /analyze")
40- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /analyze")
4144 endif()
4245 else()
46+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_CRT_SECURE_NO_DEPRECATE")
4347 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")
4549 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
46- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
4750 endif()
51+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /GF /Gy")
4852 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")
5054 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
51- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
5255 if(${MSVC_VERSION} GREATER_EQUAL 1910)
5356 # Visual Studio 2017以上の時
57+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /ZI")
5458 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /ZI")
55- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /ZI")
5659 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
5760 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
5861 endif()
5962 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()
6267 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__USE_MINGW_ANSI_STDIO=0")
6368 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__USE_MINGW_ANSI_STDIO=0")
6469 set(CMAKE_C_CXX_WARNING_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-sign-compare")
--- trunk/teraterm/common/teraterm_conf.h (revision 9229)
+++ trunk/teraterm/common/teraterm_conf.h (nonexistent)
@@ -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
--- trunk/teraterm/common/ttlib.c (revision 9229)
+++ trunk/teraterm/common/ttlib.c (revision 9230)
@@ -39,7 +39,6 @@
3939 #include <mbctype.h> // for _ismbblead
4040 #include <assert.h>
4141
42-#include "teraterm_conf.h"
4342 #include "teraterm.h"
4443 #include "tttypes.h"
4544 #include "compat_win.h"
--- trunk/teraterm/common/ttlib_static.c (revision 9229)
+++ trunk/teraterm/common/ttlib_static.c (revision 9230)
@@ -38,7 +38,6 @@
3838 #include <ctype.h>
3939 #include <assert.h>
4040
41-#include "teraterm_conf.h"
4241 #include "teraterm.h"
4342 #include "tttypes.h"
4443 #include "compat_win.h"
--- trunk/teraterm/teraterm/addsetting.cpp (revision 9229)
+++ trunk/teraterm/teraterm/addsetting.cpp (revision 9230)
@@ -29,7 +29,6 @@
2929 /*
3030 * Additional settings dialog
3131 */
32-#include "teraterm_conf.h"
3332
3433 #include <stdio.h>
3534 #include <windows.h>
--- trunk/teraterm/teraterm/broadcast.cpp (revision 9229)
+++ trunk/teraterm/teraterm/broadcast.cpp (revision 9230)
@@ -28,7 +28,6 @@
2828
2929 // vtwinから分離
3030
31-#include "teraterm_conf.h"
3231 #include "teraterm.h"
3332 #include "tttypes.h"
3433 #include "ttcommon.h"
--- trunk/teraterm/teraterm/ftdlg.cpp (revision 9229)
+++ trunk/teraterm/teraterm/ftdlg.cpp (revision 9230)
@@ -28,7 +28,6 @@
2828 */
2929
3030 /* TERATERM.EXE, file transfer dialog box */
31-#include "teraterm_conf.h"
3231
3332 #include <stdio.h>
3433 #include <windows.h>
--- trunk/teraterm/teraterm/ftdlg_lite.cpp (revision 9229)
+++ trunk/teraterm/teraterm/ftdlg_lite.cpp (revision 9230)
@@ -27,7 +27,6 @@
2727 */
2828
2929 /* TERATERM.EXE, file transfer dialog box lite */
30-#include "teraterm_conf.h"
3130
3231 #include <stdio.h>
3332 #include <windows.h>
--- trunk/teraterm/teraterm/teraterm.cpp (revision 9229)
+++ trunk/teraterm/teraterm/teraterm.cpp (revision 9230)
@@ -29,11 +29,8 @@
2929
3030 /* TERATERM.EXE, main */
3131
32-#include "teraterm_conf.h"
33-
3432 #include <stdio.h>
3533 #include <crtdbg.h>
36-#include <io.h> // for access()
3734 #include <windows.h>
3835 #include <htmlhelp.h>
3936 #include "teraterm.h"
--- trunk/teraterm/teraterm/ttplug.c (revision 9229)
+++ trunk/teraterm/teraterm/ttplug.c (revision 9230)
@@ -130,9 +130,11 @@
130130 }
131131 // 言語ファイルによるメッセージの国際化を行っているが、この時点では設定が
132132 // まだ読み込まれていない為、メッセージが英語のままとなる。要検討。
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+ }
136138 }
137139
138140 void PASCAL TTXInit(PTTSet ts_, PComVar cv_)
--- trunk/teraterm/teraterm/vtwin.cpp (revision 9229)
+++ trunk/teraterm/teraterm/vtwin.cpp (revision 9230)
@@ -30,7 +30,13 @@
3030
3131 /* TERATERM.EXE, VT window */
3232
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+
3440 #include "teraterm.h"
3541 #include "tttypes.h"
3642
@@ -65,16 +71,17 @@
6571 #include <crtdbg.h>
6672 #include <string.h>
6773 #include <locale.h>
68-
69-#include <shlobj.h>
7074 #include <io.h>
7175 #include <errno.h>
7276
77+#include <shlobj.h>
78+#include <windows.h>
7379 #include <windowsx.h>
7480 #include <imm.h>
7581 #include <dbt.h>
7682 #include <assert.h>
7783 #include <wchar.h>
84+#include <htmlhelp.h>
7885
7986 #include "tt_res.h"
8087 #include "vtwin.h"
@@ -83,7 +90,6 @@
8390 #include "sizetip.h"
8491 #include "dnddlg.h"
8592 #include "tekwin.h"
86-#include <htmlhelp.h>
8793 #include "compat_win.h"
8894 #include "unicode_test.h"
8995 #if UNICODE_DEBUG
--- trunk/teraterm/teraterm/winjump.c (revision 9229)
+++ trunk/teraterm/teraterm/winjump.c (revision 9230)
@@ -46,8 +46,6 @@
4646 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4747 */
4848
49-#include "teraterm_conf.h"
50-
5149 #include <windows.h>
5250 #include <assert.h>
5351 #include <stdio.h>
@@ -58,6 +56,13 @@
5856 #endif
5957 #include <stdlib.h>
6058 #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
6166
6267 #include "winjump.h"
6368 #include "teraterm.h"
@@ -81,15 +86,13 @@
8186 #define _REFPROPVARIANT_DEFINED
8287 typedef PROPVARIANT *REFPROPVARIANT;
8388 #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
8989
9090 #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+
9396 typedef struct ICustomDestinationListVtbl {
9497 HRESULT ( __stdcall *QueryInterface ) (
9598 /* [in] ICustomDestinationList*/ void *This,
@@ -149,7 +152,11 @@
149152 #endif
150153
151154 #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+
153160 typedef struct IObjectArrayVtbl
154161 {
155162 HRESULT ( __stdcall *QueryInterface )(
@@ -331,8 +338,11 @@
331338 #endif
332339
333340 #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+
336346 typedef struct IPropertyStoreVtbl
337347 {
338348 HRESULT ( __stdcall *QueryInterface )(
@@ -375,7 +385,7 @@
375385 } IPropertyStore;
376386 #endif
377387
378-#if !defined(__MINGW32__)
388+#if !defined(__MINGW32__) && !defined(__ShellCoreObjects_LIBRARY_DEFINED__)
379389 static const CLSID CLSID_DestinationList = {
380390 0x77f10cf0, 0x3db5, 0x4966, {0xb5,0x20,0xb7,0xc5,0x4f,0xd3,0x5e,0xd6}
381391 };
@@ -392,23 +402,13 @@
392402 0x000214ee, 0x0000, 0x0000, {0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}
393403 };
394404 #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)
408407 static const PROPERTYKEY PKEY_Title = {
409408 {0xf29f85e0, 0x4ff9, 0x1068, {0xab,0x91,0x08,0x00,0x2b,0x27,0xb3,0xd9}},
410409 0x00000002
411410 };
411+#endif
412412
413413 /* Type-checking macro to provide arguments for CoCreateInstance() etc.
414414 * The pointer arithmetic is a compile-time pointer type check that 'obj'
--- trunk/teraterm/ttpcmn/ttcmn.c (revision 9229)
+++ trunk/teraterm/ttpcmn/ttcmn.c (revision 9230)
@@ -27,10 +27,6 @@
2727 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828 */
2929
30-#ifndef _WIN32_IE
31-#define _WIN32_IE 0x501
32-#endif
33-
3430 /* TTCMN.DLL, main */
3531 #include <direct.h>
3632 #include <string.h>
--- trunk/teraterm/ttpcmn/ttcmn_notify.cpp (revision 9229)
+++ trunk/teraterm/ttpcmn/ttcmn_notify.cpp (revision 9230)
@@ -28,7 +28,14 @@
2828
2929 /* TTCMN.DLL, notify icon */
3030
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+
3239 #include <string.h>
3340 #include <windows.h>
3441 #include <wchar.h>
--- trunk/teraterm/ttpdlg/ttdlg.c (revision 9229)
+++ trunk/teraterm/ttpdlg/ttdlg.c (revision 9230)
@@ -29,7 +29,6 @@
2929 /* IPv6 modification is Copyright(C) 2000 Jun-ya Kato <kato@win6.jp> */
3030
3131 /* TTDLG.DLL, dialog boxes */
32-#include "teraterm_conf.h"
3332 #include "teraterm.h"
3433 #include <stdio.h>
3534 #include <string.h>
--- trunk/ttssh2/ttxssh/ttxssh.c (revision 9229)
+++ trunk/ttssh2/ttxssh/ttxssh.c (revision 9230)
@@ -33,7 +33,6 @@
3333 Tera Term by Takashi Teranishi (teranishi@rikaxp.riken.go.jp)
3434 */
3535
36-#include "teraterm_conf.h"
3736 #include "ttxssh.h"
3837 #include "fwdui.h"
3938 #include "util.h"
@@ -2273,14 +2272,6 @@
22732272 SendMessage(GetDlgItem(dlg, IDC_PUTTY_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
22742273 }
22752274
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-
22842275 static WNDPROC g_defAboutDlgEditWndProc; // Edit Controlのサブクラス化用
22852276 static int g_deltaSumAboutDlg = 0; // マウスホイールのDelta累積用
22862277
Show on old repository browser