Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl
===================================================================
--- /trunk/src/VBox/Main/idl/VirtualBox.xidl	(revision 35887)
+++ /trunk/src/VBox/Main/idl/VirtualBox.xidl	(revision 35888)
@@ -7890,11 +7890,11 @@
     </const>
     <const name="VBoxGuestDriver"         value="20">
-      <desc>VBoxGuest base driver.</desc>
+      <desc>VirtualBox base driver (VBoxGuest).</desc>
     </const>
     <const name="VBoxService"             value="100">
-      <desc>VBoxService.</desc>
+      <desc>VirtualBox system service (VBoxService).</desc>
     </const>
     <const name="VBoxTrayClient"          value="101">
-      <desc>VBoxTray (Windows) / VBoxClient (Non-Windows).</desc>
+      <desc>VirtualBox VBoxTray (Windows) / VBoxClient (Non-Windows).</desc>
     </const>
     <const name="All"                     value="999">
@@ -7905,5 +7905,5 @@
   <enum
     name="AdditionsFacilityStatus"
-    uuid="f49bf8c0-e40b-44dd-9db5-8f4196bfda94"
+    uuid="730a42a1-dac6-4194-b394-744a5ea487f3"
     >
     <desc>
@@ -7934,4 +7934,7 @@
     <const name="Terminated"              value="101">
       <desc>Facility successfully shut down.</desc>
+    </const>
+    <const name="Failed"                  value="800">
+      <desc>Facility failed to start.</desc>
     </const>
     <const name="Unknown"                 value="999">
Index: /trunk/src/VBox/Main/include/GuestImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/GuestImpl.h	(revision 35887)
+++ /trunk/src/VBox/Main/include/GuestImpl.h	(revision 35888)
@@ -89,5 +89,5 @@
 
     // IGuest methods
