Commit 091dc3bafa1645432dd9b8ba1ba0f77645d39c1a - mozc

+1

-2

src/base/update_checker.cc less more

32	32	#include <Windows.h>
33	33	#include <tchar.h>
34	34	#include <strsafe.h>
35		// Workaround against KB813540
36		#include <atlbase_mozc.h>
	35	#include <atlbase.h>
37	36	#include <atlcom.h>
38	37
39	38	#include <string>

+1

-2

src/base/win_util.cc less more

35	35	#include <Psapi.h>
36	36	#include <Winternl.h>
37	37
38		// Workaround against KB813540
39	38	#define _ATL_NO_AUTOMATIC_NAMESPACE
40	39	#define _WTL_NO_AUTOMATIC_NAMESPACE
41		#include <atlbase_mozc.h>
	40	#include <atlbase.h>
42	41
43	42	#include <clocale>
44	43	#include <memory>

+1

-2

src/config/stats_config_util.cc less more

34	34	#include <shlobj.h>
35	35	#include <time.h>
36	36	#include <sddl.h>
37		// Workaround against KB813540
38		#include <atlbase_mozc.h>
	37	#include <atlbase.h>
39	38	#else
40	39	#include <pwd.h>
41	40	#include <sys/stat.h>

+1

-2

src/gui/base/win_util.cc less more

35	35	#include <vssym32.h>
36	36	#include <windows.h>
37	37	#include <winuser.h>
38		// Workaround against KB813540
39		#include <atlbase_mozc.h>
	38	#include <atlbase.h>
40	39	#include <atlcom.h>
41	40	#include <atlstr.h>
42	41	#include <atlwin.h>

+0

-5

src/gyp/common.gypi less more

683	683	'include_dirs': [
684	684	'<@(msvs_includes)',
685	685	'<(additional_third_party_dir)/wtl/files/include',
686		# Add atl_wrapper dir into the 'include_dirs' so that we can
687		# include the header file as <atlbase_mozc.h>, which
688		# is more lintian-friendly than "atlbase_mozc.h".
689		# See b/5101916 for the background information.
690		'<(DEPTH)/win32/atl_wrapper',
691	686	],
692	687	'msvs_cygwin_shell': 0,
693	688	'msvs_disabled_warnings': ['<@(msvc_disabled_warnings)'], # /wdXXXX

+1

-1

src/mozc_version_template.txt less more

0	0	MAJOR=2
1	1	MINOR=16
2		BUILD=2036
	2	BUILD=2037
3	3	REVISION=102
4	4	# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
5	5	# downloaded by NaCl Mozc.

+1

-2

src/renderer/renderer_style_handler.cc less more

32	32	#include <windows.h>
33	33	#define _ATL_NO_AUTOMATIC_NAMESPACE
34	34	#define _WTL_NO_AUTOMATIC_NAMESPACE
35		// Workaround against KB813540
36		#include <atlbase_mozc.h>
	35	#include <atlbase.h>
37	36	#include <atlapp.h>
38	37	#include <atlgdi.h>
39	38	#endif // OS_WIN

+1

-2

src/renderer/win32/candidate_window.h less more

32	32	#include <windows.h>
33	33	#define _ATL_NO_AUTOMATIC_NAMESPACE
34	34	#define _WTL_NO_AUTOMATIC_NAMESPACE
35		// Workaround against KB813540
36		#include <atlbase_mozc.h>
	35	#include <atlbase.h>
37	36	#include <atlwin.h>
38	37	#include <atlapp.h>
39	38	#include <atlcrack.h>

+1

-2

src/renderer/win32/composition_window.cc less more

31	31	#include <windows.h>
32	32	#define _ATL_NO_AUTOMATIC_NAMESPACE
33	33	#define _WTL_NO_AUTOMATIC_NAMESPACE
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <atlapp.h>
37	36	#include <atlcrack.h>
38	37	#include <atlgdi.h>

+1

-2

src/renderer/win32/indicator_window.cc less more

31	31	#include <windows.h>
32	32	#define _ATL_NO_AUTOMATIC_NAMESPACE
33	33	#define _WTL_NO_AUTOMATIC_NAMESPACE
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <atlwin.h>
37	36	#include <atlapp.h>
38	37	#include <atlcrack.h>

+1

-2

src/renderer/win32/infolist_window.h less more

32	32	#include <windows.h>
33	33	#define _ATL_NO_AUTOMATIC_NAMESPACE
34	34	#define _WTL_NO_AUTOMATIC_NAMESPACE
35		// Workaround against KB813540
36		#include <atlbase_mozc.h>
	35	#include <atlbase.h>
