Changeset 30778 in vbox

Timestamp:

Jul 12, 2010 8:40:54 AM (15 years ago)

Author:

vboxsync

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

63577

Message:

Guest Additions status: Use more enums.

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp (modified) (2 diffs)
• src/VBox/Main/GuestImpl.cpp (modified) (2 diffs)
• src/VBox/Main/VMMDevInterface.cpp (modified) (2 diffs)
• src/VBox/Main/include/GuestImpl.h (modified) (1 diff)

trunk/include/VBox/VBoxGuestLib.h

@@ -413 +413 @@
 VBGLR3DECL(int)     VbglR3WaitEvent(uint32_t fMask, uint32_t cMillies, uint32_t *pfEvents);
 
-VBGLR3DECL(int)     VbglR3ReportAdditionsStatus(uint32_t u32Facility, uint32_t u32Status, uint32_t u32Flags);
+VBGLR3DECL(int)     VbglR3ReportAdditionsStatus(VBoxGuestStatusFacility Facility, VBoxGuestStatusCurrent Status, uint32_t uFlags);
 VBGLR3DECL(int)     VbglR3GetAdditionsVersion(char **ppszVer, char **ppszRev);
 VBGLR3DECL(int)     VbglR3GetAdditionsInstallationPath(char **ppszPath);

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp

@@ -147 +147 @@
  * @param uFlags
  */
-VBGLR3DECL(int) VbglR3ReportAdditionsStatus(uint32_t uFacility, uint32_t uStatus, uint32_t uFlags)
+VBGLR3DECL(int) VbglR3ReportAdditionsStatus(VBoxGuestStatusFacility Facility, VBoxGuestStatusCurrent Status, uint32_t uFlags)
 {
     VMMDevReportGuestStatus Report;
@@ -155 +155 @@
     {
 
-        Report.guestStatus.facility = uFacility;
-        Report.guestStatus.status = uStatus;
+        Report.guestStatus.facility = Facility;
+        Report.guestStatus.status = Status;
         Report.guestStatus.flags = uFlags;
 

trunk/src/VBox/Main/GuestImpl.cpp

@@ -1460 +1460 @@
  * Sets the status of a certain Guest Additions facility.
  *
- * @param ulFacility
- * @param ulStatus
+ * @param Facility
+ * @param Status
  * @param ulFlags
  */
-void Guest::setAdditionsStatus (ULONG ulFacility, ULONG ulStatus, ULONG ulFlags)
+void Guest::setAdditionsStatus (VBoxGuestStatusFacility Facility, VBoxGuestStatusCurrent Status, ULONG ulFlags)
 {
     AutoCaller autoCaller(this);
@@ -1474 +1474 @@
      * Only mark Guest Additions as active when VBoxService started up.
      */
-    mData.mAdditionsActive = (   ulFacility == VBoxGuestStatusFacility_VBoxService
-                              && ulStatus   == VBoxGuestStatusCurrent_Active) ? TRUE : FALSE;
+    mData.mAdditionsActive = (   Facility == VBoxGuestStatusFacility_VBoxService
+                              && Status   == VBoxGuestStatusCurrent_Active) ? TRUE : FALSE;
 }
 

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -179 +179 @@
         return;
 
-    guest->setAdditionsStatus(guestStatus->facility,
-                              guestStatus->status,
+    guest->setAdditionsStatus((VBoxGuestStatusFacility)guestStatus->facility,
+                              (VBoxGuestStatusCurrent)guestStatus->status,
                               guestStatus->flags);
     pDrv->pVMMDev->getParent()->onAdditionsStateChange();
@@ -230 +230 @@
          */
         guest->setAdditionsInfo(Bstr(), guestInfo->osType);
-        guest->setAdditionsStatus(0,  /* Facility; 0 = Global GA status.  May be changed
-                                       * later to VBoxService' own facility. */
-                                  0,  /* Status; 0 = Not active */
+        guest->setAdditionsStatus(VBoxGuestStatusFacility_Unknown,
+                                  VBoxGuestStatusCurrent_Disabled,
                                   0); /* Flags; not used. */
         pDrv->pVMMDev->getParent()->onAdditionsStateChange();

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

@@ -114 +114 @@
     // Public methods that are not in IDL (only called internally).
     void setAdditionsInfo(Bstr aVersion, VBOXOSTYPE aOsType);
-    void setAdditionsStatus(ULONG ulFacility, ULONG ulStatus, ULONG ulFlags);
+    void setAdditionsStatus(VBoxGuestStatusFacility Facility, VBoxGuestStatusCurrent Status, ULONG ulFlags);
     void setSupportedFeatures(ULONG64 ulCaps, ULONG64 ulActive);
     HRESULT setStatistic(ULONG aCpuId, GUESTSTATTYPE enmType, ULONG aVal);