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
fa726bed
Commit
fa726bed
authored
Mar 29, 2016
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 30, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jscript: Use already running interpreter for execution new expressions.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
2d35954a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
engine.c
dlls/jscript/engine.c
+1
-2
function.c
dlls/jscript/function.c
+1
-1
No files found.
dlls/jscript/engine.c
View file @
fa726bed
...
...
@@ -963,7 +963,7 @@ static HRESULT interp_new(script_ctx_t *ctx)
return
throw_type_error
(
ctx
,
JS_E_INVALID_PROPERTY
,
NULL
);
clear_ret
(
frame
);
return
disp_call_value
(
ctx
,
get_object
(
constr
),
NULL
,
DISPATCH_CONSTRUCT
,
return
disp_call_value
(
ctx
,
get_object
(
constr
),
NULL
,
DISPATCH_CONSTRUCT
|
DISPATCH_JSCRIPT_CALLEREXECSSOURCE
,
argc
,
stack_args
(
ctx
,
argc
),
&
frame
->
ret
);
}
...
...
@@ -2604,7 +2604,6 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi
frame
->
ip
=
function
->
instr_off
;
frame
->
stack_base
=
ctx
->
stack_top
;
frame
->
ret
=
jsval_undefined
();
if
(
scope
)
frame
->
base_scope
=
frame
->
scope
=
scope_addref
(
scope
);
...
...
dlls/jscript/function.c
View file @
fa726bed
...
...
@@ -334,7 +334,7 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi
if
(
FAILED
(
hres
))
return
hres
;
hres
=
invoke_source
(
function
->
dispex
.
ctx
,
function
,
to_disp
(
this_obj
),
argc
,
argv
,
TRUE
,
FALSE
,
r
);
hres
=
invoke_source
(
function
->
dispex
.
ctx
,
function
,
to_disp
(
this_obj
),
argc
,
argv
,
TRUE
,
caller_execs_source
,
r
);
jsdisp_release
(
this_obj
);
return
hres
;
}
...
...
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