Changeset 77582 in vbox

Timestamp:

Mar 6, 2019 2:18:39 PM (6 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Renamed IGuestSession::i_isReadyExternal() -> IGuestSession::i_isStartedExternal() to match terminology, and added i_isStarted() + i_isTerminated().

Location:

trunk/src/VBox/Main

Files:

• include/GuestSessionImpl.h (modified) (1 diff)
• src-client/GuestSessionImpl.cpp (modified) (20 diffs)

trunk/src/VBox/Main/include/GuestSessionImpl.h

@@ -307 +307 @@
     ULONG                   i_getId(void) { return mData.mSession.mID; }
     static Utf8Str          i_guestErrorToString(int guestRc);
-    HRESULT                 i_isReadyExternal(void);
+    bool                    i_isStarted(void) const;
+    HRESULT                 i_isStartedExternal(void);
+    bool                    i_isTerminated(void) const;
     int                     i_onRemove(void);
     int                     i_onSessionStatusChange(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData);

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

@@ -542 +542 @@
 HRESULT GuestSession::getUserHome(com::Utf8Str &aUserHome)
 {
-    HRESULT hr = i_isReadyExternal();
+    HRESULT hr = i_isStartedExternal();
     if (FAILED(hr))
         return hr;
@@ -580 +580 @@
 HRESULT GuestSession::getUserDocuments(com::Utf8Str &aUserDocuments)
 {
-    HRESULT hr = i_isReadyExternal();
+    HRESULT hr = i_isStartedExternal();
     if (FAILED(hr))
         return hr;
@@ -741 +741 @@
                                       const com::Utf8Str &strDestination, ComPtr<IProgress> &pProgress)
 {
-    HRESULT hrc = i_isReadyExternal();
+    HRESULT hrc = i_isStartedExternal();
     if (FAILED(hrc))
         return hrc;
@@ -812 +812 @@
                                     const com::Utf8Str &strDestination, ComPtr<IProgress> &pProgress)
 {
-    HRESULT hrc = i_isReadyExternal();
+    HRESULT hrc = i_isStartedExternal();
     if (FAILED(hrc))
         return hrc;
@@ -1733 +1733 @@
 
 /**
+ * Returns whether the session is in a started state or not.
+ *
+ * @returns \c true if in a started state, or \c false if not.
+ */
+bool GuestSession::i_isStarted(void) const
+{
+    return (mData.mStatus == GuestSessionStatus_Started);
+}
+
+/**
  * Checks if this session is ready state where it can handle
  * all session-bound actions (like guest processes, guest files).
@@ -1738 +1748 @@
  * error when not ready.
  */
-HRESULT GuestSession::i_isReadyExternal(void)
+HRESULT GuestSession::i_isStartedExternal(void)
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     /** @todo Be a bit more informative. */
-    if (mData.mStatus != GuestSessionStatus_Started)
+    if (!i_isStarted())
         return setError(E_UNEXPECTED, tr("Session is not in started state"));
 
     return S_OK;
+}
+
+/**
+ * Returns whether the session is in a terminated state or not.
+ *
+ * @returns \c true if in a terminated state, or \c false if not.
+ */
+bool GuestSession::i_isTerminated(void) const
+{
+    switch (mData.mStatus)
+    {
+        case GuestSessionStatus_Undefined:
+            RT_FALL_THROUGH();
+        case GuestSessionStatus_Starting:
+            RT_FALL_THROUGH();
+        case GuestSessionStatus_Started:
+            RT_FALL_THROUGH();
+        case GuestSessionStatus_Terminating:
+            RT_FALL_THROUGH();
+        case GuestSessionStatus_32BitHack:
+            break;
+
+        case GuestSessionStatus_Terminated:
+        case GuestSessionStatus_TimedOutKilled:
+        case GuestSessionStatus_TimedOutAbnormally:
+        case GuestSessionStatus_Down:
+        case GuestSessionStatus_Error:
+            return true;
+
+        default:
+            break;
+    }
+
+    return false;
 }
 
@@ -3140 +3184 @@
     }
 
-    HRESULT hrc = i_isReadyExternal();
+    HRESULT hrc = i_isStartedExternal();
     if (FAILED(hrc))
         return hrc;
@@ -3188 +3232 @@
         return setError(E_INVALIDARG, tr("No directory name specified"));
 
-    HRESULT hrc = i_isReadyExternal();
+    HRESULT hrc = i_isStartedExternal();
     if (FAILED(hrc))
         return hrc;
@@ -3222 +3266 @@
         return setError(E_INVALIDARG, tr("No directory to check existence for specified"));
 
-    HRESULT hrc = i_isReadyExternal();
+    HRESULT hrc = i_isStartedExternal();
     if (FAILED(hrc))
         return hrc;
@@ -3282 +3326 @@
     }
 
-    HRESULT hrc = i_isReadyExternal();
+    HRESULT hrc = i_isStartedExternal();
     if (FAILED(hrc))
         return hrc;
@@ -3330 +3374 @@
         return setError(E_INVALIDARG, tr("No directory to remove specified"));
 
-    HRESULT hrc = i_isReadyExternal();
+    HRESULT hrc = i_isStartedExternal();
     if (FAILED(hrc))
         return hrc;
@@ -3395 +3439 @@
     }
 
-    HRESULT hrc = i_isReadyExternal();
+    HRESULT hrc = i_isStartedExternal();
     if (FAILED(hrc))
         return hrc;
@@ -3594 +3638 @@
         return S_OK;
 
-    HRESULT hrc = i_isReadyExternal();
+    HRESULT hrc = i_isStartedExternal();
     if (FAILED(hrc))
         return hrc;
@@ -3658 +3702 @@
         return setError(E_INVALIDARG, tr("No file to open specified"));
 
-    HRESULT hrc = i_isReadyExternal();
+    HRESULT hrc = i_isStartedExternal();
     if (FAILED(hrc))
         return hrc;
@@ -3768 +3812 @@
         return setError(E_INVALIDARG, tr("No path specified"));
 
-    HRESULT hrc = i_isReadyExternal();
+    HRESULT hrc = i_isStartedExternal();
     if (FAILED(hrc))
         return hrc;
@@ -3797 +3841 @@
         return setError(E_INVALIDARG, tr("No path specified"));
 
-    HRESULT hrc = i_isReadyExternal();
+    HRESULT hrc = i_isStartedExternal();
     if (FAILED(hrc))
         return hrc;
@@ -3841 +3885 @@
         return setError(E_INVALIDARG, tr("No path specified"));
 
-    HRESULT hrc = i_isReadyExternal();
+    HRESULT hrc = i_isStartedExternal();
     if (FAILED(hrc))
         return hrc;
@@ -3881 +3925 @@
         return setError(E_INVALIDARG, tr("No path specified"));
 
-    HRESULT hrc = i_isReadyExternal();
+    HRESULT hrc = i_isStartedExternal();
     if (FAILED(hrc))
         return hrc;
@@ -3923 +3967 @@
         return setError(E_INVALIDARG, tr("No destination path specified"));
 
-    HRESULT hrc = i_isReadyExternal();
+    HRESULT hrc = i_isStartedExternal();
     if (FAILED(hrc))
         return hrc;
@@ -4023 +4067 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    HRESULT hr = i_isReadyExternal();
+    HRESULT hr = i_isStartedExternal();
     if (FAILED(hr))
         return hr;