Jacek Caban : jscript: Use to_flat_string to access string buffer in array. c.
Alexandre Julliard
julliard at winehq.org
Wed Mar 27 15:40:05 CDT 2013
Module: wine
Branch: master
Commit: ecdf62d3244baf464765ded17565d3ec6409e842
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecdf62d3244baf464765ded17565d3ec6409e842
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Mar 27 11:01:59 2013 +0100
jscript: Use to_flat_string to access string buffer in array.c.
---
dlls/jscript/array.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c
index 49a39dd..c98f4fe 100644
--- a/dlls/jscript/array.c
+++ b/dlls/jscript/array.c
@@ -337,15 +337,16 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne
return hres;
if(argc) {
- jsstr_t *sep;
+ const WCHAR *sep;
+ jsstr_t *sep_str;
- hres = to_string(ctx, argv[0], &sep);
+ hres = to_flat_string(ctx, argv[0], &sep_str, &sep);
if(FAILED(hres))
return hres;
- hres = array_join(ctx, jsthis, length, sep->str, r);
+ hres = array_join(ctx, jsthis, length, sep, r);
- jsstr_release(sep);
+ jsstr_release(sep_str);
}else {
hres = array_join(ctx, jsthis, length, default_separatorW, r);
}
More information about the wine-cvs
mailing list