Changeset 32771 in vbox

Timestamp:

Sep 27, 2010 12:09:42 PM (14 years ago)

Author:

vboxsync

Message:

VBoxService/VMInfo: Fixed LsaEnumerate() error case when shutting down the system, return rc.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceVMInfo-win.cpp (modified) (1 diff)
• VBoxServiceVMInfo.cpp (modified) (1 diff)

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

@@ -470 +470 @@
        of already logged off users (especially in Windows 2000). */
     NTSTATUS rcNt = LsaEnumerateLogonSessions(&cSession, &paSessions);
+    if (rcNt != STATUS_SUCCESS)
+    {
+        ULONG rcWin = LsaNtStatusToWinError(rcNt);
+
+        /* If we're about to shutdown when we were in the middle of enumerating the logon
+           sessions, skip the error to not confuse the user with an unnecessary log message. */
+        if (rcWin == ERROR_SHUTDOWN_IN_PROGRESS)
+        {
+            VBoxServiceVerbose(3, "VMInfo/Users: Shutdown in progress ...\n");
+            rcWin = ERROR_SUCCESS;
+        }
+        else
+            VBoxServiceError("VMInfo/Users: LsaEnumerate failed with %lu\n", rcWin);
+        return RTErrConvertFromWin32(rcWin);
+    }
     VBoxServiceVerbose(3, "VMInfo/Users: Found %ld users\n", cSession);
-    if (rcNt != STATUS_SUCCESS)
-    {
-        VBoxServiceError("VMInfo/Users: LsaEnumerate failed with %lu\n", LsaNtStatusToWinError(rcNt));
-        return RTErrConvertFromWin32(LsaNtStatusToWinError(rcNt));
-    }
 
     PVBOXSERVICEVMINFOPROC  paProcs;

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

@@ -332 +332 @@
     if (RT_SUCCESS(rc) && pszUserList)
         RTStrFree(pszUserList);
-    return VINF_SUCCESS;
+    return rc;
 }