Changeset 85310 in vbox

Timestamp:

Jul 13, 2020 1:09:53 PM (4 years ago)

Author:

vboxsync

Message:

Main/comimpl.xsl,VirtualBox.xidl: Added an 'autogenflags' attribute to the xidl interface element so we can selectively generate BSTR variants for a handful events where we need it. bugref:9790

Location:

trunk/src/VBox/Main/idl

Files:

• VirtualBox.dtd (modified) (1 diff)
• VirtualBox.xidl (modified) (4 diffs)
• comimpl.xsl (modified) (7 diffs)

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

@@ -67 +67 @@
                 <!-- autogen names the style of code auto-generation for this
                      interface (currently only VBoxEvent). -->
+    <!ATTLIST interface autogenflags CDATA #IMPLIED>
+                <!-- autogenflags contains autogen tweaks.
+                     For autoget=VBoxEvent: 'BSTR' - generate IN_BSTR variants of the functions. -->
     <!ATTLIST interface id CDATA #IMPLIED>
                 <!-- id is only relevant for event interfaces, and specifies

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

@@ -25841 +25841 @@
     name="IRuntimeErrorEvent" extends="IEvent"
     uuid="883DD18B-0721-4CDE-867C-1A82ABAF914C"
-    wsmap="managed" autogen="VBoxEvent" id="OnRuntimeError"
+    wsmap="managed" autogen="VBoxEvent" autogenflags="BSTR" id="OnRuntimeError"
     >
     <desc>
@@ -25937 +25937 @@
     name="IExtraDataChangedEvent" extends="IEvent"
     uuid="024F00CE-6E0B-492A-A8D0-968472A94DC7"
-    wsmap="managed" autogen="VBoxEvent" id="OnExtraDataChanged"
+    wsmap="managed" autogen="VBoxEvent" autogenflags="BSTR" id="OnExtraDataChanged"
     >
     <desc>
@@ -26178 +26178 @@
     waitable="yes"
     uuid="a0bad6df-d612-47d3-89d4-db3992533948"
-    wsmap="managed" autogen="VBoxEvent" id="OnHostPCIDevicePlug"
+    wsmap="managed" autogen="VBoxEvent" autogenflags="BSTR" id="OnHostPCIDevicePlug"
     >
     <desc>
@@ -26419 +26419 @@
   <interface name="INATNetworkCreationDeletionEvent" extends="INATNetworkAlterEvent"
              uuid="8d984a7e-b855-40b8-ab0c-44d3515b4528"
-             wsmap="managed" autogen="VBoxEvent" id="OnNATNetworkCreationDeletion">
+             wsmap="managed" autogen="VBoxEvent" autogenflags="BSTR" id="OnNATNetworkCreationDeletion">
     <attribute name="creationEvent" type="boolean" readonly="yes"/>
   </interface>

trunk/src/VBox/Main/idl/comimpl.xsl

@@ -35 +35 @@
 <!-- $G_kind contains what kind of COM class implementation we generate -->
 <xsl:variable name="G_xsltFilename" select="'autogen.xsl'" />
-<xsl:variable name="G_generateBstrVariants" select="'yes'" />
+<xsl:variable name="G_generateBstrVariants" select="'no'" />
 
 
@@ -905 +905 @@
     </xsl:call-template>
 
-    <xsl:if test="($hasStringAttribs != '') and ($G_generateBstrVariants = 'yes')">
+    <xsl:if test="($hasStringAttribs != '') and (($G_generateBstrVariants = 'yes') or (contains(@autogenflags, 'BSTR')))">
       <xsl:call-template name="genReinitFunction">
         <xsl:with-param name="name" select="@name"/>
@@ -927 +927 @@
   </xsl:call-template>
 
-  <xsl:if test="($hasStringAttribs != '') and ($G_generateBstrVariants = 'yes')">
+  <xsl:if test="($hasStringAttribs != '') and (($G_generateBstrVariants = 'yes') or (contains(@autogenflags, 'BSTR')))">
     <xsl:call-template name="genCreateFunction">
       <xsl:with-param name="name" select="@name"/>
@@ -946 +946 @@
   </xsl:call-template>
 
-  <xsl:if test="($hasStringAttribs != '') and ($G_generateBstrVariants = 'yes')">
+  <xsl:if test="($hasStringAttribs != '') and (($G_generateBstrVariants = 'yes') or (contains(@autogenflags, 'BSTR')))">
     <xsl:call-template name="genFireFunction">
       <xsl:with-param name="evname" select="$evname"/>
@@ -1043 +1043 @@
     <xsl:text>);&#10;</xsl:text>
 
-    <xsl:if test="($hasStringAttribs != '') and ($G_generateBstrVariants = 'yes')">
+    <xsl:if test="($hasStringAttribs != '') and (($G_generateBstrVariants = 'yes') or (contains(@autogenflags, 'BSTR')))">
       <xsl:value-of select="concat('DECLHIDDEN(HRESULT) Fire', $evname, '(IEventSource *aSource')"/>
       <xsl:call-template name="genFormalParams">
@@ -1078 +1078 @@
     <xsl:text>);&#10;</xsl:text>
 
-    <xsl:if test="($hasStringAttribs != '') and ($G_generateBstrVariants = 'yes')">
+    <xsl:if test="($hasStringAttribs != '') and (($G_generateBstrVariants = 'yes') or (contains(@autogenflags, 'BSTR')))">
       <xsl:value-of select="concat('DECLHIDDEN(HRESULT) Create', $evname, '(IEvent **aEvent, IEventSource *aSource')"/>
       <xsl:call-template name="genFormalParams">
@@ -1115 +1115 @@
       <xsl:text>);&#10;</xsl:text>
 
-      <xsl:if test="($hasStringAttribs != '') and ($G_generateBstrVariants = 'yes')">
+      <xsl:if test="($hasStringAttribs != '') and (($G_generateBstrVariants = 'yes') or (contains(@autogenflags, 'BSTR')))">
         <xsl:value-of select="concat('DECLHIDDEN(HRESULT) Reinit', $evname, '(IEvent *aEvent')"/>
         <xsl:call-template name="genFormalParams">