Changeset 76143 in vbox for trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFFind.cpp

Timestamp:

Dec 10, 2018 9:24:46 PM (6 years ago)

Author:

vboxsync

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

127388

Message:

SharedFolders,os2/VBoxSF: Added SHFL_FN_SET_FILE_SIZE for setting the file size without needing to passing an mostly unused buffer (SHFLOBJINFO). Deprecated most of VbglR0SfXxxx and continued hacking on replacements using OS/2 as testbed. bugref:9172

File:

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

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

@@ -467 +467 @@
      * Resolve path to a folder and folder relative path.
      */
-    PVBOXSFFOLDER pFolder;
-    PSHFLSTRING   pStrFolderPath;
     RT_NOREF(pCdFsi);
-    APIRET rc = vboxSfOs2ResolvePath(pszPath, pCdFsd, offCurDirEnd, &pFolder, &pStrFolderPath);
-    LogFlow(("FS32_FINDFIRST: vboxSfOs2ResolvePath: -> %u pFolder=%p\n", rc, pFolder));
+    PVBOXSFFOLDER       pFolder;
+    VBOXSFCREATEREQ    *pReq;
+    APIRET rc = vboxSfOs2ResolvePathEx(pszPath, pCdFsd, offCurDirEnd, RT_UOFFSETOF(VBOXSFCREATEREQ, StrPath),
+                                       &pFolder, (void **)&pReq);
+    LogFlow(("FS32_FINDFIRST: vboxSfOs2ResolvePathEx: -> %u pReq=%p\n", rc, pReq));
     if (rc == NO_ERROR)
     {
+        PSHFLSTRING pStrFolderPath = &pReq->StrPath;
+
         /*
          * Look for a wildcard filter at the end of the path, saving it all for
@@ -537 +540 @@
         else if (pwszFilter)
         {
-            pFilter = pStrFolderPath;
-            pStrFolderPath = vboxSfOs2StrAlloc(pwszFilter - pFilter->String.utf16);
-            if (pStrFolderPath)
-            {
-                pStrFolderPath->u16Length = (uint16_t)((uintptr_t)pwszFilter - (uintptr_t)pFilter->String.utf16);
-                memcpy(pStrFolderPath->String.utf16, pFilter->String.utf16, pStrFolderPath->u16Length);
+            /* Copy the whole path for filtering. */
+            pFilter = vboxSfOs2StrDup(pStrFolderPath);
+            if (pFilter)
+            {
+                /* Strip the filename off the one we're opening. */
+                pStrFolderPath->u16Length = (uint16_t)((uintptr_t)pwszFilter - (uintptr_t)pStrFolderPath->String.utf16);
+                pStrFolderPath->u16Size   = pStrFolderPath->u16Length + (uint16_t)sizeof(RTUTF16);
                 pStrFolderPath->String.utf16[pStrFolderPath->u16Length / sizeof(RTUTF16)] = '\0';
             }
@@ -559 +563 @@
          * Make sure we've got a buffer for keeping unused search results.
          */
+        /** @todo use phys heap for this too?  */
         PVBOXSFFSBUF pDataBuf = NULL;
         if (rc == NO_ERROR)
@@ -578 +583 @@
             /*
              * Now, try open the directory for reading.
-             * We pre-use the data buffer for parameter passin to avoid
-             * wasting any stack space.
              */
-            PSHFLCREATEPARMS pParams = (PSHFLCREATEPARMS)(pDataBuf + 1);
-            RT_ZERO(*pParams);
-            pParams->CreateFlags = SHFL_CF_DIRECTORY   | SHFL_CF_ACT_FAIL_IF_NEW  | SHFL_CF_ACT_OPEN_IF_EXISTS
-                                 | SHFL_CF_ACCESS_READ | SHFL_CF_ACCESS_ATTR_READ | SHFL_CF_ACCESS_DENYNONE;
-            int vrc = VbglR0SfCreate(&g_SfClient, &pFolder->hHostFolder, pStrFolderPath, pParams);
-            LogFlow(("FS32_FINDFIRST: VbglR0SfCreate(%ls) -> %Rrc Result=%d fMode=%#x hHandle=%#RX64\n",
-                     pStrFolderPath->String.utf16, vrc, pParams->Result, pParams->Info.Attr.fMode, pParams->Handle));
+            pReq->CreateParms.CreateFlags = SHFL_CF_DIRECTORY   | SHFL_CF_ACT_FAIL_IF_NEW  | SHFL_CF_ACT_OPEN_IF_EXISTS
+                                          | SHFL_CF_ACCESS_READ | SHFL_CF_ACCESS_ATTR_READ | SHFL_CF_ACCESS_DENYNONE;
+
+            int vrc = vboxSfOs2HostReqCreate(pFolder, pReq);
+            LogFlow(("FS32_FINDFIRST: vboxSfOs2HostReqCreate(%ls) -> %Rrc Result=%d fMode=%#x hHandle=%#RX64\n",
+                     pStrFolderPath->String.utf16, vrc, pReq->CreateParms.Result, pReq->CreateParms.Info.Attr.fMode,
+                     pReq->CreateParms.Handle));
             if (RT_SUCCESS(vrc))
             {
-                switch (pParams->Result)
+                switch (pReq->CreateParms.Result)
                 {
                     case SHFL_FILE_EXISTS:
-                        if (pParams->Handle != SHFL_HANDLE_NIL)
+                        if (pReq->CreateParms.Handle != SHFL_HANDLE_NIL)
                         {
                             /*
                              * Initialize the structures.
                              */
-                            pFsFsd->hHostDir        = pParams->Handle;
+                            pFsFsd->hHostDir        = pReq->CreateParms.Handle;
                             pFsFsd->u32Magic        = VBOXSFFS_MAGIC;
                             pFsFsd->pFolder         = pFolder;
@@ -631 +634 @@
                             else
                             {
-                                vrc = VbglR0SfClose(&g_SfClient, &pFolder->hHostFolder, pFsFsd->hHostDir);
+                                AssertCompile(sizeof(VBOXSFCLOSEREQ) < sizeof(*pReq));
+                                vrc = vboxSfOs2HostReqClose(pFolder, (VBOXSFCLOSEREQ *)pReq, pFsFsd->hHostDir);
                                 AssertRC(vrc);
                                 pFsFsd->u32Magic = ~VBOXSFFS_MAGIC;
@@ -641 +645 @@
                         else
                         {
-                            LogFlow(("FS32_FINDFIRST: VbglR0SfCreate returns NIL handle for '%ls'\n", pStrFolderPath->String.utf16));
+                            LogFlow(("FS32_FINDFIRST: vboxSfOs2HostReqCreate returns NIL handle for '%ls'\n",
+                                     pStrFolderPath->String.utf16));
                             rc = ERROR_PATH_NOT_FOUND;
                         }
@@ -661 +666 @@
 
         RTMemFree(pDataBuf);
-        if (pFilter != pStrFolderPath)
-            vboxSfOs2StrFree(pFilter);
-        vboxSfOs2ReleasePathAndFolder(pStrFolderPath, pFolder);
+        vboxSfOs2StrFree(pFilter);
+        VbglR0PhysHeapFree(pReq);
+        vboxSfOs2ReleaseFolder(pFolder);
     }
 
@@ -801 +806 @@
     if (pFsFsd->hHostDir != SHFL_HANDLE_NIL)
     {
-        int vrc = VbglR0SfClose(&g_SfClient, &pFolder->hHostFolder, pFsFsd->hHostDir);
+        int vrc = vboxSfOs2HostReqCloseSimple(pFolder, pFsFsd->hHostDir);
         AssertRC(vrc);
     }