Changeset 40158 in vbox for trunk/src/VBox/Additions/common

Timestamp:

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

Author:

vboxsync

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

76311

Message:

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

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService-win.cpp (modified) (3 diffs)
• VBoxServiceInternal.h (modified) (1 diff)
• VBoxServiceVMInfo-win.cpp (modified) (32 diffs)
• VBoxServiceVMInfo.cpp (modified) (7 diffs)

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

@@ -136 +136 @@
     ss.dwCurrentState             = dwStatus;
     ss.dwControlsAccepted         = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
+#ifndef TARGET_NT4
+    ss.dwControlsAccepted        |= SERVICE_ACCEPT_SESSIONCHANGE;
+#endif
     ss.dwWin32ExitCode            = NO_ERROR;
     ss.dwServiceSpecificExitCode  = 0; /* Not used */
@@ -379 +382 @@
 
 
+#ifndef TARGET_NT4
+static const char* vboxServiceWTSStateToString(DWORD dwEvent)
+{
+    switch (dwEvent)
+    {
+        case WTS_CONSOLE_CONNECT:
+            return "A session was connected to the console terminal";
+
+        case WTS_CONSOLE_DISCONNECT:
+            return "A session was disconnected from the console terminal";
+
+        case WTS_REMOTE_CONNECT:
+            return "A session connected to the remote terminal";
+
+        case WTS_REMOTE_DISCONNECT:
+            return "A session was disconnected from the remote terminal";
+
+        case WTS_SESSION_LOGON:
+            return "A user has logged on to a session";
+
+        case WTS_SESSION_LOGOFF:
+            return "A user has logged off the session";
+
+        case WTS_SESSION_LOCK:
+            return "A session has been locked";
+
+        case WTS_SESSION_UNLOCK:
+            return "A session has been unlocked";
+
+        case WTS_SESSION_REMOTE_CONTROL:
+            return "A session has changed its remote controlled status";
+#if 0
+        case WTS_SESSION_CREATE:
+            return "A session has been created";
+
+        case WTS_SESSION_TERMINATE:
+            return "The session has been terminated";
+#endif
+        default:
+            break;
+    }
+
+    return "Uknonwn state";
+}
+#endif /* !TARGET_NT4 */
+
+
 #ifdef TARGET_NT4
 static VOID WINAPI vboxServiceWinCtrlHandler(DWORD dwControl)
@@ -417 +467 @@
         }
 
-        case SERVICE_CONTROL_SESSIONCHANGE:     /* Only Win XP and up. */
-#ifndef TARGET_NT4
-# if 0
-            switch (dwEventType)
-            {
-                case WTS_SESSION_LOGON:
-                    VBoxServiceVerbose(2, "A user has logged on to the session.\n");
-                    break;
-
-                case WTS_SESSION_LOGOFF:
-                    VBoxServiceVerbose(2, "A user has logged off from the session.\n");
-                    break;
-                default:
-                    break;
-            }
-# endif
-#endif /* !TARGET_NT4 */
+# ifndef TARGET_NT4
+        case SERVICE_CONTROL_SESSIONCHANGE: /* Only Windows 2000 and up. */
+        {
+            AssertPtr(lpEventData);
+            PWTSSESSION_NOTIFICATION pNotify = (PWTSSESSION_NOTIFICATION)lpEventData;
+            Assert(pNotify->cbSize == sizeof(WTSSESSION_NOTIFICATION));
+
+            VBoxServiceVerbose(1, "Control handler: %s (Session=%ld, Event=%#x)\n",
+                               vboxServiceWTSStateToString(dwEventType),
+                               pNotify->dwSessionId, dwEventType);
+
+            /* Handle all events, regardless of dwEventType. */
+            int rc2 = VBoxServiceVMInfoSignal();
+            AssertRC(rc2);
             break;
+        }
+# endif /* !TARGET_NT4 */
 
         default:
-            VBoxServiceVerbose(1, "Service control function not implemented: %#x\n", dwControl);
+            VBoxServiceVerbose(1, "Control handler: Function not implemented: %#x\n", dwControl);
             rcRet = ERROR_CALL_NOT_IMPLEMENTED;
             break;

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -411 +411 @@
 
 #ifdef VBOXSERVICE_MANAGEMENT
