VirtualBox

Changeset 20888 in vbox for trunk


Ignore:
Timestamp:
Jun 24, 2009 12:06:04 PM (16 years ago)
Author:
vboxsync
Message:

webservice: changes to allow for supporting IDisplay and other interfaces: suppress only methods with [ptr] args, not entire interfaces that use them; better error reporting in jax-ws generator; use common table in include file for type conversions; make takeScreenShotSlow() use dir=return instead of dir=out for one output arg

Location:
trunk/src/VBox/Main
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r20849 r20888  
    70337033     >
    70347034    <desc>
    7035       Reprents one of host's network interfaces. IP V6 address and network
     7035      Represents one of host's network interfaces. IP V6 address and network
    70367036      mask are strings of 32 hexdecimal digits grouped by four. Groups are
    70377037      separated by colons.
    … …  
    78667866     name="IGuest" extends="$unknown"
    78677867     uuid="d8556fca-81bc-12af-fca3-365528fa38ca"
    7868 
    78697868     wsmap="suppress"
    78707869     >
    … …  
    1081610815     name="IDisplay" extends="$unknown"
    1081710816     uuid="26881797-bc98-444d-ac69-820633b93ec7"
    10818      wsmap="suppress"
     10817     wsmap="managed"
    1081910818     >
    1082010819    <desc>
    … …  
    1090710906      <desc>
    1090810907        Takes a screen shot of the requested size and copies it to the
    10909         32-bpp buffer allocated by the caller.
     10908        32-bpp buffer allocated by the caller and pointed to by @a address.
     10909
     10910        <note>This API can be used only by the COM/XPCOM C++ API as it
     10911            requires pointer support. Use <link to="#takeScreenShotSlow" />
     10912            with other language bindings.
     10913        </note>
    1091010914
    1091110915        <result name="E_NOTIMPL">
    … …  
    1094710951        </desc>
    1094810952      </param>
    10949       <param name="screenData" type="octet" dir="out" safearray="yes">
     10953      <param name="screenData" type="octet" dir="return" safearray="yes">
    1095010954        <desc>
    1095110955          Array with resulting screen data.

  • trunk/src/VBox/Main/webservice/glue-jaxws.xsl

    r20851 r20888  
    8989</xsl:template>
    9090
     91<!-- Emits the fully prefixed class name, if necessary, of the given type. This dies
     92     if $name is not defined in XIDL; in other words, do not call this for built-in types. -->
    9193<xsl:template name="fullClassName">
    9294  <xsl:param name="name" />
    … …  
    113115       <xsl:value-of select="concat($G_virtualBoxPackage,  concat('.', $name))" />
    114116     </xsl:when>
     117     <xsl:when test="//interface[@name=$name]">
     118       <xsl:value-of select="concat($G_virtualBoxPackage2,  concat('.', $name))" />
     119     </xsl:when>
    115120     <xsl:otherwise>
    116        <xsl:value-of select="concat($G_virtualBoxPackage2,  concat('.', $name))" />
     121      <xsl:call-template name="fatalError">
     122        <xsl:with-param name="msg" select="concat('fullClassName: Type &quot;', $name, '&quot; is not supported.')" />
     123      </xsl:call-template>
    117124     </xsl:otherwise>
    118125   </xsl:choose>
    … …  
    138145  </xsl:if>
    139146
     147  <!-- look up Java type from IDL type from table array in websrv-shared.inc.xsl -->
     148  <xsl:variable name="javatypefield" select="exsl:node-set($G_aSharedTypes)/type[@idlname=$type]/@javaname" />
     149
    140150  <xsl:choose>
    141     <xsl:when test="$type='wstring'">String</xsl:when>
    142     <xsl:when test="$type='boolean'">Boolean</xsl:when>
    143 <!--     <xsl:when test="$type='double'">double</xsl:when> -->
    144 <!--     <xsl:when test="$type='float'">float</xsl:when> -->
    145     <!-- <xsl:when test="$type='octet'">byte</xsl:when> -->
    146 <!--     <xsl:when test="$type='short'">short</xsl:when> -->
    147     <xsl:when test="$type='unsigned short'">Integer</xsl:when>
    148     <xsl:when test="$type='long'">Integer</xsl:when>
    149     <xsl:when test="$type='long long'">Long</xsl:when>
    150     <xsl:when test="$type='unsigned long'">Long</xsl:when>
    151     <xsl:when test="$type='unsigned long long'">BigInteger</xsl:when>
    152     <xsl:when test="$type='result'">Long</xsl:when>
    153     <xsl:when test="$type='uuid'">UUID</xsl:when>
     151    <xsl:when test="string-length($javatypefield)">
     152      <xsl:value-of select="$javatypefield" />
     153    </xsl:when>
    154154    <!-- not a standard type: then it better be one of the types defined in the XIDL -->
    155155    <xsl:when test="$type='$unknown'">IUnknown</xsl:when>
    … …  
    160160      </xsl:call-template>
    161161    </xsl:otherwise>
    162  <!--    <xsl:otherwise> -->
    163 <!--       <xsl:call-template name="fatalError"> -->
    164 <!--         <xsl:with-param name="msg" select="concat('typeIdl2Glue: Type &quot;', $type, '&quot; in arg &quot;', $name, '&quot; of method &quot;', $ifname, '::', $method, '&quot; is not supported.')" /> -->
    165 <!--       </xsl:call-template> -->
    166 <!--     </xsl:otherwise> -->
    167162  </xsl:choose>
    168163
    … …  
    188183  </xsl:if>
    189184
     185  <!-- look up Java type from IDL type from table array in websrv-shared.inc.xsl -->
     186  <xsl:variable name="javatypefield" select="exsl:node-set($G_aSharedTypes)/type[@idlname=$type]/@javaname" />
     187
    190188  <xsl:choose>
    191     <xsl:when test="$type='wstring'">String</xsl:when>
    192     <xsl:when test="$type='boolean'">Boolean</xsl:when>
    193     <!--     <xsl:when test="$type='double'">double</xsl:when> -->
    194     <!--     <xsl:when test="$type='float'">float</xsl:when> -->
    195     <!-- <xsl:when test="$type='octet'">byte</xsl:when> -->
    196     <!--     <xsl:when test="$type='short'">short</xsl:when> -->
    197     <xsl:when test="$type='unsigned short'">int</xsl:when>
    198     <xsl:when test="$type='long'">Integer</xsl:when>
    199     <xsl:when test="$type='long long'">Long</xsl:when>
    200     <xsl:when test="$type='unsigned long'">Long</xsl:when>
    201     <xsl:when test="$type='unsigned long long'">BigInteger</xsl:when>
    202     <xsl:when test="$type='result'">Long</xsl:when>
    203     <xsl:when test="$type='uuid'">String</xsl:when>
     189    <xsl:when test="string-length($javatypefield)">
     190      <xsl:value-of select="$javatypefield" />
     191    </xsl:when>
    204192    <xsl:when test="$type='$unknown'">String</xsl:when>
    205193    <xsl:when test="//interface[@name=$type]/@wsmap='managed'">String</xsl:when>
    … …  
    210198      </xsl:call-template>
    211199    </xsl:otherwise>
    212    <!--  <xsl:otherwise> -->
    213 <!--       <xsl:call-template name="fatalError"> -->
    214 <!--         <xsl:with-param name="msg" select="concat('typeIdl2Java: Type &quot;', $type, '&quot; in arg &quot;', $name, '&quot; of method &quot;', $ifname, '::', $method, '&quot; is not supported.')" /> -->
    215 <!--       </xsl:call-template> -->
    216 <!--     </xsl:otherwise> -->
    217200  </xsl:choose>
    218201  <xsl:if test="$safearray">
    … …  
    951934            <!-- skip this method if it has parameters of a type that has wsmap="suppress" -->
    952935            <xsl:choose>
    953               <xsl:when test="param[@type=($G_setSuppressedInterfaces/@name)]">
     936              <xsl:when test="   (param[@type=($G_setSuppressedInterfaces/@name)])
     937                              or (param[@mod='ptr'])" >
    954938                <xsl:comment><xsl:value-of select="concat('Skipping method ', $methodname, ' for it has parameters with suppressed types')" /></xsl:comment>
    955939              </xsl:when>

  • trunk/src/VBox/Main/webservice/types.txt

    r16120 r20888  
    11
    2  XIDL               IPRT        COM         XPCOM           WSDL                gSOAP default
     2 XIDL               IPRT        COM         XPCOM           WSDL                gSOAP default          JAX-WS
    33
    4  boolean                        BOOL        PRBool          xsd:boolean         bool
     4 boolean                        BOOL        PRBool          xsd:boolean         bool                   Boolean
    55
    6  octet              uint8_t     BYTE        PRUint8
     6 octet              uint8_t     BYTE        PRUint8         xsd:unsignedByte                           Short
    77
    8  short              int16_t     SHORT       PRInt16         xsd:short           short
    9  unsigned short     uint16_t    USHORT      PRUint16        xsd:unsignedShort   unsigned short
    10  long               int32_t     LONG        PRInt32         xsd:int             int
    11  unsigned long      uint32_t    ULONG       PRUint32        xsd:unsignedInt     unsigned int
    12  long long          int64_t     LONG64      PRInt64         xsd:long            long long
    13  unsigned long long uint64_t    ULONG64     PRUint64        xsd:unsignedLong    unsigned long long
     8 short              int16_t     SHORT       PRInt16         xsd:short           short                  Short   (2)
     9 unsigned short     uint16_t    USHORT      PRUint16        xsd:unsignedShort   unsigned short         Integer (2)
     10 long               int32_t     LONG        PRInt32         xsd:int             int                    Integer (2)
     11 unsigned long      uint32_t    ULONG       PRUint32        xsd:unsignedInt     unsigned int           Long    (2)
     12 long long          int64_t     LONG64      PRInt64         xsd:long            long long              Long    (2)
     13 unsigned long long uint64_t    ULONG64     PRUint64        xsd:unsignedLong    unsigned long long     BigInteger (2)
    1414
    15  double                                                     xsd:double          double
    16  float                                                      xsd:float           float
     15 double                                                     xsd:double          double                 Double
     16 float                                                      xsd:float           float                  Float
    1717
    18  wstring                        BSTR        PRUnichar*      xsd:string          std::string
     18 wstring                        BSTR        PRUnichar*      xsd:string          std::string            String
    1919
    2020 result                                                     xsd:unsignedInt(1)  (undefined)
    … …  
    2424
    2525(1) my definition
     26(2) Java "Short" is signed 16-bit integer; since Java has no support for unsigned types, we need to use the
     27    next bigger class, which is Integer, for IPRT uint16_t. Similarly for the other integer types.
    2628
    2729
    28 

  • trunk/src/VBox/Main/webservice/websrv-cpp.xsl

    r20851 r20888  
    412412
    413413<!--
    414     emitCppTypeForWSDLType:
     414    emitCppTypeForIDLType:
    415415    emits the C++ type that corresponds to the given WSDL type in $type.
    416416    -->
    417 <xsl:template name="emitCppTypeForWSDLType">
     417<xsl:template name="emitCppTypeForIDLType">
    418418  <xsl:param name="method" />
    419419  <xsl:param name="type" />
    … …  
    422422  <xsl:param name="inptr" />          <!-- whether to add INPTR to BSTR (Dmitry template magic) -->
    423423
     424  <!-- look up C++ glue type from IDL type from table array in websrv-shared.inc.xsl -->
     425  <xsl:variable name="gluetypefield" select="exsl:node-set($G_aSharedTypes)/type[@idlname=$type]/@gluename" />
     426
    424427  <xsl:choose>
    425     <xsl:when test="$type='boolean'">
    426       <xsl:call-template name="emitTypeOrArray">
    427         <xsl:with-param name="type" select="'BOOL'"/>
    428         <xsl:with-param name="safearray" select="$safearray"/>
    429       </xsl:call-template>
    430     </xsl:when>
    431     <xsl:when test="$type='short'">
    432       <xsl:call-template name="emitTypeOrArray">
    433         <xsl:with-param name="type" select="'SHORT'"/>
    434         <xsl:with-param name="safearray" select="$safearray"/>
    435       </xsl:call-template>
    436     </xsl:when>
    437     <xsl:when test="$type='unsigned short'">
    438       <xsl:call-template name="emitTypeOrArray">
    439         <xsl:with-param name="type" select="'USHORT'"/>
    440         <xsl:with-param name="safearray" select="$safearray"/>
    441       </xsl:call-template>
    442     </xsl:when>
    443     <xsl:when test="$type='long'">
    444       <xsl:call-template name="emitTypeOrArray">
    445         <xsl:with-param name="type" select="'LONG'"/>
    446         <xsl:with-param name="safearray" select="$safearray"/>
    447       </xsl:call-template>
    448     </xsl:when>
    449     <xsl:when test="$type='unsigned long'">
    450       <xsl:call-template name="emitTypeOrArray">
    451         <xsl:with-param name="type" select="'ULONG'"/>
    452         <xsl:with-param name="safearray" select="$safearray"/>
    453       </xsl:call-template>
    454     </xsl:when>
    455     <xsl:when test="$type='long long'">
    456       <xsl:call-template name="emitTypeOrArray">
    457         <xsl:with-param name="type" select="'LONG64'"/>
    458         <xsl:with-param name="safearray" select="$safearray"/>
    459       </xsl:call-template>
    460     </xsl:when>
    461     <xsl:when test="$type='unsigned long long'">
    462       <xsl:call-template name="emitTypeOrArray">
    463         <xsl:with-param name="type" select="'ULONG64'"/>
    464         <xsl:with-param name="safearray" select="$safearray"/>
    465       </xsl:call-template>
    466     </xsl:when>
    467     <xsl:when test="$type='result'">
    468       <xsl:call-template name="emitTypeOrArray">
    469         <xsl:with-param name="type" select="'HRESULT'"/>
    470         <xsl:with-param name="safearray" select="$safearray"/>
    471       </xsl:call-template>
    472     </xsl:when>
    473428    <xsl:when test="$type='uuid'">
    474429      <xsl:choose>
    … …  
    498453      </xsl:choose>
    499454    </xsl:when>
     455    <!-- if above lookup in table succeeded, use that type -->
     456    <xsl:when test="string-length($gluetypefield)">
     457      <xsl:call-template name="emitTypeOrArray">
     458        <xsl:with-param name="type" select="$gluetypefield"/>
     459        <xsl:with-param name="safearray" select="$safearray"/>
     460      </xsl:call-template>
     461    </xsl:when>
    500462    <xsl:when test="//enum[@name=$type]">
    501463      <xsl:call-template name="emitTypeOrArray">
    … …  
    533495    <xsl:otherwise>
    534496      <xsl:call-template name="fatalError">
    535         <xsl:with-param name="msg" select="concat('emitOutputArgBuffer: Type &quot;', $type, '&quot; in arg &quot;', $name, '&quot; of method &quot;', $method, '&quot; is not supported.')" />
     497        <xsl:with-param name="msg" select="concat('emitCppTypeForIDLType: Type &quot;', $type, '&quot; in method &quot;', $method, '&quot; is not supported.')" />
    536498      </xsl:call-template>
    537499    </xsl:otherwise>
    … …  
    661623      <xsl:value-of select="concat('size_t c', $name, ' = ', $structprefix, $name, '.size();')" />
    662624      <xsl:call-template name="emitNewlineIndent8" />
    663       <xsl:call-template name="emitCppTypeForWSDLType">
     625      <xsl:call-template name="emitCppTypeForIDLType">
    664626        <xsl:with-param name="method" select="$method"/>
    665627        <xsl:with-param name="type" select="$type"/>
    … …  
    711673    </xsl:when>
    712674    <xsl:otherwise>
    713       <xsl:call-template name="emitCppTypeForWSDLType">
     675      <xsl:call-template name="emitCppTypeForIDLType">
    714676        <xsl:with-param name="method" select="$method"/>
    715677        <xsl:with-param name="type" select="$type"/>
    … …  
    803765  <xsl:text>        // com output arg for </xsl:text><xsl:value-of select="concat($name, ' (safearray: ', $safearray, ')')" /><xsl:text>
    804766        </xsl:text>
    805   <xsl:call-template name="emitCppTypeForWSDLType">
     767  <xsl:call-template name="emitCppTypeForIDLType">
    806768    <xsl:with-param name="method" select="$method" />
    807769    <xsl:with-param name="type" select="$type" />
    … …  
    956918      <xsl:value-of select="concat('!!', $varname)" />
    957919    </xsl:when>
    958     <xsl:when test="   ($type='short')
    959               or ($type='unsigned short')
    960               or ($type='long')
    961               or ($type='unsigned long')
    962               or ($type='long long')
    963               or ($type='unsigned long long')
    964               or ($type='result')">
     920    <xsl:when test="   ($type='octet')
     921                    or ($type='short')
     922                    or ($type='unsigned short')
     923                    or ($type='long')
     924                    or ($type='unsigned long')
     925                    or ($type='long long')
     926                    or ($type='unsigned long long')
     927                    or ($type='result')">
    965928      <xsl:value-of select="$varname" />
    966929    </xsl:when>
    … …  
    10961059      <xsl:value-of select="'{'" />
    10971060      <xsl:call-template name="emitNewlineIndent8" />
     1061      <!-- look up C++ glue type from IDL type from table array in websrv-shared.inc.xsl -->
     1062      <xsl:variable name="gluetypefield" select="exsl:node-set($G_aSharedTypes)/type[@idlname=$type]/@gluename" />
    10981063      <xsl:choose>
    10991064        <xsl:when test="//interface[@name=$type]">
    … …  
    11121077          <xsl:value-of select="concat('    com::Guid tmpObject(', $varname, '[i]);')" />
    11131078        </xsl:when>
    1114         <xsl:when test="$type='long'">
    1115           <xsl:value-of select="concat('    long tmpObject(', $varname, '[i]);')" />
    1116         </xsl:when>
    1117         <xsl:when test="$type='unsigned long'">
    1118           <xsl:value-of select="concat('    unsigned long tmpObject(', $varname, '[i]);')" />
    1119         </xsl:when>
    1120         <xsl:when test="$type='unsigned long long'">
    1121           <xsl:value-of select="concat('    ULONG64 tmpObject(', $varname, '[i]);')" />
     1079        <xsl:when test="$gluetypefield">
     1080          <xsl:value-of select="concat('    ', $gluetypefield, ' tmpObject(', $varname, '[i]);')" />
    11221081        </xsl:when>
    11231082        <xsl:otherwise>
    … …  
    14321391      <!-- skip this method if it has parameters of a type that has wsmap="suppress" -->
    14331392      <xsl:choose>
    1434         <xsl:when test="param[@type=($G_setSuppressedInterfaces/@name)]">
     1393        <xsl:when test="   (param[@type=($G_setSuppressedInterfaces/@name)])
     1394                        or (param[@mod='ptr'])" >
    14351395          <xsl:comment><xsl:value-of select="concat('Skipping method ', $methodname, ' for it has parameters with suppressed types')" /></xsl:comment>
    14361396        </xsl:when>

  • trunk/src/VBox/Main/webservice/websrv-shared.inc.xsl

    r16122 r20888  
    160160
    161161<xsl:variable name="G_aSharedTypes">
    162   <type idlname="boolean"            xmlname="boolean"       cname="bool" />
    163   <type idlname="short"              xmlname="short"         cname="short" />
    164   <type idlname="unsigned short"     xmlname="unsignedShort" cname="unsigned short" />
    165   <type idlname="long"               xmlname="int"           cname="int" />
    166   <type idlname="unsigned long"      xmlname="unsignedInt"   cname="unsigned int" />
    167   <type idlname="long long"          xmlname="long"          cname="LONG64" />
    168   <type idlname="unsigned long long" xmlname="unsignedLong"  cname="ULONG64" />
    169   <type idlname="double"             xmlname="double"        cname="double" />
    170   <type idlname="float"              xmlname="float"         cname="float" />
    171   <type idlname="wstring"            xmlname="string"        cname="std::string" />
    172   <type idlname="uuid"               xmlname="string"        cname="std::string" />
    173   <type idlname="result"             xmlname="unsignedInt"   cname="unsigned int"/>
     162  <type idlname="octet"              xmlname="unsignedByte"  cname="unsigned char"    gluename="BYTE"    javaname="Short" />
     163  <type idlname="boolean"            xmlname="boolean"       cname="bool"             gluename="BOOL"    javaname="Boolean" />
     164  <type idlname="short"              xmlname="short"         cname="short"            gluename="SHORT"   javaname="Short" />
     165  <type idlname="unsigned short"     xmlname="unsignedShort" cname="unsigned short"   gluename="USHORT"  javaname="Integer" />
     166  <type idlname="long"               xmlname="int"           cname="int"              gluename="LONG"    javaname="Integer" />
     167  <type idlname="unsigned long"      xmlname="unsignedInt"   cname="unsigned int"     gluename="ULONG"   javaname="Long" />
     168  <type idlname="long long"          xmlname="long"          cname="LONG64"           gluename="LONG64"  javaname="Long" />
     169  <type idlname="unsigned long long" xmlname="unsignedLong"  cname="ULONG64"          gluename="ULONG64" javaname="BigInteger" />
     170  <type idlname="double"             xmlname="double"        cname="double"           gluename=""        javaname="Double" />
     171  <type idlname="float"              xmlname="float"         cname="float"            gluename=""        javaname="Float" />
     172  <type idlname="wstring"            xmlname="string"        cname="std::string"      gluename=""        javaname="String" />
     173  <type idlname="uuid"               xmlname="string"        cname="std::string"      gluename=""        javaname="UUID" />
     174  <type idlname="result"             xmlname="unsignedInt"   cname="unsigned int"     gluename="HRESULT" javaname="Long" />
    174175</xsl:variable>
    175176
    … …  
    237238    <xsl:when test="$strlen>1">
    238239     <xsl:choose>
    239        <xsl:when test="contains('ABCDEFGHIJKLMNOPQRSTUVWXYZ',substring($str,1,1)) 
    240                        and 
     240       <xsl:when test="contains('ABCDEFGHIJKLMNOPQRSTUVWXYZ',substring($str,1,1))
     241                       and
    241242                       contains('ABCDEFGHIJKLMNOPQRSTUVWXYZ',substring($str,2,1))">
    242243         <xsl:variable name="cdr">

  • trunk/src/VBox/Main/webservice/websrv-wsdl.xsl

    r16122 r20888  
    149149  <xsl:param name="type" />
    150150  <xsl:call-template name="debugMsg"><xsl:with-param name="msg" select="concat('......emitConvertedType: type=&quot;', $type, '&quot;')" /></xsl:call-template>
     151  <!-- look up XML Schema type from IDL type from table array in websrv-shared.inc.xsl -->
     152  <xsl:variable name="xmltypefield" select="exsl:node-set($G_aSharedTypes)/type[@idlname=$type]/@xmlname" />
    151153  <xsl:choose>
    152154    <xsl:when test="$type=$G_typeIsGlobalRequestElementMarker"><xsl:value-of select="concat('vbox:', $ifname, $G_classSeparator, $methodname, $G_requestMessageElementSuffix)" /></xsl:when>
    153155    <xsl:when test="$type=$G_typeIsGlobalResponseElementMarker"><xsl:value-of select="concat('vbox:', $ifname, $G_classSeparator, $methodname, $G_responseMessageElementSuffix)" /></xsl:when>
    154     <xsl:when test="$type='wstring'">xsd:string</xsl:when>
    155     <xsl:when test="$type='boolean'">xsd:boolean</xsl:when>
    156     <xsl:when test="$type='unsigned long'">xsd:unsignedInt</xsl:when>
    157     <xsl:when test="$type='double'">xsd:double</xsl:when>
    158     <xsl:when test="$type='float'">xsd:float</xsl:when>
    159     <!-- <xsl:when test="$type='octet'">xsd:unsignedByte</xsl:when> -->
    160     <xsl:when test="$type='long'">xsd:int</xsl:when>
    161     <xsl:when test="$type='long long'">xsd:long</xsl:when>
    162     <xsl:when test="$type='short'">xsd:short</xsl:when>
    163     <xsl:when test="$type='unsigned short'">xsd:unsignedShort</xsl:when>
    164     <xsl:when test="$type='unsigned long long'">xsd:unsignedLong</xsl:when>
    165     <xsl:when test="$type='result'">xsd:unsignedInt</xsl:when>
    166     <xsl:when test="$type='uuid'">xsd:string</xsl:when>
     156    <!-- if above lookup in table succeeded, use that type -->
     157    <xsl:when test="string-length($xmltypefield)"><xsl:value-of select="concat('xsd:', $xmltypefield)" /></xsl:when>
    167158    <xsl:when test="$type='$unknown'"><xsl:value-of select="$G_typeObjectRef" /></xsl:when>
    168159    <xsl:when test="$type='global'"><xsl:value-of select="$G_typeObjectRef" /></xsl:when>
    … …  
    735726      <!-- skip this method if it has parameters of a type that has wsmap="suppress" -->
    736727      <xsl:choose>
    737         <xsl:when test="param[@type=($G_setSuppressedInterfaces/@name)]">
     728        <xsl:when test="   (param[@type=($G_setSuppressedInterfaces/@name)])
     729                        or (param[@mod='ptr'])" >
    738730          <xsl:comment><xsl:value-of select="concat('skipping method ', $methodname, ' for it has parameters with suppressed types')" /></xsl:comment>
    739731        </xsl:when>
    … …  
    809801    <!-- skip this method if it has parameters of a type that has wsmap="suppress" -->
    810802    <xsl:choose>
    811       <xsl:when test="param[@type=($G_setSuppressedInterfaces/@name)]">
     803      <xsl:when test="   (param[@type=($G_setSuppressedInterfaces/@name)])
     804                      or (param[@mod='ptr'])" >
    812805        <xsl:comment><xsl:value-of select="concat('skipping method ', $methodname, ' for it has parameters with suppressed types')" /></xsl:comment>
    813806      </xsl:when>
    … …  
    867860    <!-- skip this method if it has parameters of a type that has wsmap="suppress" -->
    868861    <xsl:choose>
    869       <xsl:when test="param[@type=($G_setSuppressedInterfaces/@name)]">
     862      <xsl:when test="   (param[@type=($G_setSuppressedInterfaces/@name)])
     863                      or (param[@mod='ptr'])" >
    870864        <xsl:comment><xsl:value-of select="concat('skipping method ', $methodname, ' for it has parameters with suppressed types')" /></xsl:comment>
    871865      </xsl:when>
    … …  
    11321126                <!-- skip this method if it has parameters of a type that has wsmap="suppress" -->
    11331127                <xsl:choose>
    1134                   <xsl:when test="param[@type=($G_setSuppressedInterfaces/@name)]">
     1128                  <xsl:when test="   (param[@type=($G_setSuppressedInterfaces/@name)])
     1129                                  or (param[@mod='ptr'])" >
    11351130                    <xsl:comment><xsl:value-of select="concat('skipping method ', $methodname, ' for it has parameters with suppressed types')" /></xsl:comment>
    11361131                  </xsl:when>
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette