1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-04 21:47:16 +03:00

vbox: Use stdcall convention for all COM methods on Windows

MSCOM requires stdcall convention.
This commit is contained in:
Matthias Bolte 2010-12-14 19:53:52 +01:00
parent cddd2a0628
commit e3ce43cdd9
5 changed files with 3257 additions and 3219 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -6245,9 +6245,10 @@ cleanup:
#else /* !(VBOX_API_VERSION == 2002) */ #else /* !(VBOX_API_VERSION == 2002) */
/* Functions needed for Callbacks */ /* Functions needed for Callbacks */
static nsresult vboxCallbackOnMachineStateChange (IVirtualBoxCallback *pThis, static nsresult PR_COM_METHOD
PRUnichar * machineId, vboxCallbackOnMachineStateChange(IVirtualBoxCallback *pThis,
PRUint32 state) { PRUnichar *machineId, PRUint32 state)
{
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
int event = 0; int event = 0;
int detail = 0; int detail = 0;
@ -6318,20 +6319,23 @@ static nsresult vboxCallbackOnMachineStateChange (IVirtualBoxCallback *pThis,
return NS_OK; return NS_OK;
} }
static nsresult vboxCallbackOnMachineDataChange (IVirtualBoxCallback *pThis, static nsresult PR_COM_METHOD
PRUnichar * machineId) { vboxCallbackOnMachineDataChange(IVirtualBoxCallback *pThis,
PRUnichar *machineId)
{
DEBUG("IVirtualBoxCallback: %p", pThis); DEBUG("IVirtualBoxCallback: %p", pThis);
DEBUGPRUnichar("machineId", machineId); DEBUGPRUnichar("machineId", machineId);
return NS_OK; return NS_OK;
} }
static nsresult vboxCallbackOnExtraDataCanChange (IVirtualBoxCallback *pThis, static nsresult PR_COM_METHOD
PRUnichar * machineId, vboxCallbackOnExtraDataCanChange(IVirtualBoxCallback *pThis,
PRUnichar * key, PRUnichar *machineId, PRUnichar *key,
PRUnichar * value, PRUnichar *value,
PRUnichar * * error ATTRIBUTE_UNUSED, PRUnichar **error ATTRIBUTE_UNUSED,
PRBool * allowChange) { PRBool *allowChange)
{
DEBUG("IVirtualBoxCallback: %p, allowChange: %s", pThis, *allowChange ? "true" : "false"); DEBUG("IVirtualBoxCallback: %p, allowChange: %s", pThis, *allowChange ? "true" : "false");
DEBUGPRUnichar("machineId", machineId); DEBUGPRUnichar("machineId", machineId);
DEBUGPRUnichar("key", key); DEBUGPRUnichar("key", key);
@ -6340,10 +6344,10 @@ static nsresult vboxCallbackOnExtraDataCanChange (IVirtualBoxCallback *pThis,
return NS_OK; return NS_OK;
} }
static nsresult vboxCallbackOnExtraDataChange (IVirtualBoxCallback *pThis, static nsresult PR_COM_METHOD
PRUnichar * machineId, vboxCallbackOnExtraDataChange(IVirtualBoxCallback *pThis, PRUnichar *machineId,
PRUnichar * key, PRUnichar *key, PRUnichar *value)
PRUnichar * value) { {
DEBUG("IVirtualBoxCallback: %p", pThis); DEBUG("IVirtualBoxCallback: %p", pThis);
DEBUGPRUnichar("machineId", machineId); DEBUGPRUnichar("machineId", machineId);
DEBUGPRUnichar("key", key); DEBUGPRUnichar("key", key);
@ -6353,10 +6357,10 @@ static nsresult vboxCallbackOnExtraDataChange (IVirtualBoxCallback *pThis,
} }
# if VBOX_API_VERSION < 3001 # if VBOX_API_VERSION < 3001
static nsresult vboxCallbackOnMediaRegistered (IVirtualBoxCallback *pThis, static nsresult PR_COM_METHOD
PRUnichar * mediaId, vboxCallbackOnMediaRegistered(IVirtualBoxCallback *pThis, PRUnichar *mediaId,
PRUint32 mediaType, PRUint32 mediaType, PRBool registered)
PRBool registered) { {
DEBUG("IVirtualBoxCallback: %p, registered: %s", pThis, registered ? "true" : "false"); DEBUG("IVirtualBoxCallback: %p, registered: %s", pThis, registered ? "true" : "false");
DEBUG("mediaType: %d", mediaType); DEBUG("mediaType: %d", mediaType);
DEBUGPRUnichar("mediaId", mediaId); DEBUGPRUnichar("mediaId", mediaId);
@ -6366,9 +6370,10 @@ static nsresult vboxCallbackOnMediaRegistered (IVirtualBoxCallback *pThis,
# else /* VBOX_API_VERSION >= 3001 */ # else /* VBOX_API_VERSION >= 3001 */
# endif /* VBOX_API_VERSION >= 3001 */ # endif /* VBOX_API_VERSION >= 3001 */
static nsresult vboxCallbackOnMachineRegistered (IVirtualBoxCallback *pThis, static nsresult PR_COM_METHOD
PRUnichar * machineId, vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis,
PRBool registered) { PRUnichar *machineId, PRBool registered)
{
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
int event = 0; int event = 0;
int detail = 0; int detail = 0;
@ -6424,18 +6429,20 @@ static nsresult vboxCallbackOnMachineRegistered (IVirtualBoxCallback *pThis,
return NS_OK; return NS_OK;
} }
static nsresult vboxCallbackOnSessionStateChange (IVirtualBoxCallback *pThis, static nsresult PR_COM_METHOD
PRUnichar * machineId, vboxCallbackOnSessionStateChange(IVirtualBoxCallback *pThis,
PRUint32 state) { PRUnichar *machineId, PRUint32 state)
{
DEBUG("IVirtualBoxCallback: %p, state: %d", pThis, state); DEBUG("IVirtualBoxCallback: %p, state: %d", pThis, state);
DEBUGPRUnichar("machineId", machineId); DEBUGPRUnichar("machineId", machineId);
return NS_OK; return NS_OK;
} }
static nsresult vboxCallbackOnSnapshotTaken (IVirtualBoxCallback *pThis, static nsresult PR_COM_METHOD
PRUnichar * machineId, vboxCallbackOnSnapshotTaken(IVirtualBoxCallback *pThis, PRUnichar *machineId,
PRUnichar * snapshotId) { PRUnichar *snapshotId)
{
DEBUG("IVirtualBoxCallback: %p", pThis); DEBUG("IVirtualBoxCallback: %p", pThis);
DEBUGPRUnichar("machineId", machineId); DEBUGPRUnichar("machineId", machineId);
DEBUGPRUnichar("snapshotId", snapshotId); DEBUGPRUnichar("snapshotId", snapshotId);
@ -6443,9 +6450,10 @@ static nsresult vboxCallbackOnSnapshotTaken (IVirtualBoxCallback *pThis,
return NS_OK; return NS_OK;
} }
static nsresult vboxCallbackOnSnapshotDiscarded (IVirtualBoxCallback *pThis, static nsresult PR_COM_METHOD
PRUnichar * machineId, vboxCallbackOnSnapshotDiscarded(IVirtualBoxCallback *pThis, PRUnichar *machineId,
PRUnichar * snapshotId) { PRUnichar *snapshotId)
{
DEBUG("IVirtualBoxCallback: %p", pThis); DEBUG("IVirtualBoxCallback: %p", pThis);
DEBUGPRUnichar("machineId", machineId); DEBUGPRUnichar("machineId", machineId);
DEBUGPRUnichar("snapshotId", snapshotId); DEBUGPRUnichar("snapshotId", snapshotId);
@ -6453,9 +6461,10 @@ static nsresult vboxCallbackOnSnapshotDiscarded (IVirtualBoxCallback *pThis,
return NS_OK; return NS_OK;
} }
static nsresult vboxCallbackOnSnapshotChange (IVirtualBoxCallback *pThis, static nsresult PR_COM_METHOD
PRUnichar * machineId, vboxCallbackOnSnapshotChange(IVirtualBoxCallback *pThis, PRUnichar *machineId,
PRUnichar * snapshotId) { PRUnichar *snapshotId)
{
DEBUG("IVirtualBoxCallback: %p", pThis); DEBUG("IVirtualBoxCallback: %p", pThis);
DEBUGPRUnichar("machineId", machineId); DEBUGPRUnichar("machineId", machineId);
DEBUGPRUnichar("snapshotId", snapshotId); DEBUGPRUnichar("snapshotId", snapshotId);
@ -6463,11 +6472,11 @@ static nsresult vboxCallbackOnSnapshotChange (IVirtualBoxCallback *pThis,
return NS_OK; return NS_OK;
} }
static nsresult vboxCallbackOnGuestPropertyChange (IVirtualBoxCallback *pThis, static nsresult PR_COM_METHOD
PRUnichar * machineId, vboxCallbackOnGuestPropertyChange(IVirtualBoxCallback *pThis,
PRUnichar * name, PRUnichar *machineId, PRUnichar *name,
PRUnichar * value, PRUnichar *value, PRUnichar *flags)
PRUnichar * flags) { {
DEBUG("IVirtualBoxCallback: %p", pThis); DEBUG("IVirtualBoxCallback: %p", pThis);
DEBUGPRUnichar("machineId", machineId); DEBUGPRUnichar("machineId", machineId);
DEBUGPRUnichar("name", name); DEBUGPRUnichar("name", name);
@ -6477,7 +6486,9 @@ static nsresult vboxCallbackOnGuestPropertyChange (IVirtualBoxCallback *pThis,
return NS_OK; return NS_OK;
} }
static nsresult vboxCallbackAddRef(nsISupports *pThis) { static nsresult PR_COM_METHOD
vboxCallbackAddRef(nsISupports *pThis)
{
nsresult c; nsresult c;
c = ++g_pVBoxGlobalData->vboxCallBackRefCount; c = ++g_pVBoxGlobalData->vboxCallBackRefCount;
@ -6487,7 +6498,9 @@ static nsresult vboxCallbackAddRef(nsISupports *pThis) {
return c; return c;
} }
static nsresult vboxCallbackRelease(nsISupports *pThis) { static nsresult PR_COM_METHOD
vboxCallbackRelease(nsISupports *pThis)
{
nsresult c; nsresult c;
c = --g_pVBoxGlobalData->vboxCallBackRefCount; c = --g_pVBoxGlobalData->vboxCallBackRefCount;
@ -6502,7 +6515,9 @@ static nsresult vboxCallbackRelease(nsISupports *pThis) {
return c; return c;
} }
static nsresult vboxCallbackQueryInterface(nsISupports *pThis, const nsID *iid, void **resultp) { static nsresult PR_COM_METHOD
vboxCallbackQueryInterface(nsISupports *pThis, const nsID *iid, void **resultp)
{
IVirtualBoxCallback *that = (IVirtualBoxCallback *)pThis; IVirtualBoxCallback *that = (IVirtualBoxCallback *)pThis;
static const nsID ivirtualboxCallbackUUID = IVIRTUALBOXCALLBACK_IID; static const nsID ivirtualboxCallbackUUID = IVIRTUALBOXCALLBACK_IID;
static const nsID isupportIID = NS_ISUPPORTS_IID; static const nsID isupportIID = NS_ISUPPORTS_IID;