-extern uint32_t     VBoxServiceBalloonQueryPages(uint32_t cbPage);
+extern uint32_t                 VBoxServiceBalloonQueryPages(uint32_t cbPage);
 #endif
 #if defined(VBOX_WITH_PAGE_SHARING) && defined(RT_OS_WINDOWS)
-extern RTEXITCODE   VBoxServicePageSharingInitFork(void);
-#endif
+extern RTEXITCODE               VBoxServicePageSharingInitFork(void);
+#endif
+extern int                      VBoxServiceVMInfoSignal(void);
 
 RT_C_DECLS_END

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

@@ -53 +53 @@
     /** Number of assigned user processes. */
     ULONG ulNumProcs;
+    /** Last (highest) session number. This
+     *  is needed for distinguishing old session
+     *  process counts from new (current) session
+     *  ones. */
+    ULONG ulSession;
 } VBOXSERVICEVMINFOUSER, *PVBOXSERVICEVMINFOUSER;
 
@@ -65 +70 @@
 typedef struct
 {
+    /** The PID. */
     DWORD id;
+    /** The LUID. */
     LUID luid;
+    /** Interactive process. */
+    bool fInteractive;
 } VBOXSERVICEVMINFOPROC, *PVBOXSERVICEVMINFOPROC;
 
@@ -120 +129 @@
         DWORD dwErr = GetLastError();
         if (g_cVerbosity)
