Port missing WiX v3 changes

1 files changed, 31 insertions, 0 deletions

diff --git a/src/dutil/dirutil.cpp b/src/dutil/dirutil.cpp
index 81130a8d..b10e71f3 100644
--- a/src/dutil/dirutil.cpp
+++ b/src/dutil/dirutil.cpp
@@ -353,6 +353,37 @@ LExit:
 
 
 /*******************************************************************
+DirDeleteEmptyDirectoriesToRoot - removes an empty directory and as many
+                                  of its parents as possible.
+
+ Returns: count of directories deleted.
+*******************************************************************/
+extern "C" DWORD DAPI DirDeleteEmptyDirectoriesToRoot(
+    __in_z LPCWSTR wzPath,
+    __in DWORD /*dwFlags*/
+    )
+{
+    DWORD cDeletedDirs = 0;
+    LPWSTR sczPath = NULL;
+
+    while (wzPath && *wzPath && ::RemoveDirectoryW(wzPath))
+    {
+        ++cDeletedDirs;
+
+        HRESULT hr = PathGetParentPath(wzPath, &sczPath);
+        DirExitOnFailure(hr, "Failed to get parent directory for path: %ls", wzPath);
+
+        wzPath = sczPath;
+    }
+
+LExit:
+    ReleaseStr(sczPath);
+
+    return cDeletedDirs;
+}
+
+
+/*******************************************************************
  DirGetCurrent - gets the current directory.
 
 *******************************************************************/