Changeset 47960 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 21, 2013 10:32:05 AM (11 years ago)

Author:

vboxsync

Message:

VBoxTray/VBoxIPC: Perform user idle detection only on Windows 2000 and up.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp (modified) (9 diffs)

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

@@ -27 +27 @@
 #include <iprt/critsect.h>
 #include <iprt/err.h>
+#include <iprt/ldr.h>
 #include <iprt/list.h>
 #include <iprt/localipc.h>
@@ -68 +69 @@
     /** The thread handle. */
     RTTHREAD                            hThread;
+    /** Pointer to GetLastInputInfo() function. */
+    BOOL (WINAPI * pfnGetLastInputInfo)(PLASTINPUTINFO);
 
 } VBOXIPCSESSION, *PVBOXIPCSESSION;
@@ -73 +76 @@
 int vboxIPCSessionDestroyLocked(PVBOXIPCSESSION pSession);
 
-static int vboxIPCHandleVBoxTrayRestart(RTLOCALIPCSESSION hSession, PVBOXTRAYIPCHEADER pHdr)
-{
+static int vboxIPCHandleVBoxTrayRestart(PVBOXIPCSESSION pSession, PVBOXTRAYIPCHEADER pHdr)
+{
+    AssertPtrReturn(pSession, VERR_INVALID_POINTER);
     AssertPtrReturn(pHdr, VERR_INVALID_POINTER);
 
@@ -81 +85 @@
 }
 
-static int vboxIPCHandleShowBalloonMsg(RTLOCALIPCSESSION hSession, PVBOXTRAYIPCHEADER pHdr)
-{
+static int vboxIPCHandleShowBalloonMsg(PVBOXIPCSESSION pSession, PVBOXTRAYIPCHEADER pHdr)
+{
+    AssertPtrReturn(pSession, VERR_INVALID_POINTER);
     AssertPtrReturn(pHdr, VERR_INVALID_POINTER);
     AssertReturn(pHdr->uMsgLen > 0, VERR_INVALID_PARAMETER);
 
     VBOXTRAYIPCMSG_SHOWBALLOONMSG ipcMsg;
-    int rc = RTLocalIpcSessionRead(hSession, &ipcMsg, pHdr->uMsgLen,
+    int rc = RTLocalIpcSessionRead(pSession->hSession, &ipcMsg, pHdr->uMsgLen,
                                    NULL /* Exact read, blocking */);
     if (RT_SUCCESS(rc))
@@ -103 +108 @@
 }
 
-static int vboxIPCHandleUserLastInput(RTLOCALIPCSESSION hSession, PVBOXTRAYIPCHEADER pHdr)
-{
+static int vboxIPCHandleUserLastInput(PVBOXIPCSESSION pSession, PVBOXTRAYIPCHEADER pHdr)
+{
+    AssertPtrReturn(pSession, VERR_INVALID_POINTER);
     AssertPtrReturn(pHdr, VERR_INVALID_POINTER);
     /* No actual message from client. */
@@ -110 +116 @@
     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);
-    BOOL fRc = GetLastInputInfo(&lastInput);
-    if (fRc)
-    {
-        VBOXTRAYIPCRES_USERLASTINPUT ipcRes;
-        ipcRes.uLastInputMs = GetTickCount() - lastInput.dwTime;
-        rc = RTLocalIpcSessionWrite(hSession, &ipcRes, sizeof(ipcRes));
-    }
-    else
-        rc = RTErrConvertFromWin32(GetLastError());
+    bool fLastInputAvailable = false;
+    VBOXTRAYIPCRES_USERLASTINPUT ipcRes;
+    if (pSession->pfnGetLastInputInfo)
+    {
+        /* Note: This only works up to 49.7 days (= 2^32, 32-bit counter)
+           since Windows was started. */
+        LASTINPUTINFO lastInput;
+        lastInput.cbSize = sizeof(LASTINPUTINFO);
+        BOOL fRc = pSession->pfnGetLastInputInfo(&lastInput);
+        if (fRc)
+        {
+            VBOXTRAYIPCRES_USERLASTINPUT ipcRes;
+            ipcRes.uLastInputMs = GetTickCount() - lastInput.dwTime;
+            fLastInputAvailable = true;
+        }
+        else
+            rc = RTErrConvertFromWin32(GetLastError());
+    }
+
+    if (!fLastInputAvailable)
+    {
+        /* No last input available. */
+        ipcRes.uLastInputMs = UINT32_MAX;
+    }
+
+    int rc2 = RTLocalIpcSessionWrite(pSession->hSession, &ipcRes, sizeof(ipcRes));
+    if (RT_SUCCESS(rc))
+        rc = rc2;
 
     return rc;
@@ -306 +327 @@
                 {
                     case VBOXTRAYIPCMSGTYPE_RESTART:
-                        rc = vboxIPCHandleVBoxTrayRestart(hSession, &ipcHdr);
+                        rc = vboxIPCHandleVBoxTrayRestart(pThis, &ipcHdr);
                         break;
 
                     case VBOXTRAYIPCMSGTYPE_SHOWBALLOONMSG:
-                        rc = vboxIPCHandleShowBalloonMsg(hSession, &ipcHdr);
+                        rc = vboxIPCHandleShowBalloonMsg(pThis, &ipcHdr);
                         break;
 
                     case VBOXTRAYIPCMSGTYPE_USERLASTINPUT:
-                        rc = vboxIPCHandleUserLastInput(hSession, &ipcHdr);
+                        rc = vboxIPCHandleUserLastInput(pThis, &ipcHdr);
                         break;
 
@@ -417 +438 @@
             rc = VERR_NO_MEMORY;
 
+        if (RT_SUCCESS(rc))
+        {
+            *(void **)&pSession->pfnGetLastInputInfo =
+                RTLdrGetSystemSymbol("User32.dll", "GetLastInputInfo");
+            /* GetLastInputInfo only is available starting at Windows 2000. */
+        }
+
         int rc2 = RTCritSectLeave(&pCtx->CritSect);
         AssertRC(rc2);
@@ -427 +455 @@
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
+
     pSession->hThread = NIL_RTTHREAD;
+    pSession->pfnGetLastInputInfo = NULL;
 
     RTLOCALIPCSESSION hSession;