Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master

1 files changed, 39 insertions, 16 deletions

diff --git a/src/VBox/Main/idl/VirtualBox.dtd b/src/VBox/Main/idl/VirtualBox.dtd
index a62540e0..0af06e2c 100644
--- a/src/VBox/Main/idl/VirtualBox.dtd
+++ b/src/VBox/Main/idl/VirtualBox.dtd
@@ -5,7 +5,7 @@
      It is still the only sort-of-documentation available about what is valid
      XIDL syntax.
 
-     Copyright (C) 2008-2010 Oracle Corporation
+     Copyright (C) 2008-2013 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
      available from http://www.virtualbox.org. This file is free software;
@@ -15,26 +15,32 @@
      VirtualBox OSE distribution. VirtualBox OSE is distributed in the
      hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
 -->
-<!DOCTYPE idl [
-  <!ELEMENT idl (if|module)*>                                 <!-- done -->
+  <!ELEMENT idl (desc|if|library)*>                           <!-- done -->
   <!ELEMENT if ANY>
     <!ATTLIST if target (midl|xpidl|wsdl) #REQUIRED>          <!-- done -->
-  <!ELEMENT ifnot ANY>
-    <!ATTLIST if target (midl|xpidl|wsdl) #REQUIRED>          <!-- done -->
   <!ELEMENT cpp ANY>
     <!ATTLIST cpp line CDATA #IMPLIED>                        <!-- done -->
-  <!ELEMENT module (enum|interface|class|collection|if|enumerator)*> <!-- done -->
+  <!ELEMENT library (descGroup|if|result|enum|interface|module)*>
+    <!ATTLIST library name CDATA #REQUIRED>
+    <!ATTLIST library uuid CDATA #REQUIRED>
+    <!ATTLIST library version CDATA #REQUIRED>
+    <!ATTLIST library desc CDATA #REQUIRED>
+    <!ATTLIST library appUuid CDATA #REQUIRED>
+    <!ATTLIST library supportsErrorInfo CDATA #REQUIRED>
+  <!ELEMENT result (#PCDATA|desc|link)*>                      <!-- done -->
+    <!ATTLIST result name CDATA #REQUIRED>
+    <!ATTLIST result value CDATA #IMPLIED>
+  <!ELEMENT module (class)*>                                  <!-- done -->
     <!ATTLIST module name CDATA #REQUIRED>
-    <!ATTLIST module uuid CDATA #REQUIRED>
-    <!ATTLIST module version CDATA #REQUIRED>
-    <!ATTLIST module desc CDATA #REQUIRED>
-    <!ATTLIST module supportsErrorInfo (yes|no) #REQUIRED>
+    <!ATTLIST module context CDATA #REQUIRED>
+    <!ATTLIST module threadingModel CDATA #IMPLIED>
   <!ELEMENT enum (desc?, const+)>                             <!-- done -->
     <!ATTLIST enum name CDATA #REQUIRED>
     <!ATTLIST enum uuid CDATA #REQUIRED>
   <!ELEMENT const (desc?)>                                    <!-- done -->
     <!ATTLIST const name CDATA #REQUIRED>
     <!ATTLIST const value CDATA #REQUIRED>
+    <!ATTLIST const wsmap (managed|suppress) "managed">
   <!ELEMENT interface (desc?, (attribute|method|class|if)*)>  <!-- done -->
     <!ATTLIST interface name CDATA #REQUIRED>
     <!ATTLIST interface extends CDATA #IMPLIED>
@@ -42,7 +48,7 @@
     <!ATTLIST interface supportsErrorInfo (yes|no) #IMPLIED>
     <!ATTLIST interface default (yes|no) "no">
     <!ATTLIST interface internal (yes|no) "no">
-    <!ATTLIST interface wsmap (fail|none|uuid|wstring|global|struct|managed) "fail">
+    <!ATTLIST interface wsmap (fail|global|struct|managed|suppress) "fail">
                 <!-- wsmap specifies how this interface is mapped to the
                      web services API (WSDL). One of the following must be specified:
                         fail: the default value, for which vboxweb.xsl will raise an error and die.
@@ -56,42 +62,59 @@
                      to "hardcoded", then no automatic C++ code should be generated. This is done
                      for webservice APIs that have no counterpart in COM and are hard-coded in
                      the webservice server, such as IManagedObjectReference and ISessionManager. -->
-  <!ELEMENT class (interface)>                                <!-- done (ignoring) -->
+    <!ATTLIST interface autogen CDATA #IMPLIED>
+                <!-- autogen names the style of code auto-generation for this
+                     interface (currently only VBoxEvent). -->
+    <!ATTLIST interface id CDATA #IMPLIED>
+                <!-- id is only relevant for event interfaces, and specifies
+                     which const name will be generated. -->
+    <!ATTLIST interface waitable (yes|no) "no">
+                <!-- waitable is only relevant for event interfaces, and
+                     specifies that this event can be waited for. -->
+  <!ELEMENT class (interface)>                                <!-- done -->
     <!ATTLIST class name CDATA #REQUIRED>
     <!ATTLIST class uuid CDATA #REQUIRED>
+    <!ATTLIST class namespace CDATA #REQUIRED>
   <!ELEMENT attribute (desc?)>                                <!-- done -->
     <!ATTLIST attribute name CDATA #REQUIRED>
     <!ATTLIST attribute type CDATA #REQUIRED>
+    <!ATTLIST attribute default CDATA #IMPLIED>
     <!ATTLIST attribute readonly (yes|no) "no">
     <!ATTLIST attribute mod (ptr|string) #IMPLIED>
     <!ATTLIST attribute internal (yes|no) "no">
     <!ATTLIST attribute safearray (yes|no) "no">
-  <!ELEMENT method (desc?,param*, note*)>                     <!-- done -->
+    <!ATTLIST attribute wsmap (managed|suppress) "managed">
+  <!ELEMENT method (desc?,param*,result*)>                    <!-- done -->
     <!ATTLIST method name CDATA #REQUIRED>
     <!ATTLIST method const CDATA "no">
     <!ATTLIST method internal (yes|no) "no">
+    <!ATTLIST method wsmap (managed|suppress) "managed">
   <!ELEMENT param (desc?)>                                    <!-- done -->
     <!ATTLIST param name CDATA #REQUIRED>
     <!ATTLIST param type CDATA #REQUIRED>
     <!ATTLIST param dir (in|out|return) #REQUIRED>
     <!ATTLIST param mod (ptr|string) #IMPLIED>
     <!ATTLIST param safearray (yes|no) "no">
-  <!ELEMENT desc (#PCDATA|link|note|see|b|tt|i|pre|p|ul|h3|table)*>   <!-- done (ignoring) -->
+  <!ELEMENT descGroup (desc)*>                                <!-- done (ignoring, butt-ugly hack, improper nesting enforced all over the .xsl files!) -->
+    <!ATTLIST descGroup id CDATA #IMPLIED>
+    <!ATTLIST descGroup title CDATA #IMPLIED>
+  <!ELEMENT desc (#PCDATA|link|note|see|b|tt|i|pre|para|ul|ol|h3|table|result)*>   <!-- done (ignoring) -->
   <!-- the following only appear within descriptions -->
   <!ELEMENT link (#PCDATA)>
     <!ATTLIST link to CDATA #REQUIRED>
   <!ELEMENT h3 ANY>
-  <!ELEMENT p ANY>
+  <!ELEMENT para ANY>
   <!ELEMENT b ANY>
   <!ELEMENT i ANY>
   <!ELEMENT ul (#PCDATA|li)*>
+  <!ELEMENT ol (#PCDATA|li)*>
   <!ELEMENT li ANY>
   <!ELEMENT pre ANY>
   <!ELEMENT tt ANY>
   <!ELEMENT see (#PCDATA|link)*>
   <!ELEMENT note ANY>
+    <!ATTLIST note internal (yes|no) "no">
   <!ELEMENT table (tr)+>
   <!ELEMENT tr (td|th)+>
   <!ELEMENT th ANY>
   <!ELEMENT td ANY>
-]>