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

Timestamp:

Aug 12, 2011 3:05:41 PM (13 years ago)

Author:

vboxsync

Message:

GuestCtrl: Update.

Location:

trunk/src/VBox/Main/include

Files:

• GuestCtrlImplPrivate.h (modified) (3 diffs)
• GuestImpl.h (modified) (1 diff)

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

@@ -37 +37 @@
 
 /** Structure representing the "value" side of a "key=value" pair. */
-typedef struct VBOXGUESTCTRL_STREAMPAIR
+class VBOXGUESTCTRL_STREAMVALUE
 {
-    VBOXGUESTCTRL_STREAMPAIR(const char *pszValue)
+public:
+
+    VBOXGUESTCTRL_STREAMVALUE() { }
+    VBOXGUESTCTRL_STREAMVALUE(const char *pszValue)
         : mValue(pszValue) {}
 
+    VBOXGUESTCTRL_STREAMVALUE(const VBOXGUESTCTRL_STREAMVALUE& aThat)
+           : mValue(aThat.mValue) {}
+
     Utf8Str mValue;
-} VBOXGUESTCTRL_STREAMPAIR, *PVBOXGUESTCTRL_STREAM_PAIR;
+};
 
 /** Map containing "key=value" pairs of a guest process stream. */
-typedef std::map< Utf8Str, VBOXGUESTCTRL_STREAMPAIR > GuestCtrlStreamPairs;
-typedef std::map< Utf8Str, VBOXGUESTCTRL_STREAMPAIR >::iterator GuestCtrlStreamPairsIter;
-typedef std::map< Utf8Str, VBOXGUESTCTRL_STREAMPAIR >::const_iterator GuestCtrlStreamPairsIterConst;
+typedef std::pair< Utf8Str, VBOXGUESTCTRL_STREAMVALUE > GuestCtrlStreamPair;
+typedef std::map < Utf8Str, VBOXGUESTCTRL_STREAMVALUE > GuestCtrlStreamPairMap;
+typedef std::map < Utf8Str, VBOXGUESTCTRL_STREAMVALUE >::iterator GuestCtrlStreamPairMapIter;
+typedef std::map < Utf8Str, VBOXGUESTCTRL_STREAMVALUE >::const_iterator GuestCtrlStreamPairMapIterConst;
 
 /**
@@ -85 +92 @@
 protected:
 
-    GuestCtrlStreamPairs m_mapPairs;
+    GuestCtrlStreamPairMap m_mapPairs;
 };
 
 /** Vector containing multiple allocated stream pair objects. */
-typedef std::vector< GuestProcessStreamBlock* > GuestCtrlStreamObjects;
-typedef std::vector< GuestProcessStreamBlock* >::iterator GuestCtrlStreamObjectsIter;
-typedef std::vector< GuestProcessStreamBlock* >::const_iterator GuestCtrlStreamObjectsIterConst;
+typedef std::vector< GuestProcessStreamBlock > GuestCtrlStreamObjects;
+typedef std::vector< GuestProcessStreamBlock >::iterator GuestCtrlStreamObjectsIter;
+typedef std::vector< GuestProcessStreamBlock >::const_iterator GuestCtrlStreamObjectsIterConst;
 
 /**
@@ -132 +139 @@
 };
 
-struct GuestTask
+class GuestTask
 {
+
+public:
+
     enum TaskType
     {

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

@@ -159 +159 @@
                                    ULONG aTimeoutMS, ULONG *aPID, IProgress **aProgress, int *pRC);
     HRESULT executeProcessResult(const char *pszCommand, const char *pszUser, ULONG ulTimeout, PCALLBACKDATAEXECSTATUS pExecStatus, ULONG *puPID);
-    HRESULT executeStreamQueryFsObjInfo(IN_BSTR aObjName,GuestProcessStreamBlock *pStreamBlock, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAddAttribs);
+    HRESULT executeStreamQueryFsObjInfo(IN_BSTR aObjName,GuestProcessStreamBlock &streamBlock, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAddAttribs);
     int     executeStreamDrain(ULONG aPID, GuestProcessStream &stream);
     void    executeStreamFree(GuestCtrlStreamObjects &streamObjects);