Changeset 29807 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxService/VBoxServiceControlExec.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (1 diff)
• Main/GuestImpl.cpp (modified) (2 diffs)
• Runtime/r3/win/process-win.cpp (modified) (3 diffs)

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

@@ -823 +823 @@
                                 rc = RTProcCreateEx(pData->pszCmd, pData->papszArgs, hEnv, RTPROC_FLAGS_SERVICE,
                                                     phStdIn, phStdOut, phStdErr,
-                                                    strlen(pData->pszUser) ? pData->pszUser : NULL,
-                                                    strlen(pData->pszUser) && strlen(pData->pszPassword) ? pData->pszPassword : NULL,
+                                                    pData->pszUser, pData->pszPassword,
                                                     &hProcess);
                                 if (RT_SUCCESS(rc))

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -322 +322 @@
             if (FAILED(rc))
             {
+                /* If we got a VBOX_E_IPRT error we handle the error in a more gentle way
+                 * because it contains more accurate info about what went wrong. */
                 ErrorInfo info(guest);
                 if (info.isFullAvailable())
-                    RTPrintf("ERROR: %ls (%Rhrc).\n", info.getText().raw(), info.getResultCode());
+                {
+                    if (rc == VBOX_E_IPRT_ERROR)
+                    {
+                        RTPrintf("%ls.\n", info.getText().raw());
+                    }
+                    else
+                    {
+                        RTPrintf("ERROR: %ls (%Rhrc).\n", info.getText().raw(), info.getResultCode());
+                    }
+                }
                 break;
             }

trunk/src/VBox/Main/GuestImpl.cpp

@@ -1060 +1060 @@
                                           tr("The guest did not respond within time (%ums)"), aTimeoutMS);
                         }
-                        else if (vrc == VERR_INVALID_PARAMETER)
-                        {
-                            rc = setError(VBOX_E_IPRT_ERROR,
-                                          tr("The guest reported an unknown process status (%u)"), pData->u32Status);
-                        }
                         else if (vrc == VERR_PERMISSION_DENIED)
                         {
@@ -1072 +1067 @@
                         else
                         {
-                            rc = setError(E_UNEXPECTED,
-                                          tr("The service call failed with error %Rrc"), vrc);
+                            if (pData->u32Status == PROC_STS_ERROR)
+                                rc = setError(VBOX_E_IPRT_ERROR,
+                                              tr("Process could not be started: %Rrc"), pData->u32Flags);
+                            else
+                                rc = setError(E_UNEXPECTED,
+                                              tr("The service call failed with error %Rrc"), vrc);
                         }               
                     }

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;