Changeset 20220 in vbox for trunk

Timestamp:

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

Author:

vboxsync

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

48062

Message:

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

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManage.cpp (modified) (3 diffs)
• Main/ApplianceImpl.cpp (modified) (1 diff)
• Main/ConsoleImpl.cpp (modified) (1 diff)
• Main/HostPower.cpp (modified) (1 diff)
• Main/ProgressImpl.cpp (modified) (4 diffs)
• Main/cbinding/tstXPCOMCCall.c (modified) (1 diff)
• Main/cbinding/tstXPCOMCGlue.c (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (1 diff)
• Main/include/ProgressImpl.h (modified) (2 diffs)
• Main/testcase/tstVBoxAPILinux.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp ¶

@@ -162 +162 @@
 
     /* complete the line. */
-    ULONG iRc;
+    LONG iRc;
     if (SUCCEEDED(progress->COMGETTER(ResultCode)(&iRc)))
     {
@@ -531 +531 @@
         ASSERT(completed);
 
-        ULONG iRc;
+        LONG iRc;
         CHECK_ERROR_RET(progress, COMGETTER(ResultCode)(&iRc), rc);
         if (FAILED(iRc))
@@ -611 +611 @@
             showProgress(progress);
 
-            ULONG iRc;
+            LONG iRc;
             progress->COMGETTER(ResultCode)(&iRc);
             if (FAILED(iRc))

trunk/src/VBox/Main/ApplianceImpl.cpp ¶

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

trunk/src/VBox/Main/ConsoleImpl.cpp ¶

@@ -6918 +6918 @@
         if (SUCCEEDED (rc))
         {
-            ULONG iRc = S_OK;
+            LONG iRc = S_OK;
             rc = task->mServerProgress->COMGETTER(ResultCode) (&iRc);
             if (SUCCEEDED (rc))

trunk/src/VBox/Main/HostPower.cpp ¶

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

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))
             {

trunk/src/VBox/Main/cbinding/tstXPCOMCCall.c ¶

@@ -607 +607 @@
     {
         PRBool completed;
-        PRUint32 resultCode;
+        PRInt32 resultCode;
 
         printf("Waiting for the remote session to open...\n");

trunk/src/VBox/Main/cbinding/tstXPCOMCGlue.c ¶

@@ -238 +238 @@
     {
         PRBool completed;
-        PRUint32 resultCode;
+        PRInt32 resultCode;
 
         printf("Waiting for the remote session to open...\n");

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

@@ -8031 +8031 @@
     </attribute>
 
-    <attribute name="resultCode" type="unsigned long" readonly="yes">
+    <attribute name="resultCode" type="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)) (ULONG *aResultCode);
+    STDMETHOD(COMGETTER(ResultCode)) (LONG *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)) (ULONG *aResultCode);
+    STDMETHOD(COMGETTER(ResultCode)) (LONG *aResultCode);
     STDMETHOD(COMGETTER(ErrorInfo)) (IVirtualBoxErrorInfo **aErrorInfo);
     STDMETHOD(COMGETTER(Operation)) (ULONG *aCount);

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

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