Changeset 47232 in vbox for trunk/src/VBox

Timestamp:

Jul 18, 2013 12:00:49 PM (11 years ago)

Author:

vboxsync

Message:

Windows Guest Additions: Support for querying user idle times.

Location:

trunk/src/VBox/Additions

Files:

• WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp (modified) (2 diffs)
• WINNT/VBoxTray/VBoxIPC.cpp (modified) (3 diffs)
• WINNT/VBoxTray/VBoxTrayMsg.h (modified) (4 diffs)
• common/VBoxService/VBoxServiceVMInfo-win.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp

@@ -124 +124 @@
         StringCchPrintf(szErr, sizeof(szErr), "0");
     pushstring(szErr);
+}
+
+/**
+ * Connects to VBoxTray IPC under the behalf of the user running
+ * in the current thread context.
+ *
+ * @return  IPRT status code.
+ * @param   phSession               Where to store the IPC session.
+ */
+static int vboxConnectToVBoxTray(RTLOCALIPCSESSION hSession)
+{
+    int rc = VINF_SUCCESS;
+
+    RTUTF16 wszUserName[255];
+    DWORD cchUserName = sizeof(wszUserName) / sizeof(RTUTF16);
+    BOOL fRc = GetUserNameW(wszUserName, &cchUserName);
+    if (!fRc)
+        rc = RTErrConvertFromWin32(GetLastError());
+
+    if (RT_SUCCESS(rc))
+    {
+        char *pszUserName;
+        rc = RTUtf16ToUtf8(wszUserName, &pszUserName);
+        if (RT_SUCCESS(rc))
+        {
+            char szPipeName[255];
+            if (RTStrPrintf(szPipeName, sizeof(szPipeName), "%s%s",
+                            VBOXTRAY_IPC_PIPE_PREFIX, pszUserName))
+            {
+                rc = RTLocalIpcSessionConnect(&hSession, szPipeName, 0 /* Flags */);
+            }
+            else
+                rc = VERR_NO_MEMORY;
+
+            RTStrFree(pszUserName);
+        }
+    }
+
+    return rc;
 }
 
@@ -437 +476 @@
             {
                 RTLOCALIPCSESSION hSession;
-                int rc = RTLocalIpcSessionConnect(&hSession, VBOXTRAY_IPC_PIPENAME, 0 /* Flags */);
+                int rc = vboxConnectToVBoxTray(hSession);
                 if (RT_SUCCESS(rc))
                 {

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

@@ -110 +110 @@
     int rc = VINF_SUCCESS;
 
+    /* Note: This only works up to 49.7 days (= 2^32, 32-bit counter)
+       since Windows was started. */
     LASTINPUTINFO lastInput;
     lastInput.cbSize = sizeof(LASTINPUTINFO);
@@ -116 +118 @@
     {
         VBOXTRAYIPCRES_USERLASTINPUT ipcRes;
-        ipcRes.uTickCount = lastInput.dwTime; /** @sa GetTickCount(). */
+        ipcRes.uLastInputMs = GetTickCount() - lastInput.dwTime;
         rc = RTLocalIpcSessionWrite(hSession, &ipcRes, sizeof(ipcRes));
     }
@@ -143 +145 @@
     *pfStartThread = false;
 
-    gCtx.pEnv = pEnv;
-    gCtx.hServer = NIL_RTLOCALIPCSERVER;
-
     int rc = RTCritSectInit(&gCtx.CritSect);
     if (RT_SUCCESS(rc))
     {
-        rc = RTLocalIpcServerCreate(&gCtx.hServer, VBOXTRAY_IPC_PIPENAME,
-                                    RTLOCALIPC_FLAGS_MULTI_SESSION);
-        if (RT_FAILURE(rc))
-        {
-            LogRelFunc(("Creating local IPC server failed with rc=%Rrc\n", rc));
-            return rc;
-        }
-
-        RTListInit(&gCtx.SessionList);
-
-        *pfStartThread = true;
-    }
-
+        RTUTF16 wszUserName[255];
+        DWORD cchUserName = sizeof(wszUserName) / sizeof(RTUTF16);
+        BOOL fRc = GetUserNameW(wszUserName, &cchUserName);
+        if (!fRc)
+            rc = RTErrConvertFromWin32(GetLastError());
+
+        if (RT_SUCCESS(rc))
+        {
+            char *pszUserName;
+            rc = RTUtf16ToUtf8(wszUserName, &pszUserName);
+            if (RT_SUCCESS(rc))
+            {
+                char szPipeName[255];
+                if (RTStrPrintf(szPipeName, sizeof(szPipeName), "%s%s",
+                                VBOXTRAY_IPC_PIPE_PREFIX, pszUserName))
+                {
+                    rc = RTLocalIpcServerCreate(&gCtx.hServer, szPipeName,
+                                                RTLOCALIPC_FLAGS_MULTI_SESSION);
+                    if (RT_SUCCESS(rc))
+                    {
+                        RTStrFree(pszUserName);
+
+                        gCtx.pEnv = pEnv;
+                        RTListInit(&gCtx.SessionList);
+
+                        *ppInstance = &gCtx;
+                        *pfStartThread = true;
+
+                        LogRelFunc(("Local IPC server now running at \"%s\"\n",
+                                    szPipeName));
+                        return VINF_SUCCESS;
+                    }
+
+                }
+                else
+                    rc = VERR_NO_MEMORY;
+
+                RTStrFree(pszUserName);
+            }
+        }
+
+        RTCritSectDelete(&gCtx.CritSect);
+    }
+
+    LogRelFunc(("Creating local IPC server failed with rc=%Rrc\n", rc));
     return rc;
 }

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

