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

Timestamp:

Aug 24, 2022 9:56:54 AM (3 years ago)

Author:

vboxsync

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

153295

Message:

Add/NT/Inst,Add/NT/VBoxTray,Add/VBoxService: Cleaned up VBoxGuestInstallHelper.cpp (tested) and the VBoxTray IPC interface (not tested). The motivation for the former was to make it compile in no-CRT mode, the latter was buggy code. The IPC interface is not backwards compatible, this is intentional to avoid buggy code. bugref:10261

File:

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

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

@@ -58 +58 @@
 #include "../../WINNT/VBoxTray/VBoxTrayMsg.h" /* For IPC. */
 
-static uint32_t s_uDebugGuestPropClientID = 0;
-static uint32_t s_uDebugIter = 0;
-/** Whether to skip the logged-in user detection over RDP or not.
- *  See notes in this section why we might want to skip this. */
-static bool s_fSkipRDPDetection = false;
-
 
 /*********************************************************************************************************************************
@@ -117 +111 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
+static uint32_t s_uDebugGuestPropClientID = 0;
+static uint32_t s_uDebugIter = 0;
+/** Whether to skip the logged-in user detection over RDP or not.
+ *  See notes in this section why we might want to skip this. */
+static bool s_fSkipRDPDetection = false;
+
 static RTONCE                                   g_vgsvcWinVmInitOnce = RTONCE_INITIALIZER;
 
@@ -984 +984 @@
             {
                 /* .uMagic      = */ VBOXTRAY_IPC_HDR_MAGIC,
-                /* .uHdrVersion = */ 0,
-                /* .uMsgType    = */ VBOXTRAYIPCMSGTYPE_USERLASTINPUT,
-                /* .cbMsgData   = */ 0 /* No msg */
+                /* .uVersion    = */ VBOXTRAY_IPC_HDR_VERSION,
+                /* .enmMsgType  = */ VBOXTRAYIPCMSGTYPE_USER_LAST_INPUT,
+                /* .cbPayload   = */ 0 /* No payload */
             };
 
             rc = RTLocalIpcSessionWrite(hSession, &ipcHdr, sizeof(ipcHdr));
-
             if (RT_SUCCESS(rc))
             {
-                VBOXTRAYIPCRES_USERLASTINPUT ipcRes;
-                rc = RTLocalIpcSessionRead(hSession, &ipcRes, sizeof(ipcRes), NULL /* Exact read */);
+                VBOXTRAYIPCREPLY_USER_LAST_INPUT_T ipcReply;
+                rc = RTLocalIpcSessionRead(hSession, &ipcReply, sizeof(ipcReply), NULL /* Exact read */);
                 if (   RT_SUCCESS(rc)
                     /* If uLastInput is set to UINT32_MAX VBoxTray was not able to retrieve the
                      * user's last input time. This might happen when running on Windows NT4 or older. */
-                    && ipcRes.uLastInput != UINT32_MAX)
+                    && ipcReply.cSecSinceLastInput != UINT32_MAX)
                 {
-                    userState = (ipcRes.uLastInput * 1000) < g_uVMInfoUserIdleThresholdMS
+                    userState = ipcReply.cSecSinceLastInput * 1000 < g_uVMInfoUserIdleThresholdMS
                               ? VBoxGuestUserState_InUse
                               : VBoxGuestUserState_Idle;
@@ -1014 +1013 @@
                     fReportToHost = rc == VINF_SUCCESS;
                     VGSvcVerbose(4, "User '%s' (domain '%s') is idle for %RU32, fReportToHost=%RTbool\n",
-                                 pszUser, pszDomain ? pszDomain : "<None>", ipcRes.uLastInput, fReportToHost);
+                                 pszUser, pszDomain ? pszDomain : "<None>", ipcReply.cSecSinceLastInput, fReportToHost);
 
 #if 0 /* Do we want to write the idle time as well? */
                         /* Also write the user's current idle time, if there is any. */
                         if (userState == VBoxGuestUserState_Idle)
-                            rc = vgsvcUserUpdateF(pCache, pszUser, pszDomain, "IdleTimeMs", "%RU32", ipcRes.uLastInputMs);
+                            rc = vgsvcUserUpdateF(pCache, pszUser, pszDomain, "IdleTimeMs", "%RU32", ipcReply.cSecSinceLastInput);
                         else
                             rc = vgsvcUserUpdateF(pCache, pszUser, pszDomain, "IdleTimeMs", NULL /* Delete property */);
@@ -1027 +1026 @@
                 }
 #ifdef DEBUG
-                else if (RT_SUCCESS(rc) && ipcRes.uLastInput == UINT32_MAX)
+                else if (RT_SUCCESS(rc) && ipcReply.cSecSinceLastInput == UINT32_MAX)
                     VGSvcVerbose(4, "Last input for user '%s' is not supported, skipping\n", pszUser, rc);
 #endif