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
7af8330e
Commit
7af8330e
authored
Aug 02, 2016
by
Jacek Caban
Committed by
Alexandre Julliard
Aug 02, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jscript: Store exception code in exprval_t.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
806ea127
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
engine.c
dlls/jscript/engine.c
+9
-2
No files found.
dlls/jscript/engine.c
View file @
7af8330e
...
...
@@ -58,6 +58,7 @@ typedef struct {
IDispatch
*
disp
;
DISPID
id
;
}
idref
;
HRESULT
hres
;
}
u
;
}
exprval_t
;
...
...
@@ -221,6 +222,12 @@ static void exprval_release(exprval_t *val)
}
}
static
inline
void
exprval_set_exception
(
exprval_t
*
val
,
HRESULT
hres
)
{
val
->
type
=
EXPRVAL_INVALID
;
val
->
u
.
hres
=
hres
;
}
/* ECMA-262 3rd Edition 8.7.1 */
static
HRESULT
exprval_to_value
(
script_ctx_t
*
ctx
,
exprval_t
*
val
,
jsval_t
*
ret
)
{
...
...
@@ -537,7 +544,7 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re
if
(
lookup_global_members
(
ctx
,
identifier
,
ret
))
return
S_OK
;
ret
->
type
=
EXPRVAL_INVALID
;
exprval_set_exception
(
ret
,
JS_E_UNDEFINED_VARIABLE
)
;
return
S_OK
;
}
...
...
@@ -1060,7 +1067,7 @@ static HRESULT interp_ident(script_ctx_t *ctx)
return
hres
;
if
(
exprval
.
type
==
EXPRVAL_INVALID
)
return
throw_type_error
(
ctx
,
JS_E_UNDEFINED_VARIABLE
,
arg
);
return
throw_type_error
(
ctx
,
exprval
.
u
.
hres
,
arg
);
hres
=
exprval_to_value
(
ctx
,
&
exprval
,
&
v
);
exprval_release
(
&
exprval
);
...
...
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