Changeset 32086 in vbox for trunk/src/VBox

Timestamp:

Aug 30, 2010 12:08:30 PM (14 years ago)

Author:

vboxsync

Message:

Guest Additions Runlevels: Use a Main enum for run level type.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/UISession.h (modified) (1 diff)
• Main/GuestImpl.cpp (modified) (7 diffs)
• Main/idl/VirtualBox.xidl (modified) (3 diffs)
• Main/include/GuestImpl.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -1933 +1933 @@
             }
 
-            ULONG guestRunLevel;
+            AdditionsRunLevelType_T guestRunLevel; /** @todo Add a runlevel-to-string (e.g. 0 = "None") method? */
             rc = guest->COMGETTER(AdditionsRunLevel)(&guestRunLevel);
             if (SUCCEEDED(rc))

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -104 +104 @@
 
     /* Guest additions state getters: */
-    bool isGuestAdditionsActive() const { return (m_ulGuestAdditionsRunLevel > 0); }
+    bool isGuestAdditionsActive() const { return (m_ulGuestAdditionsRunLevel > AdditionsRunLevelType_None); }
     bool isGuestSupportsGraphics() const { return isGuestAdditionsActive() && m_fIsGuestSupportsGraphics; }
     bool isGuestSupportsSeamless() const { return isGuestSupportsGraphics() && m_fIsGuestSupportsSeamless; }

trunk/src/VBox/Main/GuestImpl.cpp

@@ -160 +160 @@
 }
 
