Remove dead code that is never used in Windows Vista or later (part 2)
This is a follow up CL for r523 (Mozc 2.16.2040.102).
This CL is just a removal of dead code and redundant code. Hence no behavior change is intended.
BUG=none
TEST=none
git-svn-id: https://mozc.googlecode.com/svn/trunk@537 a6090854-d499-a067-5803-1114d4e51264
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 84372db..6e31ae2 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
MAJOR=2
MINOR=16
-BUILD=2053
+BUILD=2054
REVISION=102
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
# downloaded by NaCl Mozc.
diff --git a/src/server/cache_service_manager.cc b/src/server/cache_service_manager.cc
index 5ea2a98..961a562 100644
--- a/src/server/cache_service_manager.cc
+++ b/src/server/cache_service_manager.cc
@@ -32,7 +32,6 @@
#include "server/cache_service_manager.h"
#include <windows.h>
-#include <shlwapi.h> // for SHLoadIndirectString
#include <strsafe.h>
#include <wincrypt.h>
diff --git a/src/server/server.gyp b/src/server/server.gyp
index 8ab8d51..9f552a8 100644
--- a/src/server/server.gyp
+++ b/src/server/server.gyp
@@ -217,10 +217,6 @@
'VCLinkerTool': {
'AdditionalDependencies': [
'crypt32.lib', # used in 'mozc_cache_service.cc'
- 'shlwapi.lib',
- ],
- 'DelayLoadDLLs': [
- 'shlwapi.dll',
],
},
},
diff --git a/src/win32/base/uninstall_helper.cc b/src/win32/base/uninstall_helper.cc
index 5313685..eb3afbd 100644
--- a/src/win32/base/uninstall_helper.cc
+++ b/src/win32/base/uninstall_helper.cc
@@ -61,10 +61,6 @@
typedef map<int, DWORD> PreloadOrderToKLIDMap;
-// Windows NT 5.1
-const DWORD kDefaultKLIDForMSIMEJa = 0xE0010411;
-const wchar_t kDefaultMSIMEJaFileName[] = L"imjp81.ime";
-
// Windows NT 6.0, 6.1 and 6.2
const CLSID CLSID_IMJPTIP = {
0x03b5835f, 0xf03c, 0x411b, {0x9c, 0xe2, 0xaa, 0x23, 0xe1, 0x17, 0x1e, 0x36}
diff --git a/src/win32/base/win32_window_util.cc b/src/win32/base/win32_window_util.cc
index df53b4f..c515419 100644
--- a/src/win32/base/win32_window_util.cc
+++ b/src/win32/base/win32_window_util.cc
@@ -90,13 +90,11 @@
// static
bool WindowUtil::ChangeMessageFilter(HWND window_handle, UINT message) {
- typedef BOOL (WINAPI *FPChangeWindowMessageFilter)(UINT, DWORD);
typedef BOOL (WINAPI *FPChangeWindowMessageFilterEx)(
HWND, UINT, DWORD, LPVOID);
- // Following constants are not available unless we change the WINVER
+ // The following constant is not available unless we change the WINVER
// higher enough.
- const int kMessageFilterAdd = 1; // MSGFLT_ADD (WINVER >=0x0600)
const int kMessageFilterAllow = 1; // MSGFLT_ALLOW (WINVER >=0x0601)
const HMODULE lib = WinUtil::GetSystemModuleHandle(L"user32.dll");
@@ -124,7 +122,7 @@
}
// Windows Vista
- if (!::ChangeWindowMessageFilter(message, kMessageFilterAdd)) {
+ if (!::ChangeWindowMessageFilter(message, MSGFLT_ADD)) {
const int error = ::GetLastError();
LOG(ERROR) << L"ChangeWindowMessageFilter failed. error = " << error;
return false;
