Changeset 29807 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

May 26, 2010 10:13:20 AM (15 years ago)

Author:

vboxsync

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

62016

Message:

Guest Control/IPRT/VBoxManage: More gentle error messages, bug fix for process lookup with different user, correct return value of process start error.

File:

• trunk/src/VBox/Runtime/r3/win/process-win.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/win/process-win.cpp

@@ -287 +287 @@
                                            (LPVOID)pTokenUser,
                                            dwSize,
-                                           &dwSize)
-                    && IsValidSid(pTokenUser->User.Sid)
-                    && EqualSid(pTokenUser->User.Sid, pSID))
+                                           &dwSize))
                 {
-                    if (DuplicateTokenEx(hTokenProc, MAXIMUM_ALLOWED,
-                                         NULL, SecurityIdentification, TokenPrimary, phToken))
+                    if (   IsValidSid(pTokenUser->User.Sid)
+                        && EqualSid(pTokenUser->User.Sid, pSID))
                     {
-                        /*
-                         * So we found the process instance which belongs to the user we want to
-                         * to run our new process under. This duplicated token will be used for
-                         * the actual CreateProcessAsUserW() call then.
-                         */
-                        fFound = TRUE;
+                        if (DuplicateTokenEx(hTokenProc, MAXIMUM_ALLOWED,
+                                             NULL, SecurityIdentification, TokenPrimary, phToken))
+                        {
+                            /*
+                             * So we found the process instance which belongs to the user we want to
+                             * to run our new process under. This duplicated token will be used for
+                             * the actual CreateProcessAsUserW() call then.
+                             */
+                            fFound = TRUE;
+                        }
+                        else
+                            dwErr = GetLastError();
                     }
-                    else
-                        dwErr = GetLastError();
                 }
                 else
@@ -320 +322 @@
     if (fFound)
         return VINF_SUCCESS;
-    return RTErrConvertFromWin32(dwErr);
+    if (dwErr != NO_ERROR)
+        return RTErrConvertFromWin32(dwErr);
+    return VERR_NOT_FOUND; /* No error occured, but we didn't find the right process. */
 }
 
@@ -649 +653 @@
                 break;
 
-            case ERROR_PASSWORD_EXPIRED:
-            case ERROR_ACCOUNT_RESTRICTION:
+            case ERROR_PASSWORD_EXPIRED:            
+            case ERROR_ACCOUNT_RESTRICTION: /* See: http://support.microsoft.com/kb/303846/ */
                 rc = VERR_LOGON_FAILURE;
                 break;