Changeset 47294 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Jul 22, 2013 11:19:20 AM (12 years ago)

Author:

vboxsync

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

87431

Message:

Guest user state reporting: Update.

File:

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

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

@@ -50 +50 @@
 *******************************************************************************/
 /** Structure for storing the looked up user information. */
-typedef struct
+typedef struct VBOXSERVICEVMINFOUSER
 {
     WCHAR wszUser[_MAX_PATH];
@@ -65 +65 @@
 
 /** Structure for the file information lookup. */
-typedef struct
+typedef struct VBOXSERVICEVMINFOFILE
 {
     char *pszFilePath;
@@ -72 +72 @@
 
 /** Structure for process information lookup. */
-typedef struct
+typedef struct VBOXSERVICEVMINFOPROC
 {
     /** The PID. */
@@ -92 +92 @@
 int  VBoxServiceVMInfoWinProcessesEnumerate(PVBOXSERVICEVMINFOPROC *ppProc, DWORD *pdwCount);
 void VBoxServiceVMInfoWinProcessesFree(DWORD cProcs, PVBOXSERVICEVMINFOPROC paProcs);
-int vboxServiceVMInfoWinWriteLastInput(char *pszUser);
+int vboxServiceVMInfoWinWriteLastInput(const char *pszUser, const char *pszDomain);
 
 typedef BOOL WINAPI FNQUERYFULLPROCESSIMAGENAME(HANDLE,  DWORD, LPTSTR, PDWORD);
@@ -808 +808 @@
 
 
-static int vboxServiceVMInfoWinWriteLastInput(char *pszUser)
+static int vboxServiceVMInfoWinWriteLastInput(const char *pszUser, const char *pszDomain)
 {
     AssertPtrReturn(pszUser, VERR_INVALID_POINTER);
@@ -833 +833 @@
             if (RT_SUCCESS(rc))
             {
+                VBoxGuestUserState userState = ipcRes.uLastInputMs < 5000 /** @todo Make this configurable. */
+                                             ? VBoxGuestUserState_InUse
+                                             : VBoxGuestUserState_Idle;
                 if (ipcRes.uLastInputMs)
-                    VBoxServiceVerbose(4, "User \"%s\" is idle for %RU32ms\n",
-                                       pszUser, ipcRes.uLastInputMs);
+                {
+                    VBoxServiceVerbose(4, "User \"%s\" (domain \"%s\") is idle for %RU32ms\n",
+                                       pszUser, pszDomain ? pszDomain : "<None>", ipcRes.uLastInputMs);
+
+                    rc = VbglR3GuestUserReportState(pszUser, pszDomain, userState,
+                                                    NULL /* No details */, 0);
+                }
             }
 #ifdef DEBUG
-            VBoxServiceVerbose(4, "Querying last input for user \"%s\" ended with rc=%Rrc\n",
+            VBoxServiceVerbose(4, "Getting last input for user \"%s\" ended with rc=%Rrc\n",
                                pszUser, rc);
 #endif
@@ -1060 +1068 @@
                     *pcUsersInList += 1;
 
-                    char *pszUser;
-                    int rc2 = RTUtf16ToUtf8(pUserInfo[i].wszUser, &pszUser);
-                    if (RT_SUCCESS(rc2))
+                    char *pszUser = NULL;
+                    char *pszDomain = NULL;
+                    rc = RTUtf16ToUtf8(pUserInfo[i].wszUser, &pszUser);
+                    if (   RT_SUCCESS(rc)
+                        && pUserInfo[i].wszLogonDomain)
+                        rc = RTUtf16ToUtf8(pUserInfo[i].wszLogonDomain, &pszDomain);
+                    if (RT_SUCCESS(rc))
                     {
+                        /* Append user to users list. */
                         rc = RTStrAAppend(ppszUserList, pszUser);
+
+                        /* Do idle detection. */
                         if (RT_SUCCESS(rc))
-                            rc = vboxServiceVMInfoWinWriteLastInput(pszUser);
-                        RTMemFree(pszUser);
+                            rc = vboxServiceVMInfoWinWriteLastInput(pszUser, pszDomain);
                     }
                     else
                         rc = RTStrAAppend(ppszUserList, "<string-conversion-error>");
+
+                    RTStrFree(pszUser);
+                    RTStrFree(pszDomain);
+
                     AssertRCBreakStmt(rc, RTStrFree(*ppszUserList));
                 }