Changeset 29863 in vbox

Timestamp:

May 28, 2010 1:33:59 PM (14 years ago)

Author:

vboxsync

Message:

Main: missing Progress changes.

Location:

trunk/src/VBox/Main

Files:

• ProgressImpl.cpp (modified) (2 diffs)
• include/ProgressImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ProgressImpl.cpp

@@ -1149 +1149 @@
 
 /**
+ * Wrapper around Progress:notifyCompleteV.
+ */
+HRESULT Progress::notifyComplete(HRESULT aResultCode,
+                                 const GUID &aIID,
+                                 const Bstr &aComponent,
+                                 const char *aText,
+                                 ...)
+{
+    va_list va;
+    va_start(va, aText);
+    HRESULT hrc = notifyCompleteV(aResultCode, aIID, aComponent, aText, va);
+    va_end(va);
+    return hrc;
+}
+
+/**
  * Marks the operation as complete and attaches full error info.
  *
@@ -1159 +1175 @@
  * @param aText         Error message (must not be null), an RTStrPrintf-like
  *                      format string in UTF-8 encoding.
- * @param  ...          List of arguments for the format string.
- */
-HRESULT Progress::notifyComplete(HRESULT aResultCode,
-                                 const GUID &aIID,
-                                 const Bstr &aComponent,
-                                 const char *aText,
-                                 ...)
-{
-    va_list args;
-    va_start(args, aText);
-    Utf8Str text = Utf8StrFmtVA(aText, args);
-    va_end (args);
+ * @param va            List of arguments for the format string.
+ */
+HRESULT Progress::notifyCompleteV(HRESULT aResultCode,
+                                  const GUID &aIID,
+                                  const Bstr &aComponent,
+                                  const char *aText,
+                                  va_list va)
+{
+    Utf8Str text = Utf8StrFmtVA(aText, va);
 
     AutoCaller autoCaller(this);

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

@@ -261 +261 @@
                            const GUID &aIID,
                            const Bstr &aComponent,
-                           const char *aText, ...);
+                           const char *aText,
+                           ...);
+    HRESULT notifyCompleteV(HRESULT aResultCode,
+                            const GUID &aIID,
+                            const Bstr &aComponent,
+                            const char *aText,
+                            va_list va);
     bool notifyPointOfNoReturn(void);