Changeset 42846 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Aug 16, 2012 1:35:28 PM (13 years ago)

Author:

vboxsync

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

80104

Message:

Guest Control 2.0: Update.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDirectoryImpl.cpp (modified) (1 diff)
• GuestFileImpl.cpp (modified) (3 diffs)
• GuestProcessImpl.cpp (modified) (2 diffs)
• GuestSessionImpl.cpp (modified) (2 diffs)

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

@@ -194 +194 @@
     uninit();
 
+    LogFlowThisFuncLeave();
     return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */

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

@@ -63 +63 @@
     mData.mSession = pSession;
     mData.mCreationMode = uCreationMode;
-    mData.mDisposition = getDispositionFromString(strDisposition);
+    mData.mDisposition = GuestFile::getDispositionFromString(strDisposition);
     mData.mFileName = strPath;
     mData.mInitialSize = 0;
-    mData.mOpenMode = getOpenModeFromString(strOpenMode);
+    mData.mOpenMode = GuestFile::getOpenModeFromString(strOpenMode);
     mData.mOffset = iOffset;
 
@@ -227 +227 @@
     ReturnComNotImplemented();
 #else
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    ReturnComNotImplemented();
+    LogFlowThisFuncEnter();
+
+    uninit();
+
+    LogFlowThisFuncLeave();
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -242 +244 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
+    HRESULT hr = S_OK;
+
+    GuestFsObjData objData;
+    int vrc = mData.mSession->fileQueryInfoInternal(mData.mFileName, objData);
+    if (RT_SUCCESS(vrc))
+    {
+        ComObjPtr<GuestFsObjInfo> pFsObjInfo;
+        hr = pFsObjInfo.createObject();
+        if (FAILED(hr))
+            return VERR_COM_UNEXPECTED;
+
+        vrc = pFsObjInfo->init(objData);
+        if (RT_SUCCESS(rc))
+            hr = pFsObjInfo.queryInterfaceTo(aInfo);
+    }
+    else
+    {
+        switch (vrc)
+        {
+            /** @todo Add more errors here! */
+
+            default:
+               hr = setError(VBOX_E_IPRT_ERROR, tr("Querying file information failed: %Rrc"), vrc);
+               break;
+        }
+    }
+
+    return hr;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }

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

@@ -1044 +1044 @@
 {
     LogFlowThisFunc(("aCmd=%s, aTimeoutMS=%RU32, fFlags=%x\n",
-                 mData.mProcess.mCommand.c_str(), mData.mProcess.mTimeoutMS, mData.mProcess.mFlags));
+                     mData.mProcess.mCommand.c_str(), mData.mProcess.mTimeoutMS, mData.mProcess.mFlags));
 
     /* Wait until the caller function (if kicked off by a thread)
@@ -1545 +1545 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
+    HRESULT hr = S_OK;
+
     int vrc = terminateProcess();
-    /** @todo Do setError() here. */
-    HRESULT hr = RT_SUCCESS(vrc) ? S_OK : VBOX_E_IPRT_ERROR;
-    LogFlowFuncLeaveRC(vrc);
-
+    if (RT_FAILURE(vrc))
+    {
+        switch (vrc)
+        {
+            case VERR_NOT_IMPLEMENTED:
+                ReturnComNotImplemented();
+                break; /* Never reached. */
+
+            case VERR_NOT_SUPPORTED:
+                hr = setError(VBOX_E_IPRT_ERROR,
+                              tr("Terminating process \"%s\" (PID %RU32) not supported by installed Guest Additions"),
+                              mData.mProcess.mCommand.c_str(), mData.mPID);
+                break;
+
+            default:
+                hr = setError(VBOX_E_IPRT_ERROR,
+                              tr("Terminating process \"%s\" (PID %RU32) failed: %Rrc"),
+                              mData.mProcess.mCommand.c_str(), mData.mPID, vrc);
+                break;
+        }
+    }
+
+    LogFlowFuncLeaveRC(vrc);
     return hr;
 #endif /* VBOX_WITH_GUEST_CONTROL */

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

@@ -765 +765 @@
         return VERR_COM_UNEXPECTED;
 
-    /* Note: There will be a race between creating and getting/initing the directory
-             object here. */
     int rc = pFile->init(this /* Parent */,
                          strPath, strOpenMode, strDisposition, uCreationMode, iOffset);
@@ -818 +816 @@
     LogFlowThisFunc(("strPath=%s\n", strPath.c_str()));
 
+    /** @todo Merge this with IGuestFile::queryInfo(). */
     GuestProcessStartupInfo procInfo;
     procInfo.mName    = Utf8StrFmt(tr("Querying info for \"%s\""), strPath.c_str());