-            VBoxServiceError("VMInfo/Users: Unable to open process with PID=%ld, error=%ld",
+            VBoxServiceError("Unable to open process with PID=%ld, error=%ld\n",
                              pProc->id, dwErr);
         rc = RTErrConvertFromWin32(dwErr);
@@ -142 +151 @@
                 if (RT_SUCCESS(rc))
                 {
-                    DWORD dwLen = sizeof(pszName);
+                    DWORD dwLen = cbName / sizeof(TCHAR);
                     if (!pfnQueryFullProcessImageName(h, 0 /*PROCESS_NAME_NATIVE*/, pszName, &dwLen))
                         rc = VERR_ACCESS_DENIED;
@@ -154 +163 @@
             if (!GetModuleFileNameEx(h, NULL /* Get main executable */, pszName, cbName / sizeof(TCHAR)))
                 rc = VERR_ACCESS_DENIED;
-        }
-
-        if (VERR_ACCESS_DENIED == rc)
-        {
-            DWORD dwErr = GetLastError();
-            if (g_cVerbosity)
-                VBoxServiceError("VMInfo/Users: Unable to retrieve module name for PID=%ld, error=%ld",
-                                 pProc->id, dwErr);
-            rc = RTErrConvertFromWin32(dwErr);
         }
 
@@ -183 +183 @@
 {
     AssertPtrReturn(pProc, VERR_INVALID_POINTER);
+
+    DWORD  dwErr = ERROR_SUCCESS;
     HANDLE h = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pProc->id);
     if (h == NULL)
     {
-        DWORD dwErr = GetLastError();
-        if (g_cVerbosity)
-            VBoxServiceError("VMInfo/Users: Unable to open process with PID=%ld, error=%ld",
+        dwErr = GetLastError();
+        if (g_cVerbosity > 4)
+            VBoxServiceError("Unable to open process with PID=%ld, error=%ld\n",
                              pProc->id, dwErr);
         return RTErrConvertFromWin32(dwErr);
     }
 
-     int    rc = VERR_NO_MEMORY;
-     HANDLE hToken;
-     if (OpenProcessToken(h, TOKEN_QUERY, &hToken))
-     {
-         void *pvTokenInfo = NULL;
-         DWORD dwTokenInfoSize;
-         switch (tkClass)
-         {
-             case TokenStatistics:
-                 dwTokenInfoSize = sizeof(TOKEN_STATISTICS);
-                 pvTokenInfo = RTMemAlloc(dwTokenInfoSize);
-                 break;
-
-             /** @todo Implement more token classes here. */
-
-             default:
-                 VBoxServiceError("Token class not implemented: %ld", tkClass);
-                 rc = VERR_NOT_IMPLEMENTED;
-                 break;
-         }
-
-         if (pvTokenInfo)
-         {
-             DWORD dwRetLength;
-             if (GetTokenInformation(hToken, tkClass, pvTokenInfo, dwTokenInfoSize, &dwRetLength))
-             {
-                 switch (tkClass)
-                 {
-                     case TokenStatistics:
-                     {
-                         TOKEN_STATISTICS *pStats = (TOKEN_STATISTICS*)pvTokenInfo;
-                         pProc->luid = pStats->AuthenticationId;
-                         /** @todo Add more information of TOKEN_STATISTICS as needed. */
-                         break;
-                     }
-
-                     default:
-                         /* Should never get here! */
-                         break;
-                 }
-                 rc = VINF_SUCCESS;
-             }
-             else
-                 rc = RTErrConvertFromWin32(GetLastError());
-             RTMemFree(pvTokenInfo);
-         }
-         CloseHandle(hToken);
+    int    rc = VINF_SUCCESS;
+    HANDLE hToken;
+    if (OpenProcessToken(h, TOKEN_QUERY, &hToken))
+    {
+        void *pvTokenInfo = NULL;
+        DWORD dwTokenInfoSize;
+        switch (tkClass)
+        {
+            case TokenStatistics:
+                dwTokenInfoSize = sizeof(TOKEN_STATISTICS);
+                pvTokenInfo = HeapAlloc(GetProcessHeap(),
+                                        HEAP_ZERO_MEMORY, dwTokenInfoSize);
+                AssertPtr(pvTokenInfo);
+                break;
+
+            case TokenGroups:
+                dwTokenInfoSize = 0;
+                /* Allocating will follow in a second step. */
+                break;
+
+            /** @todo Implement more token classes here. */
+
+            default:
+                VBoxServiceError("Token class not implemented: %ld", tkClass);
+                rc = VERR_NOT_IMPLEMENTED;
+                break;
+        }
+
+        if (RT_SUCCESS(rc))
+        {
+            DWORD dwRetLength;
+            if (!GetTokenInformation(hToken, tkClass, pvTokenInfo, dwTokenInfoSize, &dwRetLength))
+            {
+                dwErr = GetLastError();
+                if (dwErr == ERROR_INSUFFICIENT_BUFFER)
+                {
+                    dwErr = ERROR_SUCCESS;
+
+                    switch (tkClass)
+                    {
+                        case TokenGroups:
+                            pvTokenInfo = (PTOKEN_GROUPS)HeapAlloc(GetProcessHeap(),
+                                                                   HEAP_ZERO_MEMORY, dwRetLength);
+                            if (!pvTokenInfo)
+                                dwErr = GetLastError();
+                            dwTokenInfoSize = dwRetLength;
+                            break;
+
+                        default:
+                            AssertMsgFailed(("Re-allocating of token information for token class not implemented\n"));
+                            break;
+                    }
+
+                    if (dwErr == ERROR_SUCCESS)
+                    {
+                        if (!GetTokenInformation(hToken, tkClass, pvTokenInfo, dwTokenInfoSize, &dwRetLength))
+                            dwErr = GetLastError();
+                    }
+                }
+            }
+
+            if (dwErr == ERROR_SUCCESS)
+            {
+                rc = VINF_SUCCESS;
+
+                switch (tkClass)
+                {
+                    case TokenStatistics:
+                    {
+                        PTOKEN_STATISTICS pStats = (PTOKEN_STATISTICS)pvTokenInfo;
+                        memcpy(&pProc->luid, &pStats->AuthenticationId, sizeof(LUID));
+                        /** @todo Add more information of TOKEN_STATISTICS as needed. */
+                        break;
+                    }
+
+                    case TokenGroups:
+                    {
+                        pProc->fInteractive = false;
+
+                        SID_IDENTIFIER_AUTHORITY sidAuthNT = SECURITY_NT_AUTHORITY;
+                        PSID pSidInteractive = NULL; /*  S-1-5-4 */
+                        if (!AllocateAndInitializeSid(&sidAuthNT, 1, 4, 0, 0, 0, 0, 0, 0, 0, &pSidInteractive))
+                            dwErr = GetLastError();
+
+                        PSID pSidLocal = NULL; /*  S-1-2-0 */
+                        if (dwErr == ERROR_SUCCESS)
+                        {
+                            SID_IDENTIFIER_AUTHORITY sidAuthLocal = SECURITY_LOCAL_SID_AUTHORITY;
+                            if (!AllocateAndInitializeSid(&sidAuthLocal, 1, 0, 0, 0, 0, 0, 0, 0, 0, &pSidLocal))
+                                dwErr = GetLastError();
+                        }
+
+                        if (dwErr == ERROR_SUCCESS)
+                        {
+                            PTOKEN_GROUPS pGroups = (PTOKEN_GROUPS)pvTokenInfo;
+                            AssertPtr(pGroups);
+                            for (DWORD i = 0; i < pGroups->GroupCount; i++)
+                            {
+                                if (   EqualSid(pGroups->Groups[i].Sid, pSidInteractive)
+                                    || EqualSid(pGroups->Groups[i].Sid, pSidLocal)
+                                    || pGroups->Groups[i].Attributes & SE_GROUP_LOGON_ID)
+                                {
+                                    pProc->fInteractive = true;
+                                    break;
+                                }
+                            }
+                        }
+
+                        if (pSidInteractive)
+                            FreeSid(pSidInteractive);
+                        if (pSidLocal)
+                            FreeSid(pSidLocal);
+                        break;
+                    }
+
+                    default:
+                        AssertMsgFailed(("Unhandled token information class\n"));
+                        break;
+                }
+            }
+
+            if (pvTokenInfo)
+                HeapFree(GetProcessHeap(), 0 /* Flags */, pvTokenInfo);
+        }
+        CloseHandle(hToken);
     }
     else
-    {
-        DWORD dwErr = GetLastError();
+        dwErr = GetLastError();
+
+    if (dwErr != ERROR_SUCCESS)
+    {
         if (g_cVerbosity)
-            VBoxServiceError("VMInfo/Users: Unable to query process token for PID=%ld, error=%ld\n",
+            VBoxServiceError("Unable to query token information for PID=%ld, error=%ld\n",
                              pProc->id, dwErr);
         rc = RTErrConvertFromWin32(dwErr);
     }
+
     CloseHandle(h);
     return rc;
@@ -314 +397 @@
             {
                 paProcs[i].id = paPID[i];
-                rc = VBoxServiceVMInfoWinProcessesGetTokenInfo(&paProcs[i], TokenStatistics);
+                rc = VBoxServiceVMInfoWinProcessesGetTokenInfo(&paProcs[i], TokenGroups);
                 if (RT_FAILURE(rc))
                 {
                     /* Because some processes cannot be opened/parsed on
-                       Windows, we should not consider to be this an error here. */
+                           Windows, we should not consider to be this an error here. */
                     rc = VINF_SUCCESS;
+                }
+                else
+                {
+                    rc = VBoxServiceVMInfoWinProcessesGetTokenInfo(&paProcs[i], TokenStatistics);
+                    if (RT_FAILURE(rc))
+                    {
+                        /* Because some processes cannot be opened/parsed on
+                           Windows, we should not consider to be this an error here. */
+                        rc = VINF_SUCCESS;
+                    }
                 }
             }
@@ -358 +451 @@
  * @param   paProcs         The process snapshot.
  * @param   cProcs          The number of processes in the snaphot.
+ * @param   puSession       Looked up session number.  Optional.
  */
-uint32_t VBoxServiceVMInfoWinSessionHasProcesses(PLUID pSession, PVBOXSERVICEVMINFOPROC const paProcs, DWORD cProcs)
+uint32_t VBoxServiceVMInfoWinSessionHasProcesses(PLUID pSession,
+                                                 PVBOXSERVICEVMINFOPROC const paProcs, DWORD cProcs,
+                                                 PULONG puSession)
 {
     if (!pSession)
     {
-        VBoxServiceVerbose(1, "VMInfo/Users: Session became invalid while enumerating!\n");
+        VBoxServiceVerbose(1, "Session became invalid while enumerating!\n");
         return 0;
     }
@@ -371 +467 @@
     if (rcNt != STATUS_SUCCESS)
     {
-        VBoxServiceError("VMInfo/Users: Could not get logon session data! rcNt=%#x", rcNt);
+        VBoxServiceError("Could not get logon session data! rcNt=%#x", rcNt);
         return 0;
     }
@@ -383 +479 @@
     for (DWORD i = 0; i < cProcs; i++)
     {
-        /*VBoxServiceVerbose(3, "%ld:%ld <-> %ld:%ld\n",
-                             paProcs[i].luid.HighPart, paProcs[i].luid.LowPart,
-                             pSessionData->LogonId.HighPart, pSessionData->LogonId.LowPart);*/
-        if (   paProcs[i].luid.HighPart == pSessionData->LogonId.HighPart
-            && paProcs[i].luid.LowPart  == pSessionData->LogonId.LowPart)
+        VBoxServiceVerbose(4, "PID=%ld: (Interactive: %RTbool) %ld:%ld <-> %ld:%ld\n",
+                           paProcs[i].id,                  paProcs[i].fInteractive,
+                           paProcs[i].luid.HighPart,       paProcs[i].luid.LowPart,
+                           pSessionData->LogonId.HighPart, pSessionData->LogonId.LowPart);
+        if (g_cVerbosity)
+        {
+            TCHAR szModule[_1K];
+            int rc2 = VBoxServiceVMInfoWinProcessesGetModuleName(&paProcs[i], szModule, sizeof(szModule));
+            if (RT_SUCCESS(rc2))
+                VBoxServiceVerbose(4, "PID=%ld: %s\n",
+                                   paProcs[i].id, szModule);
+        }
+
+        if (   paProcs[i].fInteractive
+            && (   paProcs[i].luid.HighPart == pSessionData->LogonId.HighPart
+                && paProcs[i].luid.LowPart  == pSessionData->LogonId.LowPart))
         {
             cNumProcs++;
             if (!g_cVerbosity) /* We want a bit more info on higher verbosity. */
                 break;
-
-            TCHAR szModule[_1K];
-            int rc2 = VBoxServiceVMInfoWinProcessesGetModuleName(&paProcs[i], szModule, sizeof(szModule));
-            if (RT_SUCCESS(rc2))
-                VBoxServiceVerbose(4, "VMInfo/Users: PID=%ld: %s\n",
-                                   paProcs[i].id, szModule);
         }
     }
 
     if (g_cVerbosity)
-        VBoxServiceVerbose(3, "VMInfo/Users: Session %u has %u processes\n",
+        VBoxServiceVerbose(3, "Session %u has %u processes total\n",
                            pSessionData->Session, cNumProcs);
     else
-        VBoxServiceVerbose(3, "VMInfo/Users: Session %u has at least one process\n",
+        VBoxServiceVerbose(3, "Session %u has at least one process\n",
                            pSessionData->Session);
+
+    if (puSession)
+        *puSession = pSessionData->Session;
 
     LsaFreeReturnBuffer(pSessionData);
@@ -447 +551 @@
 bool VBoxServiceVMInfoWinIsLoggedIn(PVBOXSERVICEVMINFOUSER pUserInfo, PLUID pSession)
 {
-    AssertPtr(pUserInfo);
+    AssertPtrReturn(pUserInfo, false);
     if (!pSession)
         return false;
@@ -461 +565 @@
                 /* If we don't have enough memory it's hard to judge whether the specified user
                  * is logged in or not, so just assume he/she's not. */
-                VBoxServiceVerbose(3, "VMInfo/Users: Not enough memory to retrieve logon session data!\n");
+                VBoxServiceVerbose(3, "Not enough memory to retrieve logon session data!\n");
                 break;
 
@@ -470 +574 @@
 
             default:
-                VBoxServiceError("VMInfo/Users: LsaGetLogonSessionData failed with error %ul\n", ulError);
+                VBoxServiceError("LsaGetLogonSessionData failed with error %u\n", ulError);
                 break;
         }
@@ -479 +583 @@
     if (!pSessionData)
     {
-        VBoxServiceError("VMInfo/Users: Invalid logon session data!\n");
+        VBoxServiceError("Invalid logon session data!\n");
         return false;
     }
@@ -491 +595 @@
     if (   IsValidSid(pSessionData->Sid)
         && (   (SECURITY_LOGON_TYPE)pSessionData->LogonType == Interactive
-            || (SECURITY_LOGON_TYPE)pSessionData->LogonType == RemoteInteractive
-            || (SECURITY_LOGON_TYPE)pSessionData->LogonType == CachedInteractive
-            || (SECURITY_LOGON_TYPE)pSessionData->LogonType == CachedRemoteInteractive))
-    {
-        VBoxServiceVerbose(3, "VMInfo/Users: Session data: Name=%ls, Len=%d, SID=%s, LogonID=%ld,%ld, LogonType=%ld\n",
+            || (SECURITY_LOGON_TYPE)pSessionData->LogonType == RemoteInteractive))
+    {
+        VBoxServiceVerbose(3, "Session data: Name=%ls, Session=%u, LogonID=%ld,%ld, LogonType=%ld\n",
                            pSessionData->UserName.Buffer,
-                           pSessionData->UserName.Length,
-                           pSessionData->Sid != NULL ? "1" : "0",
+                           pSessionData->Session,
                            pSessionData->LogonId.HighPart, pSessionData->LogonId.LowPart,
                            pSessionData->LogonType);
@@ -533 +634 @@
              */
             if (dwErr != ERROR_NONE_MAPPED)
-                VBoxServiceError("VMInfo/Users: Failed looking up account info for user=%ls, error=$ld!\n",
+                VBoxServiceError("Failed looking up account info for user=%ls, error=$ld!\n",
                                  pUserInfo->wszUser, dwErr);
         }
@@ -540 +641 @@
             if (enmOwnerType == SidTypeUser) /* Only recognize users; we don't care about the rest! */
             {
-                VBoxServiceVerbose(3, "VMInfo/Users: Account User=%ls, Session=%ld, LUID=%ld,%ld, AuthPkg=%ls, Domain=%ls\n",
+                VBoxServiceVerbose(3, "Account User=%ls, Session=%ld, LogonID=%ld,%ld, AuthPkg=%ls, Domain=%ls\n",
                                    pUserInfo->wszUser, pSessionData->Session, pSessionData->LogonId.HighPart,
                                    pSessionData->LogonId.LowPart, pUserInfo->wszAuthenticationPackage,
@@ -548 +649 @@
                 LPTSTR  pBuffer = NULL;
                 DWORD   cbRet   = 0;
-                int     iState  = 0;
+                int     iState  = -1;
                 if (WTSQuerySessionInformation(WTS_CURRENT_SERVER_HANDLE,
                                                pSessionData->Session,
@@ -557 +658 @@
                     if (cbRet)
                         iState = *pBuffer;
-                    VBoxServiceVerbose(3, "VMInfo/Users: Account User=%ls, WTSConnectState=%d\n",
-                                       pUserInfo->wszUser, iState);
+                    VBoxServiceVerbose(3, "Account User=%ls, WTSConnectState=%d (%ld)\n",
+                                       pUserInfo->wszUser, iState, cbRet);
                     if (    iState == WTSActive           /* User logged on to WinStation. */
                          || iState == WTSShadow           /* Shadowing another WinStation. */
@@ -565 +666 @@
                         /** @todo On Vista and W2K, always "old" user name are still
                          *        there. Filter out the old one! */
-                        VBoxServiceVerbose(3, "VMInfo/Users: Account User=%ls using TCS/RDP, state=%d\n",
+                        VBoxServiceVerbose(3, "Account User=%ls using TCS/RDP, state=%d \n",
                                            pUserInfo->wszUser, iState);
                         fFoundUser = true;
@@ -583 +684 @@
                          */
                         case ERROR_CTX_WINSTATION_NOT_FOUND:
-                            VBoxServiceVerbose(3, "VMInfo/Users: Account User=%ls, no WinSta found\n",
+                            VBoxServiceVerbose(3, "No WinStation found for user=%ls\n",
                                                pUserInfo->wszUser);
                             break;
 
                         default:
-                            VBoxServiceVerbose(3, "VMInfo/Users: Account User=%ls, error=%ld\n",
+                            VBoxServiceVerbose(3, "Cannot query WTS connection state for user=%ls, error=%ld\n",
                                                pUserInfo->wszUser, dwLastErr);
                             break;
@@ -598 +699 @@
         }
 
-        VBoxServiceVerbose(3, "VMInfo/Users: Account User=%ls %s logged in\n",
+        VBoxServiceVerbose(3, "Account User=%ls %s logged in\n",
                            pUserInfo->wszUser, fFoundUser ? "is" : "is not");
     }
@@ -630 +731 @@
         {
             case ERROR_NOT_ENOUGH_MEMORY:
-                VBoxServiceError("VMInfo/Users: Not enough memory to enumerate logon sessions!\n");
+                VBoxServiceError("Not enough memory to enumerate logon sessions!\n");
                 break;
 
@@ -636 +737 @@
                 /* If we're about to shutdown when we were in the middle of enumerating the logon
                  * sessions, skip the error to not confuse the user with an unnecessary log message. */
-                VBoxServiceVerbose(3, "VMInfo/Users: Shutdown in progress ...\n");
+                VBoxServiceVerbose(3, "Shutdown in progress ...\n");
                 ulError = ERROR_SUCCESS;
                 break;
 
             default:
-                VBoxServiceError("VMInfo/Users: LsaEnumerate failed with error %ul\n", ulError);
+                VBoxServiceError("LsaEnumerate failed with error %u\n", ulError);
                 break;
         }
@@ -647 +748 @@
         return RTErrConvertFromWin32(ulError);
     }
-    VBoxServiceVerbose(3, "VMInfo/Users: Found %ld sessions\n", cSessions);
+    VBoxServiceVerbose(3, "Found %ld sessions\n", cSessions);
 
     PVBOXSERVICEVMINFOPROC  paProcs;
@@ -655 +756 @@
     {
         if (rc == VERR_NO_MEMORY)
-            VBoxServiceError("VMInfo/Users: Not enough memory to enumerate processes for a session!\n");
+            VBoxServiceError("Not enough memory to enumerate processes\n");
         else
-            VBoxServiceError("VMInfo/Users: Failed to enumerate processes for a session, rc=%Rrc\n", rc);
+            VBoxServiceError("Failed to enumerate processes, rc=%Rrc\n", rc);
     }
     else
@@ -664 +765 @@
         pUserInfo = (PVBOXSERVICEVMINFOUSER)RTMemAllocZ(cSessions * sizeof(VBOXSERVICEVMINFOUSER) + 1);
         if (!pUserInfo)
-            VBoxServiceError("VMInfo/Users: Not enough memory to store enumerated users!\n");
+            VBoxServiceError("Not enough memory to store enumerated users!\n");
         else
         {
@@ -673 +774 @@
                 if (VBoxServiceVMInfoWinIsLoggedIn(&UserInfo, &paSessions[i]))
                 {
-                    VBoxServiceVerbose(4, "VMInfo/Users: Handling user=%ls, domain=%ls, package=%ls\n",
-                                       pUserInfo[i].wszUser, pUserInfo[i].wszLogonDomain, pUserInfo[i].wszAuthenticationPackage);
+                    VBoxServiceVerbose(4, "Handling user=%ls, domain=%ls, package=%ls\n",
+                                       UserInfo.wszUser, UserInfo.wszLogonDomain, UserInfo.wszAuthenticationPackage);
 
                     /* Retrieve assigned processes of current session. */
-                    uint32_t cSessionProcs = VBoxServiceVMInfoWinSessionHasProcesses(&paSessions[i], paProcs, cProcs);
+                    ULONG ulSession;
+                    uint32_t cSessionProcs = VBoxServiceVMInfoWinSessionHasProcesses(&paSessions[i], paProcs, cProcs, &ulSession);
                     /* Don't return here when current session does not have assigned processes
                      * anymore -- in that case we have to search through the unique users list below
@@ -687 +789 @@
                         if (   !wcscmp(UserInfo.wszUser, pUserInfo[i].wszUser)
                             && !wcscmp(UserInfo.wszLogonDomain, pUserInfo[i].wszLogonDomain)
-                            && !wcscmp(UserInfo.wszAuthenticationPackage, pUserInfo[i].wszAuthenticationPackage))
+                            && !wcscmp(UserInfo.wszAuthenticationPackage, pUserInfo[i].wszAuthenticationPackage)
+                            && cSessionProcs)
                         {
-                            /* If the process-per-user count was higher than 0 before but another session was
-                             * was detected which also belongs to this user but has no assigned processes anymore,
-                             * we detected a stale session. */
-                            if (   pUserInfo[i].ulNumProcs > 0
-                                && !cSessionProcs)
+                            /*
+                             * Only respect the highest session for the current user.
+                             */
+                            if (ulSession > pUserInfo[i].ulSession)
                             {
-                                VBoxServiceVerbose(3, "VMInfo/Users: Stale session for user=%ls detected! Old processes: %u, new: %u\n",
-                                                   pUserInfo[i].wszUser, pUserInfo[i].ulNumProcs, cSessionProcs);
+                                VBoxServiceVerbose(4, "Updating user=%ls to %u processes (last session: %u)\n",
+                                                   UserInfo.wszUser, cSessionProcs, ulSession);
+
+                                pUserInfo[i].ulNumProcs = cSessionProcs;
+                                pUserInfo[i].ulSession  = ulSession;
+
+                                if (!cSessionProcs)
+                                    VBoxServiceVerbose(3, "Stale session for user=%ls detected! Old processes: %u, new: %u\n",
+                                                       pUserInfo[i].wszUser, pUserInfo[i].ulNumProcs, cSessionProcs);
                             }
-
-                            VBoxServiceVerbose(4, "VMInfo/Users: Updating user=%ls to %u processes\n",
-                                               UserInfo.wszUser, cSessionProcs);
-
-                            pUserInfo[i].ulNumProcs = cSessionProcs;
+                            /* There can be multiple session objects using the same session ID for the
+                             * current user -- so when we got the same session again just add the found
+                             * processes to it. */
+                            else if (pUserInfo[i].ulSession == ulSession)
+                            {
+                                VBoxServiceVerbose(4, "Adding %u processes to user=%ls (session %u)\n",
+                                                   cSessionProcs, UserInfo.wszUser, ulSession);
+
+                                pUserInfo[i].ulNumProcs += cSessionProcs;
+                                pUserInfo[i].ulSession   = ulSession;
+                            }
+
                             fFoundUser = true;
                             break;
@@ -710 +826 @@
                     if (!fFoundUser)
                     {
-                        VBoxServiceVerbose(4, "VMInfo/Users: Adding new user=%ls with %u processes\n",
-                                           UserInfo.wszUser, cSessionProcs);
+                        VBoxServiceVerbose(4, "Adding new user=%ls (session %u) with %u processes\n",
+                                           UserInfo.wszUser, ulSession, cSessionProcs);
 
                         memcpy(&pUserInfo[cUniqueUsers], &UserInfo, sizeof(VBOXSERVICEVMINFOUSER));
-                        pUserInfo[cUniqueUsers++].ulNumProcs = cSessionProcs;
+                        pUserInfo[cUniqueUsers].ulNumProcs = cSessionProcs;
+                        pUserInfo[cUniqueUsers].ulSession  = ulSession;
+                        cUniqueUsers++;
                         Assert(cUniqueUsers <= cSessions);
                     }
@@ -720 +838 @@
             }
 
-            VBoxServiceVerbose(3, "VMInfo/Users: Found %u unique logged-in user(s)\n",
+            VBoxServiceVerbose(3, "Found %u unique logged-in user(s)\n",
                                cUniqueUsers);
 
@@ -728 +846 @@
                 if (pUserInfo[i].ulNumProcs)
                 {
+                    VBoxServiceVerbose(3, "User %ls has %ld processes (session %u)\n",
+                                       pUserInfo[i].wszUser, pUserInfo[i].ulNumProcs, pUserInfo[i].ulSession);
+
                     if (*pcUsersInList > 0)
                     {

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. */