Changeset 13127 in vbox for trunk/src/VBox/Additions/WINNT/VBoxService

Timestamp:

Oct 9, 2008 12:13:02 PM (16 years ago)

Author:

vboxsync

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

37625

Message:

Additions/Windows: guest property fix for LoggedInUsersList and new NoLoggedInUsers property which only gets updated when transitioning from/to no users. Important for timestamp.

Location:

trunk/src/VBox/Additions/WINNT/VBoxService

Files:

• VBoxVMInfo.cpp (modified) (2 diffs)
• VBoxVMInfo.h (modified) (1 diff)
• VBoxVMInfoUser.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxVMInfo.cpp

@@ -80 +80 @@
     gCtx.pEnv = pEnv;
     gCtx.fFirstRun = TRUE;
+    gCtx.iUserCount = INT32_MAX; /* value which isn't reached in real life. */
 
     int rc = VbglR3GuestPropConnect(&gCtx.iInfoSvcClientID);
@@ -115 +116 @@
      * Needs to be replaced with "temporary properties" later. */
 
-    vboxVMInfoWriteProp(pCtx, "GuestInfo/OS/LoggedInUsersList", "");
+    vboxVMInfoWriteProp(pCtx, "GuestInfo/OS/LoggedInUsersList", NULL);
     vboxVMInfoWritePropInt(pCtx, "GuestInfo/OS/LoggedInUsers", 0);
+    if (pCtx->iUserCount != 0)
+        vboxVMInfoWriteProp(pCtx, "GuestInfo/OS/NoLoggedInUsers", "true");
 
     const char *apszPat[1] = { "/VirtualBox/GuestInfo/Net/*" };

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxVMInfo.h

@@ -32 +32 @@
     fnWTSGetActiveConsoleSessionId pfnWTSGetActiveConsoleSessionId;
     BOOL fFirstRun;
+    uint32_t iUserCount;
 } VBOXINFORMATIONCONTEXT;
 

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxVMInfoUser.cpp

@@ -334 +334 @@
     vboxVMInfoWriteProp(a_pCtx, "GuestInfo/OS/LoggedInUsersList", (iUserCount > 0) ? szUserList : NULL);
     vboxVMInfoWritePropInt(a_pCtx, "GuestInfo/OS/LoggedInUsers", iUserCount);
+    if (a_pCtx->iUserCount != iUserCount)
+    {
+        /* Update this property ONLY if there is a real change from no users to
+         * users or vice versa. The only exception is that the initialization
+         * of a_pCtx->iUserCount forces an update, but only once. This ensures
+         * consistent property settings even if the VM aborted previously. */
+        if (iUserCount == 0)
+            vboxVMInfoWriteProp(a_pCtx, "GuestInfo/OS/NoLoggedInUsers", "true");
+        else if (a_pCtx->iUserCount == 0)
+            vboxVMInfoWriteProp(a_pCtx, "GuestInfo/OS/NoLoggedInUsers", "false");
+    }
+    a_pCtx->iPrevUserCount = iUserCount;
 
     return ret;