37	36	#include <atlwin.h>
38	37	#include <atlapp.h>
39	38	#include <atlcrack.h>

+1

-2

src/renderer/win32/text_renderer.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlcom.h>
36	35	#include <objbase.h>
37	36	#include <d2d1.h>

+1

-2

src/renderer/win32/text_renderer.h less more

32	32	#include <windows.h>
33	33	#define _ATL_NO_AUTOMATIC_NAMESPACE
34	34	#define _WTL_NO_AUTOMATIC_NAMESPACE
35		// Workaround against KB813540
36		#include <atlbase_mozc.h>
	35	#include <atlbase.h>
37	36	#include <atlapp.h>
38	37	#include <atlmisc.h>
39	38

+1

-2

src/renderer/win32/win32_image_util.cc less more

32	32
33	33	#define _ATL_NO_AUTOMATIC_NAMESPACE
34	34	#define _WTL_NO_AUTOMATIC_NAMESPACE
35		// Workaround against KB813540
36		#include <atlbase_mozc.h>
	35	#include <atlbase.h>
37	36	#include <atlapp.h>
38	37	#include <atlmisc.h>
39	38	#include <atlgdi.h>

+1

-2

src/renderer/win32/win32_image_util_test.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlapp.h>
36	35	#include <atlgdi.h>
37	36	#include <atlmisc.h>

+1

-2

src/renderer/win32/win32_renderer_util.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlapp.h>
36	35	#include <atlgdi.h>
37	36	#include <atlmisc.h>

+1

-2

src/renderer/win32/win32_renderer_util_test.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlapp.h>
36	35	#include <atlgdi.h>
37	36	#include <atlmisc.h>

+1

-2

src/server/mozc_cache_service.cc less more

30	30	#define PSAPI_VERSION 1 // for <psapi.h>
31	31	#include <windows.h>
32	32	#if !defined(NO_LOGGING)
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlstr.h> // for CString
36	35	#endif // !NO_LOGGING
37	36	#include <psapi.h>

+0

-51

~~src/win32/atl_wrapper/atlbase_mozc.h~~ less more

0		// Copyright 2010-2015, Google Inc.
1		// All rights reserved.
2		//
3		// Redistribution and use in source and binary forms, with or without
4		// modification, are permitted provided that the following conditions are
5		// met:
6		//
7		// * Redistributions of source code must retain the above copyright
8		// notice, this list of conditions and the following disclaimer.
9		// * Redistributions in binary form must reproduce the above
10		// copyright notice, this list of conditions and the following disclaimer
11		// in the documentation and/or other materials provided with the
12		// distribution.
13		// * Neither the name of Google Inc. nor the names of its
14		// contributors may be used to endorse or promote products derived from
15		// this software without specific prior written permission.
16		//
17		// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
18		// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
19		// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
20		// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
21		// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
22		// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
23		// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24		// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25		// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26		// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27		// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
29		// This header file is made as a workaround againt
30		// http://support.microsoft.com/kb/813540.
31		// See the following thread for details.
32		// http://connect.microsoft.com/VisualStudio/feedback/details/535704/atlcomcli-h-cvartypeinfo-char-cannot-be-compiled-with-j-or-char-unsigned-flage-enabled
33		//
34		// TODO(yukawa): Remove this hack once we have switched to Visual C++ 2012 or
35		// later.
36
37		#ifndef MOZC_WIN32_ATL_WRAPPER_ATL_BASE_MOZC_H_
38		#define MOZC_WIN32_ATL_WRAPPER_ATL_BASE_MOZC_H_
39
40		#if _MSC_VER == 1600
41		#include <atldef.h>
42		#pragma push_macro("ATLSTATIC_ASSERT")
43		#undef ATLSTATIC_ASSERT
44		#define ATLSTATIC_ASSERT(a, b)
45		#include <atlcomcli.h>
46		#pragma pop_macro("ATLSTATIC_ASSERT")
47		#endif // _MSC_VER == 1600
48		#include <atlbase.h>
49
50		#endif // MOZC_WIN32_ATL_WRAPPER_ATL_BASE_MOZC_H_

+1

-2

src/win32/base/accessible_object.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlcom.h>
36	35
37	36	#include <string>

+1

-2

src/win32/base/accessible_object.h less more

33	33
34	34	#define _ATL_NO_AUTOMATIC_NAMESPACE
35	35	#define _WTL_NO_AUTOMATIC_NAMESPACE
36		// Workaround against KB813540
37		#include <atlbase_mozc.h>
	36	#include <atlbase.h>
