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

Timestamp:

Jul 12, 2012 6:16:06 PM (13 years ago)

Author:

vboxsync

Message:

Main: fix COM/XPCOM incompatibility issues and add safearray setter support to the C binding XSLT, too

Location:

trunk/src/VBox/Main

Files:

• cbinding/xpcidl.xsl (modified) (1 diff)
• src-server/ApplianceImplImport.cpp (modified) (1 diff)
• src-server/VirtualBoxImpl.cpp (modified) (1 diff)
• testcase/tstVBoxAPILinux.cpp (modified) (2 diffs)

trunk/src/VBox/Main/cbinding/xpcidl.xsl

@@ -1271 +1271 @@
       <!-- setter -->
       <xsl:if test="not(@readonly='yes')">
-        <xsl:text>    nsresult set</xsl:text>
+        <xsl:text>    nsresult (*Set</xsl:text>
         <xsl:call-template name="capitalize">
           <xsl:with-param name="str" select="@name"/>
         </xsl:call-template>
-        <xsl:text> (&#x0A;</xsl:text>
+        <xsl:text>)(</xsl:text>
+        <xsl:value-of select="../@name" />
+        <xsl:text> *pThis, </xsl:text>
         <!-- array size -->
-        <xsl:text>        in unsigned long </xsl:text>
+        <xsl:text>PRUint32 </xsl:text>
         <xsl:value-of select="@name"/>
-        <xsl:text>Size,&#x0A;</xsl:text>
+        <xsl:text>Size, </xsl:text>
         <!-- array pointer -->
-        <xsl:text>        [array, size_is(</xsl:text>
+        <xsl:apply-templates select="@type" mode="forwarder"/>
+        <xsl:text> *</xsl:text>
         <xsl:value-of select="@name"/>
-        <xsl:text>Size)] in </xsl:text>
-        <xsl:apply-templates select="@type" mode="forwarder"/>
-        <xsl:text> </xsl:text>
-        <xsl:value-of select="@name"/>
-        <xsl:text>&#x0A;    );&#x0A;</xsl:text>
+        <xsl:text>);&#x0A;</xsl:text>
       </xsl:if>
     </xsl:when>

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -1949 +1949 @@
 
     /* Create the machine */
+    SafeArray<BSTR> groups; /* no groups */
     rc = mVirtualBox->CreateMachine(NULL, /* machine name: use default */
                                     Bstr(stack.strNameVBox).raw(),
-                                    NULL, /* no groups */
+                                    ComSafeArrayAsInParam(groups),
                                     Bstr(stack.strOsTypeVBox).raw(),
                                     NULL, /* uuid */

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -3036 +3036 @@
     if (aMachineGroups)
     {
-        com::SafeArray<BSTR> machineGroups(ComSafeArrayInArg(aMachineGroups));
+        com::SafeArray<IN_BSTR> machineGroups(ComSafeArrayInArg(aMachineGroups));
         for (size_t i = 0; i < machineGroups.size(); i++)
             pllMachineGroups->push_back(machineGroups[i]);

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

@@ -8 +8 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -191 +191 @@
     rc = virtualBox->CreateMachine(NULL,        /* settings file */
                                    NS_LITERAL_STRING("A brand new name").get(),
+                                   0, nsnull,   /* groups (safearray)*/
                                    nsnull,      /* ostype */
                                    nsnull,      /* machine uuid */