Support rendering of underline style and color

src/types/UiaTextRangeBase.cpp

@@ -405,16 +405,22 @@ std::optional<bool> UiaTextRangeBase::_verifyAttr(TEXTATTRIBUTEID attributeId, V
         THROW_HR_IF(E_INVALIDARG, val.vt != VT_I4);
 
         // The underline style is stored as a TextDecorationLineStyle.
-        // However, The text buffer doesn't have that many different styles for being underlined.
-        // Instead, we only have single and double underlined.
+        // However, The text buffer doesn't have all the different styles for being underlined.
+        // Instead, we only use a subset of them.
         switch (val.lVal)
         {
         case TextDecorationLineStyle_None:
             return !attr.IsUnderlined();
+        case TextDecorationLineStyle_Single:
+            return attr.GetUnderlineStyle() == UnderlineStyle::SinglyUnderlined;
         case TextDecorationLineStyle_Double:
             return attr.GetUnderlineStyle() == UnderlineStyle::DoublyUnderlined;
-        case TextDecorationLineStyle_Single: // singly underlined and extended styles are treated the same
-            return attr.IsUnderlined() && attr.GetUnderlineStyle() != UnderlineStyle::DoublyUnderlined;
+        case TextDecorationLineStyle_Wavy:
+            return attr.GetUnderlineStyle() == UnderlineStyle::CurlyUnderlined;
+        case TextDecorationLineStyle_Dot:
+            return attr.GetUnderlineStyle() == UnderlineStyle::DottedUnderlined;
+        case TextDecorationLineStyle_Dash:
+            return attr.GetUnderlineStyle() == UnderlineStyle::DashedUnderlined;
         default:
             return std::nullopt;
         }
@@ -697,18 +703,26 @@ bool UiaTextRangeBase::_initializeAttrQuery(TEXTATTRIBUTEID attributeId, VARIANT
         const auto style = attr.GetUnderlineStyle();
         switch (style)
         {
+        case UnderlineStyle::NoUnderline:
+            pRetVal->lVal = TextDecorationLineStyle_None;
+            return true;
         case UnderlineStyle::SinglyUnderlined:
             pRetVal->lVal = TextDecorationLineStyle_Single;
             return true;
         case UnderlineStyle::DoublyUnderlined:
             pRetVal->lVal = TextDecorationLineStyle_Double;
             return true;
-        case UnderlineStyle::NoUnderline:
-            pRetVal->lVal = TextDecorationLineStyle_None;
+        case UnderlineStyle::CurlyUnderlined:
+            pRetVal->lVal = TextDecorationLineStyle_Wavy;
+            return true;
+        case UnderlineStyle::DottedUnderlined:
+            pRetVal->lVal = TextDecorationLineStyle_Dot;
+            return true;
+        case UnderlineStyle::DashedUnderlined:
+            pRetVal->lVal = TextDecorationLineStyle_Dash;
             return true;
+        // Out of range styles are treated as singly underlined.
         default:
-            // TODO: Handle other underline styles once they're supported in the graphic renderer.
-            // For now, extended styles are treated (and rendered) as single underline.
             pRetVal->lVal = TextDecorationLineStyle_Single;
             return true;
         }