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

Timestamp:

Jun 1, 2010 1:40:07 AM (15 years ago)

Author:

vboxsync

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

62200

Message:

Main: Rewrote ProgressProxyImpl.cpp to proxy at the most one progress object and skip the final operation of the proxy object that wasn't really needed in the openRemoteSession case. Operations are proxied as well so that the openRemoteSession user can wait for the teleporter to become operational by waiting for the 3rd last operation to complete in a loop(!).

File:

• trunk/src/VBox/Main/include/ProgressProxyImpl.h (modified) (3 diffs)

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

@@ -59 +59 @@
                  CBSTR bstrDescription,
                  BOOL fCancelable,
-                 ULONG cOtherProgressObjects,
                  ULONG uTotalOperationsWeight,
                  CBSTR bstrFirstOperationDescription,
                  ULONG uFirstOperationWeight,
-                 OUT_GUID pId = NULL);
+                 ULONG cOtherProgressObjectOperations);
     void    uninit();
 
     // IProgress properties
+    STDMETHOD(COMGETTER(Cancelable))(BOOL *aCancelable);
     STDMETHOD(COMGETTER(Percent))(ULONG *aPercent);
+    STDMETHOD(COMGETTER(TimeRemaining))(LONG *aTimeRemaining);
     STDMETHOD(COMGETTER(Completed))(BOOL *aCompleted);
     STDMETHOD(COMGETTER(Canceled))(BOOL *aCanceled);
     STDMETHOD(COMGETTER(ResultCode))(LONG *aResultCode);
     STDMETHOD(COMGETTER(ErrorInfo))(IVirtualBoxErrorInfo **aErrorInfo);
+    //STDMETHOD(COMGETTER(OperationCount))(ULONG *aOperationCount); - not necessary
+    STDMETHOD(COMGETTER(Operation))(ULONG *aOperation);
+    STDMETHOD(COMGETTER(OperationDescription))(BSTR *aOperationDescription);
     STDMETHOD(COMGETTER(OperationPercent))(ULONG *aOperationPercent);
     STDMETHOD(COMSETTER(Timeout))(ULONG aTimeout);
@@ -92 +96 @@
                            const char *aText, ...);
     bool    notifyPointOfNoReturn(void);
-    bool    setOtherProgressObject(IProgress *pOtherProgress, ULONG uOperationWeight);
-    bool    clearOtherProgressObject(const char *pszLastOperationDescription, ULONG uLastOperationWeight);
+    bool    setOtherProgressObject(IProgress *pOtherProgress);
 
     /** For com::SupportErrorInfoImpl. */
@@ -105 +108 @@
     /** The other progress object.  This can be NULL. */
     ComPtr<IProgress> mptrOtherProgress;
-    /** The number of other progress objects expected. */
-    ULONG mcOtherProgressObjects;
-    /** The current other progress object. */
-    ULONG miCurOtherProgressObject;
+    /** Set if the other progress object has multiple operations. */
+    bool mfMultiOperation;
+    /** The weight the other progress object started at. */
+    ULONG muOtherProgressStartWeight;
+    /** The weight of other progress object. */
+    ULONG muOtherProgressWeight;
+    /** The operation number the other progress object started at. */
+    ULONG muOtherProgressStartOperation;
 
 };