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
ef737598
Commit
ef737598
authored
Nov 01, 2019
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 01, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vbscript: Support using function return value in expressions.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
39e79c76
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
interp.c
dlls/vbscript/interp.c
+1
-2
lang.vbs
dlls/vbscript/tests/lang.vbs
+9
-0
No files found.
dlls/vbscript/interp.c
View file @
ef737598
...
@@ -104,8 +104,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_
...
@@ -104,8 +104,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_
DISPID
id
;
DISPID
id
;
HRESULT
hres
;
HRESULT
hres
;
if
(
invoke_type
==
VBDISP_LET
if
((
ctx
->
func
->
type
==
FUNC_FUNCTION
||
ctx
->
func
->
type
==
FUNC_PROPGET
||
ctx
->
func
->
type
==
FUNC_DEFGET
)
&&
(
ctx
->
func
->
type
==
FUNC_FUNCTION
||
ctx
->
func
->
type
==
FUNC_PROPGET
||
ctx
->
func
->
type
==
FUNC_DEFGET
)
&&
!
wcsicmp
(
name
,
ctx
->
func
->
name
))
{
&&
!
wcsicmp
(
name
,
ctx
->
func
->
name
))
{
ref
->
type
=
REF_VAR
;
ref
->
type
=
REF_VAR
;
ref
->
u
.
v
=
&
ctx
->
ret_val
;
ref
->
u
.
v
=
&
ctx
->
ret_val
;
...
...
dlls/vbscript/tests/lang.vbs
View file @
ef737598
...
@@ -1621,4 +1621,13 @@ with new TestPropSyntax
...
@@ -1621,4 +1621,13 @@ with new TestPropSyntax
ok
.
prop
=
1
,
".prop = "
&
.
prop
ok
.
prop
=
1
,
".prop = "
&
.
prop
end
with
end
with
function
testsetresult
(
x
,
y
)
set
testsetresult
=
new
TestPropSyntax
testsetresult
.
prop
=
x
y
=
testsetresult
.
prop
+
1
end
function
set
x
=
testsetresult
(
1
,
2
)
ok
x
.
prop
=
1
,
"x.prop = "
&
x
.
prop
reportSuccess
()
reportSuccess
()
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