Refactored.

Author: slydiman

llvm/lib/Support/Windows/Path.inc

@@ -25,6 +25,7 @@
 // These two headers must be included last, and make sure shlobj is required
 // after Windows.h to make sure it picks up our definition of _WIN32_WINNT
 #include "llvm/Support/Windows/WindowsSupport.h"
+#include <atlbase.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
@@ -1387,35 +1388,33 @@ std::error_code remove_directories(const Twine &path, bool IgnoreErrors) {
   Path16.push_back(0);
   Path16.push_back(0);
 
-  HRESULT HR =
-      CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
-  if (SUCCEEDED(HR)) {
-    IFileOperation *FileOp = NULL;
-    HR = CoCreateInstance(CLSID_FileOperation, NULL, CLSCTX_ALL,
-                          IID_PPV_ARGS(&FileOp));
-    if (SUCCEEDED(HR)) {
-      HR = FileOp->SetOperationFlags(FOF_NO_UI | FOFX_NOCOPYHOOKS);
-      if (SUCCEEDED(HR)) {
-        PIDLIST_ABSOLUTE PIDL = ILCreateFromPathW(Path16.data());
-        IShellItem *ShItem = NULL;
-        HR = SHCreateItemFromIDList(PIDL, IID_PPV_ARGS(&ShItem));
-        if (SUCCEEDED(HR)) {
-          HR = FileOp->DeleteItem(ShItem, NULL);
-          if (SUCCEEDED(HR)) {
-            HR = FileOp->PerformOperations();
-          }
-          ShItem->Release();
-        }
-        ILFree(PIDL);
-      }
-      FileOp->Release();
-    }
-    CoUninitialize();
-  }
-
-  int result = FAILED(HR) ? HRESULT_CODE(HR) : 0;
-  if (result != 0 && !IgnoreErrors)
-    return mapWindowsError(result);
+  HRESULT HR;
+  do {
+    HR =
+        CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
+    if (FAILED(HR))
+      break;
+    auto Uninitialize = make_scope_exit([] { CoUninitialize(); });
+    CComPtr<IFileOperation> FileOp;
+    HR = FileOp.CoCreateInstance(CLSID_FileOperation);
+    if (FAILED(HR))
+      break;
+    HR = FileOp->SetOperationFlags(FOF_NO_UI | FOFX_NOCOPYHOOKS);
+    if (FAILED(HR))
+      break;
+    PIDLIST_ABSOLUTE PIDL = ILCreateFromPathW(Path16.data());
+    auto FreePIDL = make_scope_exit([&PIDL] { ILFree(PIDL); });
+    CComPtr<IShellItem> ShItem;
+    HR = SHCreateItemFromIDList(PIDL, IID_PPV_ARGS(&ShItem));
+    if (FAILED(HR))
+      break;
+    HR = FileOp->DeleteItem(ShItem, NULL);
+    if (FAILED(HR))
+      break;
+    HR = FileOp->PerformOperations();
+  } while (false);
+  if (FAILED(HR) && !IgnoreErrors)
+    return mapWindowsError(HRESULT_CODE(HR));
   return std::error_code();
 }