Changeset 38437 in vbox for trunk/src/VBox/Main/src-client/GuestCtrlImplDir.cpp

Timestamp:

Aug 12, 2011 3:05:41 PM (14 years ago)

Author:

vboxsync

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

73482

Message:

GuestCtrl: Update.

File:

• trunk/src/VBox/Main/src-client/GuestCtrlImplDir.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-client/GuestCtrlImplDir.cpp

@@ -233 +233 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    RTFSOBJINFO objInfo;
     int rc;
     HRESULT hr = directoryQueryInfoInternal(aDirectory,
                                             aUsername, aPassword,
-                                            &objInfo, RTFSOBJATTRADD_NOTHING, &rc);
+                                            NULL /* No RTFSOBJINFO needed */,
+                                            RTFSOBJATTRADD_NOTHING, &rc);
     if (SUCCEEDED(hr))
     {
@@ -283 +283 @@
 /**
  * Returns the next directory entry of an open guest directory.
- * Returns VERR_NO_MORE_FILES if no more entries available.
+ * Returns VERR_NO_DATA if no more entries available or VERR_NOT_FOUND
+ * if directory handle is invalid.
  *
  * @return  IPRT status code.
@@ -486 +487 @@
                 int rc = VINF_SUCCESS;
 
-                GuestProcessStreamBlock *pBlock = streamObjs[0];
-                AssertPtr(pBlock);
-                const char *pszFsType = pBlock->GetString("ftype");
+                Assert(streamObjs.size());
+                const char *pszFsType = streamObjs[0].GetString("ftype");
                 if (!pszFsType) /* Attribute missing? */
                      rc = VERR_NOT_FOUND;
@@ -495 +495 @@
                 {
                      rc = VERR_FILE_NOT_FOUND;
+                     /* This is not critical for Main, so don't set hr --
+                      * we will take care of rc then. */
                 }
                 if (   RT_SUCCESS(rc)
                     && aObjInfo) /* Do we want object details? */
                 {
-                    hr = executeStreamQueryFsObjInfo(aDirectory, pBlock,
+                    hr = executeStreamQueryFsObjInfo(aDirectory, streamObjs[0],
                                                      aObjInfo, enmAddAttribs);
                 }
@@ -541 +543 @@
             ComAssertComRC(hr);
 
+            Assert(streamBlock.GetCount());
             hr = pDirEntry->init(this, streamBlock);
             if (SUCCEEDED(hr))
@@ -548 +551 @@
             else
                 hr = setError(VBOX_E_IPRT_ERROR,
-                              Guest::tr("Unable to init guest directory entry"));
-        }
-        else if (rc == VERR_NO_MORE_FILES)
-        {
-            /* No more directory entries to read. */
+                              Guest::tr("Failed to init guest directory entry"));
+        }
+        else if (rc == VERR_NO_DATA)
+        {
+            /* No more directory entries to read. That's fine. */
             hr = E_ABORT; /** @todo Find/define a better rc! */
         }