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
01395dec
Commit
01395dec
authored
17 years ago
by
Alex Villacís Lasso
Committed by
Alexandre Julliard
17 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Support for VT_DISPATCH in VarMul.
parent
308a0b2e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
0 deletions
+20
-0
variant.c
dlls/oleaut32/variant.c
+20
-0
No files found.
dlls/oleaut32/variant.c
View file @
01395dec
...
@@ -3345,6 +3345,7 @@ HRESULT WINAPI VarMul(LPVARIANT left, LPVARIANT right, LPVARIANT result)
...
@@ -3345,6 +3345,7 @@ HRESULT WINAPI VarMul(LPVARIANT left, LPVARIANT right, LPVARIANT result)
HRESULT
hres
;
HRESULT
hres
;
VARTYPE
lvt
,
rvt
,
resvt
,
tvt
;
VARTYPE
lvt
,
rvt
,
resvt
,
tvt
;
VARIANT
lv
,
rv
,
tv
;
VARIANT
lv
,
rv
,
tv
;
VARIANT
tempLeft
,
tempRight
;
double
r8res
;
double
r8res
;
/* Variant priority for coercion. Sorted from lowest to highest.
/* Variant priority for coercion. Sorted from lowest to highest.
...
@@ -3374,6 +3375,23 @@ HRESULT WINAPI VarMul(LPVARIANT left, LPVARIANT right, LPVARIANT result)
...
@@ -3374,6 +3375,23 @@ HRESULT WINAPI VarMul(LPVARIANT left, LPVARIANT right, LPVARIANT result)
VariantInit
(
&
lv
);
VariantInit
(
&
lv
);
VariantInit
(
&
rv
);
VariantInit
(
&
rv
);
VariantInit
(
&
tv
);
VariantInit
(
&
tv
);
VariantInit
(
&
tempLeft
);
VariantInit
(
&
tempRight
);
/* Handle VT_DISPATCH by storing and taking address of returned value */
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
;
lvt
=
V_VT
(
left
)
&
VT_TYPEMASK
;
rvt
=
V_VT
(
right
)
&
VT_TYPEMASK
;
rvt
=
V_VT
(
right
)
&
VT_TYPEMASK
;
...
@@ -3482,6 +3500,8 @@ end:
...
@@ -3482,6 +3500,8 @@ end:
VariantClear
(
&
lv
);
VariantClear
(
&
lv
);
VariantClear
(
&
rv
);
VariantClear
(
&
rv
);
VariantClear
(
&
tv
);
VariantClear
(
&
tv
);
VariantClear
(
&
tempLeft
);
VariantClear
(
&
tempRight
);
TRACE
(
"returning 0x%8x (variant type %s)
\n
"
,
hres
,
debugstr_VT
(
result
));
TRACE
(
"returning 0x%8x (variant type %s)
\n
"
,
hres
,
debugstr_VT
(
result
));
return
hres
;
return
hres
;
}
}
...
...
This diff is collapsed.
Click to expand it.
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