Changeset 44231 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Jan 4, 2013 2:06:39 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

83065

Message:

dir-win.cpp: supposed to return success even if no matches were found, that's what tstDir-3 checks for and we do on linux+the-rest.

File:

• trunk/src/VBox/Runtime/r3/win/dir-win.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/win/dir-win.cpp

@@ -139 +139 @@
      * it when adding the wildcard expression.
      */
-    size_t cchExpr;
+    size_t cbExpr;
     const char *pszExpr;
     if (pDir->enmFilter == RTDIRFILTER_WINNT)
     {
         pszExpr = pDir->pszFilter;
-        cchExpr = pDir->cchFilter + 1;
+        cbExpr  = pDir->cchFilter + 1;
     }
     else
     {
         pszExpr = "*";
-        cchExpr = sizeof("*");
-    }
-    if (pDir->cchPath + cchExpr > RTPATH_MAX)
+        cbExpr  = sizeof("*");
+    }
+    if (pDir->cchPath + cbExpr > RTPATH_MAX)
         return VERR_FILENAME_TOO_LONG;
-    memcpy(pszPathBuf + pDir->cchPath, pszExpr, cchExpr);
+    memcpy(pszPathBuf + pDir->cchPath, pszExpr, cbExpr);
 
 
@@ -167 +167 @@
         if (pDir->hDir != INVALID_HANDLE_VALUE)
             pDir->fDataUnread = true;
-        /* theoretical case of an empty directory. */
-        else if (GetLastError() == ERROR_NO_MORE_FILES)
-            pDir->fDataUnread = false;
         else
-            rc = RTErrConvertFromWin32(GetLastError());
+        {
+            DWORD dwErr = GetLastError();
+            /* Theoretical case of an empty directory or more normal case of no matches. */
+            if (   dwErr == ERROR_FILE_NOT_FOUND
+                || dwErr == ERROR_NO_MORE_FILES /* ???*/)
+                pDir->fDataUnread = false;
+            else
+                rc = RTErrConvertFromWin32(GetLastError());
+        }
         RTUtf16Free(pwszName);
     }