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
0167f4a7
Commit
0167f4a7
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_regexp_error.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
c372e79e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
7 deletions
+1
-7
error.c
dlls/jscript/error.c
+0
-5
jscript.h
dlls/jscript/jscript.h
+0
-1
jsregexp.c
dlls/jscript/jsregexp.c
+1
-1
No files found.
dlls/jscript/error.c
View file @
0167f4a7
...
...
@@ -435,11 +435,6 @@ static HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str, j
return
error
;
}
HRESULT
throw_regexp_error
(
script_ctx_t
*
ctx
,
HRESULT
error
,
const
WCHAR
*
str
)
{
return
throw_error
(
ctx
,
error
,
str
,
ctx
->
regexp_error_constr
);
}
HRESULT
throw_syntax_error
(
script_ctx_t
*
ctx
,
HRESULT
error
,
const
WCHAR
*
str
)
{
return
throw_error
(
ctx
,
error
,
str
,
ctx
->
syntax_error_constr
);
...
...
dlls/jscript/jscript.h
View file @
0167f4a7
...
...
@@ -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_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
;
HRESULT
throw_uri_error
(
script_ctx_t
*
,
HRESULT
,
const
WCHAR
*
)
DECLSPEC_HIDDEN
;
...
...
dlls/jscript/jsregexp.c
View file @
0167f4a7
...
...
@@ -935,7 +935,7 @@ static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
if
(
is_class
(
jsdisp
,
JSCLASS_REGEXP
))
{
if
(
argc
>
1
&&
!
is_undefined
(
argv
[
1
]))
{
jsdisp_release
(
jsdisp
);
return
throw_regexp_error
(
ctx
,
JS_E_REGEXP_SYNTAX
,
NULL
)
;
return
JS_E_REGEXP_SYNTAX
;
}
if
(
r
)
...
...
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