Changeset 93073 in vbox for trunk/src/VBox/Additions/os2

Timestamp:

Dec 24, 2021 1:44:58 AM (3 years ago)

Author:

vboxsync

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

149082

Message:

os2/VBoxSF: Implemented ERROR_EAS_DIDNT_FIT. ticketref:19453

File:

• trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFFind.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFFind.cpp

@@ -621 +621 @@
                                  * Initialize the structures.
                                  */
-                                pFsFsd->hHostDir        = pReq->CreateParms.Handle;
-                                pFsFsd->u32Magic        = VBOXSFFS_MAGIC;
-                                pFsFsd->pFolder         = pFolder;
-                                pFsFsd->pBuf            = pDataBuf;
-                                pFsFsd->offLastFile     = 0;
-                                pDataBuf->u32Magic      = VBOXSFFSBUF_MAGIC;
-                                pDataBuf->cbValid       = 0;
-                                pDataBuf->cEntriesLeft  = 0;
-                                pDataBuf->pEntry        = NULL;
-                                pDataBuf->pFilter       = pFilter;
-                                pDataBuf->fMustHaveAttribs   = (uint8_t)(  (fAttribs >> 8)
-                                                                         & (FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM | FILE_DIRECTORY | FILE_ARCHIVED));
-                                pDataBuf->fExcludedAttribs   = (uint8_t)(~fAttribs & (FILE_HIDDEN | FILE_SYSTEM | FILE_DIRECTORY));
-                                pDataBuf->fLongFilenames     = RT_BOOL(fAttribs & FF_ATTR_LONG_FILENAME);
+                                pFsFsd->hHostDir            = pReq->CreateParms.Handle;
+                                pFsFsd->u32Magic            = VBOXSFFS_MAGIC;
+                                pFsFsd->pFolder             = pFolder;
+                                pFsFsd->pBuf                = pDataBuf;
+                                pFsFsd->offLastFile         = 0;
+                                pDataBuf->u32Magic          = VBOXSFFSBUF_MAGIC;
+                                pDataBuf->cbValid           = 0;
+                                pDataBuf->cEntriesLeft      = 0;
+                                pDataBuf->pEntry            = NULL;
+                                pDataBuf->pFilter           = pFilter;
+                                pDataBuf->fMustHaveAttribs  = (uint8_t)(  (fAttribs >> 8)
+                                                                        & (FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM | FILE_DIRECTORY | FILE_ARCHIVED));
+                                pDataBuf->fExcludedAttribs  = (uint8_t)(~fAttribs & (FILE_HIDDEN | FILE_SYSTEM | FILE_DIRECTORY));
+                                pDataBuf->fLongFilenames    = RT_BOOL(fAttribs & FF_ATTR_LONG_FILENAME);
                                 LogFlow(("FS32_FINDFIRST: fMustHaveAttribs=%#x fExcludedAttribs=%#x fLongFilenames=%d (fAttribs=%#x)\n",
                                          pDataBuf->fMustHaveAttribs, pDataBuf->fExcludedAttribs, pDataBuf->fLongFilenames, fAttribs));
@@ -641 +641 @@
                                 rc = vboxSfOs2ReadDirEntries(pFolder, pFsFsd, pDataBuf, uLevel, fFlags,
                                                              pbData, cbData, cMaxMatches ? cMaxMatches : UINT16_MAX, pcMatches);
-                                if (rc == NO_ERROR)
+                                if (rc != ERROR_BUFFER_OVERFLOW)
+                                { /* likely */ }
+                                else if (   uLevel == FI_LVL_EAS_FROM_LIST
+                                         || uLevel == FI_LVL_EAS_FROM_LIST_64)
+                                {
+                                    /* If we've got a buffer overflow asking for EAs from a LIST, we are allowed (indeed
+                                       expected) to fall back to level 2 (EA size) and return ERROR_EAS_DIDNT_FIT.
+                                       See http://www.edm2.com/index.php/DosFindFirst for somewhat dated details. */
+                                    rc = vboxSfOs2ReadDirEntries(pFolder, pFsFsd, pDataBuf,
+                                                                 uLevel == FI_LVL_EAS_FROM_LIST_64
+                                                                 ? FI_LVL_STANDARD_EASIZE_64 : FI_LVL_STANDARD_EASIZE,
+                                                                 fFlags, pbData, cbData, 1 /* no more than one! */, pcMatches);
+                                    if (rc == NO_ERROR)
+                                        rc = ERROR_EAS_DIDNT_FIT;
+                                }
+                                if (rc == NO_ERROR || rc == ERROR_EAS_DIDNT_FIT)
                                 {
                                     uint32_t cRefs = ASMAtomicIncU32(&pFolder->cOpenSearches);
@@ -753 +768 @@
                                      cMaxMatches ? cMaxMatches : UINT16_MAX, pcMatches);
     }
+    if (rc != ERROR_BUFFER_OVERFLOW)
+    { /* likely */ }
+    else if (   uLevel == FI_LVL_EAS_FROM_LIST
+             || uLevel == FI_LVL_EAS_FROM_LIST_64)
+    {
+        /* If we've got a buffer overflow asking for EAs from a LIST, we are allowed (indeed
+           expected) to fall back to level 2 (EA size) and return ERROR_EAS_DIDNT_FIT. */
+        rc = vboxSfOs2ReadDirEntries(pFolder, pFsFsd, pDataBuf,
+                                     uLevel == FI_LVL_EAS_FROM_LIST_64 ? FI_LVL_STANDARD_EASIZE_64 : FI_LVL_STANDARD_EASIZE,
+                                     fFlags, pbData, cbData, 1 /* no more than one! */, pcMatches);
+        if (rc == NO_ERROR)
+            rc = ERROR_EAS_DIDNT_FIT;
+    }
 
     RT_NOREF(pFsFsi, pszName);
@@ -800 +828 @@
     APIRET rc = vboxSfOs2ReadDirEntries(pFolder, pFsFsd, pDataBuf, uLevel, fFlags, pbData, cbData,
                                         cMaxMatches ? cMaxMatches : UINT16_MAX, pcMatches);
+    if (rc != ERROR_BUFFER_OVERFLOW)
+    { /* likely */ }
+    else if (   uLevel == FI_LVL_EAS_FROM_LIST
+             || uLevel == FI_LVL_EAS_FROM_LIST_64)
+    {
+        /* If we've got a buffer overflow asking for EAs from a LIST, we are allowed (indeed
+           expected) to fall back to level 2 (EA size) and return ERROR_EAS_DIDNT_FIT.
+           See http://www.edm2.com/index.php/DosFindNext for somewhat dated details. */
+        rc = vboxSfOs2ReadDirEntries(pFolder, pFsFsd, pDataBuf,
+                                     uLevel == FI_LVL_EAS_FROM_LIST_64 ? FI_LVL_STANDARD_EASIZE_64 : FI_LVL_STANDARD_EASIZE,
+                                     fFlags, pbData, cbData, 1 /* no more than one! */, pcMatches);
+        if (rc == NO_ERROR)
+            rc = ERROR_EAS_DIDNT_FIT;
+    }
 
     NOREF(pFsFsi);