Merge 20395 - Fix a crash when clicking a popup entry while composing in the ...

chrome/browser/autocomplete/autocomplete_edit_view_win.cc

 // Copyright (c) 2009 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 "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
 
 #include <locale>
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
@@ skipping 399 matching lines @@
       controller_(controller),
       parent_view_(parent_view),
       toolbar_model_(toolbar_model),
       command_updater_(command_updater),
       popup_window_mode_(popup_window_mode),
       force_hidden_(false),
       tracking_click_(false),
       tracking_double_click_(false),
       double_click_time_(0),
       can_discard_mousemove_(false),
+      ignore_ime_messages_(false),
       font_(font),
       possible_drag_(false),
       in_drag_(false),
       initiated_drag_(false),
       drop_highlight_position_(-1),
       background_color_(0),
       scheme_security_level_(ToolbarModel::NORMAL) {
   model_->set_popup_model(popup_view_->GetModel());
 
   saved_selection_for_focus_change_.cpMin = -1;
@@ skipping 197 matching lines @@
                                                        size_t caret_pos) {
   HIMC imm_context = ImmGetContext(m_hWnd);
   if (imm_context) {
     // In Windows Vista, SetWindowText() automatically cancels any ongoing
     // IME composition, and updates the text of the underlying edit control.
     // In Windows XP, however, SetWindowText() gets applied to the IME
     // composition string if it exists, and doesn't update the underlying edit
     // control. To avoid this, we force the IME to cancel any outstanding
     // compositions here.  This is harmless in Vista and in cases where the IME
     // isn't composing.
+
+    // NOTE: We MUST ignore messages like WM_IME_COMPOSITION that may be sent as
+    // a result of doing this.  Until the SetWindowText() call below, the
+    // underlying edit (on XP) has out-of-date text in it; for problems this can
+    // cause, see OnImeComposition().
+    ignore_ime_messages_ = true;
     ImmNotifyIME(imm_context, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
     ImmReleaseContext(m_hWnd, imm_context);
+    ignore_ime_messages_ = false;
   }
 
   SetWindowText(text.c_str());
   PlaceCaretAt(caret_pos);
 }
 
 void AutocompleteEditViewWin::SetForcedQuery() {
   const std::wstring current_text(GetText());
   if (current_text.empty() || (current_text[0] != '?'))
     SetUserText(L"?");
@@ skipping 569 matching lines @@
       return LresultFromObject(IID_IAccessible, wparam,
                                autocomplete_accessibility_.p);
     }
   }
   return 0;
 }
 
 LRESULT AutocompleteEditViewWin::OnImeComposition(UINT message,
                                                   WPARAM wparam,
                                                   LPARAM lparam) {
+  if (ignore_ime_messages_) {
+    // This message was sent while we're in the middle of meddling with the
+    // underlying edit control.  If we handle it below, OnAfterPossibleChange()
+    // can get bogus text for the edit, and rerun autocomplete, destructively
+    // modifying the result set that we're in the midst of using.  For example,
+    // if SetWindowTextAndCaretPos() was called due to the user clicking an
+    // entry in the popup, we're in the middle of executing SetSelectedLine(),
+    // and changing the results can cause checkfailures.
+    return DefWindowProc(message, wparam, lparam);
+  }
+
   ScopedFreeze freeze(this, GetTextObjectModel());
   OnBeforePossibleChange();
   LRESULT result = DefWindowProc(message, wparam, lparam);
   if (!OnAfterPossibleChange() && (lparam & GCS_RESULTSTR)) {
     // The result string changed, but the text in the popup didn't actually
     // change.  This means the user finalized the composition.  Rerun
     // autocomplete so that we can now trigger inline autocomplete if
     // applicable.
     //
     // Note that if we're in the midst of losing focus, UpdatePopup() won't
     // actually rerun autocomplete, but will just set local state correctly.
     UpdatePopup();
   }
   return result;
 }
 
 LRESULT AutocompleteEditViewWin::OnImeNotify(UINT message,
                                              WPARAM wparam,
                                              LPARAM lparam) {
-  if (wparam == IMN_SETOPENSTATUS) {
+  // NOTE: I'm not sure this is ever reached with |ignore_ime_messages_| set,
+  // but if it is, the safe thing to do is to only call DefWindowProc().
+  if (!ignore_ime_messages_ && (wparam == IMN_SETOPENSTATUS)) {
     // A user has activated (or deactivated) IMEs (but not started a
     // composition).
     // Some IMEs get confused when we accept keywords while they are composing
     // text. To prevent this situation, we accept keywords when an IME is
     // activated.
     HIMC imm_context = ImmGetContext(m_hWnd);
     if (imm_context) {
       if (ImmGetOpenStatus(imm_context) &&
           model_->is_keyword_hint() && !model_->keyword().empty()) {
         ScopedFreeze freeze(this, GetTextObjectModel());
@@ skipping 1084 matching lines @@
     context_menu_contents_->AddItemWithStringId(IDS_PASTE_AND_GO,
                                                 IDS_PASTE_AND_GO);
     context_menu_contents_->AddSeparator();
     context_menu_contents_->AddItemWithStringId(IDS_SELECT_ALL, IDS_SELECT_ALL);
     context_menu_contents_->AddSeparator();
     context_menu_contents_->AddItemWithStringId(IDS_EDIT_SEARCH_ENGINES,
                                                 IDS_EDIT_SEARCH_ENGINES);
   }
   context_menu_.reset(new views::Menu2(context_menu_contents_.get()));
 }