Changeset 42117 in vbox for trunk

Timestamp:

Jul 11, 2012 6:09:05 PM (13 years ago)

Author:

vboxsync

Message:

Main/GuestSession+GuestProcess: real build fix

Location:

trunk/src/VBox/Main

Files:

• include/GuestProcessImpl.h (modified) (2 diffs)
• include/GuestSessionImpl.h (modified) (2 diffs)
• src-client/GuestProcessImpl.cpp (modified) (1 diff)
• src-client/GuestSessionImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/include/GuestProcessImpl.h

@@ -22 +22 @@
 #include "VirtualBoxBase.h"
 
+#include <vector>
+
+typedef std::vector<Utf8Str> StringsArray;
+
 class GuestSession;
 
@@ -44 +48 @@
 
     int     init(GuestSession *pSession,
-                 const Utf8Str &aCommand, ComSafeArrayIn(Utf8Str, aArguments), ComSafeArrayIn(Utf8Str, aEnvironment),
+                 const Utf8Str &aCommand, const StringsArray &aArguments, const StringsArray &aEnvironment,
                  ComSafeArrayIn(ProcessCreateFlag_T, aFlags), ULONG aTimeoutMS,
                  ProcessPriority_T aPriority, ComSafeArrayIn(LONG, aAffinity));

trunk/src/VBox/Main/include/GuestSessionImpl.h

@@ -26 +26 @@
 #include "GuestFileImpl.h"
 #include "GuestFsObjInfoImpl.h"
+
+#include <map>
+#include <vector>
+
+typedef std::vector<Utf8Str> StringsArray;
 
 class Guest;
@@ -113 +118 @@
     int fileClose(ComObjPtr<GuestFile> pFile);
     int processClose(ComObjPtr<GuestProcess> pProcess);
-    int processCreateExInteral(const Utf8Str &aCommand, ComSafeArrayIn(Utf8Str, aArguments), ComSafeArrayIn(Utf8Str, aEnvironment),
+    int processCreateExInteral(const Utf8Str &aCommand, const StringsArray &aArguments, const StringsArray &aEnvironment,
                                ComSafeArrayIn(ProcessCreateFlag_T, aFlags), ULONG aTimeoutMS,
                                ProcessPriority_T aPriority, ComSafeArrayIn(LONG, aAffinity),

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

@@ -51 +51 @@
 
 int GuestProcess::init(GuestSession *pSession,
-                       const Utf8Str &aCommand, ComSafeArrayIn(Utf8Str, aArguments), ComSafeArrayIn(Utf8Str, aEnvironment),
+                       const Utf8Str &aCommand, const StringsArray &aArguments, const StringsArray &aEnvironment,
                        ComSafeArrayIn(ProcessCreateFlag_T, aFlags), ULONG aTimeoutMS,
                        ProcessPriority_T aPriority, ComSafeArrayIn(LONG, aAffinity))

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

@@ -348 +348 @@
 }
 
-int GuestSession::processCreateExInteral(const Utf8Str &aCommand, ComSafeArrayIn(Utf8Str, aArguments), ComSafeArrayIn(Utf8Str, aEnvironment),
+int GuestSession::processCreateExInteral(const Utf8Str &aCommand, const StringsArray &aArguments, const StringsArray &aEnvironment,
                                          ComSafeArrayIn(ProcessCreateFlag_T, aFlags), ULONG aTimeoutMS,
                                          ProcessPriority_T aPriority, ComSafeArrayIn(LONG, aAffinity),
@@ -387 +387 @@
 
         rc = pGuestProcess->init(this,
-                                 aCommand, ComSafeArrayInArg(aArguments), ComSafeArrayInArg(aEnvironment),
+                                 aCommand, aArguments, aEnvironment,
                                  ComSafeArrayInArg(aFlags), aTimeoutMS,
                                  aPriority, ComSafeArrayInArg(aAffinity));
@@ -760 +760 @@
     ReturnComNotImplemented();
 #else
-#if 0
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
@@ -769 +768 @@
 
     com::SafeArray<IN_BSTR> arguments(ComSafeArrayInArg(aArguments));
-    com::SafeArray<Utf8Str> argumentsUtf8(arguments.size());
+    StringsArray argumentsUtf8(arguments.size());
     for (size_t i = 0; i < arguments.size(); i++)
         argumentsUtf8[i] = Utf8Str(Bstr(arguments[i]));
 
     com::SafeArray<IN_BSTR> environment(ComSafeArrayInArg(aEnvironment));
-    com::SafeArray<Utf8Str> environmentUtf8(environment.size());
+    StringsArray environmentUtf8(environment.size());
     for (size_t i = 0; i < environment.size(); i++)
         environmentUtf8[i] = Utf8Str(Bstr(environment[i]));
 
-    int rc = processCreateExInteral(Utf8Str(aCommand), ComSafeArrayAsInParam(argumentsUtf8), ComSafeArrayAsInParam(environmentUtf8),
+    int rc = processCreateExInteral(Utf8Str(aCommand), argumentsUtf8, environmentUtf8,
                                     ComSafeArrayInArg(aFlags), aTimeoutMS,
                                     ProcessPriority_Default, ComSafeArrayAsInParam(affinity), aProcess);
     return RT_SUCCESS(rc) ? S_OK : VBOX_E_IPRT_ERROR;
-#endif
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -794 +792 @@
     ReturnComNotImplemented();
 #else
-#if 0
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
@@ -801 +798 @@
 
     com::SafeArray<IN_BSTR> arguments(ComSafeArrayInArg(aArguments));
-    com::SafeArray<Utf8Str> argumentsUtf8;
+    StringsArray argumentsUtf8(arguments.size());
     for (size_t i = 0; i < arguments.size(); i++)
         argumentsUtf8[i] = Utf8Str(Bstr(arguments[i]));
 
     com::SafeArray<IN_BSTR> environment(ComSafeArrayInArg(aEnvironment));
-    com::SafeArray<Utf8Str> environmentUtf8(environment.size());
+    StringsArray environmentUtf8(environment.size());
     for (size_t i = 0; i < environment.size(); i++)
         environmentUtf8[i] = Utf8Str(Bstr(environment[i]));
 
-    int rc = processCreateExInteral(Utf8Str(aCommand), ComSafeArrayAsInParam(argumentsUtf8), ComSafeArrayAsInParam(environmentUtf8),
+    int rc = processCreateExInteral(Utf8Str(aCommand), argumentsUtf8, environmentUtf8,
                                     ComSafeArrayInArg(aFlags), aTimeoutMS,
                                     aPriority, ComSafeArrayInArg(aAffinity), aProcess);
     return RT_SUCCESS(rc) ? S_OK : VBOX_E_IPRT_ERROR;
-#endif
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }