vbox: Match struct layout of the MSCOM implementation on Windows

This commit is contained in:
Matthias Bolte 2010-12-14 20:02:49 +01:00
parent e3ce43cdd9
commit abd0e1dce7
4 changed files with 47 additions and 0 deletions

View File

@ -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
nsresult PR_COM_METHOD (*GetVersion)(IVirtualBox *pThis, PRUnichar * *version);
nsresult PR_COM_METHOD (*GetRevision)(IVirtualBox *pThis, PRUint32 *revision);
@ -4567,6 +4577,16 @@ struct ISession_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)(ISession *pThis);
nsresult PR_COM_METHOD (*GetTypeInfo)(ISession *pThis);
nsresult PR_COM_METHOD (*GetIDsOfNames)(ISession *pThis);
nsresult PR_COM_METHOD (*Invoke)(ISession *pThis);
# endif
nsresult PR_COM_METHOD (*GetState)(ISession *pThis, PRUint32 *state);
nsresult PR_COM_METHOD (*GetType)(ISession *pThis, PRUint32 *type);

View File

@ -716,6 +716,15 @@ struct nsISupports_vtbl {
*/
nsresult PR_COM_METHOD (*Release)(nsISupports *pThis);
# 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 3.x this affects all types. */
nsresult PR_COM_METHOD (*GetTypeInfoCount)(nsISupports *pThis);
nsresult PR_COM_METHOD (*GetTypeInfo)(nsISupports *pThis);
nsresult PR_COM_METHOD (*GetIDsOfNames)(nsISupports *pThis);
nsresult PR_COM_METHOD (*Invoke)(nsISupports *pThis);
# endif
};
struct nsISupports {

View File

@ -716,6 +716,15 @@ struct nsISupports_vtbl {
*/
nsresult PR_COM_METHOD (*Release)(nsISupports *pThis);
# 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 3.x this affects all types. */
nsresult PR_COM_METHOD (*GetTypeInfoCount)(nsISupports *pThis);
nsresult PR_COM_METHOD (*GetTypeInfo)(nsISupports *pThis);
nsresult PR_COM_METHOD (*GetIDsOfNames)(nsISupports *pThis);
nsresult PR_COM_METHOD (*Invoke)(nsISupports *pThis);
# endif
};
struct nsISupports {

View File

@ -712,6 +712,15 @@ struct nsISupports_vtbl {
*/
nsresult PR_COM_METHOD (*Release)(nsISupports *pThis);
# 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 3.x this affects all types. */
nsresult PR_COM_METHOD (*GetTypeInfoCount)(nsISupports *pThis);
nsresult PR_COM_METHOD (*GetTypeInfo)(nsISupports *pThis);
nsresult PR_COM_METHOD (*GetIDsOfNames)(nsISupports *pThis);
nsresult PR_COM_METHOD (*Invoke)(nsISupports *pThis);
# endif
};
struct nsISupports {