Changeset 28358 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 15, 2010 1:26:07 PM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Update.

Location:

trunk/src/VBox/Main

Files:

• GuestImpl.cpp (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/GuestImpl.h (modified) (2 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -813 +813 @@
 }
 
-STDMETHODIMP Guest::GetProcessOutput(BSTR *aBuffer, ULONG aFlags)
+STDMETHODIMP Guest::GetProcessOutput(ULONG aPID, ULONG aFlags, BSTR *aBuffer)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL

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

@@ -8372 +8372 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="105f4e9a-b8d5-49e5-9397-032e78155bee"
+     uuid="c7c26d4a-0177-455e-999e-ee26e74ee803"
      wsmap="managed"
      >
@@ -8598 +8598 @@
 
       </desc>
+      <param name="pid" type="unsigned long" dir="in">
+        <desc>
+          Buffer for retrieving the actual output.
+        </desc>
+      </param>
+      <param name="flags" type="unsigned long" dir="in">
+        <desc>
+                  Flags describing which output to retrieve.
+        </desc>
+      </param>      
       <param name="buffer" type="wstring" dir="out">
         <desc>
           Buffer for retrieving the actual output.
-        </desc>
-      </param>      
-      <param name="flags" type="unsigned long" dir="in">
-        <desc>
-                  Flags describing which output to retrieve.
         </desc>
       </param>      

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

@@ -97 +97 @@
                               IN_BSTR aUserName, IN_BSTR aPassword,
                               ULONG aTimeoutMS, ULONG* aPID, IProgress **aProgress);
-    STDMETHOD(GetProcessOutput)(BSTR *aBuffer, ULONG aFlags);
+    STDMETHOD(GetProcessOutput)(ULONG aPID, ULONG aFlags, BSTR *aBuffer);
     STDMETHOD(InternalGetStatistics)(ULONG *aCpuUser, ULONG *aCpuKernel, ULONG *aCpuIdle,
                                      ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, ULONG *aMemCache,
@@ -124 +124 @@
     struct CallbackContext
     {
-        uint32_t        mContextID;
-        void           *pvData;
-        uint32_t        cbData;
+        uint32_t            mContextID;
+        void               *pvData;
+        uint32_t            cbData;
         /** Atomic flag whether callback was called. */
-        volatile bool   bCalled;
-        ComObjPtr<Progress>      pProgress;
+        volatile bool       bCalled;
+        /** Pointer to user-supplied IProgress. */
+        ComObjPtr<Progress> pProgress;
     };
     typedef std::list< CallbackContext > CallbackList;