38	37	#include <atlcom.h>
39	38
40	39	#include <vector>

+1

-2

src/win32/base/browser_info.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlcom.h>
36	35
37	36	#include <string>

+1

-2

src/win32/base/focus_hierarchy_observer.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlcom.h>
36	35
37	36	#include <memory>

+1

-2

src/win32/base/imm_registrar.cc less more

31	31
32	32	#include <windows.h>
33	33	#include <WinNls32.h>
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <strsafe.h>
37	36
38	37	#include <iomanip>

+1

-2

src/win32/base/imm_util.cc less more

29	29	#include "win32/base/imm_util.h"
30	30
31	31	#include <windows.h>
32		// Workaround against KB813540
33		#include <atlbase_mozc.h>
	32	#include <atlbase.h>
34	33	#include <atlstr.h>
35	34	#include <imm.h>
36	35	#include <msctf.h>

+1

-2

src/win32/base/migration_util.cc less more

32	32
33	33	#define _ATL_NO_AUTOMATIC_NAMESPACE
34	34	#define _WTL_NO_AUTOMATIC_NAMESPACE
35		// Workaround against KB813540
36		#include <atlbase_mozc.h>
	35	#include <atlbase.h>
37	36	#include <atlstr.h>
38	37
39	38	#include <strsafe.h>

+1

-2

src/win32/base/omaha_util.cc less more

39	39	#define _ATL_NO_AUTOMATIC_NAMESPACE
40	40	#define _WTL_NO_AUTOMATIC_NAMESPACE
41	41	#define _ATL_NO_HOSTING
42		// Workaround against KB813540
43		#include <atlbase_mozc.h>
	42	#include <atlbase.h>
44	43
45	44	#include <string>
46	45

+1

-2

src/win32/base/text_icon.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlapp.h>
36	35	#include <atlmisc.h>
37	36	#include <atlgdi.h>

+1

-2

src/win32/base/text_icon_test.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlapp.h>
36	35	#include <atlmisc.h>
37	36	#include <atlgdi.h>

+1

-2

src/win32/base/tsf_registrar.cc less more

31	31	#include <windows.h>
32	32	#define _ATL_NO_AUTOMATIC_NAMESPACE
33	33	#define _WTL_NO_AUTOMATIC_NAMESPACE
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <msctf.h>
37	36	#include <objbase.h>
38	37

+1

-2

src/win32/base/uninstall_helper.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlcom.h>
36	35	#include <msctf.h>
37	36	#include <strsafe.h>

+1

-2

src/win32/base/win32_window_util.cc less more

31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33	33	#define _ATL_NO_HOSTING
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <atlapp.h>
37	36	#include <atlwin.h>
38	37	#include <atlstr.h>

+1

-2

src/win32/custom_action/custom_action.cc less more

29	29	#include "win32/custom_action/custom_action.h"
30	30
31	31	#include <windows.h>
32		// Workaround against KB813540
33		#include <atlbase_mozc.h>
	32	#include <atlbase.h>
34	33	#if !defined(NO_LOGGING)
35	34	#include <atlstr.h>
36	35	#endif // !NO_LOGGING

+1

-2

src/win32/ime/ime_input_context.cc less more

29	29	#include "win32/ime/ime_input_context.h"
30	30
31	31	#define _ATL_NO_HOSTING // prevents including <dimm.h>
32		// Workaround against KB813540
33		#include <atlbase_mozc.h>
	32	#include <atlbase.h>
34	33	#include <atlwin.h>
35	34
36	35	#include "base/logging.h"

+1

-2

src/win32/ime/ime_language_bar.h less more

33	33	#include <rpcsal.h>
34	34	#include <msctf.h>
35	35	#include <ctffunc.h>
36		// Workaround against KB813540
37		#include <atlbase_mozc.h>
	36	#include <atlbase.h>
38	37
39	38	#include "base/port.h"
40	39	#include "session/commands.pb.h"

+1

-2

src/win32/ime/ime_language_bar_menu.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlapp.h>
36	35	#include <atlmisc.h>
37	36	#include <atlgdi.h>

+1

-2

src/win32/ime/ime_types.cc less more

31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33	33	#define _ATL_NO_HOSTING
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <atlapp.h>
37	36	#include <atlwin.h>
38	37	#include <atlmisc.h>

+1

-2

src/win32/ime/ime_ui_context.cc less more

31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33	33	#define _ATL_NO_HOSTING
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <atlapp.h>
37	36	#include <atlstr.h>
38	37	#include <atlmisc.h>

