[PATCH 0/1] MR4759: mscoree/tests: Add debug code for RemoveDirectory failure.

[Esme Povirk (＠madewokherd)]

This failed at least once on testbot, but there wasn't enough information to debug: https://testbot.winehq.org/JobDetails.pl?Key=141486&s301=1&f301=exe64.report...

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4759

[PATCH 1/1] mscoree/tests: Add debug code for RemoveDirectory failure.

[Esme Povirk]

From: Esme Povirk <esme(a)codeweavers.com>

---
 dlls/mscoree/tests/mscoree.c | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c
index bfcbc78db55..33f5bfa905b 100644
--- a/dlls/mscoree/tests/mscoree.c
+++ b/dlls/mscoree/tests/mscoree.c
@@ -630,7 +630,7 @@ static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name,
     PROCESS_INFORMATION pi;
     STARTUPINFOW si = { 0 };
     WCHAR *ptr, *end;
-    DWORD exit_code = 0xdeadbeef;
+    DWORD exit_code = 0xdeadbeef, err;
     BOOL ret;
 
     ok(create_new_dir(tmpdir, L"loadpaths"),
@@ -702,7 +702,31 @@ static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name,
     while (ptr >= end && (ptr = wcsrchr(tmpdir, '\\')))
     {
         ret = RemoveDirectoryW(tmpdir);
-        ok(ret, "RemoveDirectoryW(%s) failed: %lu\n", debugstr_w(tmpdir), GetLastError());
+        err = GetLastError();
+        ok(ret, "RemoveDirectoryW(%s) failed: %lu\n", debugstr_w(tmpdir), err);
+
+        if (!ret && err == ERROR_DIR_NOT_EMPTY)
+        {
+            WIN32_FIND_DATAW fd;
+            HANDLE hfind;
+
+            wcscat(tmpdir, L"\\*");
+            hfind = FindFirstFileW(tmpdir, &fd);
+            while (hfind != INVALID_HANDLE_VALUE && (!wcscmp(fd.cFileName, L".") || !wcscmp(fd.cFileName, L"..")))
+            {
+                if (!FindNextFileW(hfind, &fd))
+                {
+                    FindClose(hfind);
+                    hfind = INVALID_HANDLE_VALUE;
+                }
+            }
+            if (hfind != INVALID_HANDLE_VALUE)
+            {
+                trace("file %s still present in tmpdir\n", debugstr_w(fd.cFileName));
+                FindClose(hfind);
+            }
+        }
+
         *ptr = '\0';
     }
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/4759