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
1d487027
Commit
1d487027
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_generic_error.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
940b0258
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
8 deletions
+1
-8
activex.c
dlls/jscript/activex.c
+1
-1
error.c
dlls/jscript/error.c
+0
-5
jscript.h
dlls/jscript/jscript.h
+0
-2
No files found.
dlls/jscript/activex.c
View file @
1d487027
...
...
@@ -172,7 +172,7 @@ static HRESULT ActiveXObject_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag
obj
=
create_activex_object
(
ctx
,
progid
);
jsstr_release
(
progid_str
);
if
(
!
obj
)
return
throw_generic_error
(
ctx
,
JS_E_CANNOT_CREATE_OBJ
,
NULL
)
;
return
JS_E_CANNOT_CREATE_OBJ
;
hres
=
IUnknown_QueryInterface
(
obj
,
&
IID_IDispatch
,
(
void
**
)
&
disp
);
IUnknown_Release
(
obj
);
...
...
dlls/jscript/error.c
View file @
1d487027
...
...
@@ -435,11 +435,6 @@ static HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str, j
return
error
;
}
HRESULT
throw_generic_error
(
script_ctx_t
*
ctx
,
HRESULT
error
,
const
WCHAR
*
str
)
{
return
throw_error
(
ctx
,
error
,
str
,
ctx
->
error_constr
);
}
HRESULT
throw_range_error
(
script_ctx_t
*
ctx
,
HRESULT
error
,
const
WCHAR
*
str
)
{
return
throw_error
(
ctx
,
error
,
str
,
ctx
->
range_error_constr
);
...
...
dlls/jscript/jscript.h
View file @
1d487027
...
...
@@ -312,8 +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_eval_error
(
script_ctx_t
*
,
HRESULT
,
const
WCHAR
*
)
DECLSPEC_HIDDEN
;
HRESULT
throw_generic_error
(
script_ctx_t
*
,
HRESULT
,
const
WCHAR
*
)
DECLSPEC_HIDDEN
;
HRESULT
throw_range_error
(
script_ctx_t
*
,
HRESULT
,
const
WCHAR
*
)
DECLSPEC_HIDDEN
;
HRESULT
throw_reference_error
(
script_ctx_t
*
,
HRESULT
,
const
WCHAR
*
)
DECLSPEC_HIDDEN
;
HRESULT
throw_regexp_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