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
5e9663c0
Commit
5e9663c0
authored
Nov 26, 2023
by
Nikolay Sivov
Committed by
Alexandre Julliard
Nov 27, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Always reset return type for VarMod().
parent
bda6decd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
vartest.c
dlls/oleaut32/tests/vartest.c
+7
-0
variant.c
dlls/oleaut32/variant.c
+1
-0
No files found.
dlls/oleaut32/tests/vartest.c
View file @
5e9663c0
...
@@ -3518,8 +3518,15 @@ static void test_Mod( int line, VARIANT *left, VARIANT *right, VARIANT *expected
...
@@ -3518,8 +3518,15 @@ static void test_Mod( int line, VARIANT *left, VARIANT *right, VARIANT *expected
hres
=
pVarMod
(
left
,
right
,
&
result
);
hres
=
pVarMod
(
left
,
right
,
&
result
);
ok_
(
__FILE__
,
line
)(
hres
==
expres
,
"wrong result %lx/%lx
\n
"
,
hres
,
expres
);
ok_
(
__FILE__
,
line
)(
hres
==
expres
,
"wrong result %lx/%lx
\n
"
,
hres
,
expres
);
if
(
hres
==
S_OK
)
if
(
hres
==
S_OK
)
{
ok_
(
__FILE__
,
line
)(
is_expected_variant
(
&
result
,
expected
),
ok_
(
__FILE__
,
line
)(
is_expected_variant
(
&
result
,
expected
),
"got %s expected %s
\n
"
,
variantstr
(
&
result
),
variantstr
(
expected
)
);
"got %s expected %s
\n
"
,
variantstr
(
&
result
),
variantstr
(
expected
)
);
}
else
{
ok_
(
__FILE__
,
line
)(
V_VT
(
&
result
)
==
VT_EMPTY
,
"Unexpected type %d.
\n
"
,
V_VT
(
&
result
)
);
ok_
(
__FILE__
,
line
)(
V_I4
(
&
result
)
==
0x12345
,
"Unexpected value %ld.
\n
"
,
V_I4
(
&
result
)
);
}
}
}
#define VARMOD(vt1,vt2,val1,val2,rvt,rval) \
#define VARMOD(vt1,vt2,val1,val2,rvt,rval) \
...
...
dlls/oleaut32/variant.c
View file @
5e9663c0
...
@@ -5410,6 +5410,7 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result)
...
@@ -5410,6 +5410,7 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result)
VariantInit
(
&
tempRight
);
VariantInit
(
&
tempRight
);
VariantInit
(
&
lv
);
VariantInit
(
&
lv
);
VariantInit
(
&
rv
);
VariantInit
(
&
rv
);
V_VT
(
result
)
=
VT_EMPTY
;
TRACE
(
"(%s,%s,%p)
\n
"
,
debugstr_variant
(
left
),
debugstr_variant
(
right
),
result
);
TRACE
(
"(%s,%s,%p)
\n
"
,
debugstr_variant
(
left
),
debugstr_variant
(
right
),
result
);
...
...
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