Changeset 42507 in vbox for trunk/src/VBox/Main/include

Timestamp:

Aug 1, 2012 12:40:05 PM (13 years ago)

Author:

vboxsync

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

79672

Message:

Guest Control 2.0: Update.

Location:

trunk/src/VBox/Main/include

Files:

• GuestCtrlImplPrivate.h (modified) (2 diffs)
• GuestProcessImpl.h (modified) (3 diffs)

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

@@ -133 +133 @@
     void Destroy(void);
 
-    int FillData(const void *pvToWrite, size_t cbToWrite);
-
     int Init(eVBoxGuestCtrlCallbackType enmType);
 
     eVBoxGuestCtrlCallbackType GetCallbackType(void) { return mType; }
 
+    const void* GetDataRaw(void) const { return pvData; }
+
+    size_t GetDataSize(void) { return cbData; }
+
     const void* GetPayloadRaw(void) const { return pvPayload; }
 
     size_t GetPayloadSize(void) { return cbPayload; }
+
+    int SetData(const void *pvCallback, size_t cbCallback);
+
+    int SetPayload(const void *pvToWrite, size_t cbToWrite);
 
 protected:
@@ -156 +162 @@
      *  waiting (optional). */
     void                       *pvPayload;
-    /** Size of the payload. */
+    /** Size of the payload (optional). */
     size_t                      cbPayload;
 };

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

@@ -65 +65 @@
     STDMETHOD(WaitFor)(ULONG aWaitFlags, ULONG aTimeoutMS, ProcessWaitResult_T *aReason);
     STDMETHOD(WaitForArray)(ComSafeArrayIn(ProcessWaitForFlag_T, aFlags), ULONG aTimeoutMS, ProcessWaitResult_T *aReason);
-    STDMETHOD(Write)(ULONG aHandle, ComSafeArrayIn(BYTE, aData), ULONG aTimeoutMS, ULONG *aWritten);
+    STDMETHOD(Write)(ULONG aHandle, ULONG aFlags, ComSafeArrayIn(BYTE, aData), ULONG aTimeoutMS, ULONG *aWritten);
+    STDMETHOD(WriteArray)(ULONG aHandle, ComSafeArrayIn(ProcessInputFlag_T, aFlags), ComSafeArrayIn(BYTE, aData), ULONG aTimeoutMS, ULONG *aWritten);
     /** @}  */
 
@@ -72 +73 @@
      * @{ */
     int callbackDispatcher(uint32_t uContextID, uint32_t uFunction, void *pvData, size_t cbData);
-    inline bool callbackExists(ULONG uContextID);
+    inline bool callbackExists(uint32_t uContextID);
     void close(void);
     bool isReady(void);
     ULONG getPID(void) { return mData.mPID; }
-    int readData(ULONG uHandle, ULONG uSize, ULONG uTimeoutMS, BYTE *pbData, size_t cbData, size_t *pcbRead);
+    int readData(uint32_t uHandle, uint32_t uSize, uint32_t uTimeoutMS, void *pvData, size_t cbData, size_t *pcbRead);
     int startProcess(void);
     int startProcessAsync(void);
     int terminateProcess(void);
     int waitFor(uint32_t fWaitFlags, ULONG uTimeoutMS, GuestProcessWaitResult &guestResult);
-    int writeData(ULONG uHandle, BYTE const *pbData, size_t cbData, ULONG uTimeoutMS, ULONG *puWritten);
+    int writeData(uint32_t uHandle, uint32_t uFlags, void *pvData, size_t cbData, uint32_t uTimeoutMS, uint32_t *puWritten);
     /** @}  */
 
@@ -87 +88 @@
     /** @name Protected internal methods.
      * @{ */
-    inline int callbackAdd(GuestCtrlCallback *pCallback, ULONG *puContextID);
-    inline int callbackRemove(ULONG uContextID);
+    inline int callbackAdd(GuestCtrlCallback *pCallback, uint32_t *puContextID);
+    inline int callbackRemove(uint32_t uContextID);
     inline bool isAlive(void);
     int onGuestDisconnected(GuestCtrlCallback *pCallback, PCALLBACKDATACLIENTDISCONNECTED pData);