Address review comments.

Author: KlausLoeffelmann

src/System.Windows.Forms/System/Windows/Forms/Controls/ComboBox/ComboBox.cs

@@ -3696,21 +3696,22 @@ protected override unsafe void WndProc(ref Message m)
                 }
 
                 // Additional handling for Simple style listbox when disabled
-                if (DropDownStyle == ComboBoxStyle.Simple && Application.IsDarkModeEnabled && !Enabled)
+                if (DropDownStyle == ComboBoxStyle.Simple
+                    && Application.IsDarkModeEnabled
+                    && !Enabled
+                    && hwndChild == _childListBox?.HWND)
                 {
-                    if (hwndChild == _childListBox?.HWND)
-                    {
-                        PInvokeCore.SetBkColor(
-                            (HDC)m.WParamInternal,
-                            ColorTranslator.ToWin32(Color.FromArgb(64, 64, 64)));
+                    PInvokeCore.SetBkColor(
+                        (HDC)m.WParamInternal,
+                        ColorTranslator.ToWin32(Color.FromArgb(64, 64, 64)));
+
+                    PInvokeCore.SetTextColor(
+                        (HDC)m.WParamInternal,
+                        ColorTranslator.ToWin32(Color.FromArgb(180, 180, 180)));
 
-                        PInvokeCore.SetTextColor(
-                            (HDC)m.WParamInternal,
-                            ColorTranslator.ToWin32(Color.FromArgb(180, 180, 180)));
+                    m.ResultInternal = (LRESULT)s_darkEditBrush;
 
-                        m.ResultInternal = (LRESULT)s_darkEditBrush;
-                        return;
-                    }
+                    return;
                 }
 #pragma warning restore WFO5001
 

src/System.Windows.Forms/System/Windows/Forms/Controls/RichTextBox/RichTextBox.cs

@@ -3428,12 +3428,15 @@ protected override unsafe void WndProc(ref Message m)
         {
 #pragma warning disable WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
             case PInvokeCore.WM_PAINT:
+
+                // Important: We need to let to run the base
+                // renderer first in the case of the RTF control.
+                base.WndProc(ref m);
+
                 if (Handle == m.HWND
                     && !Enabled
                     && Application.IsDarkModeEnabled)
                 {
-                    base.WndProc(ref m);
-
                     // If the control is disabled, we don't want to let the RTF control
                     // paint anything else. We will paint the background and the unformatted
                     // text ourselves, so we don't want the RTF control to paint the background
@@ -3452,14 +3455,12 @@ protected override unsafe void WndProc(ref Message m)
                         SystemColors.GrayText,
                         TextFormatFlags.Left
                         | TextFormatFlags.Top
-                        | TextFormatFlags.WordBreak,
+                        | TextFormatFlags.WordBreak
                         | TextFormatFlags.EndEllipsis);
 
                     return;
                 }
 
-                base.WndProc(ref m);
-
                 break;
 #pragma warning restore WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.