Changeset 35907 in vbox for trunk/src/VBox/Additions

Timestamp:

Feb 9, 2011 11:20:31 AM (14 years ago)

Author:

vboxsync

Message:

Main/Frontends: Also use facilities for guest features (seamless, graphics), added facility-state-to-name to VBoxManage, some renaming.

Location:

trunk/src/VBox/Additions

Files:

• WINNT/VBoxTray/VBoxHelpers.cpp (modified) (1 diff)
• WINNT/VBoxTray/VBoxHelpers.h (modified) (1 diff)
• WINNT/VBoxTray/VBoxTray.cpp (modified) (4 diffs)
• common/VBoxGuest/VBoxGuest2.cpp (modified) (2 diffs)
• common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp (modified) (1 diff)
• common/VBoxService/VBoxService.cpp (modified) (9 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxHelpers.cpp

@@ -28 +28 @@
 
 
-int hlpReportStatus(VBoxGuestStatusCurrent statusCurrent)
-{
-    int rc = VbglR3ReportAdditionsStatus(VBoxGuestStatusFacility_VBoxTrayClient,
+int hlpReportStatus(VBoxGuestFacilityStatus statusCurrent)
+{
+    int rc = VbglR3ReportAdditionsStatus(VBoxGuestFacilityType_VBoxTrayClient,
                                          statusCurrent,
                                          0 /* Flags */);

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxHelpers.h

@@ -27 +27 @@
 #endif /* !DEBUG_DISPLAY_CHANGE */
 
-extern int hlpReportStatus(VBoxGuestStatusCurrent statusCurrent);
+extern int hlpReportStatus(VBoxGuestFacilityStatus statusCurrent);
 extern void hlpReloadCursor(void);
 extern void hlpResizeRect(RECTL *paRects, unsigned nRects, unsigned uPrimary, unsigned uResized, int iNewWidth, int iNewHeight);

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

@@ -583 +583 @@
                 {
                     /* Report the host that we're up and running! */
-                    rc = hlpReportStatus(VBoxGuestStatusCurrent_Active);
+                    hlpReportStatus(VBoxGuestFacilityStatus_Active);
                 }
             }
@@ -685 +685 @@
     }
 
-    if (RT_FAILURE(rc))
-    {
-        CloseHandle (hMutexAppRunning);
-        hMutexAppRunning = NULL;
-        return 1;
-    }
-
     if (RT_SUCCESS(rc))
     {
@@ -697 +690 @@
         ghInstance = hInstance;
 
-        rc = hlpReportStatus(VBoxGuestStatusCurrent_Init);
+        hlpReportStatus(VBoxGuestFacilityStatus_Init);
+        rc = vboxTrayCreateToolWindow();
         if (RT_SUCCESS(rc))
         {
-            rc = vboxTrayCreateToolWindow();
+            rc = vboxTraySetupSeamless();
             if (RT_SUCCESS(rc))
             {
-                rc = vboxTraySetupSeamless();
+                Log(("VBoxTray: Init successful\n"));
+                rc = vboxTrayServiceMain();
                 if (RT_SUCCESS(rc))
-                {
-                    Log(("VBoxTray: Init successful\n"));
-                    rc = vboxTrayServiceMain();
-                    hlpReportStatus(VBoxGuestStatusCurrent_Terminating);
-                    vboxTrayShutdownSeamless();
-                }
-                vboxTrayDestroyToolWindow();
-            }
-            rc = hlpReportStatus(VBoxGuestStatusCurrent_Inactive);
-        }
-    }
-    else
-        Log(("VBoxTray: Could not report VBoxTray status \"Init\", rc=%Rrc\n", rc));
+                    hlpReportStatus(VBoxGuestFacilityStatus_Terminating);
+                vboxTrayShutdownSeamless();
+            }
+            vboxTrayDestroyToolWindow();
+        }
+        if (RT_SUCCESS(rc))
+            hlpReportStatus(VBoxGuestFacilityStatus_Terminated);
+    }
+
         if (RT_FAILURE(rc))
-        LogRel(("VBoxTray: Error while starting, rc=%Rrc\n", rc));
+    {
+        LogRel(("VBoxTray: Error while starting, rc=%Rrc\n", rc));
+        hlpReportStatus(VBoxGuestFacilityStatus_Failed);
+    }
     LogRel(("VBoxTray: Ended\n"));
+    vboxTrayCloseBaseDriver();
 
     /* Release instance mutex. */
@@ -730 +725 @@
 
     VbglR3Term();
