reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-16 19:10:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

jscript: Use helpers to access string buffer in object.c.

Browse Source
This commit is contained in:
Jacek Caban 2013-03-27 11:04:09 +01:00 committed by Alexandre Julliard
parent e67169c114
commit b7ffca591d
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/jscript/object.c
View File

@ -130,9 +130,14 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl
return hres; return hres;
if(is_jsdisp(jsthis)) { if(is_jsdisp(jsthis)) {
const WCHAR *name_str;
BOOL result; 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); jsstr_release(name);
if(FAILED(hres)) if(FAILED(hres))
return 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, static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r) jsval_t *r)
{ {
jsstr_t *name; const WCHAR *name;
jsstr_t *name_str;
BOOL ret; BOOL ret;
HRESULT hres; HRESULT hres;
@ -180,12 +186,12 @@ static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, W
return E_FAIL; return E_FAIL;
} }
hres = to_string(ctx, argv[0], &name); hres = to_flat_string(ctx, argv[0], &name_str, &name);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
hres = jsdisp_is_enumerable(jsthis->u.jsdisp, name->str, &ret); hres = jsdisp_is_enumerable(jsthis->u.jsdisp, name, &ret);
jsstr_release(name); jsstr_release(name_str);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;