Changeset 37447 in vbox for trunk/src/VBox

Timestamp:

Jun 14, 2011 3:46:03 PM (14 years ago)

Author:

vboxsync

Message:

GuestCtrl/Execute: Added NoProfile flag for executing processes without loading the user's profile.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxService/VBoxServiceControlExec.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (3 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/src-client/GuestCtrlImpl.cpp (modified) (1 diff)
• Runtime/r3/win/process-win.cpp (modified) (1 diff)

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

@@ -865 +865 @@
                 if (fFlags & RT_BIT(2))
                     uProcFlags = RTPROC_FLAGS_HIDDEN;
+                /* Process Main flag "ExecuteProcessFlag_NoProfile". */
+                if (fFlags & RT_BIT(3))
+                    uProcFlags = RTPROC_FLAGS_NO_PROFILE;
             }
 

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

@@ -140 +140 @@
 {
     GETOPTDEF_EXEC_IGNOREORPHANEDPROCESSES = 1000,
+    GETOPTDEF_EXEC_NO_PROFILE,
     GETOPTDEF_EXEC_OUTPUTFORMAT,
     GETOPTDEF_EXEC_DOS2UNIX,
@@ -443 +444 @@
         { "--ignore-operhaned-processes",   GETOPTDEF_EXEC_IGNOREORPHANEDPROCESSES,   RTGETOPT_REQ_NOTHING },
         { "--image",                        'i',                                      RTGETOPT_REQ_STRING  },
+        { "--no-profile",                   GETOPTDEF_EXEC_NO_PROFILE,                RTGETOPT_REQ_NOTHING },
         { "--password",                     'p',                                      RTGETOPT_REQ_STRING  },
         { "--timeout",                      't',                                      RTGETOPT_REQ_UINT32  },
@@ -502 +504 @@
             case GETOPTDEF_EXEC_IGNOREORPHANEDPROCESSES:
                 fExecFlags |= ExecuteProcessFlag_IgnoreOrphanedProcesses;
+                break;
+
+            case GETOPTDEF_EXEC_NO_PROFILE:
+                fExecFlags |= ExecuteProcessFlag_NoProfile;
                 break;
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -8147 +8147 @@
   <enum
     name="ExecuteProcessFlag"
-    uuid="3258e8a5-ba0c-43d5-86b5-cf91405fddc0"
+    uuid="286ceb91-5f66-4c96-9845-4483e90e00ae"
     >
     <desc>
@@ -8165 +8165 @@
     <const name="Hidden"                  value="4">
       <desc>Don't show the started process according to the guest OS guidelines.</desc>
+    </const>
+    <const name="NoProfile"               value="8">
+      <desc>Do not use the user's profile data when exeuting a process.</desc>
     </const>
   </enum>

trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp

@@ -1803 +1803 @@
         if (   !(aFlags & ExecuteProcessFlag_IgnoreOrphanedProcesses)
             && !(aFlags & ExecuteProcessFlag_WaitForProcessStartOnly)
-            && !(aFlags & ExecuteProcessFlag_Hidden))
+            && !(aFlags & ExecuteProcessFlag_Hidden)
+            && !(aFlags & ExecuteProcessFlag_NoProfile))
         {
             if (pRC)

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

@@ -868 +868 @@
             }
 