-    return 0;
+    return RT_SUCCESS(rc) ? 0 : 1;
 }
 

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -116 +116 @@
     if (RT_SUCCESS(rc))
     {
-        pReq2->guestStatus.facility = VBoxGuestStatusFacility_VBoxGuestDriver;
+        pReq2->guestStatus.facility = VBoxGuestFacilityType_VBoxGuestDriver;
         pReq2->guestStatus.status = fActive ?
-                                    VBoxGuestStatusCurrent_Active
-                                  : VBoxGuestStatusCurrent_Inactive;
+                                    VBoxGuestFacilityStatus_Active
+                                  : VBoxGuestFacilityStatus_Inactive;
         pReq2->guestStatus.flags = 0;
         rc = VbglGRPerform(&pReq2->header);

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

@@ -147 +147 @@
  * @param   fReserved       Reserved for future use (what?).
  */
-VBGLR3DECL(int) VbglR3ReportAdditionsStatus(VBoxGuestStatusFacility enmFacility,
-                                            VBoxGuestStatusCurrent enmStatusCurrent,
+VBGLR3DECL(int) VbglR3ReportAdditionsStatus(VBoxGuestFacilityType enmFacility,
+                                            VBoxGuestFacilityStatus enmStatusCurrent,
                                             uint32_t fReserved)
 {

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -229 +229 @@
 
 /**
+ * Reports the current VBoxService status to the host.
+ *
+ * @return  IPRT status code.
+ * @param   enmStatus               Status to report to the host.
+ */
+int VBoxServiceReportStatus(VBoxGuestFacilityStatus enmStatus)
+{
+    /* Report the host that we're up and running! */
+    int rc = VbglR3ReportAdditionsStatus(VBoxGuestFacilityType_VBoxService,
+                                         enmStatus, 0 /* Flags */);
+    if (RT_FAILURE(rc))
+        VBoxServiceError("Could not report VBoxService status (%u), rc=%Rrc\n", enmStatus, rc);
+    return rc;
+}
+
+
+/**
  * Gets a 32-bit value argument.
  *
@@ -310 +327 @@
 {
     int rc;
+
+    VBoxServiceReportStatus(VBoxGuestFacilityStatus_Init);
 
     /*
@@ -372 +391 @@
         VBoxServiceVerbose(1, "All services started.\n");
     else
+    {
         VBoxServiceError("An error occcurred while the services!\n");
+        VBoxServiceReportStatus(VBoxGuestFacilityStatus_Failed);
+    }
     return rc;
 }
@@ -386 +408 @@
 {
     int rc = VINF_SUCCESS;
+
+    VBoxServiceReportStatus(VBoxGuestFacilityStatus_Terminating);
 
     /*
@@ -445 +469 @@
 
     VBoxServiceVerbose(2, "Stopping services returned: rc=%Rrc\n", rc);
+    VBoxServiceReportStatus(RT_SUCCESS(rc)
+                            ? VBoxGuestFacilityStatus_Paused : VBoxGuestFacilityStatus_Failed);
     return rc;
 }
@@ -456 +482 @@
     int rc;
 
-    /* Report the host that we're up and running! */
-    rc = VbglR3ReportAdditionsStatus(VBoxGuestStatusFacility_VBoxService,
-                                     VBoxGuestStatusCurrent_Active,
-                                     0 /* Flags */);
-    if (RT_FAILURE(rc))
-        VBoxServiceError("Could not report facility (%u) status %u, rc=%Rrc\n",
-                         VBoxGuestStatusFacility_VBoxService, VBoxGuestStatusCurrent_Active, rc);
+    VBoxServiceReportStatus(VBoxGuestFacilityStatus_Active);
 
 #ifdef RT_OS_WINDOWS
@@ -557 +577 @@
 #endif
 
+    VBoxServiceReportStatus(VBoxGuestFacilityStatus_PreInit);
+
     /*
      * Do pre-init of services.
@@ -564 +586 @@
         rc = g_aServices[j].pDesc->pfnPreInit();
         if (RT_FAILURE(rc))
+        {
+            VBoxServiceReportStatus(VBoxGuestFacilityStatus_Failed);
             return VBoxServiceError("Service '%s' failed pre-init: %Rrc\n", g_aServices[j].pDesc->pszName, rc);
+        }
     }
 #ifdef RT_OS_WINDOWS
@@ -768 +793 @@
 
     VBoxServiceVerbose(0, "Ended.\n");
+    VBoxServiceReportStatus(VBoxGuestFacilityStatus_Terminated);
     return rcExit;
 }