VirtualBox

Changeset 56596 in vbox


Ignore:
Timestamp:
Jun 23, 2015 11:25:11 AM (9 years ago)
Author:
vboxsync
Message:

Main/idl: change the unit of "reservedAttributes" from read-write attributes (taking two vtable slots) to read-only attributes. It is more flexible, as one can still make a read-write attribute out of them, decrasing the reserved attribute count by 2.

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

Legend:

Unmodified
Added
Removed

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

    r56588 r56596  
    15031503    uuid="4bbc405d-f268-4483-9a52-f43ffdbf67f8"
    15041504    wsmap="managed"
    1505     reservedMethods="2" reservedAttributes="4"
     1505    reservedMethods="2" reservedAttributes="8"
    15061506    >
    15071507
    … …  
    16881688    uuid="00c8f974-92c5-44a1-8f3f-702469fdd04b"
    16891689    wsmap="managed"
    1690     reservedMethods="2" reservedAttributes="3"
     1690    reservedMethods="2" reservedAttributes="6"
    16911691    >
    16921692    <desc>
    … …  
    18571857    uuid="0169423f-46b4-cde9-91af-1e9d5b6cd945"
    18581858    wsmap="managed"
    1859     reservedMethods="8" reservedAttributes="6"
     1859    reservedMethods="8" reservedAttributes="12"
    18601860    >
    18611861    <desc>
    … …  
    29832983    uuid="8398f026-4add-4474-5bc3-2f9f2140b23e"
    29842984    wsmap="managed"
    2985     reservedMethods="8" reservedAttributes="4"
     2985    reservedMethods="8" reservedAttributes="8"
    29862986    >
    29872987    <desc>
    … …  
    33323332    uuid="316c99a2-405d-41af-8508-46889144d067"
    33333333    wsmap="managed"
    3334     reservedMethods="4" reservedAttributes="2"
     3334    reservedMethods="4" reservedAttributes="4"
    33353335    >
    33363336
    … …  
    39253925    uuid="c5b5afe3-4a6f-05eb-c9b6-4dbf98538b67"
    39263926    wsmap="managed"
    3927     reservedMethods="1" reservedAttributes="4"
     3927    reservedMethods="1" reservedAttributes="8"
    39283928    >
    39293929    <desc>
    … …  
    41854185    wrap-hint-server-addinterfaces="IInternalMachineControl"
    41864186    wrap-hint-server="manualaddinterfaces"
    4187     reservedMethods="8" reservedAttributes="8"
     4187    reservedMethods="8" reservedAttributes="16"
    41884188    >
    41894189    <desc>
    … …  
    75957595    uuid="6e253ee8-477a-2497-6759-88b8292a5af0"
    75967596    wsmap="managed"
    7597     reservedMethods="4" reservedAttributes="2"
     7597    reservedMethods="4" reservedAttributes="4"
    75987598    >
    75997599    <desc>
    … …  
    76367636    uuid="c39ef4d6-7532-45e8-96da-eb5986ae76e4"
    76377637    wsmap="struct"
    7638     reservedAttributes="4"
     7638    reservedAttributes="8"
    76397639    >
    76407640    <desc>
    … …  
    77457745    uuid="872da645-4a9b-1727-bee2-5585105b9eed"
    77467746    wsmap="managed"
    7747     reservedMethods="8" reservedAttributes="4"
     7747    reservedMethods="8" reservedAttributes="8"
    77487748    >
    77497749    <desc>
    … …  
    84018401    uuid="455f8c45-44a0-a470-ba20-27890b96dba9"
    84028402    wsmap="managed"
    8403     reservedMethods="2" reservedAttributes="2"
     8403    reservedMethods="2" reservedAttributes="4"
    84048404    >
    84058405    <desc>
    … …  
    85078507    uuid="e8c25d4d-ac97-4c16-b3e2-81bd8a57cc27"
    85088508    wsmap="managed"
    8509     reservedAttributes="2"
     8509    reservedAttributes="4"
    85108510    >
    85118511    <desc>
    … …  
    85308530    uuid="afca788c-4477-787d-60b2-3fa70e56fbbc"
    85318531    wsmap="managed"
    8532     reservedMethods="2" reservedAttributes="6"
     8532    reservedMethods="2" reservedAttributes="12"
    85338533    >
    85348534    <desc>
    … …  
    90059005    uuid="0eb668d2-495e-5a36-8890-29999b5f030c"
    90069006    wsmap="managed"
    9007     reservedMethods="4" reservedAttributes="8"
     9007    reservedMethods="4" reservedAttributes="16"
    90089008    >
    90099009    <desc>
    … …  
    94829482    uuid="d7cb0243-97bf-48ac-9d44-1c3bade5ea0f"
    94839483    wsmap="struct"
    9484     reservedAttributes="4"
     9484    reservedAttributes="8"
    94859485    >
    94869486    <desc>
    … …  
    97149714    uuid="f2f7fae4-4a06-81fc-a916-78b2da1fa0e5"
    97159715    wsmap="struct"
    9716     reservedAttributes="1"
     9716    reservedAttributes="2"
    97179717    >
    97189718    <desc>
    … …  
    1070510705    uuid="4132147b-42f8-cd96-7570-6a8800e3342c"
    1070610706    wsmap="managed"
    10707     reservedMethods="1" reservedAttributes="1"
     10707    reservedMethods="1" reservedAttributes="2"
    1070810708    >
    1070910709    <desc>Base abstract interface for drag'n drop.</desc>
    … …  
    1075410754    uuid="d23a9ca3-42da-c94b-8aec-21968e08355d"
    1075510755    wsmap="managed"
    10756     reservedMethods="1" reservedAttributes="1"
     10756    reservedMethods="1" reservedAttributes="2"
    1075710757    >
    1075810758    <desc>Abstract interface for handling drag'n drop sources.</desc>
    … …  
    1083510835    uuid="ff5befc3-4ba3-7903-2aa4-43988ba11554"
    1083610836    wsmap="managed"
    10837     reservedMethods="1" reservedAttributes="1"
     10837    reservedMethods="1" reservedAttributes="2"
    1083810838    >
    1083910839    <desc>Abstract interface for handling drag'n drop targets.</desc>
    … …  
    1100611006    uuid="486fd828-4c6b-239b-a846-c4bb69e41038"
    1100711007    wsmap="managed"
    11008     reservedMethods="8" reservedAttributes="4"
     11008    reservedMethods="8" reservedAttributes="8"
    1100911009    >
    1101011010    <desc>
    … …  
    1220712207    uuid="2e20707d-4325-9a83-83cf-3faf5b97457c"
    1220812208    wsmap="managed"
    12209     reservedMethods="1" reservedAttributes="2"
     12209    reservedMethods="1" reservedAttributes="4"
    1221012210    >
    1221112211    <desc>
    … …  
    1240912409    uuid="f73650f4-4506-50ca-045a-23a0e32ea508"
    1241012410    wsmap="managed"
    12411     reservedMethods="2" reservedAttributes="2"
     12411    reservedMethods="2" reservedAttributes="4"
    1241212412    >
    1241312413    <desc>
    … …  
    1246512465    uuid="14c66b23-404c-f24a-3cc1-ee9501d44f2a"
    1246612466    wsmap="managed"
    12467     reservedMethods="4" reservedAttributes="2"
     12467    reservedMethods="4" reservedAttributes="4"
    1246812468    >
    1246912469    <desc>
    … …  
    1273112731    uuid="d344626e-4b0a-10bc-9c2b-68973052de16"
    1273212732    wsmap="managed"
    12733     reservedAttributes="2"
     12733    reservedAttributes="4"
    1273412734    >
    1273512735    <desc>
    … …  
    1285412854    uuid="13a11514-402e-022e-6180-c3944de3f9c8"
    1285512855    wsmap="managed"
    12856     reservedMethods="8" reservedAttributes="8"
     12856    reservedMethods="8" reservedAttributes="16"
    1285712857    >
    1285812858    <desc>
    … …  
    1318213182    uuid="77faf1c0-489d-b123-274c-5a95e77ab286"
    1318313183    wsmap="managed"
    13184     reservedMethods="1" reservedAttributes="1"
     13184    reservedMethods="1" reservedAttributes="2"
    1318513185    >
    1318613186    <desc>
    … …  
    1343013430    uuid="5732f030-4194-ec8b-c761-e1a99327e9f0"
    1343113431    wsmap="managed"
    13432     reservedMethods="1" reservedAttributes="1"
     13432    reservedMethods="1" reservedAttributes="2"
    1343313433    >
    1343413434    <desc>
    … …  
    1376313763    uuid="3785b3f7-7b5f-4000-8842-ad0cc6ab30b7"
    1376413764    wsmap="struct"
    13765     reservedAttributes="2"
     13765    reservedAttributes="4"
    1376613766    >
    1376713767    <desc>
    … …  
    1400614006    uuid="4afe423b-43e0-e9d0-82e8-ceb307940dda"
    1400714007    wsmap="managed"
    14008     reservedMethods="4" reservedAttributes="4"
     14008    reservedMethods="4" reservedAttributes="8"
    1400914009    >
    1401014010    <desc>
    … …  
    1543815438    uuid="10f337fb-422e-e57e-661b-0998ac309175"
    1543915439    wsmap="managed"
    15440     reservedMethods="1" reservedAttributes="1"
     15440    reservedMethods="1" reservedAttributes="2"
    1544115441    >
    1544215442    <desc>
    … …  
    1555915559    uuid="20479eaf-d8ed-44cf-85ac-c83a26c95a4d"
    1556015560    wsmap="managed"
    15561     reservedMethods="1" reservedAttributes="1"
     15561    reservedMethods="1" reservedAttributes="2"
    1556215562    >
    1556315563    <desc>
    … …  
    1561315613    uuid="da91d4c9-4c02-fdb1-c5ac-d89e22e81302"
    1561415614    wsmap="managed"
    15615     reservedMethods="1" reservedAttributes="1"
     15615    reservedMethods="1" reservedAttributes="2"
    1561615616    >
    1561715617    <desc>
    … …  
    1573415734    uuid="e04e5545-4a0f-f9d2-5bef-f9b25b6557ed"
    1573515735    wsmap="managed"
    15736     reservedAttributes="1"
     15736    reservedAttributes="2"
    1573715737    >
    1573815738    <desc>
    … …  
    1580815808    uuid="ee35adb0-4748-3e12-e7fd-5aad957bba0f"
    1580915809    wsmap="managed"
    15810     reservedMethods="1" reservedAttributes="1"
     15810    reservedMethods="1" reservedAttributes="2"
    1581115811    >
    1581215812    <desc>
    … …  
    1642916429    wsmap="managed"
    1643016430    wrap-hint-server-addinterfaces="IEventListener"
    16431     reservedMethods="4" reservedAttributes="1"
     16431    reservedMethods="4" reservedAttributes="2"
    1643216432    >
    1643316433    <desc>
    … …  
    1683316833    uuid="e925c2aa-4fe4-aaf6-91c5-e9b8ea4151ee"
    1683416834    wsmap="managed"
    16835     reservedMethods="1" reservedAttributes="2"
     16835    reservedMethods="1" reservedAttributes="4"
    1683616836    >
    1683716837    <desc>
    … …  
    1707117071    uuid="cb0a4a29-43a3-9040-0c25-34845db7b042"
    1707217072    wsmap="managed"
    17073     reservedAttributes="1"
     17073    reservedAttributes="2"
    1707417074    >
    1707517075
    … …  
    1716217162    uuid="788b87df-7708-444b-9eef-c116ce423d39"
    1716317163    wsmap="managed"
    17164     reservedAttributes="2"
     17164    reservedAttributes="4"
    1716517165    >
    1716617166
    … …  
    1722317223    uuid="9c0f5269-47ae-ee34-c2fe-53a16e388925"
    1722417224    wsmap="managed"
    17225     reservedMethods="16" reservedAttributes="8"
     17225    reservedMethods="16" reservedAttributes="16"
    1722617226    >
    1722717227    <method name="dumpGuestCore">
    … …  
    1771617716    uuid="9709db9b-3346-49d6-8f1c-41b0c4784ff2"
    1771717717    wsmap="managed"
    17718     reservedMethods="2" reservedAttributes="1"
     17718    reservedMethods="2" reservedAttributes="2"
    1771917719    >
    1772017720
    … …  
    1786117861    uuid="0c293c51-4810-e174-4f78-199376c63bbe"
    1786217862    wsmap="managed"
    17863     reservedAttributes="1"
     17863    reservedAttributes="2"
    1786417864    >
    1786517865
    … …  
    1794717947    uuid="5915d179-83c7-4f2b-a323-9a97f46f4e29"
    1794817948    wsmap="managed"
    17949     reservedAttributes="2"
     17949    reservedAttributes="4"
    1795017950    >
    1795117951    <desc>
    … …  
    1804318043    uuid="45587218-4289-ef4e-8e6a-e5b07816b631"
    1804418044    wsmap="managed"
    18045     reservedAttributes="4"
     18045    reservedAttributes="8"
    1804618046    >
    1804718047    <desc>
    … …  
    1829018290    uuid="c19073dd-cc7b-431b-98b2-951fda8eab89"
    1829118291    wsmap="managed"
    18292     reservedAttributes="2"
     18292    reservedAttributes="4"
    1829318293    >
    1829418294    <desc>
    … …  
    1834418344    uuid="01adb2d6-aedf-461c-be2c-99e91bdad8a1"
    1834518345    wsmap="managed"
    18346     reservedAttributes="4"
     18346    reservedAttributes="8"
    1834718347    >
    1834818348    <desc>
    … …  
    1845818458    uuid="aeccc0a8-e0a0-427f-b946-c42063f54d81"
    1845918459    wsmap="managed"
    18460     reservedMethods="1" reservedAttributes="1"
     18460    reservedMethods="1" reservedAttributes="2"
    1846118461    >
    1846218462    <desc>
    … …  
    1856718567    uuid="6e758489-453a-6f98-9cb9-2da2cb8eabb5"
    1856818568    wsmap="managed"
    18569     reservedMethods="1" reservedAttributes="1"
     18569    reservedMethods="1" reservedAttributes="2"
    1857018570    >
    1857118571
    … …  
    1866118661    uuid="15aabe95-e594-4e18-9222-b5e83a23f1da"
    1866218662    wsmap="struct"
    18663     reservedAttributes="2"
     18663    reservedAttributes="4"
    1866418664    >
    1866518665    <desc>
    … …  
    1941519415    wsmap="managed"
    1941619416    wrap-hint-server-addinterfaces="IInternalSessionControl"
    19417     reservedMethods="3" reservedAttributes="2"
     19417    reservedMethods="3" reservedAttributes="4"
    1941819418    >
    1941919419    <desc>
    … …  
    1962519625    uuid="49b19d41-4a75-7bd5-c124-259acba3c41d"
    1962619626    wsmap="managed"
    19627     reservedMethods="1" reservedAttributes="1"
     19627    reservedMethods="1" reservedAttributes="2"
    1962819628    >
    1962919629    <desc>
    … …  
    1984219842    name="IPerformanceMetric" extends="$unknown"
    1984319843    uuid="81314d14-fd1c-411a-95c5-e9bb1414e632" wsmap="managed"
    19844     reservedAttributes="4"
     19844    reservedAttributes="8"
    1984519845    >
    1984619846    <desc>
    … …  
    1990619906    uuid="b14290ad-cd54-400c-b858-797bcb82570e"
    1990719907    wsmap="managed"
    19908     reservedMethods="4" reservedAttributes="4"
     19908    reservedMethods="4" reservedAttributes="8"
    1990919909    >
    1991019910    <desc>
    … …  
    2028720287    uuid="c1cdb6bf-44cb-e334-66fa-469a17fd09df"
    2028820288    wsmap="managed"
    20289     reservedMethods="2" reservedAttributes="2"
     20289    reservedMethods="2" reservedAttributes="4"
    2029020290    >
    2029120291    <desc>Interface for managing a NAT engine which is used with a virtual machine. This
    … …  
    2040420404    uuid="c8e667b2-4234-1f9c-6508-afa9cea4efa1"
    2040520405    wsmap="suppress"
    20406     reservedAttributes="1"
     20406    reservedAttributes="2"
    2040720407    >
    2040820408    <desc>
    … …  
    2043020430    uuid="4bd17415-4438-8657-e78e-80a40713a23c"
    2043120431    wsmap="suppress"
    20432     reservedMethods="1" reservedAttributes="2"
     20432    reservedMethods="1" reservedAttributes="4"
    2043320433    >
    2043420434    <desc>
    … …  
    2055620556    uuid="4c7f4bf6-4671-2f75-0fbb-a99f6218cdfc"
    2055720557    wsmap="suppress"
    20558     reservedMethods="1" reservedAttributes="1"
     20558    reservedMethods="1" reservedAttributes="2"
    2055920559    >
    2056020560    <desc>
    … …  
    2059620596    uuid="edba9d10-45d8-b440-1712-46ac0c9bc4c5"
    2059720597    wsmap="suppress"
    20598     reservedMethods="1" reservedAttributes="1"
     20598    reservedMethods="1" reservedAttributes="2"
    2059920599    >
    2060020600    <desc>
    … …  
    2073420734    uuid="31587f93-2d12-4d7c-ba6d-ce51d0d5b265"
    2073520735    wsmap="managed"
    20736     reservedAttributes="2"
     20736    reservedAttributes="4"
    2073720737    >
    2073820738    <desc>Represents one bandwidth group.</desc>
    … …  
    2076520765    uuid="48c7f4c0-c9d6-4742-957c-a6fd52e8c4ae"
    2076620766    wsmap="managed"
    20767     reservedMethods="2" reservedAttributes="1"
     20767    reservedMethods="2" reservedAttributes="2"
    2076820768    >
    2076920769    <desc>
    … …  
    2083820838    uuid="d2937a8e-cb8d-4382-90ba-b7da78a74573"
    2083920839    wsmap="suppress"
    20840     reservedMethods="4" reservedAttributes="2"
     20840    reservedMethods="4" reservedAttributes="4"
    2084120841    >
    2084220842    <desc>

  • trunk/src/VBox/Main/idl/apiwrap-server.xsl

    r56396 r56596  
    15521552                    <xsl:value-of select="concat(position(), $name)"/>
    15531553                    <xsl:text>))(ULONG *aReserved);&#x0A;</xsl:text>
    1554                     <xsl:text>    STDMETHOD(COMSETTER(InternalAndReservedAttribute</xsl:text>
    1555                     <xsl:value-of select="concat(position(), $name)"/>
    1556                     <xsl:text>))(ULONG aReserved);&#x0A;</xsl:text>
    15571554                </xsl:for-each>
    15581555            </xsl:if>
    … …  
    15741571                <xsl:for-each select="(//*)[position() &lt;= $reservedAttributes]">
    15751572                    <xsl:value-of select="concat('STDMETHODIMP ', $topclass, 'Wrap::COMGETTER(InternalAndReservedAttribute', position(), $name, ')(ULONG *aReserved)&#x0A;')"/>
    1576                     <xsl:text>{
    1577     NOREF(aReserved);
    1578     return E_NOTIMPL;
    1579 }
    1580 
    1581 </xsl:text>
    1582                     <xsl:value-of select="concat('STDMETHODIMP ', $topclass, 'Wrap::COMSETTER(InternalAndReservedAttribute', position(), $name, ')(ULONG aReserved)&#x0A;')"/>
    15831573                    <xsl:text>{
    15841574    NOREF(aReserved);

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

    r56396 r56596  
    223223      <xsl:value-of select="concat(position(), $name)"/>
    224224      <xsl:text> ([out, retval] ULONG *aReserved);&#x0A;&#x0A;</xsl:text>
    225       <xsl:text>    [propput] HRESULT InternalAndReservedAttribute</xsl:text>
    226       <xsl:value-of select="concat(position(), $name)"/>
    227       <xsl:text> ([in] ULONG aReserved);&#x0A;&#x0A;</xsl:text>
    228225    </xsl:for-each>
    229226  </xsl:if>

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

    r56396 r56596  
    207207    <!-- tricky way to do a "for" loop without recursion -->
    208208    <xsl:for-each select="(//*)[position() &lt;= $reservedAttributes]">
    209       <xsl:text>    attribute unsigned long InternalAndReservedAttribute</xsl:text>
     209      <xsl:text>    readonly attribute unsigned long InternalAndReservedAttribute</xsl:text>
    210210      <xsl:value-of select="concat(position(), $name)"/>
    211211      <xsl:text>;&#x0A;&#x0A;</xsl:text>
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