Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
e3ce43cd
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e3ce43cd
编写于
12月 14, 2010
作者:
M
Matthias Bolte
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
vbox: Use stdcall convention for all COM methods on Windows
MSCOM requires stdcall convention.
上级
cddd2a06
变更
5
展开全部
显示空白变更内容
内联
并排
Showing
5 changed file
with
3257 addition
and
3219 deletion
+3257
-3219
src/vbox/vbox_CAPI_v2_2.h
src/vbox/vbox_CAPI_v2_2.h
+753
-748
src/vbox/vbox_CAPI_v3_0.h
src/vbox/vbox_CAPI_v3_0.h
+781
-775
src/vbox/vbox_CAPI_v3_1.h
src/vbox/vbox_CAPI_v3_1.h
+790
-784
src/vbox/vbox_CAPI_v3_2.h
src/vbox/vbox_CAPI_v3_2.h
+876
-870
src/vbox/vbox_tmpl.c
src/vbox/vbox_tmpl.c
+57
-42
未找到文件。
src/vbox/vbox_CAPI_v2_2.h
浏览文件 @
e3ce43cd
此差异已折叠。
点击以展开。
src/vbox/vbox_CAPI_v3_0.h
浏览文件 @
e3ce43cd
此差异已折叠。
点击以展开。
src/vbox/vbox_CAPI_v3_1.h
浏览文件 @
e3ce43cd
此差异已折叠。
点击以展开。
src/vbox/vbox_CAPI_v3_2.h
浏览文件 @
e3ce43cd
此差异已折叠。
点击以展开。
src/vbox/vbox_tmpl.c
浏览文件 @
e3ce43cd
...
@@ -6245,9 +6245,10 @@ cleanup:
...
@@ -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,
...
@@ -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,
...
@@ -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,
...
@@ -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,
...
@@ -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,
...
@@ -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,
...
@@ -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,
...
@@ -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,
...
@@ -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,
...
@@ -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) {
...
@@ -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) {
...
@@ -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
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录