Using input language instead of the application locale to determine the Omnibox's text input type o…

ui/base/ime/win/imm32_manager.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/ime/win/imm32_manager.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 106 matching lines @@
       input_language_id_(LANG_USER_DEFAULT),
       system_caret_(false),
       caret_rect_(-1, -1, 0, 0),
       use_composition_window_(false) {
 }
 
 IMM32Manager::~IMM32Manager() {
 }
 
 void IMM32Manager::SetInputLanguage() {
-  // Retrieve the current keyboard layout from Windows and determine whether
-  // or not the current input context has IMEs.
-  // Also save its input language for language-specific operations required
-  // while composing a text.
-  HKL keyboard_layout = ::GetKeyboardLayout(0);
+  // Retrieve the current input language from the system's keyboard layout.
+  // Using GetKeyboardLayoutName instead of GetKeyboardLayout, because
+  // the language from GetKeyboardLayout is the language under where the
+  // keyboard layout is installed. And the language from GetKeyboardLayoutName
+  // indicates the language of the keyboard layout itself.
+  // See crbug.com/344834.
+  WCHAR keyboard_layout[KL_NAMELENGTH];
+  ::GetKeyboardLayoutNameW(keyboard_layout);

[yukawa, 2016/09/01 20:15:03]

Let's check the return value.  If |GetKeyboardLayoutNameW| failed for some
reasons, |_wtoi| could try to access uninitialized memory.

[Shu Chen, 2016/09/07 03:13:34]

Done.

   input_language_id_ =
-      static_cast<LANGID>(reinterpret_cast<uintptr_t>(keyboard_layout));
+      static_cast<LANGID>(_wtoi(&keyboard_layout[KL_NAMELENGTH >> 1]));
 }
 
 void IMM32Manager::CreateImeWindow(HWND window_handle) {
   // When a user disables TSF (Text Service Framework) and CUAS (Cicero
   // Unaware Application Support), Chinese IMEs somehow ignore function calls
   // to ::ImmSetCandidateWindow(), i.e. they do not move their candidate
   // window to the position given as its parameters, and use the position
   // of the current system caret instead, i.e. it uses ::GetCaretPos() to
   // retrieve the position of their IME candidate window.
   // Therefore, we create a temporary system caret for Chinese IMEs and use
@@ skipping 306 matching lines @@
       MoveImeWindow(window_handle, imm_context);
       ::ImmReleaseContext(window_handle, imm_context);
     }
   }
 }
 
 void IMM32Manager::SetUseCompositionWindow(bool use_composition_window) {
   use_composition_window_ = use_composition_window;
 }
 
-std::string IMM32Manager::GetInputLanguageName() const {
-  const LCID locale_id = MAKELCID(input_language_id_, SORT_DEFAULT);
-  // max size for LOCALE_SISO639LANGNAME and LOCALE_SISO3166CTRYNAME is 9.
-  wchar_t buffer[9];
-
-  // Get language id.
-  int length = ::GetLocaleInfo(locale_id, LOCALE_SISO639LANGNAME, &buffer[0],
-                               arraysize(buffer));
-  if (length <= 1)
-    return std::string();
-
-  std::string language;
-  base::WideToUTF8(buffer, length - 1, &language);
-  if (SUBLANGID(input_language_id_) == SUBLANG_NEUTRAL)
-    return language;
-
-  // Get region id.
-  length = ::GetLocaleInfo(locale_id, LOCALE_SISO3166CTRYNAME, &buffer[0],
-                           arraysize(buffer));
-  if (length <= 1)
-    return language;
-
-  std::string region;
-  base::WideToUTF8(buffer, length - 1, &region);
-  return language.append(1, '-').append(region);
+bool IMM32Manager::IsInputLanguageCJK() const {
+  LANGID lang = PRIMARYLANGID(input_language_id_);
+  return lang == LANG_CHINESE || lang == LANG_JAPANESE ||
+      lang == LANG_KOREAN;
 }
 
 void IMM32Manager::SetTextInputMode(HWND window_handle,
                                     TextInputMode input_mode) {
   if (input_mode == ui::TEXT_INPUT_MODE_DEFAULT)
     return;
 
   const HIMC imm_context = ::ImmGetContext(window_handle);
   if (!imm_context)
     return;
@@ skipping 121 matching lines @@
                              | IME_CMODE_KATAKANA
                              | IME_CMODE_FULLSHAPE);
       break;
     default:
       *open = FALSE;
       break;
   }
 }
 
 }  // namespace ui