+1

-2

src/win32/ime/ime_ui_window.cc less more

31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33	33	#define _ATL_NO_HOSTING
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <atlapp.h>
37	36	#include <atlstr.h>
38	37	#include <atlwin.h>

+1

-2

src/win32/tip/tip_candidate_list.cc less more

31	31	#include <Windows.h>
32	32	#define _ATL_NO_AUTOMATIC_NAMESPACE
33	33	#define _WTL_NO_AUTOMATIC_NAMESPACE
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <atlcom.h>
37	36	#include <ctffunc.h>
38	37

+1

-2

src/win32/tip/tip_candidate_list_test.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlcom.h>
36	35	#include <ctffunc.h>
37	36

+1

-2

src/win32/tip/tip_class_factory.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlcom.h>
36	35
37	36	#include "win32/tip/tip_dll_module.h"

+1

-2

src/win32/tip/tip_compartment_util.h less more

32	32	#include <Windows.h>
33	33	#define _ATL_NO_AUTOMATIC_NAMESPACE
34	34	#define _WTL_NO_AUTOMATIC_NAMESPACE
35		// Workaround against KB813540
36		#include <atlbase_mozc.h>
	35	#include <atlbase.h>
37	36	#include <atlcom.h>
38	37	#include <msctf.h>
39	38

+1

-2

src/win32/tip/tip_composition_util.h less more

32	32	#include <Windows.h>
33	33	#define _ATL_NO_AUTOMATIC_NAMESPACE
34	34	#define _WTL_NO_AUTOMATIC_NAMESPACE
35		// Workaround against KB813540
36		#include <atlbase_mozc.h>
	35	#include <atlbase.h>
37	36	#include <atlcom.h>
38	37	#include <msctf.h>
39	38

+1

-2

src/win32/tip/tip_display_attributes_test.cc less more

28	28
29	29	#define _ATL_NO_AUTOMATIC_NAMESPACE
30	30	#define _WTL_NO_AUTOMATIC_NAMESPACE
31		// Workaround against KB813540
32		#include <atlbase_mozc.h>
	31	#include <atlbase.h>
33	32	#include <atlcom.h>
34	33
35	34	#include "testing/base/public/googletest.h"

+1

-2

src/win32/tip/tip_edit_session.cc less more

32	32
33	33	#define _ATL_NO_AUTOMATIC_NAMESPACE
34	34	#define _WTL_NO_AUTOMATIC_NAMESPACE
35		// Workaround against KB813540
36		#include <atlbase_mozc.h>
	35	#include <atlbase.h>
37	36	#include <atlcom.h>
38	37
39	38	#include <string>

+1

-2

src/win32/tip/tip_edit_session_impl.cc less more

31	31	#include <Windows.h>
32	32	#define _ATL_NO_AUTOMATIC_NAMESPACE
33	33	#define _WTL_NO_AUTOMATIC_NAMESPACE
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <atlcom.h>
37	36	#include <msctf.h>
38	37

+1

-2

src/win32/tip/tip_enum_display_attributes_test.cc less more

28	28
29	29	#define _ATL_NO_AUTOMATIC_NAMESPACE
30	30	#define _WTL_NO_AUTOMATIC_NAMESPACE
31		// Workaround against KB813540
32		#include <atlbase_mozc.h>
	31	#include <atlbase.h>
33	32	#include <atlcom.h>
34	33
35	34	#include "testing/base/public/googletest.h"

+1

-2

src/win32/tip/tip_keyevent_handler.cc less more

31	31	#include <Windows.h>
32	32	#define _ATL_NO_AUTOMATIC_NAMESPACE
33	33	#define _WTL_NO_AUTOMATIC_NAMESPACE
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <atlcom.h>
37	36	#include <msctf.h>
38	37

+1

-2

src/win32/tip/tip_lang_bar.h less more

35	35	#define _ATL_NO_AUTOMATIC_NAMESPACE
36	36	#define _WTL_NO_AUTOMATIC_NAMESPACE
37	37	#define _ATL_NO_HOSTING
38		// Workaround against KB813540
39		#include <atlbase_mozc.h>
	38	#include <atlbase.h>
40	39	#include <atlcom.h>
41	40	#include <ctffunc.h>
42	41	#include <msctf.h>

+1

-2

src/win32/tip/tip_lang_bar_menu.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlapp.h>
36	35	#include <atlmisc.h>
37	36	#include <atlgdi.h>

+1

-2

src/win32/tip/tip_linguistic_alternates.cc less more

