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
c372e79e
Commit
c372e79e
authored
Jan 31, 2020
by
Jacek Caban
Committed by
Alexandre Julliard
Feb 02, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jscript: Directly return error code instead of using throw_reference_error.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
b67c957f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
10 deletions
+4
-10
engine.c
dlls/jscript/engine.c
+4
-4
error.c
dlls/jscript/error.c
+0
-5
jscript.h
dlls/jscript/jscript.h
+0
-1
No files found.
dlls/jscript/engine.c
View file @
c372e79e
...
...
@@ -898,7 +898,7 @@ static HRESULT interp_throw_ref(script_ctx_t *ctx)
TRACE
(
"%08x
\n
"
,
arg
);
return
throw_reference_error
(
ctx
,
arg
,
NULL
)
;
return
arg
;
}
static
HRESULT
interp_throw_type
(
script_ctx_t
*
ctx
)
...
...
@@ -1161,7 +1161,7 @@ static HRESULT interp_refval(script_ctx_t *ctx)
TRACE
(
"
\n
"
);
if
(
!
stack_topn_exprval
(
ctx
,
0
,
&
ref
))
return
throw_reference_error
(
ctx
,
JS_E_ILLEGAL_ASSIGN
,
NULL
)
;
return
JS_E_ILLEGAL_ASSIGN
;
hres
=
exprval_propget
(
ctx
,
&
ref
,
&
v
);
if
(
FAILED
(
hres
))
...
...
@@ -2527,7 +2527,7 @@ static HRESULT interp_assign(script_ctx_t *ctx)
if
(
!
stack_pop_exprval
(
ctx
,
&
ref
))
{
jsval_release
(
v
);
return
throw_reference_error
(
ctx
,
JS_E_ILLEGAL_ASSIGN
,
NULL
)
;
return
JS_E_ILLEGAL_ASSIGN
;
}
hres
=
exprval_propput
(
ctx
,
&
ref
,
v
);
...
...
@@ -2551,7 +2551,7 @@ static HRESULT interp_assign_call(script_ctx_t *ctx)
TRACE
(
"%u
\n
"
,
argc
);
if
(
!
stack_topn_exprval
(
ctx
,
argc
+
1
,
&
ref
))
return
throw_reference_error
(
ctx
,
JS_E_ILLEGAL_ASSIGN
,
NULL
)
;
return
JS_E_ILLEGAL_ASSIGN
;
hres
=
exprval_call
(
ctx
,
&
ref
,
DISPATCH_PROPERTYPUT
,
argc
+
1
,
stack_args
(
ctx
,
argc
+
1
),
NULL
);
if
(
FAILED
(
hres
))
...
...
dlls/jscript/error.c
View file @
c372e79e
...
...
@@ -435,11 +435,6 @@ static HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str, j
return
error
;
}
HRESULT
throw_reference_error
(
script_ctx_t
*
ctx
,
HRESULT
error
,
const
WCHAR
*
str
)
{
return
throw_error
(
ctx
,
error
,
str
,
ctx
->
reference_error_constr
);
}
HRESULT
throw_regexp_error
(
script_ctx_t
*
ctx
,
HRESULT
error
,
const
WCHAR
*
str
)
{
return
throw_error
(
ctx
,
error
,
str
,
ctx
->
regexp_error_constr
);
...
...
dlls/jscript/jscript.h
View file @
c372e79e
...
...
@@ -312,7 +312,6 @@ HRESULT Function_get_value(script_ctx_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN;
struct
_function_code_t
*
Function_get_code
(
jsdisp_t
*
)
DECLSPEC_HIDDEN
;
#define DEFAULT_FUNCTION_VALUE {NULL, Function_value,0, Function_get_value}
HRESULT
throw_reference_error
(
script_ctx_t
*
,
HRESULT
,
const
WCHAR
*
)
DECLSPEC_HIDDEN
;
HRESULT
throw_regexp_error
(
script_ctx_t
*
,
HRESULT
,
const
WCHAR
*
)
DECLSPEC_HIDDEN
;
HRESULT
throw_syntax_error
(
script_ctx_t
*
,
HRESULT
,
const
WCHAR
*
)
DECLSPEC_HIDDEN
;
HRESULT
throw_type_error
(
script_ctx_t
*
,
HRESULT
,
const
WCHAR
*
)
DECLSPEC_HIDDEN
;
...
...
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