Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
5aacee95
Commit
5aacee95
authored
Jan 02, 2007
by
Alex Villacís Lasso
Committed by
Alexandre Julliard
Jan 03, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Support for VT_DISPATCH in VarXor.
parent
e98a49de
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
1 deletion
+24
-1
variant.c
dlls/oleaut32/variant.c
+24
-1
No files found.
dlls/oleaut32/variant.c
View file @
5aacee95
...
...
@@ -4520,6 +4520,7 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut
{
VARTYPE
vt
;
VARIANT
varLeft
,
varRight
;
VARIANT
tempLeft
,
tempRight
;
double
d
;
HRESULT
hRet
;
...
...
@@ -4542,6 +4543,23 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut
return
S_OK
;
}
VariantInit
(
&
tempLeft
);
VariantInit
(
&
tempRight
);
/* Handle VT_DISPATCH by storing and taking address of returned value */
if
((
V_VT
(
pVarLeft
)
&
VT_TYPEMASK
)
==
VT_DISPATCH
)
{
hRet
=
VARIANT_FetchDispatchValue
(
pVarLeft
,
&
tempLeft
);
if
(
FAILED
(
hRet
))
goto
VarXor_Exit
;
pVarLeft
=
&
tempLeft
;
}
if
((
V_VT
(
pVarRight
)
&
VT_TYPEMASK
)
==
VT_DISPATCH
)
{
hRet
=
VARIANT_FetchDispatchValue
(
pVarRight
,
&
tempRight
);
if
(
FAILED
(
hRet
))
goto
VarXor_Exit
;
pVarRight
=
&
tempRight
;
}
/* Copy our inputs so we don't disturb anything */
V_VT
(
&
varLeft
)
=
V_VT
(
&
varRight
)
=
VT_EMPTY
;
...
...
@@ -4576,7 +4594,10 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut
if
(
V_VT
(
&
varLeft
)
==
VT_I8
||
V_VT
(
&
varRight
)
==
VT_I8
)
{
if
(
V_VT
(
pVarLeft
)
==
VT_INT
||
V_VT
(
pVarRight
)
==
VT_INT
)
return
DISP_E_TYPEMISMATCH
;
{
hRet
=
DISP_E_TYPEMISMATCH
;
goto
VarXor_Exit
;
}
vt
=
VT_I8
;
}
else
...
...
@@ -4654,6 +4675,8 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut
VarXor_Exit:
VariantClear
(
&
varLeft
);
VariantClear
(
&
varRight
);
VariantClear
(
&
tempLeft
);
VariantClear
(
&
tempRight
);
return
hRet
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment