Add noexcept to all FontInfo structs

microsoft · Oct 28, 2021 · d4d8e47 · d4d8e47
1 parent 8560b4a
commit d4d8e47
Show file tree

Hide file tree

Showing 15 changed files with 93 additions and 189 deletions.
diff --git a/src/host/getset.cpp b/src/host/getset.cpp
@@ -274,8 +274,7 @@ void ApiRoutines::GetNumberOfConsoleMouseButtonsImpl(ULONG& buttons) noexcept
         const FontInfo& fontInfo = activeScreenInfo.GetCurrentFont();
         consoleFontInfoEx.FontFamily = fontInfo.GetFamily();
         consoleFontInfoEx.FontWeight = fontInfo.GetWeight();
-
-        RETURN_IF_FAILED(fontInfo.FillLegacyNameBuffer(gsl::make_span(consoleFontInfoEx.FaceName)));
+        fontInfo.FillLegacyNameBuffer(consoleFontInfoEx.FaceName);
 
         return S_OK;
     }

diff --git a/src/renderer/base/FontInfoBase.cpp b/src/renderer/base/FontInfoBase.cpp
@@ -7,20 +7,7 @@
 
 #include "../inc/FontInfoBase.hpp"
 
-bool operator==(const FontInfoBase& a, const FontInfoBase& b)
-{
-    return a._faceName == b._faceName &&
-           a._weight == b._weight &&
-           a._family == b._family &&
-           a._codePage == b._codePage &&
-           a._fDefaultRasterSetFromEngine == b._fDefaultRasterSetFromEngine;
-}
-
-FontInfoBase::FontInfoBase(const std::wstring_view faceName,
-                           const unsigned char family,
-                           const unsigned int weight,
-                           const bool fSetDefaultRasterFont,
-                           const unsigned int codePage) :
+FontInfoBase::FontInfoBase(const std::wstring_view& faceName, const unsigned char family, const unsigned int weight, const bool fSetDefaultRasterFont, const unsigned int codePage) noexcept :
     _faceName(faceName),
     _family(family),
     _weight(weight),
@@ -30,43 +17,39 @@ FontInfoBase::FontInfoBase(const std::wstring_view faceName,
     ValidateFont();
 }
 
-FontInfoBase::FontInfoBase(const FontInfoBase& fibFont) :
-    FontInfoBase(fibFont.GetFaceName(),
-                 fibFont.GetFamily(),
-                 fibFont.GetWeight(),
-                 fibFont.WasDefaultRasterSetFromEngine(),
-                 fibFont.GetCodePage())
-{
-}
-
-FontInfoBase::~FontInfoBase()
+bool FontInfoBase::operator==(const FontInfoBase& other) noexcept
 {
+    return _faceName == other._faceName &&
+           _weight == other._weight &&
+           _family == other._family &&
+           _codePage == other._codePage &&
+           _fDefaultRasterSetFromEngine == other._fDefaultRasterSetFromEngine;
 }
 
-unsigned char FontInfoBase::GetFamily() const
+unsigned char FontInfoBase::GetFamily() const noexcept
 {
     return _family;
 }
 
 // When the default raster font is forced set from the engine, this is how we differentiate it from a simple apply.
 // Default raster font is internally represented as a blank face name and zeros for weight, family, and size. This is
 // the hint for the engine to use whatever comes back from GetStockObject(OEM_FIXED_FONT) (at least in the GDI world).
-bool FontInfoBase::WasDefaultRasterSetFromEngine() const
+bool FontInfoBase::WasDefaultRasterSetFromEngine() const noexcept
 {
     return _fDefaultRasterSetFromEngine;
 }
 
-unsigned int FontInfoBase::GetWeight() const
+unsigned int FontInfoBase::GetWeight() const noexcept
 {
     return _weight;
 }
 
-const std::wstring_view FontInfoBase::GetFaceName() const noexcept
+const std::wstring& FontInfoBase::GetFaceName() const noexcept
 {
     return _faceName;
 }
 
-unsigned int FontInfoBase::GetCodePage() const
+unsigned int FontInfoBase::GetCodePage() const noexcept
 {
     return _codePage;
 }
