VirtualBox

Changeset 76067 in vbox for trunk/src/VBox/Main/idl


Ignore:
Timestamp:
Dec 8, 2018 12:54:36 AM (6 years ago)
Author:
vboxsync
Message:

VBoxSDS,VBoxSVC,VBoxProxyStub: Kicked out the failed attempt at centralized client watching. bugref:3300

Location:
trunk/src/VBox/Main/idl
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r75926 r76067  
    2576925769</application>
    2577025770
     25771<if target="midl">
    2577125772<!-- Pay attention! Application uuid of this application is used in midl.xsl
    2577225773     So if you change it then change filter in "interface" and "class" template in midl.xsl too
    … …  
    2577725778  supportsErrorInfo="yes"
    2577825779>
    25779 
    25780 <if target="midl">
    2578125780
    2578225781  <!--
    … …  
    2581925818  <interface
    2582025819    name="IVirtualBoxSDS" extends="$unknown" notdual="yes"
    25821     uuid="787d20ed-faf3-4170-6697-3a2a7de6e086"
     25820    uuid="152265b8-fe7d-4077-9dd6-032bc3f1c5a3"
    2582225821    wsmap="suppress" internal="yes"
    2582325822    reservedMethods="0" reservedAttributes="0"
    … …  
    2585725856      </method>
    2585825857
    25859       <method name="notifyClientsFinished">
    25860           <desc>Notify SDS that clients finished.</desc>
    25861       </method>
    25862 
    2586325858  </interface>
    25864 
    25865     <!--
    25866   // IVirtualBoxClientList
    25867   //////////////////////////////////////////////////////////////////////////
    25868   -->
    25869 
    25870     <interface
    25871       name="IVirtualBoxClientList" extends="$unknown"
    25872       uuid="6e7f09c9-da13-4126-9cc8-9aab81fed413"
    25873       wsmap="suppress"
    25874       reservedMethods="2" reservedAttributes="2"
    25875     >
    25876         <desc>
    25877             The IVirtualBoxClientList interface represents a list of VirtualBox API clients.
    25878         </desc>
    25879 
    25880         <method name="registerClient">
    25881             <desc>Register VirtualBox API Client.</desc>
    25882             <param name="pid" type="long" dir="in">
    25883                 <desc>Process ID of VirtualBox API client.</desc>
    25884             </param>
    25885         </method>
    25886 
    25887         <attribute name="clients" readonly="yes" type="long" dir="out" safearray="yes">
    25888             <desc>List of registered VirtualBox API clients.</desc>
    25889         </attribute>
    25890 
    25891     </interface>
    25892 
    25893 </if> <!-- bird: shouldn't this if-element at leat include the VBoxSDS module, if not the whole system service application? -->
    2589425859
    2589525860<!-- Warning: the name of module should coincide with real windows service name.
    … …  
    2590725872          <interface name="IVirtualBoxSDS" default="yes"/>
    2590825873      </class>
    25909       <class name="VirtualBoxClientList" uuid="b2313c29-07eb-4613-ab27-f86bda7a0cae" namespace="virtualbox.org" >
    25910           <interface name="IVirtualBoxClientList" default="yes" />
    25911       </class>
    2591225874  </module>
    2591325875</application>
     25876</if>
    2591425877
    2591525878</library>

  • trunk/src/VBox/Main/idl/midl.xsl

    r69770 r76067  
    127127    <xsl:text>&#x0A;</xsl:text>
    128128    <!-- forward declarations -->
    129     <xsl:apply-templates select="application/if | application/interface" mode="forward"/>
     129    <xsl:apply-templates select="descendant::application/if   | descendant::application/interface" mode="forward"/>
    130130    <xsl:text>&#x0A;</xsl:text>
    131131    <!-- all enums go first -->
    132     <xsl:apply-templates select="application/enum | application/if[enum]"/>
     132    <xsl:apply-templates select="descendant::application/enum | descendant::application/if[enum]"/>
    133133    <!-- declare the interfaces -->
    134     <xsl:apply-templates select="application/if | application/interface"/>
     134    <xsl:apply-templates select="descendant::application/if   | descendant::application/interface"/>
    135135  </xsl:if>
    136136
    … …  
    153153    <xsl:when test="$g_fGenProxy = 'yes'">
    154154      <!-- reference enums and interfaces -->
    155       <xsl:apply-templates select="application/if | application/interface" mode="forward"/>
    156       <xsl:apply-templates select="application/enum | application/if[enum]" mode="forward"/>
     155      <xsl:apply-templates select="descendant::application/if          | descendant::application/interface" mode="forward"/>
     156      <xsl:apply-templates select="descendant::application/enum        | descendant::application/if[enum]" mode="forward"/>
    157157      <!-- the modules (i.e. everything else) -->
    158       <xsl:apply-templates select="application/module | application/if[module]"/>
     158      <xsl:apply-templates select="descendant::application/module      | descendant::application/if[module]"/>
    159159    </xsl:when>
    160160    <xsl:otherwise>
    161161      <!-- forward declarations -->
    162       <xsl:apply-templates select="application/if | application/interface" mode="forward"/>
     162      <xsl:apply-templates select="descendant::application/if          | descendant::application/interface" mode="forward"/>
    163163      <!-- all enums go first -->
    164       <xsl:apply-templates select="application/enum | application/if[enum]"/>
     164      <xsl:apply-templates select="descendant::application/enum        | descendant::application/if[enum]"/>
    165165      <!-- everything else but result codes and enums -->
    166       <xsl:apply-templates select="  application/interface | application/if[interface]
    167                                    | application/module | application/if[module]"/>
     166      <xsl:apply-templates select="  descendant::application/interface | descendant::application/if[interface]
     167                                   | descendant::application/module    | descendant::application/if[module]"/>
    168168    </xsl:otherwise>
    169169  </xsl:choose>
    … …  
    857857            <!-- enum types -->
    858858            <xsl:when test="
    859               (ancestor::library/application/enum[@name=current()]) or
    860               (ancestor::library/application/if[@target=$self_target]/enum[@name=current()])
     859                 (ancestor::library/application/enum[@name=current()])
     860              or (ancestor::library/if/application/enum[@name=current()])
     861              or (ancestor::library/application/if[@target=$self_target]/enum[@name=current()])
     862              or (ancestor::library/if/application/if[@target=$self_target]/enum[@name=current()])
    861863            ">
    862864              <xsl:value-of select="."/>
    … …  
    864866            <!-- custom interface types -->
    865867            <xsl:when test="
    866               ((ancestor::library/application/interface[@name=current()]) or
    867                (ancestor::library/application/if[@target=$self_target]/interface[@name=current()])
     868              (    (ancestor::library/application/interface[@name=current()])
     869                or (ancestor::library/if/application/interface[@name=current()])
     870                or (ancestor::library/application/if[@target=$self_target]/interface[@name=current()])
     871                or (ancestor::library/if/application/if[@target=$self_target]/interface[@name=current()])
    868872              )
    869873            ">
    … …  
    887891<!-- Filters for switch on/off VBoxSDS definitions -->
    888892
    889 <xsl:template match="application[@uuid='ec0e78e8-fa43-43e8-ac0a-02c784c4a4fa']//module/class" >
     893<xsl:template match="if[@target='midl']/application[@uuid='ec0e78e8-fa43-43e8-ac0a-02c784c4a4fa']//module/class" >
    890894    <xsl:if test="$g_fVBoxWithSDS='yes'" >
    891895        <xsl:call-template name="template_class" />
    … …  
    893897</xsl:template>
    894898
    895 <xsl:template match="application[@uuid='ec0e78e8-fa43-43e8-ac0a-02c784c4a4fa']/if//interface
     899<xsl:template match="if[@target='midl']/application[@uuid='ec0e78e8-fa43-43e8-ac0a-02c784c4a4fa']/if//interface
    896900                                | application[@uuid='ec0e78e8-fa43-43e8-ac0a-02c784c4a4fa']//interface" >
    897901    <xsl:if test="$g_fVBoxWithSDS='yes'" >
    … …  
    900904</xsl:template>
    901905
    902 <xsl:template match="application[@uuid='ec0e78e8-fa43-43e8-ac0a-02c784c4a4fa']//interface" mode="forward" >
     906<xsl:template match="if[@target='midl']/application[@uuid='ec0e78e8-fa43-43e8-ac0a-02c784c4a4fa']//interface" mode="forward" >
    903907    <xsl:if test="$g_fVBoxWithSDS='yes'" >
    904908        <xsl:call-template name="template_interface_forward" />
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