31	31	#include <Windows.h>
32	32	#define _ATL_NO_AUTOMATIC_NAMESPACE
33	33	#define _WTL_NO_AUTOMATIC_NAMESPACE
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <atlcom.h>
37	36	#include <Ctffunc.h>
38	37

+1

-2

src/win32/tip/tip_preferred_touch_keyboard.cc less more

31	31	#include <Windows.h>
32	32	#define _ATL_NO_AUTOMATIC_NAMESPACE
33	33	#define _WTL_NO_AUTOMATIC_NAMESPACE
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <atlcom.h>
37	36	#include <Ctffunc.h>
38	37

+1

-2

src/win32/tip/tip_range_util.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlcom.h>
36	35
37	36	#include <limits>

+1

-2

src/win32/tip/tip_reconvert_function.cc less more

31	31	#include <Windows.h>
32	32	#define _ATL_NO_AUTOMATIC_NAMESPACE
33	33	#define _WTL_NO_AUTOMATIC_NAMESPACE
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <atlcom.h>
37	36	#include <Ctffunc.h>
38	37

+1

-2

src/win32/tip/tip_search_candidate_provider.cc less more

31	31	#include <Windows.h>
32	32	#define _ATL_NO_AUTOMATIC_NAMESPACE
33	33	#define _WTL_NO_AUTOMATIC_NAMESPACE
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <atlcom.h>
37	36	#include <Ctffunc.h>
38	37

+1

-2

src/win32/tip/tip_status.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlcom.h>
36	35
37	36	#include <string>

+1

-2

src/win32/tip/tip_surrounding_text.cc less more

31	31	#include <Windows.h>
32	32	#define _ATL_NO_AUTOMATIC_NAMESPACE
33	33	#define _WTL_NO_AUTOMATIC_NAMESPACE
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <atlcom.h>
37	36	#include <msctf.h>
38	37

+1

-2

src/win32/tip/tip_text_service.cc less more

31	31	#include <Ime.h>
32	32	#define _ATL_NO_AUTOMATIC_NAMESPACE
33	33	#define _WTL_NO_AUTOMATIC_NAMESPACE
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <atlcom.h>
37	36	#include <objbase.h>
38	37

+1

-2

src/win32/tip/tip_transitory_extension.cc less more

31	31	#include <Windows.h>
32	32	#define _ATL_NO_AUTOMATIC_NAMESPACE
33	33	#define _WTL_NO_AUTOMATIC_NAMESPACE
34		// Workaround against KB813540
35		#include <atlbase_mozc.h>
	34	#include <atlbase.h>
36	35	#include <atlcom.h>
37	36	#include <msctf.h>
38	37

+1

-2

src/win32/tip/tip_transitory_extension.h less more

32	32	#include <Windows.h>
33	33	#define _ATL_NO_AUTOMATIC_NAMESPACE
34	34	#define _WTL_NO_AUTOMATIC_NAMESPACE
35		// Workaround against KB813540
36		#include <atlbase_mozc.h>
	35	#include <atlbase.h>
37	36	#include <atlcom.h>
38	37	#include <msctf.h>
39	38

+1

-2

src/win32/tip/tip_ui_element_conventional.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlcom.h>
36	35	#include <atlstr.h>
37	36	#include <msctf.h>

+1

-2

src/win32/tip/tip_ui_element_delegate.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlcom.h>
36	35	#include <atlstr.h>
37	36	#include <msctf.h>

+1

-2

src/win32/tip/tip_ui_element_immersive.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlcom.h>
36	35	#include <atlapp.h>
37	36	#include <atlmisc.h>

+1

-2

src/win32/tip/tip_ui_element_manager.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlcom.h>
36	35	#include <atlstr.h>
37	36	#include <msctf.h>

+1

-2

src/win32/tip/tip_ui_handler_conventional.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlcom.h>
36	35	#include <msctf.h>
37	36	#include <CommCtrl.h> // for CCSIZEOF_STRUCT

+1

-2

src/win32/tip/tip_ui_handler_immersive.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlcom.h>
36	35	#include <atlapp.h>
37	36	#include <atlmisc.h>

+1

-2

src/win32/tip/tip_ui_renderer_immersive.cc less more

30	30
31	31	#define _ATL_NO_AUTOMATIC_NAMESPACE
32	32	#define _WTL_NO_AUTOMATIC_NAMESPACE
33		// Workaround against KB813540
34		#include <atlbase_mozc.h>
	33	#include <atlbase.h>
35	34	#include <atlapp.h>
36	35	#include <atlmisc.h>
37	36