Remove a workaround code for Visual C++ 2010 (KB813540)

Mozc no longer supports Visual C++ 2010. We don't need to work around KB813540 anymore. http://support.microsoft.com/kb/813540 This is just a removal of dead code. No behavior change is intended. BUG=none TEST=compile git-svn-id: https://mozc.googlecode.com/svn/trunk@510 a6090854-d499-a067-5803-1114d4e51264
google · Jan 25, 2015 · 091dc3b · 091dc3b
1 parent 1423238
commit 091dc3b
Show file tree

Hide file tree

Showing 68 changed files with 66 additions and 187 deletions.
diff --git a/src/base/update_checker.cc b/src/base/update_checker.cc
@@ -33,8 +33,7 @@
 #include <Windows.h>
 #include <tchar.h>
 #include <strsafe.h>
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 
 #include <string>

diff --git a/src/base/win_util.cc b/src/base/win_util.cc
@@ -36,10 +36,9 @@
 #include <Psapi.h>
 #include <Winternl.h>
 
-// Workaround against KB813540
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 
 #include <clocale>
 #include <memory>

diff --git a/src/config/stats_config_util.cc b/src/config/stats_config_util.cc
@@ -35,8 +35,7 @@
 #include <shlobj.h>
 #include <time.h>
 #include <sddl.h>
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #else
 #include <pwd.h>
 #include <sys/stat.h>

diff --git a/src/gui/base/win_util.cc b/src/gui/base/win_util.cc
@@ -36,8 +36,7 @@
 #include <vssym32.h>
 #include <windows.h>
 #include <winuser.h>
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <atlstr.h>
 #include <atlwin.h>

diff --git a/src/gyp/common.gypi b/src/gyp/common.gypi
@@ -684,11 +684,6 @@
         'include_dirs': [
           '<@(msvs_includes)',
           '<(additional_third_party_dir)/wtl/files/include',
-          # Add atl_wrapper dir into the 'include_dirs' so that we can
-          # include the header file as <atlbase_mozc.h>, which
-          # is more lintian-friendly than "atlbase_mozc.h".
-          # See b/5101916 for the background information.
-          '<(DEPTH)/win32/atl_wrapper',
         ],
         'msvs_cygwin_shell': 0,
         'msvs_disabled_warnings': ['<@(msvc_disabled_warnings)'],  # /wdXXXX

diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=16
-BUILD=2036
+BUILD=2037
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.

diff --git a/src/renderer/renderer_style_handler.cc b/src/renderer/renderer_style_handler.cc
@@ -33,8 +33,7 @@
 #include <windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlgdi.h>
 #endif  // OS_WIN

diff --git a/src/renderer/win32/candidate_window.h b/src/renderer/win32/candidate_window.h
@@ -33,8 +33,7 @@
 #include <windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlwin.h>
 #include <atlapp.h>
 #include <atlcrack.h>

diff --git a/src/renderer/win32/composition_window.cc b/src/renderer/win32/composition_window.cc
@@ -32,8 +32,7 @@
 #include <windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlgdi.h>

diff --git a/src/renderer/win32/indicator_window.cc b/src/renderer/win32/indicator_window.cc
@@ -32,8 +32,7 @@
 #include <windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlwin.h>
 #include <atlapp.h>
 #include <atlcrack.h>

diff --git a/src/renderer/win32/infolist_window.h b/src/renderer/win32/infolist_window.h
@@ -33,8 +33,7 @@
 #include <windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlwin.h>
 #include <atlapp.h>
 #include <atlcrack.h>

diff --git a/src/renderer/win32/text_renderer.cc b/src/renderer/win32/text_renderer.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <objbase.h>
 #include <d2d1.h>

diff --git a/src/renderer/win32/text_renderer.h b/src/renderer/win32/text_renderer.h
@@ -33,8 +33,7 @@
 #include <windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlmisc.h>
 

diff --git a/src/renderer/win32/win32_image_util.cc b/src/renderer/win32/win32_image_util.cc
@@ -33,8 +33,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlmisc.h>
 #include <atlgdi.h>

diff --git a/src/renderer/win32/win32_image_util_test.cc b/src/renderer/win32/win32_image_util_test.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlgdi.h>
 #include <atlmisc.h>

diff --git a/src/renderer/win32/win32_renderer_util.cc b/src/renderer/win32/win32_renderer_util.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlgdi.h>
 #include <atlmisc.h>

