Changeset 20220 in vbox for trunk/src/VBox/Main/ProgressImpl.cpp

Timestamp:

Jun 3, 2009 8:40:29 AM (16 years ago)

Author:

vboxsync

Message:

Main: back out the IProgess::GetResultCode() parameter change

File:

• trunk/src/VBox/Main/ProgressImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/ProgressImpl.cpp

@@ -372 +372 @@
 }
 
-STDMETHODIMP ProgressBase::COMGETTER(ResultCode) (ULONG *aResultCode)
+STDMETHODIMP ProgressBase::COMGETTER(ResultCode) (LONG *aResultCode)
 {
     CheckComArgOutPointerValid(aResultCode);
@@ -492 +492 @@
     AssertReturn (aProgress != NULL, E_INVALIDARG);
 
-    ULONG resultCode;
-    HRESULT rc = aProgress->COMGETTER(ResultCode) (&resultCode);
+    LONG iRc;
+    HRESULT rc = aProgress->COMGETTER(ResultCode) (&iRc);
     AssertComRCReturnRC (rc);
+    HRESULT resultCode = iRc;
 
     if (resultCode == S_OK)
@@ -1315 +1316 @@
 }
 
-STDMETHODIMP CombinedProgress::COMGETTER(ResultCode) (ULONG *aResultCode)
+STDMETHODIMP CombinedProgress::COMGETTER(ResultCode) (LONG *aResultCode)
 {
     CheckComArgOutPointerValid(aResultCode);
@@ -1592 +1593 @@
                 return rc;
 
-            ULONG iRc;
+            LONG iRc;
             rc = progress->COMGETTER(ResultCode) (&iRc);
             if (FAILED (rc))
                 return rc;
-
             mResultCode = iRc;
+
             if (FAILED (mResultCode))
             {