Changeset 80824 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Sep 16, 2019 1:18:44 PM (5 years ago)

Author:

vboxsync

Message:

Main: bugref:9341: The "environment" parameter in the IMachine::launchVMProcess renamed to "environmentChanges" and changed the type from wstring to "safearray of wstrings"

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (5 diffs)
• VirtualBoxImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -3358 +3358 @@
 HRESULT Machine::launchVMProcess(const ComPtr<ISession> &aSession,
                                  const com::Utf8Str &aName,
-                                 const com::Utf8Str &aEnvironment,
+                                 const std::vector<com::Utf8Str> &aEnvironmentChanges,
                                  ComPtr<IProgress> &aProgress)
 {
@@ -3435 +3435 @@
         if (SUCCEEDED(rc))
         {
-            rc = i_launchVMProcess(control, strFrontend, aEnvironment, progress);
+            rc = i_launchVMProcess(control, strFrontend, aEnvironmentChanges, progress);
             if (SUCCEEDED(rc))
             {
@@ -7370 +7370 @@
 HRESULT Machine::i_launchVMProcess(IInternalSessionControl *aControl,
                                    const Utf8Str &strFrontend,
-                                   const Utf8Str &strEnvironment,
+                                   const std::vector<com::Utf8Str> &aEnvironmentChanges,
                                    ProgressProxy *aProgress)
 {
@@ -7606 +7606 @@
         if (FAILED(rc))
             return setError(rc, tr("Failed to start the machine '%s'. CoSetProxyBlanket failed"), strMachineName.c_str());
+
+        size_t const            cEnvVars = aEnvironmentChanges.size();
+        com::SafeArray<IN_BSTR> aBstrEnvironmentChanges(cEnvVars);
+        for (size_t i = 0; i < cEnvVars; i++)
+            aBstrEnvironmentChanges[i] = Bstr(aEnvironmentChanges[i]).raw();
+
         ULONG uPid = 0;
         rc = pVBoxSDS->LaunchVMProcess(Bstr(idStr).raw(), Bstr(strMachineName).raw(), Bstr(strFrontend).raw(),
-                                       Bstr(strEnvironment).raw(), Bstr(strSupHardeningLogArg).raw(),
+                                       ComSafeArrayAsInParam(aBstrEnvironmentChanges), Bstr(strSupHardeningLogArg).raw(),
                                        idCallerSession, &uPid);
         if (FAILED(rc))
@@ -7617 +7623 @@
 #endif /* VBOX_WITH_VBOXSDS && RT_OS_WINDOWS */
     {
-        int vrc = MachineLaunchVMCommonWorker(idStr, strMachineName, strFrontend, strEnvironment, strSupHardeningLogArg,
+        int vrc = MachineLaunchVMCommonWorker(idStr, strMachineName, strFrontend, aEnvironmentChanges, strSupHardeningLogArg,
                                               strAppOverride, 0 /*fFlags*/, NULL /*pvExtraData*/, pid);
         if (RT_FAILURE(vrc))

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -1157 +1157 @@
     /** @todo This needs to be the same in OSE and non-OSE, preferrably
      *        only changing when actual API changes happens. */
-    uRevision |= 0;
+    uRevision |= 1;
 
     *aAPIRevision = uRevision;