diff --git a/src/renderer/win32/win32_renderer_util_test.cc b/src/renderer/win32/win32_renderer_util_test.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlgdi.h>
 #include <atlmisc.h>

diff --git a/src/server/mozc_cache_service.cc b/src/server/mozc_cache_service.cc
@@ -31,8 +31,7 @@
 #define PSAPI_VERSION 1  // for <psapi.h>
 #include <windows.h>
 #if !defined(NO_LOGGING)
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlstr.h>  // for CString
 #endif  // !NO_LOGGING
 #include <psapi.h>

diff --git a/src/win32/atl_wrapper/atlbase_mozc.h b/src/win32/atl_wrapper/atlbase_mozc.h
diff --git a/src/win32/base/accessible_object.cc b/src/win32/base/accessible_object.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 
 #include <string>

diff --git a/src/win32/base/accessible_object.h b/src/win32/base/accessible_object.h
@@ -34,8 +34,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 
 #include <vector>

diff --git a/src/win32/base/browser_info.cc b/src/win32/base/browser_info.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 
 #include <string>

diff --git a/src/win32/base/focus_hierarchy_observer.cc b/src/win32/base/focus_hierarchy_observer.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 
 #include <memory>

diff --git a/src/win32/base/imm_registrar.cc b/src/win32/base/imm_registrar.cc
@@ -32,8 +32,7 @@
 
 #include <windows.h>
 #include <WinNls32.h>
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <strsafe.h>
 
 #include <iomanip>

diff --git a/src/win32/base/imm_util.cc b/src/win32/base/imm_util.cc
@@ -30,8 +30,7 @@
 #include "win32/base/imm_util.h"
 
 #include <windows.h>
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlstr.h>
 #include <imm.h>
 #include <msctf.h>

diff --git a/src/win32/base/migration_util.cc b/src/win32/base/migration_util.cc
@@ -33,8 +33,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlstr.h>
 
 #include <strsafe.h>

diff --git a/src/win32/base/omaha_util.cc b/src/win32/base/omaha_util.cc
@@ -40,8 +40,7 @@
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
 #define _ATL_NO_HOSTING
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 
 #include <string>
 

diff --git a/src/win32/base/text_icon.cc b/src/win32/base/text_icon.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlmisc.h>
 #include <atlgdi.h>

diff --git a/src/win32/base/text_icon_test.cc b/src/win32/base/text_icon_test.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlmisc.h>
 #include <atlgdi.h>

diff --git a/src/win32/base/tsf_registrar.cc b/src/win32/base/tsf_registrar.cc
@@ -32,8 +32,7 @@
 #include <windows.h>
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <msctf.h>
 #include <objbase.h>
 

diff --git a/src/win32/base/uninstall_helper.cc b/src/win32/base/uninstall_helper.cc
@@ -31,8 +31,7 @@
 
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlcom.h>
 #include <msctf.h>
 #include <strsafe.h>

diff --git a/src/win32/base/win32_window_util.cc b/src/win32/base/win32_window_util.cc
@@ -32,8 +32,7 @@
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _WTL_NO_AUTOMATIC_NAMESPACE
 #define _ATL_NO_HOSTING
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlapp.h>
 #include <atlwin.h>
 #include <atlstr.h>

diff --git a/src/win32/custom_action/custom_action.cc b/src/win32/custom_action/custom_action.cc
@@ -30,8 +30,7 @@
 #include "win32/custom_action/custom_action.h"
 
 #include <windows.h>
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #if !defined(NO_LOGGING)
 #include <atlstr.h>
 #endif  // !NO_LOGGING

diff --git a/src/win32/ime/ime_input_context.cc b/src/win32/ime/ime_input_context.cc
@@ -30,8 +30,7 @@
 #include "win32/ime/ime_input_context.h"
 
 #define _ATL_NO_HOSTING  // prevents including <dimm.h>
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 #include <atlwin.h>
 
 #include "base/logging.h"

diff --git a/src/win32/ime/ime_language_bar.h b/src/win32/ime/ime_language_bar.h
@@ -34,8 +34,7 @@
 #include <rpcsal.h>
 #include <msctf.h>
 #include <ctffunc.h>
-// Workaround against KB813540
-#include <atlbase_mozc.h>
+#include <atlbase.h>
 
 #include "base/port.h"
 #include "session/commands.pb.h"