From 2d2cd97b55f82fe811ebd8cbce9e1e933fe940a8 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Thu, 28 Jul 2022 12:04:17 -0400
Subject: [PATCH] Backport proper exception handling in win32 system dialogs

---
 src/Windows/Avalonia.Win32/SystemDialogImpl.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/SystemDialogImpl.cs b/src/Windows/Avalonia.Win32/SystemDialogImpl.cs
index fa53bf57fe..df38ab1c8f 100644
--- a/src/Windows/Avalonia.Win32/SystemDialogImpl.cs
+++ b/src/Windows/Avalonia.Win32/SystemDialogImpl.cs
@@ -117,7 +117,8 @@ namespace Avalonia.Win32
                 }
                 catch (COMException ex)
                 {
-                    throw new Win32Exception(ex.HResult);
+                    var message = new Win32Exception(ex.HResult).Message;
+                    throw new COMException(message, ex);
                 }
             })!;
         }
@@ -176,7 +177,8 @@ namespace Avalonia.Win32
                 }
                 catch (COMException ex)
                 {
-                    throw new Win32Exception(ex.HResult);
+                    var message = new Win32Exception(ex.HResult).Message;
+                    throw new COMException(message, ex);
                 }
             });
         }