-    STDMETHOD(GetFacilityStatus)(AdditionsFacilityType aType, LONGLONG *aTimestamp, AdditionsFacilityStatus *aStatus);
+    STDMETHOD(GetFacilityStatus)(AdditionsFacilityType aType, LONG64 *aTimestamp, AdditionsFacilityStatus *aStatus);
     STDMETHOD(GetAdditionsStatus)(AdditionsRunLevelType_T aLevel, BOOL *aActive);
     STDMETHOD(SetCredentials)(IN_BSTR aUserName, IN_BSTR aPassword,
@@ -116,6 +116,6 @@
     void setAdditionsInfo(Bstr aInterfaceVersion, VBOXOSTYPE aOsType);
     void setAdditionsInfo2(Bstr aAdditionsVersion, Bstr aVersionName, Bstr aRevision);
-    void setAdditionsStatus(VBoxGuestStatusFacility Facility, VBoxGuestStatusCurrent Status, ULONG ulFlags);
-    void setSupportedFeatures(uint32_t fCaps, uint32_t fActive);
+    void setAdditionsStatus(VBoxGuestStatusFacility enmFacility, VBoxGuestStatusCurrent enmStatus, ULONG aFlags);
+    void setSupportedFeatures(uint32_t aCaps);
     HRESULT setStatistic(ULONG aCpuId, GUESTSTATTYPE enmType, ULONG aVal);
     BOOL isPageFusionEnabled();
Index: /trunk/src/VBox/Main/src-client/GuestImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestImpl.cpp	(revision 35887)
+++ /trunk/src/VBox/Main/src-client/GuestImpl.cpp	(revision 35888)
@@ -445,5 +445,5 @@
  * @param   aTimestamp      Timestamp of last facility status update in ms (optional).
  */
-STDMETHODIMP Guest::GetFacilityStatus(AdditionsFacilityType aType, LONGLONG *aTimestamp, AdditionsFacilityStatus *aStatus)
+STDMETHODIMP Guest::GetFacilityStatus(AdditionsFacilityType aType, LONG64 *aTimestamp, AdditionsFacilityStatus *aStatus)
 {
     AutoCaller autoCaller(this);
@@ -626,9 +626,9 @@
  * Gets called by vmmdevUpdateGuestStatus.
  *
- * @param Facility
- * @param Status
- * @param ulFlags
- */
-void Guest::setAdditionsStatus(VBoxGuestStatusFacility Facility, VBoxGuestStatusCurrent Status, ULONG ulFlags)
+ * @param enmFacility
+ * @param enmStatus
+ * @param aFlags
+ */
+void Guest::setAdditionsStatus(VBoxGuestStatusFacility enmFacility, VBoxGuestStatusCurrent enmStatus, ULONG aFlags)
 {
     AutoCaller autoCaller(this);
@@ -642,9 +642,9 @@
 
     /* First check for disabled status. */
-    uint32_t uCurFacility = Facility + (Status == VBoxGuestStatusCurrent_Active ? 0 : -1);
-    if (   Facility < VBoxGuestStatusFacility_VBoxGuestDriver
-        || (   Facility == VBoxGuestStatusFacility_All
-            && (   Status   == VBoxGuestStatusCurrent_Inactive
-                || Status   == VBoxGuestStatusCurrent_Disabled
+    uint32_t uCurFacility = enmFacility + (enmStatus == VBoxGuestStatusCurrent_Active ? 0 : -1);
+    if (   enmFacility < VBoxGuestStatusFacility_VBoxGuestDriver
+        || (   enmFacility == VBoxGuestStatusFacility_All
+            && (   enmStatus   == VBoxGuestStatusCurrent_Inactive
+                || enmStatus   == VBoxGuestStatusCurrent_Disabled
                )
            )
@@ -671,15 +671,15 @@
      * Set a specific facility status.
      */
-    if (Facility)
-    {
-        Assert(Facility < UINT32_MAX);
-        FacilityData *pData = &mData.mFacilityMap[(AdditionsFacilityType_T)Facility];
+    if (enmFacility)
+    {
+        Assert(enmFacility < UINT32_MAX);
+        FacilityData *pData = &mData.mFacilityMap[(AdditionsFacilityType_T)enmFacility];
         AssertPtr(pData);
 
         RTTimeNow(&pData->tsLastUpdated);
-        pData->curStatus = (AdditionsFacilityStatus_T)Status;
+        pData->curStatus = (AdditionsFacilityStatus_T)enmStatus;
 
         LogFlowFunc(("Setting guest facility %u = %u (%u)\n",
-                     Facility, pData->curStatus, pData->tsLastUpdated));
+                     enmFacility, pData->curStatus, pData->tsLastUpdated));
     }
 }
@@ -689,8 +689,6 @@
  *
  * @param   fCaps       Guest capability bit mask (VMMDEV_GUEST_SUPPORTS_XXX).
- * @param   fActive     No idea what this is supposed to be, it's always 0 and
- *                      not references by this method.
- */
-void Guest::setSupportedFeatures(uint32_t fCaps, uint32_t fActive)
+ */
+void Guest::setSupportedFeatures(uint32_t aCaps)
 {
     AutoCaller autoCaller(this);
@@ -699,7 +697,7 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mData.mSupportsSeamless = (fCaps & VMMDEV_GUEST_SUPPORTS_SEAMLESS);
+    mData.mSupportsSeamless = (aCaps & VMMDEV_GUEST_SUPPORTS_SEAMLESS);
     /** @todo Add VMMDEV_GUEST_SUPPORTS_GUEST_HOST_WINDOW_MAPPING */
-    mData.mSupportsGraphics = (fCaps & VMMDEV_GUEST_SUPPORTS_GRAPHICS);
+    mData.mSupportsGraphics = (aCaps & VMMDEV_GUEST_SUPPORTS_GRAPHICS);
 }
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */
Index: /trunk/src/VBox/Main/src-client/VMMDevInterface.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/VMMDevInterface.cpp	(revision 35887)
+++ /trunk/src/VBox/Main/src-client/VMMDevInterface.cpp	(revision 35888)
@@ -294,10 +294,11 @@
 {
     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
+    AssertPtr(pDrv);
     Console *pConsole = pDrv->pVMMDev->getParent();
 
     /* store that information in IGuest */
-    Guest* guest = pConsole->getGuest();
-    Assert(guest);
-    if (!guest)
+    Guest* pGuest = pConsole->getGuest();
+    AssertPtr(pGuest);
+    if (!pGuest)
         return;
 
@@ -305,5 +306,5 @@
      * Report our current capabilities (and assume none is active yet).
      */
-    guest->setSupportedFeatures(newCapabilities, 0 /* Active capabilities, not used here. */);
+    pGuest->setSupportedFeatures(newCapabilities);
 
     /*