Elizabeth Figura (@zfigura) commented about dlls/advpack/files.c:
if (done) {
+onlyemptydir: TRACE("%s: directory\n", debugstr_w(fname));
if (SetFileAttributesW(fname, FILE_ATTRIBUTE_NORMAL) && RemoveDirectoryW(fname))
SetFileAttributesW(fname, FILE_ATTRIBUTE_NORMAL);
That's a separate and unrelated change; it should be in its own commit and supported by tests.