Fixed bugs in the message consumer

Author: vonhoff

.github/workflows/build.yml

@@ -50,7 +50,7 @@ jobs:
         $coverage = Select-Xml -Path "./coverage/**/coverage.cobertura.xml" -XPath "//coverage/@line-rate" | Select-Object -ExpandProperty Node | Select-Object -ExpandProperty Value
         $coveragePercent = [math]::Round([double]$coverage * 100, 2)
         Write-Host "Current line coverage: $coveragePercent%"
-        if ($coveragePercent -lt 70) {
+        if ($coveragePercent -lt 75) {
           Write-Error "Code coverage ($coveragePercent%) is below the required threshold of 70%"
           exit 1
         }

Serilog.Sinks.RichTextBox.WinForms.Colored/Sinks/RichTextBoxForms/Extensions/RichTextBoxExtensions.cs

@@ -40,10 +40,10 @@ private struct Point
 #if NET7_0_OR_GREATER
         // Use source-generated P/Invoke for newer target frameworks to avoid the startup
         // penalty of runtime marshalling stub generation.
-        [LibraryImport("user32.dll")]
+        [LibraryImport("user32.dll", EntryPoint = "SendMessageW")]
         private static partial IntPtr SendMessage(IntPtr hWnd, int wMsg, IntPtr wParam, IntPtr lParam);
 
-        [LibraryImport("user32.dll")]
+        [LibraryImport("user32.dll", EntryPoint = "SendMessageW")]
         private static partial IntPtr SendMessage(IntPtr hWnd, int wMsg, int wParam, ref Point lParam);
 #else
         // Fallback for older target frameworks that do not support source-generated P/Invokes.

Serilog.Sinks.RichTextBox.WinForms.Colored/Sinks/RichTextBoxForms/RichTextBoxSink.cs

@@ -77,24 +77,34 @@ public void Dispose()
         public void Emit(LogEvent logEvent)
         {
             _buffer.Add(logEvent);
-            Interlocked.Exchange(ref _hasNewMessages, 1);
-            _signal.Set();
+            if (Interlocked.Exchange(ref _hasNewMessages, 1) == 0)
+            {
+                _signal.Set();
+            }
         }
 
         private void ProcessMessages(CancellationToken token)
         {
             var builder = new RtfBuilder(_options.Theme);
             var snapshot = new System.Collections.Generic.List<LogEvent>(_options.MaxLogLines);
+            var lastFlush = DateTime.UtcNow;
 
             while (!token.IsCancellationRequested)
             {
                 _signal.WaitOne(_options.FlushInterval);
+                if (Interlocked.CompareExchange(ref _hasNewMessages, 1, 1) == 0)
+                {
+                    continue;
+                }
 
-                if (Interlocked.Exchange(ref _hasNewMessages, 0) == 0)
+                var now = DateTime.UtcNow;
+                var elapsed = now - lastFlush;
+                if (elapsed < _options.FlushInterval)
                 {
                     continue;
                 }
 
+                Interlocked.Exchange(ref _hasNewMessages, 0);
                 _buffer.TakeSnapshot(snapshot);
                 builder.Clear();
                 foreach (var evt in snapshot)
@@ -103,6 +113,7 @@ private void ProcessMessages(CancellationToken token)
                 }
 
                 _richTextBox.SetRtf(builder.Rtf, _options.AutoScroll);
+                lastFlush = now;
             }
         }
     }