Commit 5086bb2c authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

jscript: Get rid of no longer needed EXPR_NEWREF flag.

parent 63366f8f
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(jscript); WINE_DEFAULT_DEBUG_CHANNEL(jscript);
#define EXPR_NOVAL 0x0001 #define EXPR_NOVAL 0x0001
#define EXPR_NEWREF 0x0002
static const WCHAR booleanW[] = {'b','o','o','l','e','a','n',0}; static const WCHAR booleanW[] = {'b','o','o','l','e','a','n',0};
static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0};
...@@ -715,7 +714,7 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, DWORD flags, ...@@ -715,7 +714,7 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, DWORD flags,
if(lookup_global_members(ctx, identifier, ret)) if(lookup_global_members(ctx, identifier, ret))
return S_OK; return S_OK;
if(flags & EXPR_NEWREF) { if(flags & fdexNameEnsure) {
hres = jsdisp_get_id(ctx->global, identifier, fdexNameEnsure, &id); hres = jsdisp_get_id(ctx->global, identifier, fdexNameEnsure, &id);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
...@@ -1805,7 +1804,7 @@ static HRESULT identifier_expression_eval(script_ctx_t *ctx, expression_t *_expr ...@@ -1805,7 +1804,7 @@ static HRESULT identifier_expression_eval(script_ctx_t *ctx, expression_t *_expr
if(!identifier) if(!identifier)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
hres = identifier_eval(ctx, identifier, EXPR_NEWREF, ei, ret); hres = identifier_eval(ctx, identifier, fdexNameEnsure, ei, ret);
SysFreeString(identifier); SysFreeString(identifier);
return hres; return hres;
...@@ -1843,7 +1842,7 @@ static HRESULT interp_identid(exec_ctx_t *ctx) ...@@ -1843,7 +1842,7 @@ static HRESULT interp_identid(exec_ctx_t *ctx)
TRACE("%s %x\n", debugstr_w(arg), flags); TRACE("%s %x\n", debugstr_w(arg), flags);
hres = identifier_eval(ctx->parser->script, arg, (flags&fdexNameEnsure) ? EXPR_NEWREF : 0, &ctx->ei, &exprval); hres = identifier_eval(ctx->parser->script, arg, flags, &ctx->ei, &exprval);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment