Use constants defined in the latest Windows SDK.

The Windows SDK has been updated to Windows SDK 8.1. We no longer need to define them in our source code. This is just a removal of unnecessary constant definitions. Hence no behavior change is intended. BUG=none TEST=compile REF_BUG=18970800,19010851 REF_CL=84602712
google · Sep 5, 2015 · fd0f5b3 · fd0f5b3
1 parent 859f62a
commit fd0f5b3
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 100 deletions.
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=17
-BUILD=2115
+BUILD=2116
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.

diff --git a/src/win32/base/tsf_registrar.cc b/src/win32/base/tsf_registrar.cc
@@ -61,24 +61,15 @@ const wchar_t kTipInProcServer32[] = L"InProcServer32";
 const wchar_t kTipThreadingModel[] = L"ThreadingModel";
 const wchar_t kTipTextServiceModel[] = L"Apartment";
 
-// GUID_TFCAT_TIPCAP_IMMERSIVESUPPORT
-const GUID KGuidTfcatTipcapImmersiveSupport = {
-  0x13a016df, 0x560b, 0x46cd, {0x94, 0x7a, 0x4c, 0x3a, 0xf1, 0xe0, 0xe3, 0x5d}
-};
-// GUID_TFCAT_TIPCAP_SYSTRAYSUPPORT
-const GUID KGuidTfcatTipcapSystraySupport = {
-  0x25504fb4, 0x7bab, 0x4bc1, {0x9c, 0x69, 0xcf, 0x81, 0x89, 0x0f, 0x0e, 0xf5}
-};
-
 // The categories this text service is registered under.
 const GUID kCategories[] = {
   GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER,     // It supports inline input.
   GUID_TFCAT_TIPCAP_COMLESS,               // It's a COM-Less module.
   GUID_TFCAT_TIPCAP_INPUTMODECOMPARTMENT,  // It supports input mode.
   GUID_TFCAT_TIPCAP_UIELEMENTENABLED,      // It supports UI less mode.
   GUID_TFCAT_TIP_KEYBOARD,                 // It's a keyboard input method.
-  KGuidTfcatTipcapImmersiveSupport,        // It supports Metro mode.
-  KGuidTfcatTipcapSystraySupport,          // It supports Win8 systray.
+  GUID_TFCAT_TIPCAP_IMMERSIVESUPPORT,      // It supports Metro mode.
+  GUID_TFCAT_TIPCAP_SYSTRAYSUPPORT,        // It supports Win8 systray.
 };
 
 }  // namespace

diff --git a/src/win32/tip/tip_linguistic_alternates.cc b/src/win32/tip/tip_linguistic_alternates.cc
@@ -49,26 +49,6 @@
 using ::ATL::CComPtr;
 using ::std::unique_ptr;
 
