Changeset 47232 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

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

Author:

vboxsync

Message:

Windows Guest Additions: Support for querying user idle times.

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Installer/InstallHelper/VBoxGuestInstallHelper.cpp (modified) (2 diffs)
• VBoxTray/VBoxIPC.cpp (modified) (3 diffs)
• VBoxTray/VBoxTrayMsg.h (modified) (4 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;