mirror of
git://source.winehq.org/git/wine.git
synced 2024-08-31 15:13:38 +00:00
jscript: Use helpers to access string buffer in object.c.
This commit is contained in:
parent
e67169c114
commit
b7ffca591d
|
@ -130,9 +130,14 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl
|
|||
return hres;
|
||||
|
||||
if(is_jsdisp(jsthis)) {
|
||||
const WCHAR *name_str;
|
||||
BOOL result;
|
||||
|
||||
hres = jsdisp_is_own_prop(jsthis->u.jsdisp, name->str, &result);
|
||||
name_str = jsstr_flatten(name);
|
||||
if(name_str)
|
||||
hres = jsdisp_is_own_prop(jsthis->u.jsdisp, name_str, &result);
|
||||
else
|
||||
hres = E_OUTOFMEMORY;
|
||||
jsstr_release(name);
|
||||
if(FAILED(hres))
|
||||
return hres;
|
||||
|
@ -164,7 +169,8 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl
|
|||
static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
|
||||
jsval_t *r)
|
||||
{
|
||||
jsstr_t *name;
|
||||
const WCHAR *name;
|
||||
jsstr_t *name_str;
|
||||
BOOL ret;
|
||||
HRESULT hres;
|
||||
|
||||
|
@ -180,12 +186,12 @@ static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, W
|
|||
return E_FAIL;
|
||||
}
|
||||
|
||||
hres = to_string(ctx, argv[0], &name);
|
||||
hres = to_flat_string(ctx, argv[0], &name_str, &name);
|
||||
if(FAILED(hres))
|
||||
return hres;
|
||||
|
||||
hres = jsdisp_is_enumerable(jsthis->u.jsdisp, name->str, &ret);
|
||||
jsstr_release(name);
|
||||
hres = jsdisp_is_enumerable(jsthis->u.jsdisp, name, &ret);
|
||||
jsstr_release(name_str);
|
||||
if(FAILED(hres))
|
||||
return hres;
|
||||
|
||||
|
|
Loading…
Reference in a new issue