-// ITfFnGetLinguisticAlternates is available on Windows 8.1 SDK and later.
-#ifndef __ITfFnGetLinguisticAlternates_INTERFACE_DEFINED__
-#define __ITfFnGetLinguisticAlternates_INTERFACE_DEFINED__
-
-// {ea163ce2-7a65-4506-82a3-c528215da64e}
-const IID IID_ITfFnGetLinguisticAlternates = {
-  0xea163ce2, 0x7a65, 0x4506, {0x82, 0xa3, 0xc5, 0x28, 0x21, 0x5d, 0xa6, 0x4e}
-};
-
-// Note: "ea163ce2-7a65-4506-82a3-c528215da64e" is equivalent to
-// IID_ITfFnSearchCandidateProvider
-struct __declspec(uuid("ea163ce2-7a65-4506-82a3-c528215da64e"))
-ITfFnGetLinguisticAlternates : public ITfFunction {
- public:
-  virtual HRESULT STDMETHODCALLTYPE GetAlternates(
-      ITfRange *range,
-      ITfCandidateList **candidate_list) = 0;
-};
-#endif  // !__ITfFnSearchCandidateProvider_INTERFACE_DEFINED__
-
 namespace mozc {
 namespace win32 {
 namespace tsf {

diff --git a/src/win32/tip/tip_preferred_touch_keyboard.cc b/src/win32/tip/tip_preferred_touch_keyboard.cc
@@ -46,43 +46,6 @@ namespace {
 
 using ATL::CComPtr;
 
-// SPI_GETTHREADLOCALINPUTSETTINGS is available on Windows 8 SDK and later.
-#ifndef SPI_SETTHREADLOCALINPUTSETTINGS
-#define SPI_SETTHREADLOCALINPUTSETTINGS 0x104F
-#endif  // SPI_SETTHREADLOCALINPUTSETTINGS
-
-// ITfFnGetPreferredTouchKeyboardLayout is available on Windows 8 SDK and later.
-#ifndef TKBL_UNDEFINED
-#define TKBL_UNDEFINED                             0x0000
-#define TKBL_CLASSIC_TRADITIONAL_CHINESE_PHONETIC  0x0404
-#define TKBL_CLASSIC_TRADITIONAL_CHINESE_CHANGJIE  0xF042
-#define TKBL_CLASSIC_TRADITIONAL_CHINESE_DAYI      0xF043
-#define TKBL_OPT_JAPANESE_ABC                      0x0411
-#define TKBL_OPT_KOREAN_HANGUL_2_BULSIK            0x0412
-#define TKBL_OPT_SIMPLIFIED_CHINESE_PINYIN         0x0804
-#define TKBL_OPT_TRADITIONAL_CHINESE_PHONETIC      0x0404
-
-enum TKBLayoutType {
-  TKBLT_UNDEFINED = 0,
-  TKBLT_CLASSIC = 1,
-  TKBLT_OPTIMIZED = 2
-};
-
-// {5F309A41-590A-4ACC-A97F-D8EFFF13FDFC}
-const IID IID_ITfFnGetPreferredTouchKeyboardLayout = {
-  0x5f309a41, 0x590a, 0x4acc, {0xa9, 0x7f, 0xd8, 0xef, 0xff, 0x13, 0xfd, 0xfc}
-};
-
-// Note: "5F309A41-590A-4ACC-A97F-D8EFFF13FDFC" is equivalent to
-// IID_ITfFnGetPreferredTouchKeyboardLayout
-struct __declspec(uuid("5F309A41-590A-4ACC-A97F-D8EFFF13FDFC"))
-ITfFnGetPreferredTouchKeyboardLayout : public ITfFunction {
- public:
-  virtual HRESULT STDMETHODCALLTYPE GetLayout(TKBLayoutType *layout_type,
-                                              WORD *preferred_layout_id) = 0;
-};
-#endif  // !TKBL_UNDEFINED
-
 #ifdef GOOGLE_JAPANESE_INPUT_BUILD
 const wchar_t kGetPreferredTouchKeyboardLayoutDisplayName[] =
     L"Google Japanese Input: GetPreferredTouchKeyboardLayout Function";

diff --git a/src/win32/tip/tip_search_candidate_provider.cc b/src/win32/tip/tip_search_candidate_provider.cc
@@ -47,32 +47,6 @@
 using ::ATL::CComPtr;
 using ::std::unique_ptr;
 
-// ITfFnSearchCandidateProvider is available on Windows 8 SDK and later.
-#ifndef __ITfFnSearchCandidateProvider_INTERFACE_DEFINED__
-#define __ITfFnSearchCandidateProvider_INTERFACE_DEFINED__
-
-// {87a2ad8f-f27b-4920-8501-67602280175d}
-const IID IID_ITfFnSearchCandidateProvider = {
-  0x87a2ad8f, 0xf27b, 0x4920, {0x85, 0x01, 0x67, 0x60, 0x22, 0x80, 0x17, 0x5d}
-};
-
-// Note: "87a2ad8f-f27b-4920-8501-67602280175d" is equivalent to
-// IID_ITfFnSearchCandidateProvider
-struct __declspec(uuid("87a2ad8f-f27b-4920-8501-67602280175d"))
-ITfFnSearchCandidateProvider : public ITfFunction {
- public:
-  virtual HRESULT STDMETHODCALLTYPE GetSearchCandidates(
-      BSTR query,
-      BSTR application_id,
-      ITfCandidateList **candidate_list) = 0;
-
-  virtual HRESULT STDMETHODCALLTYPE SetResult(
-      BSTR query,
-      BSTR application_id,
-      BSTR result) = 0;
-};
-#endif  // !__ITfFnSearchCandidateProvider_INTERFACE_DEFINED__
-
 namespace mozc {
 namespace win32 {
 namespace tsf {

diff --git a/src/win32/tip/tip_text_service.cc b/src/win32/tip/tip_text_service.cc
@@ -151,11 +151,6 @@ const GUID kTipFunctionProvider = {
 
 #endif
 
-// This flag is available in Windows SDK 8.0 and later.
-#ifndef TF_TMF_IMMERSIVEMODE
-#define TF_TMF_IMMERSIVEMODE  0x40000000
-#endif  // !TF_TMF_IMMERSIVEMODE
-
 HRESULT SpawnTool(const string &command) {
   if (!Process::SpawnMozcProcess(kMozcTool, "--mode=" + command)) {
     return E_FAIL;