Changeset 55588 in vbox for trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

Timestamp:

May 1, 2015 7:37:46 PM (10 years ago)

Author:

vboxsync

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

99961

Message:

Main: Environment cleanup in the guest control area. The GuestEnvironment class implementation has been replaced by one based on IPRT's RTEnv API and it has been changed into a way of recording environment changes, thus renamed to GuestEnvironmentChanges.

File:

• trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp (modified) (6 diffs)

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

@@ -304 +304 @@
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    mData.mProcess.mEnvironment.CopyTo(aEnvironment);
+    mData.mProcess.mEnvironment.queryPutEnvArray(&aEnvironment);
     return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
@@ -1054 +1054 @@
 
     /* Prepare environment. */
-    void *pvEnv = NULL;
-    size_t cbEnv = 0;
+    size_t  cbEnvBlock;
+    char   *pszzEnvBlock;
     if (RT_SUCCESS(vrc))
-        vrc = mData.mProcess.mEnvironment.BuildEnvironmentBlock(&pvEnv, &cbEnv, NULL /* cEnv */);
+        vrc = mData.mProcess.mEnvironment.queryUtf8Block(&pszzEnvBlock, &cbEnvBlock);
 
     if (RT_SUCCESS(vrc))
@@ -1065 +1065 @@
         int i = 0;
         paParms[i++].setUInt32(pEvent->ContextID());
-        paParms[i++].setPointer((void*)mData.mProcess.mExecutable.c_str(),
-                                (ULONG)mData.mProcess.mExecutable.length() + 1);
+        paParms[i++].setCppString(mData.mProcess.mExecutable);
         paParms[i++].setUInt32(mData.mProcess.mFlags);
         paParms[i++].setUInt32((uint32_t)mData.mProcess.mArguments.size());
-        paParms[i++].setPointer((void*)pszArgs, (uint32_t)cbArgs);
-        paParms[i++].setUInt32((uint32_t)mData.mProcess.mEnvironment.Size());
-        paParms[i++].setUInt32((uint32_t)cbEnv);
-        paParms[i++].setPointer((void*)pvEnv, (uint32_t)cbEnv);
+        paParms[i++].setPointer(pszArgs, (uint32_t)cbArgs);
+        paParms[i++].setUInt32(mData.mProcess.mEnvironment.count());
+        paParms[i++].setUInt32((uint32_t)cbEnvBlock);
+        paParms[i++].setPointer(pszzEnvBlock, (uint32_t)cbEnvBlock);
         if (uProtocol < 2)
         {
@@ -1078 +1077 @@
              * call. In newer protocols these credentials are part of the opened guest
              * session, so not needed anymore here. */
-            paParms[i++].setPointer((void*)sessionCreds.mUser.c_str(), (ULONG)sessionCreds.mUser.length() + 1);
-            paParms[i++].setPointer((void*)sessionCreds.mPassword.c_str(), (ULONG)sessionCreds.mPassword.length() + 1);
+            paParms[i++].setCppString(sessionCreds.mUser);
+            paParms[i++].setCppString(sessionCreds.mPassword);
         }
         /*
@@ -1098 +1097 @@
             paParms[i++].setUInt32(1);
             /* The actual CPU affinity blocks. */
-            paParms[i++].setPointer((void*)&mData.mProcess.mAffinity, sizeof(mData.mProcess.mAffinity));
+            paParms[i++].setPointer((void *)&mData.mProcess.mAffinity, sizeof(mData.mProcess.mAffinity));
         }
 
@@ -1109 +1108 @@
             AssertRC(rc2);
         }
-    }
-
-    GuestEnvironment::FreeEnvironmentBlock(pvEnv);
+
+        mData.mProcess.mEnvironment.freeUtf8Block(pszzEnvBlock);
+    }
+
     if (pszArgs)
         RTStrFree(pszArgs);