[PATCH v3 1/1] advpack: DelNode support ADN_DEL_IF_EMPTY flag

[anders]

From: anders

---
 dlls/advpack/files.c         | 10 ++++++++--
 dlls/advpack/tests/advpack.c |  9 ++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c
index 2bf2481cca4..fa247cb3f07 100644
--- a/dlls/advpack/files.c
+++ b/dlls/advpack/files.c
@@ -320,6 +320,9 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags)
         BOOL done = TRUE;
         int fname_len = lstrlenW(fname);

+        if (flags & ADN_DEL_IF_EMPTY)
+            goto onlyemptydir;
+
         /* Generate a path with wildcard suitable for iterating */
         if (fname_len && fname[fname_len-1] != '\') fname[fname_len++] = '\';
         lstrcpyW(fname + fname_len, L"*");
@@ -347,8 +350,10 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags)

if (done)
         {
+onlyemptydir:
             TRACE("%s: directory\n", debugstr_w(fname));
-            if (SetFileAttributesW(fname, FILE_ATTRIBUTE_NORMAL) && RemoveDirectoryW(fname))
+            SetFileAttributesW(fname, FILE_ATTRIBUTE_NORMAL);
+            if (RemoveDirectoryW(fname))
             {
                 ret = S_OK;
             }
@@ -357,7 +362,8 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags)
     else
     {
         TRACE("%s: file\n", debugstr_w(fname));
-        if (SetFileAttributesW(fname, FILE_ATTRIBUTE_NORMAL) && DeleteFileW(fname))
+        SetFileAttributesW(fname, FILE_ATTRIBUTE_NORMAL);
+        if (DeleteFileW(fname))
         {
             ret = S_OK;
         }
diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c
index 33d5f4bc52b..2e49c332973 100644
--- a/dlls/advpack/tests/advpack.c
+++ b/dlls/advpack/tests/advpack.c
@@ -160,6 +160,10 @@ static void delnode_test(void)
     hr = pDelNode(lstrcatA(currDir, "\DelNodeTestDir"), 0);
     ok (hr == S_OK, "DelNode failed deleting an empty directory\n");
     currDir[currDirLen] = '\0';
+    CreateDirectoryA("DelNodeTestDir", NULL);
+    hr = pDelNode(lstrcatA(currDir, "\DelNodeTestDir"), ADN_DEL_IF_EMPTY);
+    ok (hr == S_OK, "DelNode ADN_DEL_IF_EMPTY failed deleting an empty directory\n");
+    currDir[currDirLen] = '\0';

/* Test deletion of a directory containing one file. */
     CreateDirectoryA("DelNodeTestDir", NULL);
@@ -167,7 +171,10 @@ static void delnode_test(void)
         CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
     assert(hn != INVALID_HANDLE_VALUE);
     CloseHandle(hn);
-    hr = pDelNode(lstrcatA(currDir, "\DelNodeTestDir"), 0);
+    lstrcatA(currDir, "\DelNodeTestDir");
+    hr = pDelNode(currDir, ADN_DEL_IF_EMPTY);
+    ok (FAILED(hr), "DelNode ADN_DEL_IF_EMPTY should not delete non-empty\n");
+    hr = pDelNode(currDir, 0);
     ok (hr == S_OK, "DelNode failed deleting a directory containing one file\n");
     currDir[currDirLen] = '\0';