Fixes for re-enabling more MSVC level 4 warnings: misc edition #2

win8/metro_driver/ime/text_store.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 "win8/metro_driver/ime/text_store.h"
 
 #include <algorithm>
 
 #include "base/win/scoped_variant.h"
 #include "ui/base/win/atl_module.h"
@@ skipping 747 matching lines @@
 
   base::win::ScopedComPtr<IEnumTfRanges> ranges;
   if (FAILED(track_property->EnumRanges(read_only_edit_cookie, ranges.Receive(),
                                         start_to_end_range))) {
     return false;
   }
 
   while (true) {
     base::win::ScopedComPtr<ITfRange> range;
     if (ranges->Next(1, range.Receive(), NULL) != S_OK)
-      break;
+      return true;
     base::win::ScopedVariant value;
     base::win::ScopedComPtr<IEnumTfPropertyValue> enum_prop_value;
     if (FAILED(track_property->GetValue(read_only_edit_cookie, range,
                                         value.Receive()))) {
       return false;
     }
     if (FAILED(enum_prop_value.QueryFrom(value.AsInput()->punkVal)))
       return false;
 
     TF_PROPERTYVAL property_value;
     bool is_composition = false;
-    bool has_display_attribute = false;

[Peter Kasting, 2014/07/09 22:19:54]

This variable was never checked below, so we could try and read
display_attribute.fBoldLine without having ever set it.

-    TF_DISPLAYATTRIBUTE display_attribute;
+    metro_viewer::UnderlineInfo underline;
     while (enum_prop_value->Next(1, &property_value, NULL) == S_OK) {
       if (IsEqualGUID(property_value.guidId, GUID_PROP_COMPOSING)) {
         is_composition = (property_value.varValue.lVal == TRUE);
       } else if (IsEqualGUID(property_value.guidId, GUID_PROP_ATTRIBUTE)) {
         TfGuidAtom guid_atom =
             static_cast<TfGuidAtom>(property_value.varValue.lVal);
+        TF_DISPLAYATTRIBUTE display_attribute;
         if (GetDisplayAttribute(guid_atom, &display_attribute))
-          has_display_attribute = true;
+          underline.thick = !!display_attribute.fBoldLine;
       }
       VariantClear(&property_value.varValue);
     }
 
     base::win::ScopedComPtr<ITfRangeACP> range_acp;
     range_acp.QueryFrom(range);
     LONG start_pos, length;
     range_acp->GetExtent(&start_pos, &length);
-    if (!is_composition) {
-      if (*committed_size < static_cast<size_t>(start_pos + length))
-        *committed_size = start_pos + length;
-    } else {
-      metro_viewer::UnderlineInfo underline;
+    if (is_composition) {
       underline.start_offset = start_pos;
       underline.end_offset = start_pos + length;
-      underline.thick = !!display_attribute.fBoldLine;
       undelines->push_back(underline);
+    } else if (*committed_size < static_cast<size_t>(start_pos + length)) {
+      *committed_size = start_pos + length;
     }
   }
-  return true;
 }
 
 bool TextStore::CancelComposition() {
   // If there is an on-going document lock, we must not edit the text.
   if (edit_flag_)
     return false;
 
   if (string_buffer_.empty())
     return true;
 
@@ skipping 69 matching lines @@
 
 bool TextStore::HasReadLock() const {
   return (current_lock_type_ & TS_LF_READ) == TS_LF_READ;
 }
 
 bool TextStore::HasReadWriteLock() const {
   return (current_lock_type_ & TS_LF_READWRITE) == TS_LF_READWRITE;
 }
 
 }  // namespace metro_driver