@@ -77,21 +60,15 @@ unsigned int FontInfoBase::GetCodePage() const
 // Arguments:
 // - buffer: the buffer into which to copy characters
 // - size: the size of buffer
-HRESULT FontInfoBase::FillLegacyNameBuffer(gsl::span<wchar_t> buffer) const
-try
+void FontInfoBase::FillLegacyNameBuffer(wchar_t (&buffer)[LF_FACESIZE]) const noexcept
 {
-    auto toCopy = std::min<size_t>(buffer.size() - 1, _faceName.size());
-    auto last = std::copy(_faceName.cbegin(), _faceName.cbegin() + toCopy, buffer.begin());
-    std::fill(last, buffer.end(), L'\0');
-    return S_OK;
+    const auto toCopy = std::min(std::size(buffer) - 1, _faceName.size());
+    const auto last = std::copy_n(_faceName.data(), toCopy, &buffer[0]);
+    *last = L'\0';
 }
-CATCH_RETURN();
 
 // NOTE: this method is intended to only be used from the engine itself to respond what font it has chosen.
-void FontInfoBase::SetFromEngine(const std::wstring_view faceName,
-                                 const unsigned char family,
-                                 const unsigned int weight,
-                                 const bool fSetDefaultRasterFont)
+void FontInfoBase::SetFromEngine(const std::wstring_view& faceName, const unsigned char family, const unsigned int weight, const bool fSetDefaultRasterFont) noexcept
 {
     _faceName = faceName;
     _family = family;
@@ -101,12 +78,12 @@ void FontInfoBase::SetFromEngine(const std::wstring_view faceName,
 
 // Internally, default raster font is represented by empty facename, and zeros for weight, family, and size. Since
 // FontInfoBase doesn't have sizing information, this helper checks everything else.
-bool FontInfoBase::IsDefaultRasterFontNoSize() const
+bool FontInfoBase::IsDefaultRasterFontNoSize() const noexcept
 {
     return (_weight == 0 && _family == 0 && _faceName.empty());
 }
 
-void FontInfoBase::ValidateFont()
+void FontInfoBase::ValidateFont() noexcept
 {
     // If we were given a blank name, it meant raster fonts, which to us is always Terminal.
     if (!IsDefaultRasterFontNoSize() && s_pFontDefaultList != nullptr)
@@ -115,8 +92,7 @@ void FontInfoBase::ValidateFont()
         if (_faceName == DEFAULT_TT_FONT_FACENAME)
         {
             std::wstring defaultFontFace;
-            if (SUCCEEDED(s_pFontDefaultList->RetrieveDefaultFontNameForCodepage(GetCodePage(),
-                                                                                 defaultFontFace)))
+            if (SUCCEEDED(s_pFontDefaultList->RetrieveDefaultFontNameForCodepage(GetCodePage(), defaultFontFace)))
             {
                 _faceName = defaultFontFace;
 
@@ -128,14 +104,14 @@ void FontInfoBase::ValidateFont()
     }
 }
 
-bool FontInfoBase::IsTrueTypeFont() const
+bool FontInfoBase::IsTrueTypeFont() const noexcept
 {
     return WI_IsFlagSet(_family, TMPF_TRUETYPE);
 }
 
 Microsoft::Console::Render::IFontDefaultList* FontInfoBase::s_pFontDefaultList;
 
-void FontInfoBase::s_SetFontDefaultList(_In_ Microsoft::Console::Render::IFontDefaultList* const pFontDefaultList)
+void FontInfoBase::s_SetFontDefaultList(_In_ Microsoft::Console::Render::IFontDefaultList* const pFontDefaultList) noexcept
 {
     s_pFontDefaultList = pFontDefaultList;
 }
diff --git a/src/renderer/base/FontInfoDesired.cpp b/src/renderer/base/FontInfoDesired.cpp
@@ -5,13 +5,25 @@
 
 #include "../inc/FontInfoDesired.hpp"
 
-bool operator==(const FontInfoDesired& a, const FontInfoDesired& b)
+FontInfoDesired::FontInfoDesired(const std::wstring_view& faceName, const unsigned char family, const unsigned int weight, const COORD coordSizeDesired, const unsigned int codePage) noexcept :
+    FontInfoBase(faceName, family, weight, false, codePage),
+    _coordSizeDesired(coordSizeDesired)
+{
+}
+
+FontInfoDesired::FontInfoDesired(const FontInfo& fiFont) noexcept :
+    FontInfoBase(fiFont),
+    _coordSizeDesired(fiFont.GetUnscaledSize())
+{
+}
+
+bool FontInfoDesired::operator==(const FontInfoDesired& other) noexcept
 {
-    return (static_cast<FontInfoBase>(a) == static_cast<FontInfoBase>(b) &&
-            a._coordSizeDesired == b._coordSizeDesired);
+    return FontInfoBase::operator==(other) &&
+           _coordSizeDesired == other._coordSizeDesired;
 }
 
-COORD FontInfoDesired::GetEngineSize() const
+COORD FontInfoDesired::GetEngineSize() const noexcept
 {
     COORD coordSize = _coordSizeDesired;
     if (IsTrueTypeFont())
@@ -22,30 +34,12 @@ COORD FontInfoDesired::GetEngineSize() const
     return coordSize;
 }
 
-FontInfoDesired::FontInfoDesired(const std::wstring_view faceName,
-                                 const unsigned char family,
-                                 const unsigned int weight,
-                                 const COORD coordSizeDesired,
-                                 const unsigned int codePage) :
-    FontInfoBase(faceName, family, weight, false, codePage),
-    _coordSizeDesired(coordSizeDesired)
-{
-}
-
-FontInfoDesired::FontInfoDesired(const FontInfo& fiFont) :
-    FontInfoBase(fiFont),
-    _coordSizeDesired(fiFont.GetUnscaledSize())
-{
-}
-
 // This helper determines if this object represents the default raster font. This can either be because internally we're
 // using the empty facename and zeros for size, weight, and family, or it can be because we were given explicit
 // dimensions from the engine that were the result of loading the default raster font. See GdiEngine::_GetProposedFont().
-bool FontInfoDesired::IsDefaultRasterFont() const
+bool FontInfoDesired::IsDefaultRasterFont() const noexcept
 {
     // Either the raster was set from the engine...
     // OR the face name is empty with a size of 0x0 or 8x12.
-    return WasDefaultRasterSetFromEngine() || (GetFaceName().empty() &&
-                                               ((_coordSizeDesired.X == 0 && _coordSizeDesired.Y == 0) ||
-                                                (_coordSizeDesired.X == 8 && _coordSizeDesired.Y == 12)));
+    return WasDefaultRasterSetFromEngine() || (GetFaceName().empty() && (_coordSizeDesired == COORD{ 0, 0 } || _coordSizeDesired == COORD{ 8, 12 }));
 }
diff --git a/src/renderer/base/fontinfo.cpp b/src/renderer/base/fontinfo.cpp
@@ -5,19 +5,7 @@
 
 #include "../inc/FontInfo.hpp"
 
-bool operator==(const FontInfo& a, const FontInfo& b)
-{
-    return (static_cast<FontInfoBase>(a) == static_cast<FontInfoBase>(b) &&
-            a._coordSize == b._coordSize &&
-            a._coordSizeUnscaled == b._coordSizeUnscaled);
-}
-
-FontInfo::FontInfo(const std::wstring_view faceName,
-                   const unsigned char family,
-                   const unsigned int weight,
-                   const COORD coordSize,
-                   const unsigned int codePage,
-                   const bool fSetDefaultRasterFont /* = false */) :
+FontInfo::FontInfo(const std::wstring_view& faceName, const unsigned char family, const unsigned int weight, const COORD coordSize, const unsigned int codePage, const bool fSetDefaultRasterFont) noexcept :
     FontInfoBase(faceName, family, weight, fSetDefaultRasterFont, codePage),
     _coordSize(coordSize),
     _coordSizeUnscaled(coordSize),
@@ -26,38 +14,28 @@ FontInfo::FontInfo(const std::wstring_view faceName,
     ValidateFont();
 }
 
-FontInfo::FontInfo(const FontInfo& fiFont) :
-    FontInfoBase(fiFont),
-    _coordSize(fiFont.GetSize()),
-    _coordSizeUnscaled(fiFont.GetUnscaledSize())
+bool FontInfo::operator==(const FontInfo& other) noexcept
 {
+    return FontInfoBase::operator==(other) &&
+           _coordSize == other._coordSize &&
+           _coordSizeUnscaled == other._coordSizeUnscaled;
 }
 
-COORD FontInfo::GetUnscaledSize() const
+COORD FontInfo::GetUnscaledSize() const noexcept
 {
     return _coordSizeUnscaled;
 }
 
-COORD FontInfo::GetSize() const
+COORD FontInfo::GetSize() const noexcept
 {
     return _coordSize;
 }
 
-void FontInfo::SetFromEngine(const std::wstring_view faceName,
-                             const unsigned char family,
-                             const unsigned int weight,
-                             const bool fSetDefaultRasterFont,
-                             const COORD coordSize,
-                             const COORD coordSizeUnscaled)
+void FontInfo::SetFromEngine(const std::wstring_view& faceName, const unsigned char family, const unsigned int weight, const bool fSetDefaultRasterFont, const COORD coordSize, const COORD coordSizeUnscaled) noexcept
 {
-    FontInfoBase::SetFromEngine(faceName,
-                                family,
-                                weight,
-                                fSetDefaultRasterFont);
-
+    FontInfoBase::SetFromEngine(faceName, family, weight, fSetDefaultRasterFont);
     _coordSize = coordSize;
     _coordSizeUnscaled = coordSizeUnscaled;
-
     _ValidateCoordSize();
 }
 

diff --git a/src/renderer/gdi/state.cpp b/src/renderer/gdi/state.cpp
@@ -610,7 +610,7 @@ GdiEngine::~GdiEngine()
         // NOTE: not using what GDI gave us because some fonts don't quite roundtrip (e.g. MS Gothic and VL Gothic)
         lf.lfPitchAndFamily = (FIXED_PITCH | FF_MODERN);
 
-        RETURN_IF_FAILED(FontDesired.FillLegacyNameBuffer(gsl::make_span(lf.lfFaceName)));
+        FontDesired.FillLegacyNameBuffer(lf.lfFaceName);
 
         // Create font.
         hFont.reset(CreateFontIndirectW(&lf));

diff --git a/src/renderer/inc/FontInfo.hpp b/src/renderer/inc/FontInfo.hpp
@@ -28,40 +28,21 @@ Author(s):
 class FontInfo : public FontInfoBase
 {
 public:
-    FontInfo(const std::wstring_view faceName,
-             const unsigned char family,
-             const unsigned int weight,
-             const COORD coordSize,
-             const unsigned int codePage,
-             const bool fSetDefaultRasterFont = false);
+    FontInfo(const std::wstring_view& faceName, const unsigned char family, const unsigned int weight, const COORD coordSize, const unsigned int codePage, const bool fSetDefaultRasterFont = false) noexcept;
 
-    FontInfo(const FontInfo& fiFont);
-
-    COORD GetSize() const;
-    COORD GetUnscaledSize() const;
-
-    void SetFromEngine(const std::wstring_view faceName,
-                       const unsigned char family,
-                       const unsigned int weight,
-                       const bool fSetDefaultRasterFont,
-                       const COORD coordSize,
-                       const COORD coordSizeUnscaled);
+    bool operator==(const FontInfo& other) noexcept;
 
+    COORD GetSize() const noexcept;
+    COORD GetUnscaledSize() const noexcept;
+    void SetFromEngine(const std::wstring_view& faceName, const unsigned char family, const unsigned int weight, const bool fSetDefaultRasterFont, const COORD coordSize, const COORD coordSizeUnscaled) noexcept;
     bool GetFallback() const noexcept;
     void SetFallback(const bool didFallback) noexcept;
-
-    void ValidateFont();
-
-    friend bool operator==(const FontInfo& a, const FontInfo& b);
+    void ValidateFont() noexcept;
 
 private:
-    void _ValidateCoordSize();
+    void _ValidateCoordSize() noexcept;
 
     COORD _coordSize;
     COORD _coordSizeUnscaled;
     bool _didFallback;
 };
-
-bool operator==(const FontInfo& a, const FontInfo& b);
-
-// SET AND UNSET CONSOLE_OEMFONT_DISPLAY unless we can get rid of the stupid recoding in the conhost side.