Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
22247369
Commit
22247369
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_uri_error.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
0167f4a7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
9 deletions
+3
-9
error.c
dlls/jscript/error.c
+0
-5
global.c
dlls/jscript/global.c
+3
-3
jscript.h
dlls/jscript/jscript.h
+0
-1
No files found.
dlls/jscript/error.c
View file @
22247369
...
...
@@ -445,11 +445,6 @@ HRESULT throw_type_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str)
return
throw_error
(
ctx
,
error
,
str
,
ctx
->
type_error_constr
);
}
HRESULT
throw_uri_error
(
script_ctx_t
*
ctx
,
HRESULT
error
,
const
WCHAR
*
str
)
{
return
throw_error
(
ctx
,
error
,
str
,
ctx
->
uri_error_constr
);
}
jsdisp_t
*
create_builtin_error
(
script_ctx_t
*
ctx
)
{
jsdisp_t
*
constr
=
ctx
->
error_constr
,
*
r
;
...
...
dlls/jscript/global.c
View file @
22247369
...
...
@@ -632,7 +632,7 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
i
=
WideCharToMultiByte
(
CP_UTF8
,
WC_ERR_INVALID_CHARS
,
ptr
,
1
,
NULL
,
0
,
NULL
,
NULL
)
*
3
;
if
(
!
i
)
{
jsstr_release
(
str
);
return
throw_uri_error
(
ctx
,
JS_E_INVALID_URI_CHAR
,
NULL
)
;
return
JS_E_INVALID_URI_CHAR
;
}
len
+=
i
;
...
...
@@ -710,7 +710,7 @@ static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
if
(
!
res
)
{
jsstr_release
(
str
);
return
throw_uri_error
(
ctx
,
JS_E_INVALID_URI_CODING
,
NULL
)
;
return
JS_E_INVALID_URI_CODING
;
}
ptr
+=
i
*
3
+
2
;
...
...
@@ -783,7 +783,7 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W
size
=
WideCharToMultiByte
(
CP_UTF8
,
WC_ERR_INVALID_CHARS
,
ptr
,
1
,
NULL
,
0
,
NULL
,
NULL
);
if
(
!
size
)
{
jsstr_release
(
str
);
return
throw_uri_error
(
ctx
,
JS_E_INVALID_URI_CHAR
,
NULL
)
;
return
JS_E_INVALID_URI_CHAR
;
}
len
+=
size
*
3
;
}
...
...
dlls/jscript/jscript.h
View file @
22247369
...
...
@@ -314,7 +314,6 @@ struct _function_code_t *Function_get_code(jsdisp_t*) 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
;
jsdisp_t
*
create_builtin_error
(
script_ctx_t
*
ctx
)
DECLSPEC_HIDDEN
;
HRESULT
create_object
(
script_ctx_t
*
,
jsdisp_t
*
,
jsdisp_t
**
)
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