Changeset 34808 in vbox for trunk/src/VBox

Timestamp:

Dec 7, 2010 5:21:19 PM (14 years ago)

Author:

vboxsync

Message:

IExtPackBase: Added two attributes: license and showLicense.

Location:

trunk/src/VBox/Main

Files:

• ExtPackManagerImpl.cpp (modified) (2 diffs)
• idl/VirtualBox.xidl (modified) (4 diffs)
• include/ExtPackManagerImpl.h (modified) (2 diffs)

trunk/src/VBox/Main/ExtPackManagerImpl.cpp

@@ -374 +374 @@
 #endif
     ReturnComNotImplemented();
+}
+
+STDMETHODIMP ExtPackFile::COMGETTER(License)(BSTR *a_pbstrHtmlLicense)
+{
+    CheckComArgOutPointerValid(a_pbstrHtmlLicense);
+
+    AutoCaller autoCaller(this);
+    HRESULT hrc = autoCaller.rc();
+    if (SUCCEEDED(hrc))
+    {
+        Utf8Str Dummy;
+        Dummy.cloneTo(a_pbstrHtmlLicense);
+    }
+    return hrc;
+}
+
+STDMETHODIMP ExtPackFile::COMGETTER(ShowLicense)(BOOL *a_pfShowIt)
+{
+    CheckComArgOutPointerValid(a_pfShowIt);
+
+    AutoCaller autoCaller(this);
+    HRESULT hrc = autoCaller.rc();
+    if (SUCCEEDED(hrc))
+        *a_pfShowIt = FALSE;
+    return hrc;
 }
 
@@ -1377 +1402 @@
 #endif
     ReturnComNotImplemented();
+}
+
+STDMETHODIMP ExtPack::COMGETTER(License)(BSTR *a_pbstrHtmlLicense)
+{
+    CheckComArgOutPointerValid(a_pbstrHtmlLicense);
+
+    AutoCaller autoCaller(this);
+    HRESULT hrc = autoCaller.rc();
+    if (SUCCEEDED(hrc))
+    {
+        Utf8Str Dummy;
+        Dummy.cloneTo(a_pbstrHtmlLicense);
+    }
+    return hrc;
+}
+
+STDMETHODIMP ExtPack::COMGETTER(ShowLicense)(BOOL *a_pfShowIt)
+{
+    CheckComArgOutPointerValid(a_pfShowIt);
+
+    AutoCaller autoCaller(this);
+    HRESULT hrc = autoCaller.rc();
+    if (SUCCEEDED(hrc))
+        *a_pfShowIt = FALSE;
+    return hrc;
 }
 

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

@@ -14335 +14335 @@
   <interface
     name="IExtPackBase" extends="$unknown"
-    uuid="58304368-f78a-418c-8fec-d9e4e588d797"
+    uuid="ddc90e1d-b156-480e-b128-d3ccacbb42e0"
     wsmap="suppress"
     >
@@ -14365 +14365 @@
       <desc>Plug-ins provided by this extension pack.</desc>
     </attribute>
+    <attribute name="license" type="wstring" readonly="yes">
+      <desc>The HTML license text for the extension pack.</desc>
+    </attribute>
+    <attribute name="showLicense" type="boolean" readonly="yes">
+      <desc>Whether to show the license before installation</desc>
+    </attribute>
     <attribute name="usable" type="boolean" readonly="yes">
       <desc>
@@ -14384 +14390 @@
   <interface
     name="IExtPack" extends="IExtPackBase"
-    uuid="60f0c30f-c773-4d3e-9580-3ffa47c24e95"
+    uuid="b9c18b10-611e-46ea-abcc-bfa1e680ea80"
     wsmap="suppress"
     >
@@ -14408 +14414 @@
   <interface
     name="IExtPackFile" extends="IExtPackBase"
-    uuid="58509cab-f905-4acb-8087-ba0ab80d8038"
+    uuid="d9eab28b-b28f-4400-a956-403f28750225"
     wsmap="suppress"
     >

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

@@ -59 +59 @@
     STDMETHOD(COMGETTER(VRDEModule))(BSTR *a_pbstrVrdeModule);
     STDMETHOD(COMGETTER(PlugIns))(ComSafeArrayOut(IExtPackPlugIn *, a_paPlugIns));
+    STDMETHOD(COMGETTER(License))(BSTR *a_pbstrHtmlLicense);
+    STDMETHOD(COMGETTER(ShowLicense))(BOOL *a_pfShowIt);
     STDMETHOD(COMGETTER(Usable))(BOOL *a_pfUsable);
     STDMETHOD(COMGETTER(WhyUnusable))(BSTR *a_pbstrWhy);
@@ -120 +122 @@
     STDMETHOD(COMGETTER(VRDEModule))(BSTR *a_pbstrVrdeModule);
     STDMETHOD(COMGETTER(PlugIns))(ComSafeArrayOut(IExtPackPlugIn *, a_paPlugIns));
+    STDMETHOD(COMGETTER(License))(BSTR *a_pbstrHtmlLicense);
+    STDMETHOD(COMGETTER(ShowLicense))(BOOL *a_pfShowIt);
     STDMETHOD(COMGETTER(Usable))(BOOL *a_pfUsable);
     STDMETHOD(COMGETTER(WhyUnusable))(BSTR *a_pbstrWhy);