@@ -19 +19 @@
 #define ___VBOXTRAY_MSG_H
 
-#define VBOXTRAY_IPC_PIPENAME           "VBoxTrayIPCSvc"
+#define VBOXTRAY_IPC_PIPE_PREFIX      "VBoxTrayIPC-"
 
 enum VBOXTRAYIPCMSGTYPE
@@ -29 +29 @@
     /** Retrieves the current user's last input
      *  time. This will be the user VBoxTray is running
-     *  under. */
+     *  under. No actual message for this command
+     *  required. */
     VBOXTRAYIPCMSGTYPE_USERLASTINPUT  = 120
 };
@@ -36 +37 @@
 typedef struct VBOXTRAYIPCHEADER
 {
+    /** @todo Add magic? */
     /** Header version, must be 0 by now. */
     uint32_t uHdrVersion;
@@ -84 +86 @@
 typedef struct VBOXTRAYIPCRES_USERLASTINPUT
 {
-    uint32_t uTickCount;
+    /** Last occurred user input event (in ms). */
+    uint32_t uLastInputMs;
 } VBOXTRAYIPCRES_USERLASTINPUT, *PVBOXTRAYIPCRES_USERLASTINPUT;
 

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

@@ -31 +31 @@
 #include <iprt/assert.h>
 #include <iprt/ldr.h>
+#include <iprt/localipc.h>
 #include <iprt/mem.h>
 #include <iprt/thread.h>
@@ -40 +41 @@
 #include "VBoxServiceInternal.h"
 #include "VBoxServiceUtils.h"
+#include "../../WINNT/VBoxTray/VBoxTrayMsg.h" /* For IPC. */
 
 static uint32_t s_uGuestPropClientID = 0;
@@ -90 +92 @@
 int  VBoxServiceVMInfoWinProcessesEnumerate(PVBOXSERVICEVMINFOPROC *ppProc, DWORD *pdwCount);
 void VBoxServiceVMInfoWinProcessesFree(DWORD cProcs, PVBOXSERVICEVMINFOPROC paProcs);
+int vboxServiceVMInfoWinWriteLastInput(char *pszUser);
 
 typedef BOOL WINAPI FNQUERYFULLPROCESSIMAGENAME(HANDLE,  DWORD, LPTSTR, PDWORD);
@@ -805 +808 @@
 
 
+static int vboxServiceVMInfoWinWriteLastInput(char *pszUser)
+{
+    AssertPtrReturn(pszUser, VERR_INVALID_POINTER);
+
+    int rc = VINF_SUCCESS;
+
+    char szPipeName[255];
+    if (RTStrPrintf(szPipeName, sizeof(szPipeName), "%s%s",
+                    VBOXTRAY_IPC_PIPE_PREFIX, pszUser))
+    {
+        RTLOCALIPCSESSION hSession;
+        rc = RTLocalIpcSessionConnect(&hSession, szPipeName, 0 /* Flags */);
+        if (RT_SUCCESS(rc))
+        {
+            VBOXTRAYIPCHEADER ipcHdr = { 0 /* Header version */,
+                                         VBOXTRAYIPCMSGTYPE_USERLASTINPUT, 0 /* No msg */ };
+
+            rc = RTLocalIpcSessionWrite(hSession, &ipcHdr, sizeof(ipcHdr));
+
+            VBOXTRAYIPCRES_USERLASTINPUT ipcRes;
+            if (RT_SUCCESS(rc))
+                rc = RTLocalIpcSessionRead(hSession, &ipcRes, sizeof(ipcRes),
+                                           NULL /* Exact read */);
+            if (RT_SUCCESS(rc))
+            {
+                if (ipcRes.uLastInputMs)
+                    VBoxServiceVerbose(4, "User \"%s\" is idle for %RU32ms\n",
+                                       pszUser, ipcRes.uLastInputMs);
+            }
+#ifdef DEBUG
+            VBoxServiceVerbose(4, "Querying last input for user \"%s\" ended with rc=%Rrc\n",
+                               pszUser, rc);
+#endif
+            int rc2 = RTLocalIpcSessionClose(hSession);
+            if (RT_SUCCESS(rc))
+                rc = rc2;
+        }
+        else
+        {
+            switch (rc)
+            {
+                case VERR_FILE_NOT_FOUND:
+                    /* No VBoxTray (or too old version which does not support IPC) running
+                       for the given user. Not much we can do then. */
+                    VBoxServiceVerbose(4, "User \"%s\" not logged in, no last input available\n",
+                                       pszUser);
+                    break;
+
+                default:
+                    VBoxServiceVerbose(4, "Error querying last input for user \"%s\", rc=%Rrc\n",
+                                       pszUser, rc);
+                    break;
+            }
+
+            rc = VINF_SUCCESS;
+        }
+    }
+
+    return rc;
+}
+
+
 /**
  * Retrieves the currently logged in users and stores their names along with the
@@ -995 +1060 @@
                     *pcUsersInList += 1;
 
-                    char *pszTemp;
-                    int rc2 = RTUtf16ToUtf8(pUserInfo[i].wszUser, &pszTemp);
+                    char *pszUser;
+                    int rc2 = RTUtf16ToUtf8(pUserInfo[i].wszUser, &pszUser);
                     if (RT_SUCCESS(rc2))
                     {
-                        rc = RTStrAAppend(ppszUserList, pszTemp);
-                        RTMemFree(pszTemp);
+                        rc = RTStrAAppend(ppszUserList, pszUser);
+                        if (RT_SUCCESS(rc))
+                            rc = vboxServiceVMInfoWinWriteLastInput(pszUser);
+                        RTMemFree(pszUser);
                     }
                     else