Merge pull request #7569 from MarchingCube/win32-filepicker-no-except…

…ions Avoid using COM exceptions for dialog control flow.
AvaloniaUI · Feb 9, 2022 · 572e91b · 572e91b
2 parents e11c6c0 + f4ae1c9
commit 572e91b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/src/Windows/Avalonia.Win32/SystemDialogImpl.cs b/src/Windows/Avalonia.Win32/SystemDialogImpl.cs
@@ -89,7 +89,16 @@ internal class SystemDialogImpl : ISystemDialogImpl
                         }
                     }
 
-                    frm.Show(hWnd);
+                    var showResult = frm.Show(hWnd);
+
+                    if ((uint)showResult == (uint)UnmanagedMethods.HRESULT.E_CANCELLED)
+                    {
+                        return result;
+                    } 
+                    else if ((uint)showResult != (uint)UnmanagedMethods.HRESULT.S_OK)
+                    {
+                        throw new Win32Exception(showResult);
+                    }
 
                     if (openDialog?.AllowMultiple == true)
                     {
@@ -118,10 +127,6 @@ internal class SystemDialogImpl : ISystemDialogImpl
                 }
                 catch (COMException ex)
                 {
-                    if ((uint)ex.HResult == (uint)UnmanagedMethods.HRESULT.E_CANCELLED)
-                    {
-                        return result;
-                    }
                     throw new Win32Exception(ex.HResult);
                 }
             })!;
@@ -161,7 +166,17 @@ internal class SystemDialogImpl : ISystemDialogImpl
                         }
                     }
 
-                    frm.Show(hWnd);
+                    var showResult = frm.Show(hWnd);
+
+                    if ((uint)showResult == (uint)UnmanagedMethods.HRESULT.E_CANCELLED)
+                    {
+                        return result;
+                    }
+                    else if ((uint)showResult != (uint)UnmanagedMethods.HRESULT.S_OK)
+                    {
+                        throw new Win32Exception(showResult);
+                    }
+
                     if (frm.Result is not null)
                     {
                         result = GetAbsoluteFilePath(frm.Result);
@@ -171,10 +186,6 @@ internal class SystemDialogImpl : ISystemDialogImpl
                 }
                 catch (COMException ex)
                 {
-                    if ((uint)ex.HResult == (uint)UnmanagedMethods.HRESULT.E_CANCELLED)
-                    {
-                        return result;
-                    }
                     throw new Win32Exception(ex.HResult);
                 }
             });

diff --git a/src/Windows/Avalonia.Win32/Win32Com/win32.idl b/src/Windows/Avalonia.Win32/Win32Com/win32.idl
@@ -112,7 +112,7 @@ interface IShellItemArray : IUnknown
 interface IModalWindow : IUnknown
 {
     [local]
-    HRESULT Show(
+    int Show(
         [in, unique] HWND hwndOwner);
 }