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
00030ff6
Commit
00030ff6
authored
Dec 20, 2011
by
Jacek Caban
Committed by
Alexandre Julliard
Dec 20, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jscript: Get rid of no longer needed identifier in exprval_t.
parent
f5a3f141
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
7 deletions
+5
-7
engine.c
dlls/jscript/engine.c
+5
-6
engine.h
dlls/jscript/engine.h
+0
-1
No files found.
dlls/jscript/engine.c
View file @
00030ff6
...
...
@@ -220,7 +220,7 @@ static void exprval_release(exprval_t *val)
IDispatch_Release
(
val
->
u
.
idref
.
disp
);
return
;
case
EXPRVAL_INVALID
:
SysFreeString
(
val
->
u
.
identifier
)
;
return
;
}
}
...
...
@@ -240,7 +240,7 @@ static HRESULT exprval_value(script_ctx_t *ctx, exprval_t *val, jsexcept_t *ei,
return
disp_propget
(
ctx
,
val
->
u
.
idref
.
disp
,
val
->
u
.
idref
.
id
,
ret
,
ei
,
NULL
/*FIXME*/
);
case
EXPRVAL_INVALID
:
return
throw_type_error
(
ctx
,
ei
,
JS_E_UNDEFINED_VARIABLE
,
val
->
u
.
identifier
);
assert
(
0
);
}
ERR
(
"type %d
\n
"
,
val
->
type
);
...
...
@@ -653,10 +653,6 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, DWORD flags,
}
ret
->
type
=
EXPRVAL_INVALID
;
ret
->
u
.
identifier
=
SysAllocString
(
identifier
);
if
(
!
ret
->
u
.
identifier
)
return
E_OUTOFMEMORY
;
return
S_OK
;
}
...
...
@@ -1585,6 +1581,9 @@ static HRESULT interp_ident(exec_ctx_t *ctx)
if
(
FAILED
(
hres
))
return
hres
;
if
(
exprval
.
type
==
EXPRVAL_INVALID
)
return
throw_type_error
(
ctx
->
parser
->
script
,
ctx
->
ei
,
JS_E_UNDEFINED_VARIABLE
,
arg
);
hres
=
exprval_to_value
(
ctx
->
parser
->
script
,
&
exprval
,
ctx
->
ei
,
&
v
);
exprval_release
(
&
exprval
);
if
(
FAILED
(
hres
))
...
...
dlls/jscript/engine.h
View file @
00030ff6
...
...
@@ -423,7 +423,6 @@ typedef struct {
IDispatch
*
disp
;
DISPID
id
;
}
idref
;
BSTR
identifier
;
}
u
;
}
exprval_t
;
...
...
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