Changeset 56398 in vbox for trunk

Timestamp:

Jun 12, 2015 8:44:16 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

100998

Message:

IVirtualBox: Added APIRevision attribute for the ValidationKit, details to be discussed.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• include/VirtualBoxImpl.h (modified) (1 diff)
• src-server/VirtualBoxImpl.cpp (modified) (1 diff)

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

@@ -1851 +1851 @@
   <interface
     name="IVirtualBox" extends="$unknown"
-    uuid="025c4331-4096-1640-b261-649ffc36adee"
+    uuid="0169423f-46b4-cde9-91af-1e9d5b6cd945"
     wsmap="managed"
     reservedMethods="8" reservedAttributes="6"
@@ -1916 +1916 @@
         guarantee that this version is identical to the first two integer
         numbers of the package version.
+      </desc>
+    </attribute>
+
+    <attribute name="APIRevision" type="long long" readonly="yes">
+      <desc>
+        To be defined exactly, but we need something that the Validation Kit
+        can use to figure which methods and attributes can safely be used on a
+        continuously changing trunk (and occational branch).
       </desc>
     </attribute>

trunk/src/VBox/Main/include/VirtualBoxImpl.h

@@ -255 +255 @@
     HRESULT getPackageType(com::Utf8Str &aPackageType);
     HRESULT getAPIVersion(com::Utf8Str &aAPIVersion);
+    HRESULT getAPIRevision(LONG64 *aAPIRevision);
     HRESULT getHomeFolder(com::Utf8Str &aHomeFolder);
     HRESULT getSettingsFilePath(com::Utf8Str &aSettingsFilePath);

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -874 +874 @@
 {
     aAPIVersion = sAPIVersion;
+    return S_OK;
+}
+
+HRESULT VirtualBox::getAPIRevision(LONG64 *aAPIRevision)
+{
+    AssertCompile(VBOX_VERSION_MAJOR < 128 && VBOX_VERSION_MAJOR > 0);
+    AssertCompile((uint64_t)VBOX_VERSION_MINOR < 256);
+    uint64_t uRevision = ((uint64_t)VBOX_VERSION_MAJOR << 56)
+                       | ((uint64_t)VBOX_VERSION_MINOR << 48);
+
+    if (VBOX_VERSION_BUILD >= 51 && (VBOX_VERSION_BUILD & 1)) /* pre-release trunk */
+        uRevision |= (uint64_t)VBOX_VERSION_BUILD << 40;
+
+    /** @todo This needs to be the same in OSE and non-OSE, preferrably
+     *        only changing when actual API changes happens. */
+    uRevision |= 0;
+
+    *aAPIRevision = uRevision;
+
     return S_OK;
 }