-            /*
-             * If we didn't find a matching VBoxTray, just use the token we got
-             * above from LogonUserW(). This enables us to at least run processes with
-             * desktop interaction without UI.
-             */
-            phToken = fFound ? &hTokenUserDesktop : &hTokenLogon;
-
-            RTLDRMOD hUserenv;
-            int rc = RTLdrLoad("Userenv.dll", &hUserenv);
-            if (RT_SUCCESS(rc))
+            /** @todo Hmm, this function already is too big! We need to split
+             *        it up into several small parts. */
+
+            /* If we got an error due to account lookup/loading above, don't
+             * continue here. */
+            if (dwErr == NO_ERROR)
             {
-                PFNLOADUSERPROFILEW pfnLoadUserProfileW;
-                rc = RTLdrGetSymbol(hUserenv, "LoadUserProfileW", (void**)&pfnLoadUserProfileW);
+                /*
+                 * If we didn't find a matching VBoxTray, just use the token we got
+                 * above from LogonUserW(). This enables us to at least run processes with
+                 * desktop interaction without UI.
+                 */
+                phToken = fFound ? &hTokenUserDesktop : &hTokenLogon;
+                RTLDRMOD hUserenv;
+                int rc = RTLdrLoad("Userenv.dll", &hUserenv);
                 if (RT_SUCCESS(rc))
                 {
-                    PFNUNLOADUSERPROFILE pfnUnloadUserProfile;
-                    rc = RTLdrGetSymbol(hUserenv, "UnloadUserProfile", (void**)&pfnUnloadUserProfile);
+                    PFNLOADUSERPROFILEW pfnLoadUserProfileW;
+                    rc = RTLdrGetSymbol(hUserenv, "LoadUserProfileW", (void**)&pfnLoadUserProfileW);
                     if (RT_SUCCESS(rc))
                     {
-                        PROFILEINFOW profileInfo;
-                        ZeroMemory(&profileInfo, sizeof(profileInfo));
-                        profileInfo.dwSize = sizeof(profileInfo);
-                        profileInfo.lpUserName = pwszUser;
-                        profileInfo.dwFlags = PI_NOUI; /* Prevents the display of profile error messages. */
-
-                        if (pfnLoadUserProfileW(*phToken, &profileInfo))
+                        PFNUNLOADUSERPROFILE pfnUnloadUserProfile;
+                        rc = RTLdrGetSymbol(hUserenv, "UnloadUserProfile", (void**)&pfnUnloadUserProfile);
+                        if (RT_SUCCESS(rc))
                         {
-                            PRTUTF16 pwszzBlock;
-                            rc = rtProcEnvironmentCreateFromToken(*phToken, hEnv, &pwszzBlock);
-                            if (RT_SUCCESS(rc))
+                            PROFILEINFOW profileInfo;
+                            if (!(fFlags & RTPROC_FLAGS_NO_PROFILE))
                             {
-                                /*
-                                 * Useful KB articles:
-                                 *      http://support.microsoft.com/kb/165194/
-                                 *      http://support.microsoft.com/kb/184802/
-                                 *      http://support.microsoft.com/kb/327618/
-                                 */
-                                fRc = CreateProcessAsUserW(*phToken,
-                                                           pwszExec,
-                                                           pwszCmdLine,
-                                                           NULL,         /* pProcessAttributes */
-                                                           NULL,         /* pThreadAttributes */
-                                                           TRUE,         /* fInheritHandles */
-                                                           dwCreationFlags,
-                                                           pwszzBlock,
-                                                           NULL,         /* pCurrentDirectory */
-                                                           pStartupInfo,
-                                                           pProcInfo);
-                                if (fRc)
-                                    dwErr = NO_ERROR;
+                                ZeroMemory(&profileInfo, sizeof(profileInfo));
+                                profileInfo.dwSize = sizeof(profileInfo);
+                                profileInfo.lpUserName = pwszUser;
+                                profileInfo.dwFlags = PI_NOUI; /* Prevents the display of profile error messages. */
+
+                                if (!pfnLoadUserProfileW(*phToken, &profileInfo))
+                                    dwErr = GetLastError();
+                            }
+
+                            if (dwErr == NO_ERROR)
+                            {
+                                PRTUTF16 pwszzBlock;
+                                rc = rtProcEnvironmentCreateFromToken(*phToken, hEnv, &pwszzBlock);
+                                if (RT_SUCCESS(rc))
+                                {
+                                    /*
+                                     * Useful KB articles:
+                                     *      http://support.microsoft.com/kb/165194/
+                                     *      http://support.microsoft.com/kb/184802/
+                                     *      http://support.microsoft.com/kb/327618/
+                                     */
+                                    fRc = CreateProcessAsUserW(*phToken,
+                                                               pwszExec,
+                                                               pwszCmdLine,
+                                                               NULL,         /* pProcessAttributes */
+                                                               NULL,         /* pThreadAttributes */
+                                                               TRUE,         /* fInheritHandles */
+                                                               dwCreationFlags,
+                                                               pwszzBlock,
+                                                               NULL,         /* pCurrentDirectory */
+                                                               pStartupInfo,
+                                                               pProcInfo);
+                                    if (fRc)
+                                        dwErr = NO_ERROR;
+                                    else
+                                        dwErr = GetLastError(); /* CreateProcessAsUserW() failed. */
+                                    rtProcEnvironmentDestroy(pwszzBlock);
+                                }
                                 else
-                                    dwErr = GetLastError(); /* CreateProcessAsUserW() failed. */
-                                rtProcEnvironmentDestroy(pwszzBlock);
+                                    dwErr = rc;
+
+                                if (!(fFlags & RTPROC_FLAGS_NO_PROFILE))
+                                    pfnUnloadUserProfile(*phToken, profileInfo.hProfile);
                             }
-                            else
-                                dwErr = rc;
-                            pfnUnloadUserProfile(*phToken, profileInfo.hProfile);
                         }
-                        else
-                            dwErr = GetLastError(); /* LoadUserProfileW() failed. */
                     }
-                }
-                RTLdrClose(hUserenv);
-            }
+                    RTLdrClose(hUserenv);
+                } /* Userenv.dll found/loaded? */
+            } /* Account lookup succeeded? */
             if (hTokenUserDesktop != INVALID_HANDLE_VALUE)
                 CloseHandle(hTokenUserDesktop);