[libvirt] [PATCH 2/6] vbox: Match struct layout of the MSCOM implementation on Windows

[Matthias Bolte]

2010/12/17 Eric Blake <eblake at redhat.com>:
> On 12/17/2010 11:56 AM, Matthias Bolte wrote:
>> ---
>>  src/vbox/vbox_CAPI_v2_2.h |   20 ++++++++++++++++++++
>>  src/vbox/vbox_CAPI_v3_0.h |    9 +++++++++
>>  src/vbox/vbox_CAPI_v3_1.h |    9 +++++++++
>>  src/vbox/vbox_CAPI_v3_2.h |    9 +++++++++
>>  4 files changed, 47 insertions(+), 0 deletions(-)
>>
>> diff --git a/src/vbox/vbox_CAPI_v2_2.h b/src/vbox/vbox_CAPI_v2_2.h
>> index 7a94ff5..0543fdd 100644
>> --- a/src/vbox/vbox_CAPI_v2_2.h
>> +++ b/src/vbox/vbox_CAPI_v2_2.h
>> @@ -1563,6 +1563,16 @@ struct IVirtualBox_vtbl
>>  {
>>      struct nsISupports_vtbl nsisupports;
>>
>> +#  ifdef WIN32
>> +    /* The MSCOM implementation has some additional methods here.
>> +     * So add them here to get correct binary layout of the object.
>> +     * In API version 2.2 this affects IVirtualBox and ISession only. */
>> +    nsresult PR_COM_METHOD (*GetTypeInfoCount)(IVirtualBox *pThis);
>> +    nsresult PR_COM_METHOD (*GetTypeInfo)(IVirtualBox *pThis);
>> +    nsresult PR_COM_METHOD (*GetIDsOfNames)(IVirtualBox *pThis);
>> +    nsresult PR_COM_METHOD (*Invoke)(IVirtualBox *pThis);
>> +#  endif
>
> ACK.  Hmm, I'm wondering if MSCOM is usable under cygwin, in which case
> you might have to adjust the #ifdef WIN32 into #if defined WIN32 ||
> defined __CYGWIN; but that change should come later only after someone
> reports needing it to build vbox support into cygwin libvirt.
>

Thanks, pushed.

Matthias