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

Timestamp:

Jun 1, 2010 8:41:32 AM (15 years ago)

Author:

vboxsync

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

62206

Message:

Main: Reapplied r62200 with bug fixes.

File:

• trunk/src/VBox/Main/include/ProgressProxyImpl.h (modified) (4 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);
@@ -85 +89 @@
     // public methods only for internal purposes
 
-    HRESULT setResultCode(HRESULT aResultCode);
     HRESULT notifyComplete(HRESULT aResultCode);
     HRESULT notifyComplete(HRESULT aResultCode,
@@ -91 +94 @@
                            const Bstr &aComponent,
                            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 +106 @@
     /** 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;
 
 };