Changeset 20267 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Jun 4, 2009 11:27:27 AM (16 years ago)

Author:

vboxsync

Message:

Main: completed scriptable changes
Make VBox buildable on SMB share exported by Win box.

Location:

trunk/src/VBox/Main/glue

Files:

• ErrorInfo.cpp (modified) (1 diff)
• SupportErrorInfo.cpp (modified) (1 diff)
• VirtualBoxErrorInfo.cpp (modified) (2 diffs)

trunk/src/VBox/Main/glue/ErrorInfo.cpp

@@ -180 +180 @@
     bool gotSomething = false;
     bool gotAll = true;
-
-    rc = info->COMGETTER(ResultCode) (&mResultCode);
+    LONG lrc;
+
+    rc = info->COMGETTER(ResultCode) (&lrc); mResultCode = lrc;    
     gotSomething |= SUCCEEDED (rc);
     gotAll &= SUCCEEDED (rc);

trunk/src/VBox/Main/glue/SupportErrorInfo.cpp

@@ -253 +253 @@
 
                 /* we want to return the head's result code */
-                rc = info->COMGETTER(ResultCode) (&aResultCode);
+                PRInt32 lrc;
+                rc = info->COMGETTER(ResultCode) (&lrc); aResultCode = lrc;
                 CheckComRCBreakRC (rc);
             }

trunk/src/VBox/Main/glue/VirtualBoxErrorInfo.cpp

@@ -60 +60 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(ResultCode) (HRESULT *aResultCode)
+STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(ResultCode) (LONG *aResultCode)
 {
     if (!aResultCode)
@@ -202 +202 @@
 NS_IMETHODIMP VirtualBoxErrorInfo::GetResult (nsresult *aResult)
 {
-    return COMGETTER(ResultCode) (aResult);
+    if (!aResult)
+      return NS_ERROR_INVALID_POINTER;
+
+    PRInt32 lrc;
+    nsresult rc = COMGETTER(ResultCode) (&lrc);
+    if (SUCCEEDED(rc))
+      *aResult = lrc;
+    return rc;
 }