Type conversion fixes, ui/ edition.

ui/base/l10n/l10n_util_win.cc

 // Copyright (c) 2011 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/l10n/l10n_util_win.h"
 
 #include <windowsx.h>
 #include <algorithm>
 #include <iterator>
 
@@ skipping 36 matching lines @@
 }
 
 bool IsFontPresent(const wchar_t* font_name) {
   HFONT hfont = CreateFont(12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                            font_name);
   if (hfont == NULL)
     return false;
   HDC dc = GetDC(0);
   HGDIOBJ oldFont = static_cast<HFONT>(SelectObject(dc, hfont));
   WCHAR actual_font_name[LF_FACESIZE];
-  DWORD size_ret = GetTextFace(dc, LF_FACESIZE, actual_font_name);
-  actual_font_name[LF_FACESIZE - 1] = 0;
+  int size_ret = GetTextFace(dc, LF_FACESIZE, actual_font_name);
   SelectObject(dc, oldFont);
   DeleteObject(hfont);
   ReleaseDC(0, dc);
   // We don't have to worry about East Asian fonts with locale-dependent
   // names here.
-  return wcscmp(font_name, actual_font_name) == 0;
+  return (size_ret != 0) && wcscmp(font_name, actual_font_name) == 0;
 }
 
 class OverrideLocaleHolder {
  public:
   OverrideLocaleHolder() {}
   const std::vector<std::string>& value() const { return value_; }
   void swap_value(std::vector<std::string>* override_value) {
     value_.swap(*override_value);
   }
  private:
@@ skipping 72 matching lines @@
       ui_font_family.empty())
     return false;
   if (override_font_family && font_size_scaler) {
     override_font_family->swap(ui_font_family);
     *font_size_scaler = scaler100 / 100.0;
   }
   return true;
 }
 
 void AdjustUIFont(LOGFONT* logfont) {
-  double dpi_scale = gfx::GetDPIScale();
+  float dpi_scale = gfx::GetDPIScale();
   if (gfx::Display::HasForceDeviceScaleFactor()) {
     // If the scale is forced, we don't need to adjust it here.
-    dpi_scale = 1.0;
+    dpi_scale = 1.0f;
   }
   AdjustUIFontForDIP(dpi_scale, logfont);
 }
 
 void AdjustUIFontForDIP(float dpi_scale, LOGFONT* logfont) {
   base::string16 ui_font_family = L"default";
   double ui_font_size_scaler = 1;
   if (NeedOverrideDefaultUIFont(&ui_font_family, &ui_font_size_scaler) ||
       dpi_scale != 1) {
     AdjustLogFont(ui_font_family, ui_font_size_scaler, dpi_scale, logfont);
@@ skipping 26 matching lines @@
   } else {
     NOTREACHED() << "Failed to determine the UI language for locale override.";
   }
 }
 
 const std::vector<std::string>& GetLocaleOverrides() {
   return override_locale_holder.Get().value();
 }
 
 }  // namespace l10n_util