Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
308a0b2e
Commit
308a0b2e
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 VarAdd.
parent
97d13c55
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
0 deletions
+23
-0
variant.c
dlls/oleaut32/variant.c
+23
-0
No files found.
dlls/oleaut32/variant.c
View file @
308a0b2e
...
...
@@ -3130,6 +3130,7 @@ HRESULT WINAPI VarAdd(LPVARIANT left, LPVARIANT right, LPVARIANT result)
HRESULT
hres
;
VARTYPE
lvt
,
rvt
,
resvt
,
tvt
;
VARIANT
lv
,
rv
,
tv
;
VARIANT
tempLeft
,
tempRight
;
double
r8res
;
/* Variant priority for coercion. Sorted from lowest to highest.
...
...
@@ -3161,6 +3162,26 @@ HRESULT WINAPI VarAdd(LPVARIANT left, LPVARIANT right, LPVARIANT result)
VariantInit
(
&
lv
);
VariantInit
(
&
rv
);
VariantInit
(
&
tv
);
VariantInit
(
&
tempLeft
);
VariantInit
(
&
tempRight
);
/* Handle VT_DISPATCH by storing and taking address of returned value */
if
((
V_VT
(
left
)
&
VT_TYPEMASK
)
!=
VT_NULL
&&
(
V_VT
(
right
)
&
VT_TYPEMASK
)
!=
VT_NULL
)
{
if
((
V_VT
(
left
)
&
VT_TYPEMASK
)
==
VT_DISPATCH
)
{
hres
=
VARIANT_FetchDispatchValue
(
left
,
&
tempLeft
);
if
(
FAILED
(
hres
))
goto
end
;
left
=
&
tempLeft
;
}
if
((
V_VT
(
right
)
&
VT_TYPEMASK
)
==
VT_DISPATCH
)
{
hres
=
VARIANT_FetchDispatchValue
(
right
,
&
tempRight
);
if
(
FAILED
(
hres
))
goto
end
;
right
=
&
tempRight
;
}
}
lvt
=
V_VT
(
left
)
&
VT_TYPEMASK
;
rvt
=
V_VT
(
right
)
&
VT_TYPEMASK
;
...
...
@@ -3288,6 +3309,8 @@ end:
VariantClear
(
&
lv
);
VariantClear
(
&
rv
);
VariantClear
(
&
tv
);
VariantClear
(
&
tempLeft
);
VariantClear
(
&
tempRight
);
TRACE
(
"returning 0x%8x (variant type %s)
\n
"
,
hres
,
debugstr_VT
(
result
));
return
hres
;
}
...
...
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