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
02406d4f
Commit
02406d4f
authored
Sep 16, 2014
by
Jacek Caban
Committed by
Alexandre Julliard
Sep 16, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jscript: Add DISPATCH_PROPERTYGET flag only for DISPATCH_METHOD call in disp_call_value.
Spotted by Qian Hong.
parent
063ef3ca
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
dispex.c
dlls/jscript/dispex.c
+1
-1
run.c
dlls/jscript/tests/run.c
+9
-0
No files found.
dlls/jscript/dispex.c
View file @
02406d4f
...
...
@@ -1202,7 +1202,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W
return
hres
;
}
if
(
r
&&
argc
)
if
(
r
&&
argc
&&
flags
==
DISPATCH_METHOD
)
flags
|=
DISPATCH_PROPERTYGET
;
hres
=
IDispatch_QueryInterface
(
disp
,
&
IID_IDispatchEx
,
(
void
**
)
&
dispex
);
...
...
dlls/jscript/tests/run.c
View file @
02406d4f
...
...
@@ -95,6 +95,7 @@ DEFINE_EXPECT(dispexfunc_value);
DEFINE_EXPECT
(
testobj_delete_test
);
DEFINE_EXPECT
(
testobj_delete_nodelete
);
DEFINE_EXPECT
(
testobj_value
);
DEFINE_EXPECT
(
testobj_construct
);
DEFINE_EXPECT
(
testobj_prop_d
);
DEFINE_EXPECT
(
testobj_withprop_d
);
DEFINE_EXPECT
(
testobj_withprop_i
);
...
...
@@ -364,6 +365,10 @@ static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid,
case
INVOKE_FUNC
|
INVOKE_PROPERTYGET
:
ok
(
pdp
->
cArgs
==
1
,
"cArgs = %d
\n
"
,
pdp
->
cArgs
);
break
;
case
DISPATCH_CONSTRUCT
:
CHECK_EXPECT
(
testobj_construct
);
ok
(
pdp
->
cArgs
==
1
,
"cArgs = %d
\n
"
,
pdp
->
cArgs
);
break
;
default:
ok
(
0
,
"invalid flag (%x)
\n
"
,
wFlags
);
}
...
...
@@ -2121,6 +2126,10 @@ static BOOL run_tests(void)
parse_script_a
(
"ok(String.prototype.concat.call(testObj, ' OK') === '1 OK', 'wrong concat result');"
);
CHECK_CALLED
(
testobj_value
);
SET_EXPECT
(
testobj_construct
);
parse_script_a
(
"var t = new testObj(1);"
);
CHECK_CALLED
(
testobj_construct
);
SET_EXPECT
(
global_propget_d
);
SET_EXPECT
(
global_propget_i
);
parse_script_a
(
"this.testPropGet;"
);
...
...
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