Changeset 20267 in vbox

Timestamp:

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

Author:

vboxsync

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

48138

Message:

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

Location:

trunk

Files:

• include/VBox/com/ErrorInfo.h (modified) (1 diff)
• include/VBox/com/VirtualBoxErrorInfo.h (modified) (2 diffs)
• src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (1 diff)
• src/VBox/Main/VirtualBoxErrorInfoImpl.cpp (modified) (2 diffs)
• src/VBox/Main/glue/ErrorInfo.cpp (modified) (1 diff)
• src/VBox/Main/glue/SupportErrorInfo.cpp (modified) (1 diff)
• src/VBox/Main/glue/VirtualBoxErrorInfo.cpp (modified) (2 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/VirtualBoxErrorInfoImpl.h (modified) (1 diff)
• src/VBox/Main/testcase/tstVBoxAPILinux.cpp (modified) (1 diff)
• src/VBox/Main/webservice/split-soapC.sed (modified) (1 prop)

trunk/include/VBox/com/ErrorInfo.h

@@ -284 +284 @@
 
     HRESULT mResultCode;
-    Guid mInterfaceID;
-    Bstr mComponent;
-    Bstr mText;
+    Guid    mInterfaceID;
+    Bstr    mComponent;
+    Bstr    mText;
 
     cppx::auto_copy_ptr <ErrorInfo> mNext;

trunk/include/VBox/com/VirtualBoxErrorInfo.h

@@ -85 +85 @@
 
     // IVirtualBoxErrorInfo properties
-    STDMETHOD(COMGETTER(ResultCode)) (HRESULT *aResultCode);
+    STDMETHOD(COMGETTER(ResultCode)) (LONG *aResultCode);
     STDMETHOD(COMGETTER(InterfaceID)) (OUT_GUID aIID);
     STDMETHOD(COMGETTER(Component)) (BSTR *aComponent);
@@ -105 +105 @@
     HRESULT init (nsIException *aInfo);
 
-    NS_DECL_NSIEXCEPTION
-
+    NS_DECL_NSIEXCEPTION   
 #endif
 

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -4099 +4099 @@
      * What's the result of the operation?
      */
-    HRESULT lrc;
+    LONG lrc;
     rc = gProgress->COMGETTER(ResultCode)(&lrc);
     if (FAILED(rc))

trunk/src/VBox/Main/VirtualBoxErrorInfoImpl.cpp

@@ -42 +42 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(ResultCode) (HRESULT *aResultCode)
+STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(ResultCode) (LONG *aResultCode)
 {
     CheckComArgOutPointerValid(aResultCode);
@@ -178 +178 @@
 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;
 }
 

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;
 }
 

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

@@ -932 +932 @@
     </desc>
 
-    <attribute name="resultCode" type="result" readonly="yes">
+    <attribute name="resultCode" type="long" readonly="yes">
       <desc>
         Result code of the error.
@@ -940 +940 @@
         likely return E_NOINTERFACE upon unsuccessful component
         instantiation attempt, but not the value the component factory
-        returned.
+        returned. Value is typed 'long', not 'result',
+        to make interface usable from scripting languages.
         <note>
           In MS COM, there is no equivalent.

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

@@ -74 +74 @@
 
     // IVirtualBoxErrorInfo properties
-    STDMETHOD(COMGETTER(ResultCode)) (HRESULT *aResultCode);
+    STDMETHOD(COMGETTER(ResultCode)) (LONG *aResultCode);
     STDMETHOD(COMGETTER(InterfaceID)) (OUT_GUID aIID);
     STDMETHOD(COMGETTER(Component)) (BSTR *aComponent);

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

@@ -605 +605 @@
                     /* got extended error info */
                     printf ("Extended error info (IVirtualBoxErrorInfo):\n");
-                    nsresult resultCode = NS_OK;
+                    PRInt32 resultCode = NS_OK;
                     info->GetResultCode (&resultCode);
                     printf ("  resultCode=%08X\n", resultCode);