Changeset 32020 in vbox for trunk/src/VBox/Main/include/GuestImpl.h

Timestamp:

Aug 27, 2010 7:08:38 AM (15 years ago)

Author:

vboxsync

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

65273

Message:

Initial commit of Guest Additions runlevels; this replaces the additionsActive flag to get more detailed information of the current Guest Additions state.

File:

• trunk/src/VBox/Main/include/GuestImpl.h (modified) (3 diffs)

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

@@ -75 +75 @@
     // IGuest properties
     STDMETHOD(COMGETTER(OSTypeId)) (BSTR *aOSTypeId);
-#if 0
-    /** @todo Will replace old AdditionsActive call. */
-    STDMETHOD(COMGETTER(AdditionsActive)) (ULONG aLevel, BOOL *aAdditionsActive);
-#endif
-    STDMETHOD(COMGETTER(AdditionsActive)) (BOOL *aAdditionsActive);
+    STDMETHOD(COMGETTER(AdditionsRunLevel)) (ULONG *aRunLevel);
     STDMETHOD(COMGETTER(AdditionsVersion)) (BSTR *aAdditionsVersion);
     /** @todo Remove later by replacing it by AdditionsFeatureAvailable(). */
@@ -94 +90 @@
 
     // IGuest methods
+    STDMETHOD(GetAdditionsStatus)(ULONG aLevel, BOOL *aActive);
     STDMETHOD(SetCredentials)(IN_BSTR aUserName, IN_BSTR aPassword,
                               IN_BSTR aDomain, BOOL aAllowInteractiveLogon);
@@ -163 +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() : mAdditionsActive (FALSE), mSupportsSeamless (FALSE),
+        Data() : mAdditionsRunLevel (0), mSupportsSeamless (FALSE),
                  mSupportsGraphics (FALSE) {}
 
-        Bstr  mOSTypeId;
-        BOOL  mAdditionsActive;
-        Bstr  mAdditionsVersion;
-        Bstr  mInterfaceVersion;
-        BOOL  mSupportsSeamless;
-        BOOL  mSupportsGraphics;
+        Bstr     mOSTypeId;
+        uint32_t mAdditionsRunLevel;
+        Bstr     mAdditionsVersion;
+        Bstr     mInterfaceVersion;
+        BOOL     mSupportsSeamless;
+        BOOL     mSupportsGraphics;
     };