Jacek Caban : jscript: Rename PROPF_ENUM to PROPF_ENUMERABLE.
Alexandre Julliard
julliard at winehq.org
Thu May 3 18:04:02 CDT 2018
Module: wine
Branch: master
Commit: da186c3cc58a563f73b8e505bdf22ff6927f518e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=da186c3cc58a563f73b8e505bdf22ff6927f518e
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu May 3 14:59:02 2018 +0200
jscript: Rename PROPF_ENUM to PROPF_ENUMERABLE.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/jscript/dispex.c | 12 ++++++------
dlls/jscript/jscript.h | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index f896b30..d3f345a 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -221,7 +221,7 @@ static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name,
flags |= PROPF_WRITABLE | PROPF_CONFIGURABLE;
else if(builtin->setter)
flags |= PROPF_WRITABLE;
- flags &= PROPF_ENUM | PROPF_WRITABLE | PROPF_CONFIGURABLE;
+ flags &= PROPF_ENUMERABLE | PROPF_WRITABLE | PROPF_CONFIGURABLE;
prop = alloc_prop(This, name, PROP_BUILTIN, flags);
if(!prop)
return E_OUTOFMEMORY;
@@ -490,7 +490,7 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val)
/* fall through */
case PROP_PROTREF:
prop->type = PROP_JSVAL;
- prop->flags = PROPF_ENUM | PROPF_CONFIGURABLE | PROPF_WRITABLE;
+ prop->flags = PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE;
prop->u.val = jsval_undefined();
break;
case PROP_JSVAL:
@@ -850,7 +850,7 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex,
}
while(iter < This->props + This->prop_cnt) {
- if(iter->name && (get_flags(This, iter) & PROPF_ENUM) && iter->type!=PROP_DELETED) {
+ if(iter->name && (get_flags(This, iter) & PROPF_ENUMERABLE) && iter->type!=PROP_DELETED) {
*pid = prop_to_id(This, iter);
return S_OK;
}
@@ -1040,7 +1040,7 @@ HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID *
HRESULT hres;
if(flags & fdexNameEnsure)
- hres = ensure_prop_name(jsdisp, name, TRUE, PROPF_ENUM | PROPF_CONFIGURABLE | PROPF_WRITABLE,
+ hres = ensure_prop_name(jsdisp, name, TRUE, PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE,
&prop);
else
hres = find_prop_name_prot(jsdisp, string_hash(name), name, &prop);
@@ -1313,7 +1313,7 @@ HRESULT jsdisp_propput(jsdisp_t *obj, const WCHAR *name, DWORD flags, jsval_t va
HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, jsval_t val)
{
- return jsdisp_propput(obj, name, PROPF_ENUM | PROPF_CONFIGURABLE | PROPF_WRITABLE, val);
+ return jsdisp_propput(obj, name, PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE, val);
}
HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, jsval_t val)
@@ -1611,6 +1611,6 @@ HRESULT jsdisp_is_enumerable(jsdisp_t *obj, const WCHAR *name, BOOL *ret)
if(FAILED(hres))
return hres;
- *ret = prop && (prop->flags & PROPF_ENUM) && prop->type != PROP_PROTREF;
+ *ret = prop && (prop->flags & PROPF_ENUMERABLE) && prop->type != PROP_PROTREF;
return S_OK;
}
diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h
index 335df1a..9c28da0 100644
--- a/dlls/jscript/jscript.h
+++ b/dlls/jscript/jscript.h
@@ -89,7 +89,7 @@ extern HINSTANCE jscript_hinstance DECLSPEC_HIDDEN;
#define PROPF_ARGMASK 0x00ff
#define PROPF_METHOD 0x0100
-#define PROPF_ENUM 0x0200
+#define PROPF_ENUMERABLE 0x0200
#define PROPF_CONSTR 0x0400
#define PROPF_WRITABLE 0x0800
#define PROPF_CONFIGURABLE 0x1000
More information about the wine-cvs
mailing list