Changeset 20212 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 3, 2009 8:09:42 AM (16 years ago)

Author:

vboxsync

Message:

Main: changed the parameter of IProgress::GetResultCode() from long to unsigned long for a better match with nsresult

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (1 diff)
• HostPower.cpp (modified) (1 diff)
• ProgressImpl.cpp (modified) (4 diffs)
• idl/VirtualBox.xidl (modified) (1 diff)
• include/ProgressImpl.h (modified) (2 diffs)
• testcase/tstVBoxAPILinux.cpp (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -4000 +4000 @@
     }
     // report result of asynchronous operation
-    LONG iRc;
+    ULONG iRc;
     rc = pProgressAsync->COMGETTER(ResultCode)(&iRc);
     if (FAILED(rc)) throw rc;

trunk/src/VBox/Main/HostPower.cpp

@@ -136 +136 @@
 
                 /* Wait until the operation has been completed. */
-                LONG iRc;
+                ULONG iRc;
                 rc = progress->WaitForCompletion(-1);
                 if (SUCCEEDED (rc))

trunk/src/VBox/Main/ProgressImpl.cpp

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

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -8031 +8031 @@
     </attribute>
 
-    <attribute name="resultCode" type="long" readonly="yes">
+    <attribute name="resultCode" type="unsigned long" readonly="yes">
       <desc>
         Result code of the progress task.

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

@@ -76 +76 @@
     STDMETHOD(COMGETTER(Completed)) (BOOL *aCompleted);
     STDMETHOD(COMGETTER(Canceled)) (BOOL *aCanceled);
-    STDMETHOD(COMGETTER(ResultCode)) (LONG *aResultCode);
+    STDMETHOD(COMGETTER(ResultCode)) (ULONG *aResultCode);
     STDMETHOD(COMGETTER(ErrorInfo)) (IVirtualBoxErrorInfo **aErrorInfo);
     STDMETHOD(COMGETTER(OperationCount)) (ULONG *aOperationCount);
@@ -396 +396 @@
     STDMETHOD(COMGETTER(Completed)) (BOOL *aCompleted);
     STDMETHOD(COMGETTER(Canceled)) (BOOL *aCanceled);
-    STDMETHOD(COMGETTER(ResultCode)) (LONG *aResultCode);
+    STDMETHOD(COMGETTER(ResultCode)) (ULONG *aResultCode);
     STDMETHOD(COMGETTER(ErrorInfo)) (IVirtualBoxErrorInfo **aErrorInfo);
     STDMETHOD(COMGETTER(Operation)) (ULONG *aCount);

trunk/src/VBox/Main/testcase/tstVBoxAPILinux.cpp

@@ -326 +326 @@
              */
             rc = progress->WaitForCompletion(-1);
-            PRInt32 resultCode;
+            PRUint32 resultCode;
             progress->GetResultCode(&resultCode);
             if (NS_FAILED(rc) || NS_FAILED(resultCode))