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
6f459022
Commit
6f459022
authored
Mar 08, 2014
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 10, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vbscript: Use VariantCopyInd in invoke_variant_prop.
parent
6ad651bf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
lang.vbs
dlls/vbscript/tests/lang.vbs
+9
-1
vbdisp.c
dlls/vbscript/vbdisp.c
+2
-2
No files found.
dlls/vbscript/tests/lang.vbs
View file @
6f459022
...
...
@@ -1061,12 +1061,20 @@ Class ArrClass
classarr
(
2
)
=
3
classarr
(
3
)
=
4
End
Sub
Public
Sub
testVarVT
Call
ok
(
getVT
(
var
)
=
"VT_ARRAY|VT_VARIANT*"
,
"getVT(var) = "
&
getVT
(
var
))
End
Sub
End
Class
Set
obj
=
new
ArrClass
'todo_wine
Call ok(getVT(obj.classarr) = "VT_ARRAY|VT_VARIANT", "getVT(obj.classarr) = " & getVT(obj.classarr))
Call
ok
(
getVT
(
obj
.
classarr
)
=
"VT_ARRAY|VT_VARIANT"
,
"getVT(obj.classarr) = "
&
getVT
(
obj
.
classarr
))
'todo_wine Call ok(obj.classarr(1) = 2, "obj.classarr(1) = " & obj.classarr(1))
obj
.
var
=
arr
Call
ok
(
getVT
(
obj
.
var
)
=
"VT_ARRAY|VT_VARIANT"
,
"getVT(obj.var) = "
&
getVT
(
obj
.
var
))
Call
obj
.
testVarVT
Sub
arrarg
(
byref
refarr
,
byval
valarr
,
byref
refarr2
,
byval
valarr2
)
Call
ok
(
getVT
(
refarr
)
=
"VT_ARRAY|VT_BYREF|VT_VARIANT*"
,
"getVT(refarr) = "
&
getVT
(
refarr
))
Call
ok
(
getVT
(
valarr
)
=
"VT_ARRAY|VT_VARIANT*"
,
"getVT(valarr) = "
&
getVT
(
valarr
))
...
...
dlls/vbscript/vbdisp.c
View file @
6f459022
...
...
@@ -109,7 +109,7 @@ static HRESULT invoke_variant_prop(VARIANT *v, WORD flags, DISPPARAMS *dp, VARIA
return
DISP_E_MEMBERNOTFOUND
;
/* That's what tests show */
}
hres
=
VariantCopy
(
res
,
v
);
hres
=
VariantCopy
Ind
(
res
,
v
);
break
;
case
DISPATCH_PROPERTYPUT
:
{
...
...
@@ -129,7 +129,7 @@ static HRESULT invoke_variant_prop(VARIANT *v, WORD flags, DISPPARAMS *dp, VARIA
if
(
res
)
V_VT
(
res
)
=
VT_EMPTY
;
hres
=
VariantCopy
(
v
,
put_val
);
hres
=
VariantCopy
Ind
(
v
,
put_val
);
break
;
}
...
...
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