Changeset 61893 in vbox for trunk

Timestamp:

Jun 27, 2016 11:31:20 AM (8 years ago)

Author:

vboxsync

Message:

Main: Renamed ProcessCreateFlag::NoProfile to ProcessCreateFlag::Profile.

Location:

trunk

Files:

• doc/manual/en_US/SDKRef.xml (modified) (1 diff)
• include/VBox/GuestHost/GuestControl.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (5 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/src-client/GuestSessionImpl.cpp (modified) (1 diff)

trunk/doc/manual/en_US/SDKRef.xml

@@ -3918 +3918 @@
 
       <itemizedlist>
-        <listitem>TODO: Rename EXECUTEPROCESSFLAG_NO_PROFILE to EXECUTEPROCESSFLAG_PROFILE (also in Main).</listitem>
+        <listitem><para><link linkend="ProcessCreateFlag__NoProfile">ProcessCreateFlag::NoProfile</link>
+          has been renamed to <link linkend="ProcessCreateFlag__Profile">ProcessCreateFlag::Profile</link>,
+          whereas the semantics also has been changed: <link linkend="ProcessCreateFlag__NoProfile">ProcessCreateFlag::NoProfile</link>
+          explicitly <emphasis role="bold">did not</emphasis> utilize the guest user's profile data,
+          which in turn <link linkend="ProcessCreateFlag__Profile">ProcessCreateFlag::NoProfile</link>
+          explicitly <emphasis role="bold">does now</emphasis>.</para>
+        </listitem>
       </itemizedlist>
 

trunk/include/VBox/GuestHost/GuestControl.h

@@ -95 +95 @@
 #define EXECUTEPROCESSFLAG_IGNORE_ORPHANED  RT_BIT(1)
 #define EXECUTEPROCESSFLAG_HIDDEN           RT_BIT(2)
-#define EXECUTEPROCESSFLAG_NO_PROFILE       RT_BIT(3) /**< @todo Rename to EXECUTEPROCESSFLAG_PROFILE in next API change. */
+#define EXECUTEPROCESSFLAG_PROFILE          RT_BIT(3)
 #define EXECUTEPROCESSFLAG_WAIT_STDOUT      RT_BIT(4)
 #define EXECUTEPROCESSFLAG_WAIT_STDERR      RT_BIT(5)

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

@@ -1341 +1341 @@
                 if (fFlags & EXECUTEPROCESSFLAG_HIDDEN)
                     uProcFlags |= RTPROC_FLAGS_HIDDEN;
-                /** @todo Rename to EXECUTEPROCESSFLAG_PROFILE in next API change. */
-                if (!(fFlags & EXECUTEPROCESSFLAG_NO_PROFILE))
+                if (!(fFlags & EXECUTEPROCESSFLAG_PROFILE))
                     uProcFlags |= RTPROC_FLAGS_PROFILE;
                 if (fFlags & EXECUTEPROCESSFLAG_UNQUOTED_ARGS)

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

@@ -331 +331 @@
                      "                              [--exe <path to executable>] [--timeout <msec>]\n"
                      "                              [-E|--putenv <NAME>[=<VALUE>]] [--unquoted-args]\n"
-                     "                              [--ignore-operhaned-processes] [--no-profile]\n"
+                     "                              [--ignore-operhaned-processes] [--profile]\n"
                      "                              [--no-wait-stdout|--wait-stdout]\n"
                      "                              [--no-wait-stderr|--wait-stderr]\n"
@@ -342 +342 @@
                      "                              [--exe <path to executable>] [--timeout <msec>]\n"
                      "                              [-E|--putenv <NAME>[=<VALUE>]] [--unquoted-args]\n"
-                     "                              [--ignore-operhaned-processes] [--no-profile]\n"
+                     "                              [--ignore-operhaned-processes] [--profile]\n"
                      "                              -- <program/arg0> [argument1] ... [argumentN]]\n"
                      "\n");
@@ -1313 +1313 @@
     {
         kGstCtrlRunOpt_IgnoreOrphanedProcesses = 1000,
-        kGstCtrlRunOpt_NoProfile,
+        kGstCtrlRunOpt_NoProfile, /** @todo Deprecated and will be removed soon; use kGstCtrlRunOpt_Profile instead, if needed. */
+        kGstCtrlRunOpt_Profile,
         kGstCtrlRunOpt_Dos2Unix,
         kGstCtrlRunOpt_Unix2Dos,
@@ -1329 +1330 @@
         { "--unquoted-args",                'u',                                      RTGETOPT_REQ_NOTHING },
         { "--ignore-operhaned-processes",   kGstCtrlRunOpt_IgnoreOrphanedProcesses,   RTGETOPT_REQ_NOTHING },
-        { "--no-profile",                   kGstCtrlRunOpt_NoProfile,                 RTGETOPT_REQ_NOTHING },
+        { "--no-profile",                   kGstCtrlRunOpt_NoProfile,                 RTGETOPT_REQ_NOTHING }, /** @todo Deprecated. */
+        { "--profile"                       kGstCtrlRunOpt_Profile,                   RTGETOPT_REQ_NOTHING },
         /* run only: 6 - options */
         { "--dos2unix",                     kGstCtrlRunOpt_Dos2Unix,                  RTGETOPT_REQ_NOTHING },
@@ -1387 +1389 @@
 
                 case kGstCtrlRunOpt_NoProfile:
-                    aCreateFlags.push_back(ProcessCreateFlag_NoProfile);
+                    /** @todo Deprecated, will be removed. */
+                    RTPrintf("Warning: Deprecated option \"--no-profile\" specified\n");
+                    break;
+
+                case kGstCtrlRunOpt_Profile:
+                    aCreateFlags.push_back(ProcessCreateFlag_Profile);
                     break;
 

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

@@ -10566 +10566 @@
   <enum
     name="ProcessCreateFlag"
-    uuid="be8c8dbd-4a76-e9ac-20df-468e86edf383"
+    uuid="C544CD2B-F02D-4886-9901-71C523DB8DC5"
     >
     <desc>
       Guest process execution flags.
       <note>The values are passed to the guest additions, so its not possible
-            to change (move) or reuse values.here.  See EXECUTEPROCESSFLAG_XXX
+            to change (move) or reuse values.here. See EXECUTEPROCESSFLAG_XXX
             in GuestControlSvc.h.</note>
     </desc>
@@ -10588 +10588 @@
       <desc>Do not 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. Only available for Windows guests.</desc>
+    <const name="Profile"                   value="8">
+      <desc>Utilize the user's profile data when exeuting a process. Only available for Windows guests at the moment.</desc>
     </const>
     <const name="WaitForStdOut"             value="16">

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

@@ -1931 +1931 @@
             && !(procInfo.mFlags & ProcessCreateFlag_WaitForProcessStartOnly)
             && !(procInfo.mFlags & ProcessCreateFlag_Hidden)
-            && !(procInfo.mFlags & ProcessCreateFlag_NoProfile)
+            && !(procInfo.mFlags & ProcessCreateFlag_Profile)
             && !(procInfo.mFlags & ProcessCreateFlag_WaitForStdOut)
             && !(procInfo.mFlags & ProcessCreateFlag_WaitForStdErr))