Index: /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp	(revision 38945)
+++ /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp	(revision 38946)
@@ -50,4 +50,6 @@
     WCHAR wszAuthenticationPackage[_MAX_PATH];
     WCHAR wszLogonDomain[_MAX_PATH];
+    /** Number of assigned user processes. */
+    ULONG ulNumProcs;
 } VBOXSERVICEVMINFOUSER, *PVBOXSERVICEVMINFOUSER;
 
@@ -380,9 +382,10 @@
             || (SECURITY_LOGON_TYPE)pSessionData->LogonType == CachedRemoteInteractive))
     {
-        VBoxServiceVerbose(3, "VMInfo/Users: Session data: Name=%ls, Len=%d, SID=%s, LogonID=%ld,%ld\n",
+        VBoxServiceVerbose(3, "VMInfo/Users: Session data: Name=%ls, Len=%d, SID=%s, LogonID=%ld,%ld, LogonType=%ld\n",
                            pSessionData->UserName.Buffer,
                            pSessionData->UserName.Length,
                            pSessionData->Sid != NULL ? "1" : "0",
-                           pSessionData->LogonId.HighPart, pSessionData->LogonId.LowPart);
+                           pSessionData->LogonId.HighPart, pSessionData->LogonId.LowPart,
+                           pSessionData->LogonType);
 
         /*
@@ -503,9 +506,9 @@
 {
     PLUID       paSessions = NULL;
-    ULONG       cSession = 0;
+    ULONG       cSessions = 0;
 
     /* This function can report stale or orphaned interactive logon sessions
        of already logged off users (especially in Windows 2000). */
-    NTSTATUS rcNt = LsaEnumerateLogonSessions(&cSession, &paSessions);
+    NTSTATUS rcNt = LsaEnumerateLogonSessions(&cSessions, &paSessions);
     if (rcNt != STATUS_SUCCESS)
     {
@@ -514,5 +517,5 @@
         {
             case ERROR_NOT_ENOUGH_MEMORY:
-                VBoxServiceVerbose(3, "VMInfo/Users: Not enough memory to enumerate logon sessions!\n");
+                VBoxServiceError("VMInfo/Users: Not enough memory to enumerate logon sessions!\n");
                 break;
 
@@ -531,5 +534,5 @@
         return RTErrConvertFromWin32(ulError);
     }
-    VBoxServiceVerbose(3, "VMInfo/Users: Found %ld sessions\n", cSession);
+    VBoxServiceVerbose(3, "VMInfo/Users: Found %ld sessions\n", cSessions);
 
     PVBOXSERVICEVMINFOPROC  paProcs;
@@ -539,5 +542,5 @@
     {
         if (rc == VERR_NO_MEMORY)
-            VBoxServiceVerbose(3, "VMInfo/Users: Not enough memory to enumerate processes for a session!\n");
+            VBoxServiceError("VMInfo/Users: Not enough memory to enumerate processes for a session!\n");
         else
             VBoxServiceError("VMInfo/Users: Failed to enumerate processes for a session, rc=%Rrc\n", rc);
@@ -545,30 +548,85 @@
     else
     {
-        *pcUsersInList = 0;
-        for (ULONG i = 0; i < cSession; i++)
-        {
-            VBOXSERVICEVMINFOUSER UserInfo;
-            if (   VBoxServiceVMInfoWinIsLoggedIn(&UserInfo, &paSessions[i])
-                && VBoxServiceVMInfoWinSessionHasProcesses(&paSessions[i], paProcs, cProcs))
+        PVBOXSERVICEVMINFOUSER pUserInfo;
+        pUserInfo = (PVBOXSERVICEVMINFOUSER)RTMemAllocZ(cSessions * sizeof(VBOXSERVICEVMINFOUSER) + 1);
+        if (!pUserInfo)
+            VBoxServiceError("VMInfo/Users: Not enough memory to store enumerated users!\n");
+        else
+        {
+            ULONG cUniqueUsers = 0;
+            for (ULONG i = 0; i < cSessions; i++)
             {
-                if (*pcUsersInList > 0)
+                VBOXSERVICEVMINFOUSER UserInfo;
+                if (VBoxServiceVMInfoWinIsLoggedIn(&UserInfo, &paSessions[i]))
                 {
-                    rc = RTStrAAppend(ppszUserList, ",");
+                    VBoxServiceVMInfoWinSessionHasProcesses(&paSessions[i], paProcs, cProcs);
+
+                    bool fFoundUser = false;
+                    for (ULONG i = 0; i < cUniqueUsers; i++)
+                    {
+                        if (   !wcscmp(UserInfo.wszUser, pUserInfo[i].wszUser)
+                            && !wcscmp(UserInfo.wszLogonDomain, pUserInfo[i].wszLogonDomain)
+                            && !wcscmp(UserInfo.wszAuthenticationPackage, pUserInfo[i].wszAuthenticationPackage))
+                        {
+                            /* 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
+                                && !cProcs)
+                            {
+                                VBoxServiceVerbose(3, "VMInfo/Users: Stale session for user=%ls detected! Old processes: %u, new: %u\n",
+                                                   pUserInfo[i].wszUser, pUserInfo[i].ulNumProcs, cProcs);
+                            }
+
+                            VBoxServiceVerbose(4, "VMInfo/Users: Updating user=%ls to %u processes\n",
+                                               UserInfo.wszUser, cProcs);
+
+                            pUserInfo[i].ulNumProcs = cProcs;
+                            fFoundUser = true;
+                            break;
+                        }
+                    }
+
+                    if (!fFoundUser)
+                    {
+                        VBoxServiceVerbose(4, "VMInfo/Users: Adding new user=%ls with %u processes\n",
+                                           UserInfo.wszUser, cProcs);
+
+                        memcpy(&pUserInfo[cUniqueUsers++], &UserInfo, sizeof(VBOXSERVICEVMINFOUSER));
+                        Assert(cUniqueUsers <= cSessions);
+                    }
+                }
+            }
+
+            VBoxServiceVerbose(3, "VMInfo/Users: Found %u unique logged-in user(s) with processes\n",
+                               cUniqueUsers);
+
+            *pcUsersInList = 0;
+            for (ULONG i = 0; i < cUniqueUsers; i++)
+            {
+                if (pUserInfo[i].ulNumProcs)
+                {
+                    if (*pcUsersInList > 0)
+                    {
+                        rc = RTStrAAppend(ppszUserList, ",");
+                        AssertRCBreakStmt(rc, RTStrFree(*ppszUserList));
+                    }
+
+                    *pcUsersInList += 1;
+
+                    char *pszTemp;
+                    int rc2 = RTUtf16ToUtf8(pUserInfo[i].wszUser, &pszTemp);
+                    if (RT_SUCCESS(rc2))
+                    {
+                        rc = RTStrAAppend(ppszUserList, pszTemp);
+                        RTMemFree(pszTemp);
+                    }
+                    else
+                        rc = RTStrAAppend(ppszUserList, "<string-conversion-error>");
                     AssertRCBreakStmt(rc, RTStrFree(*ppszUserList));
                 }
-
-                *pcUsersInList += 1;
-
-                char *pszTemp;
-                int rc2 = RTUtf16ToUtf8(UserInfo.wszUser, &pszTemp);
-                if (RT_SUCCESS(rc2))
-                {
-                    rc = RTStrAAppend(ppszUserList, pszTemp);
-                    RTMemFree(pszTemp);
-                }
-                else
-                    rc = RTStrAAppend(ppszUserList, "<string-conversion-error>");
-                AssertRCBreakStmt(rc, RTStrFree(*ppszUserList));
             }
+
+            RTMemFree(pUserInfo);
         }
         VBoxServiceVMInfoWinProcessesFree(paProcs);