-STDMETHODIMP Guest::COMGETTER(AdditionsRunLevel) (ULONG *aRunLevel)
+STDMETHODIMP Guest::COMGETTER(AdditionsRunLevel) (AdditionsRunLevelType_T *aRunLevel)
 {
     AutoCaller autoCaller(this);
@@ -184 +184 @@
     if (   mData.mAdditionsVersion.isEmpty()
         /* Only try alternative way if GA are active! */
-        && mData.mAdditionsRunLevel > VBoxGuestAdditionsRunLevel_None)
+        && mData.mAdditionsRunLevel > AdditionsRunLevelType_None)
     {
         /*
@@ -429 +429 @@
 }
 
-STDMETHODIMP Guest::GetAdditionsStatus(ULONG aLevel, BOOL *aActive)
+STDMETHODIMP Guest::GetAdditionsStatus(AdditionsRunLevelType_T aLevel, BOOL *aActive)
 {
     AutoCaller autoCaller(this);
@@ -439 +439 @@
     switch (aLevel)
     {
-        case 0: /* System */
-            *aActive = (mData.mAdditionsRunLevel > VBoxGuestAdditionsRunLevel_None);
+        case AdditionsRunLevelType_System:
+            *aActive = (mData.mAdditionsRunLevel > AdditionsRunLevelType_None);
             break;
 
-        case 1: /* Userland */
-            *aActive = (mData.mAdditionsRunLevel >= VBoxGuestAdditionsRunLevel_Userland);
+        case AdditionsRunLevelType_Userland:
+            *aActive = (mData.mAdditionsRunLevel >= AdditionsRunLevelType_Userland);
             break;
 
-        case 2: /* Desktop */
-            *aActive = (mData.mAdditionsRunLevel >= VBoxGuestAdditionsRunLevel_Desktop);
+        case AdditionsRunLevelType_Desktop:
+            *aActive = (mData.mAdditionsRunLevel >= AdditionsRunLevelType_Desktop);
             break;
 
@@ -1520 +1520 @@
     {
         mData.mAdditionsRunLevel = aInterfaceVersion.isEmpty()
-                                 ? VBoxGuestAdditionsRunLevel_None
-                                 : VBoxGuestAdditionsRunLevel_System;
+                                 ? AdditionsRunLevelType_None
+                                 : AdditionsRunLevelType_System;
     }
 
@@ -1529 +1529 @@
      * and use the setSupportedFeatures function instead.
      */
-    mData.mSupportsGraphics = mData.mAdditionsRunLevel > VBoxGuestAdditionsRunLevel_None;
+    mData.mSupportsGraphics = mData.mAdditionsRunLevel > AdditionsRunLevelType_None;
 
     /*
@@ -1589 +1589 @@
        )
     {
-        mData.mAdditionsRunLevel = VBoxGuestAdditionsRunLevel_None;
+        mData.mAdditionsRunLevel = AdditionsRunLevelType_None;
     }
     else if (uCurFacility >= VBoxGuestStatusFacility_VBoxTray)
     {
-        mData.mAdditionsRunLevel = VBoxGuestAdditionsRunLevel_Desktop;
+        mData.mAdditionsRunLevel = AdditionsRunLevelType_Desktop;
     }
     else if (uCurFacility >= VBoxGuestStatusFacility_VBoxService)
     {
-        mData.mAdditionsRunLevel = VBoxGuestAdditionsRunLevel_Userland;
+        mData.mAdditionsRunLevel = AdditionsRunLevelType_Userland;
     }
     else if (uCurFacility >= VBoxGuestStatusFacility_VBoxGuestDriver)
     {
-        mData.mAdditionsRunLevel = VBoxGuestAdditionsRunLevel_System;
+        mData.mAdditionsRunLevel = AdditionsRunLevelType_System;
     }
     else /* Should never happen! */

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -7644 +7644 @@
   </interface>
 
+  <enum
+    name="AdditionsRunLevelType"
+    uuid="a25417ee-a9dd-4f5b-b0dc-377860087754"
+  >
+    <desc>
+      Guest Additions run level type.
+    </desc>
+
+    <const name="None"     value="0">
+      <desc>Guest Additions are not loaded.</desc>
+    </const>
+    <const name="System"   value="1">
+        <desc>Guest drivers are loaded.</desc>
+    </const>
+    <const name="Userland" value="2">
+        <desc>Common components (such as application services) are loaded.</desc>
+    </const>
+    <const name="Desktop"  value="3">
+        <desc>Per-user desktop components are loaded.</desc>
+    </const>
+  </enum>
+
   <interface
      name="IGuest" extends="$unknown"
@@ -7673 +7695 @@
     </attribute>
 
-    <attribute name="additionsRunLevel" type="unsigned long" readonly="yes">
+    <attribute name="additionsRunLevel" type="AdditionsRunLevelType" readonly="yes">
       <desc>
         Current run level of the Guest Additions.
@@ -7765 +7787 @@
 
       </desc>
-      <param name="level" type="unsigned long" dir="in">
+      <param name="level" type="AdditionsRunLevelType" dir="in">
         <desc>Status level to check</desc>
       </param>

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

@@ -75 +75 @@
     // IGuest properties
     STDMETHOD(COMGETTER(OSTypeId)) (BSTR *aOSTypeId);
-    STDMETHOD(COMGETTER(AdditionsRunLevel)) (ULONG *aRunLevel);
+    STDMETHOD(COMGETTER(AdditionsRunLevel)) (AdditionsRunLevelType_T *aRunLevel);
     STDMETHOD(COMGETTER(AdditionsVersion)) (BSTR *aAdditionsVersion);
     /** @todo Remove later by replacing it by AdditionsFeatureAvailable(). */
@@ -90 +90 @@
 
     // IGuest methods
-    STDMETHOD(GetAdditionsStatus)(ULONG aLevel, BOOL *aActive);
+    STDMETHOD(GetAdditionsStatus)(AdditionsRunLevelType_T aLevel, BOOL *aActive);
     STDMETHOD(SetCredentials)(IN_BSTR aUserName, IN_BSTR aPassword,
                               IN_BSTR aDomain, BOOL aAllowInteractiveLogon);
@@ -160 +160 @@
 # endif
 
-    /**
-     * Guest additions run level.
-     */
-    enum VBoxGuestAdditionsRunLevel
-    {
-        VBoxGuestAdditionsRunLevel_None     = 0,
-        VBoxGuestAdditionsRunLevel_System   = 100,
-        VBoxGuestAdditionsRunLevel_Userland = 200,
-        VBoxGuestAdditionsRunLevel_Desktop  = 400,
-        VBoxGuestAdditionsRunLevel_SizeHack = 0x7fffffff
-    };
-
     struct Data
     {
-        Data() : mAdditionsRunLevel (0), mSupportsSeamless (FALSE),
+        Data() : mAdditionsRunLevel (AdditionsRunLevelType_None),
+                 mSupportsSeamless (FALSE),
                  mSupportsGraphics (FALSE) {}
 
-        Bstr     mOSTypeId;
-        uint32_t mAdditionsRunLevel;
-        Bstr     mAdditionsVersion;
-        Bstr     mInterfaceVersion;
-        BOOL     mSupportsSeamless;
-        BOOL     mSupportsGraphics;
+        Bstr                    mOSTypeId;
+        AdditionsRunLevelType_T mAdditionsRunLevel;
+        Bstr                    mAdditionsVersion;
+        Bstr                    mInterfaceVersion;
+        BOOL                    mSupportsSeamless;
+        BOOL                    mSupportsGraphics;
     };