Changeset 57820 in vbox for trunk/include

Timestamp:

Sep 18, 2015 10:00:11 AM (10 years ago)

Author:

vboxsync

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

102769

Message:

IPRT/process-win.cpp: User profile environment handling, take 2: Renamed RTPROC_FLAGS_OVERWRITE_WITH_PROFILE to RTPROC_MODIFY_DEFAULT_ENV and changed its semantics. See flag description for details.

Location:

trunk/include/iprt

Files:

• env.h (modified) (1 diff)
• mangling.h (modified) (2 diffs)
• process.h (modified) (1 diff)

trunk/include/iprt/env.h

@@ -385 +385 @@
 RTDECL(int) RTEnvApplyChanges(RTENV hEnvDst, RTENV hEnvChanges);
 
+/**
+ * Creates an environment block out of a handed-in Unicode block.
+ *
+ * @return  IPRT status code.
+ * @param   hEnv                Handle of an existing RTENV block to store the
+ *                              result into.
+ * @param   pcwszBlock          Unicode block (array) of environment entries;
+ *                              in form of "FOO=BAR\0BAR=BAZ".
+ * @param   fOverwriteExisting  Whether to overwrite existing values of hEnv
+ *                              with the ones defined in pcwszBlock.
+
+ */
+RTDECL(int) RTEnvFromUtf16Block(RTENV hEnv, PCRTUTF16 pcwszBlock, bool fOverwriteExisting);
 
 #endif /* IN_RING3 */

trunk/include/iprt/mangling.h

@@ -521 +521 @@
 # define RTEnvFreeUtf8Block                             RT_MANGLER(RTEnvFreeUtf8Block)
 # define RTEnvFreeUtf16Block                            RT_MANGLER(RTEnvFreeUtf16Block)
+# define RTEnvFromUtf16                                 RT_MANGLER(RTEnvFromUtf16)
 # define RTEnvGet                                       RT_MANGLER(RTEnvGet)
 # define RTEnvGetBad                                    RT_MANGLER(RTEnvGetBad)
@@ -1873 +1874 @@
 # define RTUriParsedQuery                               RT_MANGLER(RTUriParsedQuery)
 # define RTUriIsSchemeMatch                             RT_MANGLER(RTUriIsSchemeMatch)
-# define RTUriPath                                      RT_MANGLER(RTUriPath)
 # define RTUtf16AllocTag                                RT_MANGLER(RTUtf16AllocTag)
 # define RTUtf16CalcLatin1Len                           RT_MANGLER(RTUtf16CalcLatin1Len)

trunk/include/iprt/process.h

@@ -211 +211 @@
  * passing argument the vector. */
 #define RTPROC_FLAGS_UNQUOTED_ARGS          RT_BIT(7)
-/** Only valid in combination with RTPROC_FLAGS_PROFILE.
- * This will overwrite environment variables of the passed-in hEnv
- * environment block with variables of the loaded profile. */
-#define RTPROC_FLAGS_OVERWRITE_WITH_PROFILE RT_BIT(8)
+/** Indicates that the passed hEnv environment block should be used to
+ *  modify the default environment block. If this flag is not specified,
+ *  then hEnv will be used exclusively. If hEnv is RTENV_DEFAULT, however,
+ *  this flag does nothing. */
+#define RTPROC_MODIFY_DEFAULT_ENV           RT_BIT(8)
 /** Valid flag mask. */
 #define RTPROC_FLAGS_VALID_MASK             UINT32_C(0x1ff)