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

Timestamp:

Aug 21, 2013 4:37:27 PM (11 years ago)

Author:

vboxsync

Message:

VBoxService/VBoxTray: User idle detection: Reset usage status to idle when VBoxTray exits, cleanup.

File:

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

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

@@ -52 +52 @@
 } VBOXIPCCONTEXT, *PVBOXIPCCONTEXT;
 static VBOXIPCCONTEXT gCtx = {0};
+
+/** Function pointer for GetLastInputInfo(). */
+typedef BOOL (WINAPI *PFNGETLASTINPUTINFO)(PLASTINPUTINFO);
 
 /**
@@ -69 +72 @@
     /** The thread handle. */
     RTTHREAD                            hThread;
-    /** Pointer to GetLastInputInfo() function. */
-    BOOL (WINAPI * pfnGetLastInputInfo)(PLASTINPUTINFO);
 
 } VBOXIPCSESSION, *PVBOXIPCSESSION;
+
+/** Static pointer to GetLastInputInfo() function. */
+static PFNGETLASTINPUTINFO s_pfnGetLastInputInfo = NULL;
 
 int vboxIPCSessionDestroyLocked(PVBOXIPCSESSION pSession);
@@ -118 +122 @@
     bool fLastInputAvailable = false;
     VBOXTRAYIPCRES_USERLASTINPUT ipcRes;
-    if (pSession->pfnGetLastInputInfo)
+    if (s_pfnGetLastInputInfo)
     {
         /* Note: This only works up to 49.7 days (= 2^32, 32-bit counter)
@@ -124 +128 @@
         LASTINPUTINFO lastInput;
         lastInput.cbSize = sizeof(LASTINPUTINFO);
-        BOOL fRc = pSession->pfnGetLastInputInfo(&lastInput);
+        BOOL fRc = s_pfnGetLastInputInfo(&lastInput);
         if (fRc)
         {
-            VBOXTRAYIPCRES_USERLASTINPUT ipcRes;
             ipcRes.uLastInput = (GetTickCount() - lastInput.dwTime) / 1000;
             fLastInputAvailable = true;
@@ -196 +199 @@
                         *ppInstance = &gCtx;
                         *pfStartThread = true;
+
+                        /* GetLastInputInfo only is available starting at Windows 2000. */
+                        s_pfnGetLastInputInfo = (PFNGETLASTINPUTINFO)
+                            RTLdrGetSystemSymbol("User32.dll", "GetLastInputInfo");
 
                         LogRelFunc(("Local IPC server now running at \"%s\"\n",
@@ -438 +445 @@
             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);
@@ -457 +457 @@
 
     pSession->hThread = NIL_RTTHREAD;
-    pSession->pfnGetLastInputInfo = NULL;
 
     RTLOCALIPCSESSION hSession;