Permalink
Browse files

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
  • Loading branch information...
1 parent 1423238 commit 091dc3bafa1645432dd9b8ba1ba0f77645d39c1a @yukawa yukawa committed Jan 25, 2015
Showing with 66 additions and 187 deletions.
  1. +1 −2 src/base/update_checker.cc
  2. +1 −2 src/base/win_util.cc
  3. +1 −2 src/config/stats_config_util.cc
  4. +1 −2 src/gui/base/win_util.cc
  5. +0 −5 src/gyp/common.gypi
  6. +1 −1 src/mozc_version_template.txt
  7. +1 −2 src/renderer/renderer_style_handler.cc
  8. +1 −2 src/renderer/win32/candidate_window.h
  9. +1 −2 src/renderer/win32/composition_window.cc
  10. +1 −2 src/renderer/win32/indicator_window.cc
  11. +1 −2 src/renderer/win32/infolist_window.h
  12. +1 −2 src/renderer/win32/text_renderer.cc
  13. +1 −2 src/renderer/win32/text_renderer.h
  14. +1 −2 src/renderer/win32/win32_image_util.cc
  15. +1 −2 src/renderer/win32/win32_image_util_test.cc
  16. +1 −2 src/renderer/win32/win32_renderer_util.cc
  17. +1 −2 src/renderer/win32/win32_renderer_util_test.cc
  18. +1 −2 src/server/mozc_cache_service.cc
  19. +0 −51 src/win32/atl_wrapper/atlbase_mozc.h
  20. +1 −2 src/win32/base/accessible_object.cc
  21. +1 −2 src/win32/base/accessible_object.h
  22. +1 −2 src/win32/base/browser_info.cc
  23. +1 −2 src/win32/base/focus_hierarchy_observer.cc
  24. +1 −2 src/win32/base/imm_registrar.cc
  25. +1 −2 src/win32/base/imm_util.cc
  26. +1 −2 src/win32/base/migration_util.cc
  27. +1 −2 src/win32/base/omaha_util.cc
  28. +1 −2 src/win32/base/text_icon.cc
  29. +1 −2 src/win32/base/text_icon_test.cc
  30. +1 −2 src/win32/base/tsf_registrar.cc
  31. +1 −2 src/win32/base/uninstall_helper.cc
  32. +1 −2 src/win32/base/win32_window_util.cc
  33. +1 −2 src/win32/custom_action/custom_action.cc
  34. +1 −2 src/win32/ime/ime_input_context.cc
  35. +1 −2 src/win32/ime/ime_language_bar.h
  36. +1 −2 src/win32/ime/ime_language_bar_menu.cc
  37. +1 −2 src/win32/ime/ime_types.cc
  38. +1 −2 src/win32/ime/ime_ui_context.cc
  39. +1 −2 src/win32/ime/ime_ui_window.cc
  40. +1 −2 src/win32/tip/tip_candidate_list.cc
  41. +1 −2 src/win32/tip/tip_candidate_list_test.cc
  42. +1 −2 src/win32/tip/tip_class_factory.cc
  43. +1 −2 src/win32/tip/tip_compartment_util.h
  44. +1 −2 src/win32/tip/tip_composition_util.h
  45. +1 −2 src/win32/tip/tip_display_attributes_test.cc
  46. +1 −2 src/win32/tip/tip_edit_session.cc
  47. +1 −2 src/win32/tip/tip_edit_session_impl.cc
  48. +1 −2 src/win32/tip/tip_enum_display_attributes_test.cc
  49. +1 −2 src/win32/tip/tip_keyevent_handler.cc
  50. +1 −2 src/win32/tip/tip_lang_bar.h
  51. +1 −2 src/win32/tip/tip_lang_bar_menu.cc
  52. +1 −2 src/win32/tip/tip_linguistic_alternates.cc
  53. +1 −2 src/win32/tip/tip_preferred_touch_keyboard.cc
  54. +1 −2 src/win32/tip/tip_range_util.cc
  55. +1 −2 src/win32/tip/tip_reconvert_function.cc
  56. +1 −2 src/win32/tip/tip_search_candidate_provider.cc
  57. +1 −2 src/win32/tip/tip_status.cc
  58. +1 −2 src/win32/tip/tip_surrounding_text.cc
  59. +1 −2 src/win32/tip/tip_text_service.cc
  60. +1 −2 src/win32/tip/tip_transitory_extension.cc
  61. +1 −2 src/win32/tip/tip_transitory_extension.h
  62. +1 −2 src/win32/tip/tip_ui_element_conventional.cc
  63. +1 −2 src/win32/tip/tip_ui_element_delegate.cc
  64. +1 −2 src/win32/tip/tip_ui_element_immersive.cc
  65. +1 −2 src/win32/tip/tip_ui_element_manager.cc
  66. +1 −2 src/win32/tip/tip_ui_handler_conventional.cc
  67. +1 −2 src/win32/tip/tip_ui_handler_immersive.cc
  68. +1 −2 src/win32/tip/tip_ui_renderer_immersive.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>
@@ -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>
@@ -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>
@@ -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>
View
@@ -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
@@ -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.
@@ -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
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -1,51 +0,0 @@
-// Copyright 2010-2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This header file is made as a workaround againt
-// http://support.microsoft.com/kb/813540.
-// See the following thread for details.
-// http://connect.microsoft.com/VisualStudio/feedback/details/535704/atlcomcli-h-cvartypeinfo-char-cannot-be-compiled-with-j-or-char-unsigned-flage-enabled
-//
-// TODO(yukawa): Remove this hack once we have switched to Visual C++ 2012 or
-// later.
-
-#ifndef MOZC_WIN32_ATL_WRAPPER_ATL_BASE_MOZC_H_
-#define MOZC_WIN32_ATL_WRAPPER_ATL_BASE_MOZC_H_
-
-#if _MSC_VER == 1600
-#include <atldef.h>
-#pragma push_macro("ATLSTATIC_ASSERT")
-#undef ATLSTATIC_ASSERT
-#define ATLSTATIC_ASSERT(a, b)
-#include <atlcomcli.h>
-#pragma pop_macro("ATLSTATIC_ASSERT")
-#endif // _MSC_VER == 1600
-#include <atlbase.h>
-
-#endif // MOZC_WIN32_ATL_WRAPPER_ATL_BASE_MOZC_H_
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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
@@ -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"
@@ -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"
Oops, something went wrong.

0 comments on commit 091dc3b

Please sign in to comment.