Changeset 40158 in vbox for trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

Timestamp:

Feb 16, 2012 5:06:35 PM (13 years ago)

Author:

vboxsync

Message:

VBoxService/users-win: Added session change detection, more fun with logged-in user detection.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp (modified) (7 diffs)

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

@@ -83 +83 @@
 
 
-#ifdef RT_OS_WINDOWS
-static BOOL WINAPI VBoxServiceVMInfoConsoleControlHandler(DWORD dwCtrlType)
-{
-    int rc = VINF_SUCCESS;
-    bool fEventHandled = FALSE;
-    switch (dwCtrlType)
-    {
-        case CTRL_LOGOFF_EVENT:
-            VBoxServiceVerbose(2, "VMInfo: Received logged-off event\n");
-            /* Trigger a re-enumeration of all logged-in users by unblocking
-             * the multi event semaphore of the VMInfo thread. */
-            if (g_hVMInfoEvent)
-                rc = RTSemEventMultiSignal(g_hVMInfoEvent);
-            fEventHandled = TRUE;
-            break;
-        default:
-            break;
-        /** @todo Add other events here. */
-    }
-
-    if (RT_FAILURE(rc))
-        VBoxServiceError("VMInfo: Event %ld handled with error rc=%Rrc\n",
-                         dwCtrlType, rc);
-    return fEventHandled;
+
+/**
+ * Signals the event so that a re-enumeration of VM-specific
+ * information (like logged in users) can happen.
+ *
+ * @return  IPRT status code.
+ */
+int VBoxServiceVMInfoSignal(void)
+{
+    /* Trigger a re-enumeration of all logged-in users by unblocking
+     * the multi event semaphore of the VMInfo thread. */
+    if (g_hVMInfoEvent)
+        return RTSemEventMultiSignal(g_hVMInfoEvent);
+
+    return VINF_SUCCESS;
 }
-#endif /* RT_OS_WINDOWS */
 
 
@@ -182 +172 @@
         VBoxServicePropCacheUpdateEntry(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/Net/Count",
                                         VBOXSERVICEPROPCACHEFLAG_TEMPORARY | VBOXSERVICEPROPCACHEFLAG_ALWAYS_UPDATE, NULL /* Delete on exit */);
-
-#ifdef RT_OS_WINDOWS
-# ifndef RT_OS_NT4
-    /* Install console control handler. */
-    if (!SetConsoleCtrlHandler((PHANDLER_ROUTINE)VBoxServiceVMInfoConsoleControlHandler, TRUE /* Add handler */))
-    {
-        VBoxServiceError("VMInfo: Unable to add console control handler, error=%ld\n", GetLastError());
-        /* Just skip this error, not critical. */
-    }
-# endif /* !RT_OS_NT4 */
-#endif /* RT_OS_WINDOWS */
     }
     return rc;
@@ -301 +280 @@
            && RT_SUCCESS(rc))
     {
-        VBoxServiceVerbose(4, "VMInfo/Users: Found logged in user \"%s\"\n",
+        VBoxServiceVerbose(4, "Found logged in user \"%s\"\n",
                            ut_user->ut_user);
         if (cUsersInList > cListSize)
@@ -369 +348 @@
             static int s_iVMInfoBitchedOOM = 0;
             if (s_iVMInfoBitchedOOM++ < 3)
-                VBoxServiceVerbose(0, "VMInfo/Users: Warning: Not enough memory available to enumerate users! Keeping old value (%u)\n",
+                VBoxServiceVerbose(0, "Warning: Not enough memory available to enumerate users! Keeping old value (%u)\n",
                                    g_cVMInfoLoggedInUsers);
             cUsersInList = g_cVMInfoLoggedInUsers;
@@ -377 +356 @@
     }
 
-    VBoxServiceVerbose(4, "VMInfo/Users: cUsersInList: %u, pszUserList: %s, rc=%Rrc\n",
+    VBoxServiceVerbose(4, "cUsersInList: %u, pszUserList: %s, rc=%Rrc\n",
                        cUsersInList, pszUserList ? pszUserList : "<NULL>", rc);
 
@@ -878 +857 @@
 static DECLCALLBACK(void) VBoxServiceVMInfoTerm(void)
 {
-    int rc;
-
-#ifdef RT_OS_WINDOWS
-# ifndef RT_OS_NT4
-    /* Uninstall console control handler. */
-    if (!SetConsoleCtrlHandler((PHANDLER_ROUTINE)NULL, FALSE /* Remove handler */))
-    {
-        VBoxServiceError("VMInfo: Unable to remove console control handler, error=%ld\n", GetLastError());
-        /* Just skip this error, not critical. */
-    }
-# endif /* !RT_OS_NT4 */
-#endif
-
     if (g_hVMInfoEvent != NIL_RTSEMEVENTMULTI)
     {
@@ -906 +872 @@
         /* Delete the "../Net" branch. */
         const char *apszPat[1] = { "/VirtualBox/GuestInfo/Net/*" };
-        rc = VbglR3GuestPropDelSet(g_uVMInfoGuestPropSvcClientID, &apszPat[0], RT_ELEMENTS(apszPat));
+        int rc = VbglR3GuestPropDelSet(g_uVMInfoGuestPropSvcClientID, &apszPat[0], RT_ELEMENTS(apszPat));
 
         /* Destroy property cache. */