From 286ca73fdd417c363991b3d790e57d030835826b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 25 Nov 2020 15:15:30 +0100
Subject: [PATCH] Prevent hangs on win32 in case of clipboard errors.

---
 src/Windows/Avalonia.Win32/ClipboardImpl.cs | 37 +++++++++++++++++----
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/ClipboardImpl.cs b/src/Windows/Avalonia.Win32/ClipboardImpl.cs
index 7d9e0a8bd2..0475a9d607 100644
--- a/src/Windows/Avalonia.Win32/ClipboardImpl.cs
+++ b/src/Windows/Avalonia.Win32/ClipboardImpl.cs
@@ -12,6 +12,9 @@ namespace Avalonia.Win32
 {
     internal class ClipboardImpl : IClipboard
     {
+        private const int OleRetryCount = 10;
+        private const int OleRetryDelay = 100;
+
         private async Task<IDisposable> OpenClipboard()
         {
             while (!UnmanagedMethods.OpenClipboard(IntPtr.Zero))
@@ -72,20 +75,32 @@ namespace Avalonia.Win32
         {
             Dispatcher.UIThread.VerifyAccess();
             var wrapper = new DataObject(data);
+            var i = OleRetryCount;
+
             while (true)
             {
-                if (UnmanagedMethods.OleSetClipboard(wrapper) == 0)
+                var hr = UnmanagedMethods.OleSetClipboard(wrapper);
+
+                if (hr == 0)
                     break;
-                await Task.Delay(100);
+
+                if (--i == 0)
+                    Marshal.ThrowExceptionForHR(hr);
+                
+                await Task.Delay(OleRetryDelay);
             }
         }
 
         public async Task<string[]> GetFormatsAsync()
         {
             Dispatcher.UIThread.VerifyAccess();
+            var i = OleRetryCount;
+
             while (true)
             {
-                if (UnmanagedMethods.OleGetClipboard(out var dataObject) == 0)
+                var hr = UnmanagedMethods.OleGetClipboard(out var dataObject);
+
+                if (hr == 0)
                 {
                     var wrapper = new OleDataObject(dataObject);
                     var formats = wrapper.GetDataFormats().ToArray();
@@ -93,16 +108,23 @@ namespace Avalonia.Win32
                     return formats;
                 }
 
-                await Task.Delay(100);
+                if (--i == 0)
+                    Marshal.ThrowExceptionForHR(hr);
+
+                await Task.Delay(OleRetryDelay);
             }
         }
 
         public async Task<object> GetDataAsync(string format)
         {
             Dispatcher.UIThread.VerifyAccess();
+            var i = OleRetryCount;
+
             while (true)
             {
-                if (UnmanagedMethods.OleGetClipboard(out var dataObject) == 0)
+                var hr = UnmanagedMethods.OleGetClipboard(out var dataObject);
+
+                if (hr == 0)
                 {
                     var wrapper = new OleDataObject(dataObject);
                     var rv = wrapper.Get(format);
@@ -110,7 +132,10 @@ namespace Avalonia.Win32
                     return rv;
                 }
 
-                await Task.Delay(100);
+                if (--i == 0)
+                    Marshal.ThrowExceptionForHR(hr);
+
+                await Task.Delay(OleRetryDelay);
             }
         }
     }