July 2009 - Wine-commits - list.winehq.org

Andrew Nguyen : server: Remap the EROFS errno value to STATUS_ACCESS_DENIED .
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 270179a78f214f30a0800add40fa1cb86d11924d URL: http://source.winehq.org/git/wine.git/?a=commit;h=270179a78f214f30a0800add4… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Jul 12 23:55:43 2009 -0500 server: Remap the EROFS errno value to STATUS_ACCESS_DENIED. --- server/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/file.c b/server/file.c index dc93b4b..98017b9 100644 --- a/server/file.c +++ b/server/file.c @@ -602,8 +602,8 @@ void file_set_error(void) case ENOSPC: set_error( STATUS_DISK_FULL ); break; case EACCES: case ESRCH: + case EROFS: case EPERM: set_error( STATUS_ACCESS_DENIED ); break; - case EROFS: set_error( STATUS_MEDIA_WRITE_PROTECTED ); break; case EBUSY: set_error( STATUS_FILE_LOCK_CONFLICT ); break; case ENOENT: set_error( STATUS_NO_SUCH_FILE ); break; case EISDIR: set_error( STATUS_FILE_IS_A_DIRECTORY ); break;

1 0

Piotr Caban : jscript: Inherit Function_valueOf from Object.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 42f9608269390c4e49c045f9ae12afe74b80dd21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f9608269390c4e49c045f9a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:52:31 2009 +0200 jscript: Inherit Function_valueOf from Object. --- dlls/jscript/function.c | 72 ++++++++++++++++++++----------------------- dlls/jscript/global.c | 15 ++++++--- dlls/jscript/jscript.h | 5 ++- dlls/jscript/object.c | 18 ++++------- dlls/jscript/tests/api.js | 6 ++- dlls/jscript/tests/lang.js | 2 +- 6 files changed, 59 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42f9608269390c4e49c04…

1 0

Piotr Caban : jscript: Fix String_match implementation.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 91ce0dd6a33edf148bb01675873158df1577caa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ce0dd6a33edf148bb016758… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:52:21 2009 +0200 jscript: Fix String_match implementation. --- dlls/jscript/string.c | 9 ++++++--- dlls/jscript/tests/regexp.js | 18 +++++++++++++----- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 0385a22..6aa6302 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -596,9 +596,12 @@ static HRESULT String_match(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM TRACE("\n"); - if(arg_cnt(dp) != 1) { - FIXME("unsupported args\n"); - return E_NOTIMPL; + if(!arg_cnt(dp)) { + if(retv) { + V_VT(retv) = VT_NULL; + } + + return S_OK; } arg_var = get_arg(dp, 0); diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 6809101..3e4db68 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -31,7 +31,7 @@ ok(m["0"] === "ab", "m[0] is not \"ab\""); m = "abcabc".match(/ab/g); ok(typeof(m) === "object", "typeof m is not object"); -ok(m.length === 2, "m.length is not 1"); +ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "ab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); @@ -41,7 +41,7 @@ ok(m === null, "m is not null"); m = "abcabc".match(/Ab/gi); ok(typeof(m) === "object", "typeof m is not object"); -ok(m.length === 2, "m.length is not 1"); +ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "ab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); @@ -64,22 +64,30 @@ ok(m["0"] === "ab", "m[0] is not \"ab\""); m = "abcabc".match(new RegExp("ab","g")); ok(typeof(m) === "object", "typeof m is not object"); -ok(m.length === 2, "m.length is not 1"); +ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "ab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); m = "abcabc".match(new RegExp(/ab/g)); ok(typeof(m) === "object", "typeof m is not object"); -ok(m.length === 2, "m.length is not 1"); +ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "ab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); m = "abcabc".match(new RegExp("ab","g", "test")); ok(typeof(m) === "object", "typeof m is not object"); -ok(m.length === 2, "m.length is not 1"); +ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "ab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); +m = "abcabcg".match("ab", "g"); +ok(typeof(m) === "object", "typeof m is not object"); +ok(m.length === 1, "m.length is not 1"); +ok(m["0"] === "ab", "m[0] is not \"ab\""); + +m = "abcabc".match(); +ok(m === null, "m is not null"); + r = "- [test] -".replace(/\[([^\[]+)\]/g, "success"); ok(r === "- success -", "r = " + r + " expected '- success -'");

1 0

Piotr Caban : jscript: Make String_toUpperCase generic.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: df8195668d7f7366b8ef8a3d97b2ef9ec3fbdfbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=df8195668d7f7366b8ef8a3d9… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:52:10 2009 +0200 jscript: Make String_toUpperCase generic. --- dlls/jscript/string.c | 41 +++++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index b33eb4f..0385a22 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1388,33 +1388,46 @@ static HRESULT String_toLowerCase(DispatchEx *dispex, LCID lcid, WORD flags, DIS static HRESULT String_toUpperCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - StringInstance *string; const WCHAR* str; DWORD length; - BSTR bstr; + BSTR val_str = NULL; + HRESULT hres; TRACE("\n"); - if(is_class(dispex, JSCLASS_STRING)) { - string = (StringInstance*)dispex; + if(!is_class(dispex, JSCLASS_STRING)) { + VARIANT this; - length = string->length; - str = string->str; - }else { - FIXME("not string this not supported\n"); - return E_NOTIMPL; + V_VT(&this) = VT_DISPATCH; + V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex); + + hres = to_string(dispex->ctx, &this, ei, &val_str); + if(FAILED(hres)) + return hres; + + str = val_str; + length = SysStringLen(val_str); + } + else { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; } if(retv) { - bstr = SysAllocStringLen(str, length); - if (!bstr) - return E_OUTOFMEMORY; + if(!val_str) { + val_str = SysAllocStringLen(str, length); + if(!val_str) + return E_OUTOFMEMORY; + } - struprW(bstr); + struprW(val_str); V_VT(retv) = VT_BSTR; - V_BSTR(retv) = bstr; + V_BSTR(retv) = val_str; } + else SysFreeString(val_str); return S_OK; }

1 0

Piotr Caban : jscript: Make String_toLowerCase generic.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: ab8168141be96ba168a347e1244460691ec637bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8168141be96ba168a347e12… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:52:02 2009 +0200 jscript: Make String_toLowerCase generic. --- dlls/jscript/string.c | 41 +++++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index dcb0266..b33eb4f 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1342,33 +1342,46 @@ static HRESULT String_sup(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS static HRESULT String_toLowerCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - StringInstance *string; const WCHAR* str; DWORD length; - BSTR bstr; + BSTR val_str = NULL; + HRESULT hres; TRACE("\n"); - if(is_class(dispex, JSCLASS_STRING)) { - string = (StringInstance*)dispex; + if(!is_class(dispex, JSCLASS_STRING)) { + VARIANT this; - length = string->length; - str = string->str; - }else { - FIXME("not string this not supported\n"); - return E_NOTIMPL; + V_VT(&this) = VT_DISPATCH; + V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex); + + hres = to_string(dispex->ctx, &this, ei, &val_str); + if(FAILED(hres)) + return hres; + + str = val_str; + length = SysStringLen(val_str); + } + else { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; } if(retv) { - bstr = SysAllocStringLen(str, length); - if (!bstr) - return E_OUTOFMEMORY; + if(!val_str) { + val_str = SysAllocStringLen(str, length); + if(!val_str) + return E_OUTOFMEMORY; + } - strlwrW(bstr); + strlwrW(val_str); V_VT(retv) = VT_BSTR; - V_BSTR(retv) = bstr; + V_BSTR(retv) = val_str; } + else SysFreeString(val_str); return S_OK; }

1 0

Piotr Caban : jscript: Make String_substring generic.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 973f3be02c867b12e73204680581b6dccf10472e URL: http://source.winehq.org/git/wine.git/?a=commit;h=973f3be02c867b12e73204680… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:51:54 2009 +0200 jscript: Make String_substring generic. --- dlls/jscript/string.c | 38 ++++++++++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 19f3792..dcb0266 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1241,6 +1241,7 @@ static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPP VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { const WCHAR *str; + BSTR val_str = NULL; INT start=0, end; DWORD length; VARIANT v; @@ -1248,20 +1249,32 @@ static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPP TRACE("\n"); - if(is_class(dispex, JSCLASS_STRING)) { - StringInstance *string = (StringInstance*)dispex; + if(!is_class(dispex, JSCLASS_STRING)) { + VARIANT this; - length = string->length; - str = string->str; - }else { - FIXME("not string this not supported\n"); - return E_NOTIMPL; + V_VT(&this) = VT_DISPATCH; + V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex); + + hres = to_string(dispex->ctx, &this, ei, &val_str); + if(FAILED(hres)) + return hres; + + str = val_str; + length = SysStringLen(val_str); + } + else { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; } if(arg_cnt(dp) >= 1) { hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-1, ei, &v); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } if(V_VT(&v) == VT_I4) { start = V_I4(&v); @@ -1276,8 +1289,10 @@ static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPP if(arg_cnt(dp) >= 2) { hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-2, ei, &v); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } if(V_VT(&v) == VT_I4) { end = V_I4(&v); @@ -1301,9 +1316,12 @@ static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPP if(retv) { V_VT(retv) = VT_BSTR; V_BSTR(retv) = SysAllocStringLen(str+start, end-start); - if(!V_BSTR(retv)) + if(!V_BSTR(retv)) { + SysFreeString(val_str); return E_OUTOFMEMORY; + } } + SysFreeString(val_str); return S_OK; }

1 0

Piotr Caban : jscript: Make String_split generic.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 09e1b37fea847fc3dcad464b5c0da173d0688bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09e1b37fea847fc3dcad464b5… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:51:47 2009 +0200 jscript: Make String_split generic. --- dlls/jscript/string.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index d0345aa..19f3792 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1085,26 +1085,38 @@ static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { match_result_t *match_result = NULL; - DWORD match_cnt, i, match_len = 0; - StringInstance *string; - const WCHAR *ptr, *ptr2; + DWORD length, match_cnt, i, match_len = 0; + const WCHAR *str, *ptr, *ptr2; VARIANT *arg, var; DispatchEx *array; - BSTR match_str = NULL; + BSTR val_str = NULL, match_str = NULL; HRESULT hres; TRACE("\n"); - if(!is_class(dispex, JSCLASS_STRING)) { - FIXME("not String this\n"); + if(arg_cnt(dp) != 1) { + FIXME("unsupported args\n"); return E_NOTIMPL; } - string = (StringInstance*)dispex; + if(!is_class(dispex, JSCLASS_STRING)) { + VARIANT this; - if(arg_cnt(dp) != 1) { - FIXME("unsupported args\n"); - return E_NOTIMPL; + V_VT(&this) = VT_DISPATCH; + V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex); + + hres = to_string(dispex->ctx, &this, ei, &val_str); + if(FAILED(hres)) + return hres; + + str = val_str; + length = SysStringLen(val_str); + } + else { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; } arg = get_arg(dp, 0); @@ -1115,10 +1127,12 @@ static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM regexp = iface_to_jsdisp((IUnknown*)V_DISPATCH(arg)); if(regexp) { if(is_class(regexp, JSCLASS_REGEXP)) { - hres = regexp_match(regexp, string->str, string->length, TRUE, &match_result, &match_cnt); + hres = regexp_match(regexp, str, length, TRUE, &match_result, &match_cnt); jsdisp_release(regexp); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } break; } jsdisp_release(regexp); @@ -1126,8 +1140,10 @@ static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } default: hres = to_string(dispex->ctx, arg, ei, &match_str); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } match_len = SysStringLen(match_str); if(!match_len) { @@ -1139,7 +1155,7 @@ static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM hres = create_array(dispex->ctx, 0, &array); if(SUCCEEDED(hres)) { - ptr = string->str; + ptr = str; for(i=0;; i++) { if(match_result) { if(i == match_cnt) @@ -1177,7 +1193,7 @@ static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } if(SUCCEEDED(hres) && (match_str || match_result)) { - DWORD len = (string->str+string->length) - ptr; + DWORD len = (str+length) - ptr; if(len || match_str) { V_VT(&var) = VT_BSTR; @@ -1193,6 +1209,7 @@ static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } SysFreeString(match_str); + SysFreeString(val_str); heap_free(match_result); if(SUCCEEDED(hres) && retv) {

1 0

Piotr Caban : jscript: Make String_slice generic.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 2f28956f065b7df1f3fbb4ea737f30f220b98d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f28956f065b7df1f3fbb4ea7… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:51:36 2009 +0200 jscript: Make String_slice generic. --- dlls/jscript/string.c | 39 +++++++++++++++++++++++++++++---------- 1 files changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 5644559..d0345aa 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -982,6 +982,7 @@ static HRESULT String_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { const WCHAR *str; + BSTR val_str = NULL; DWORD length; INT start=0, end; VARIANT v; @@ -989,20 +990,32 @@ static HRESULT String_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM TRACE("\n"); - if(is_class(dispex, JSCLASS_STRING)) { - StringInstance *string = (StringInstance*)dispex; + if(!is_class(dispex, JSCLASS_STRING)) { + VARIANT this; - str = string->str; - length = string->length; - }else { - FIXME("this is not a string class\n"); - return E_NOTIMPL; + V_VT(&this) = VT_DISPATCH; + V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex); + + hres = to_string(dispex->ctx, &this, ei, &val_str); + if(FAILED(hres)) + return hres; + + str = val_str; + length = SysStringLen(val_str); + } + else { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; } if(arg_cnt(dp)) { hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-1, ei, &v); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } if(V_VT(&v) == VT_I4) { start = V_I4(&v); @@ -1022,8 +1035,10 @@ static HRESULT String_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM if(arg_cnt(dp) >= 2) { hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-2, ei, &v); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } if(V_VT(&v) == VT_I4) { end = V_I4(&v); @@ -1046,12 +1061,16 @@ static HRESULT String_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM if(retv) { BSTR retstr = SysAllocStringLen(str+start, end-start); - if(!str) + if(!retstr) { + SysFreeString(val_str); return E_OUTOFMEMORY; + } V_VT(retv) = VT_BSTR; V_BSTR(retv) = retstr; } + + SysFreeString(val_str); return S_OK; }

1 0

Piotr Caban : jscript: Make String_replace generic.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 54a3fa842b80704e42e2731aaacc39384317d6bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a3fa842b80704e42e2731aa… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:51:28 2009 +0200 jscript: Make String_replace generic. --- dlls/jscript/string.c | 44 ++++++++++++++++++++++++++++++-------------- 1 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index a291ea1..5644559 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -794,11 +794,11 @@ static HRESULT rep_call(DispatchEx *func, const WCHAR *str, match_result_t *matc static HRESULT String_replace(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { + const WCHAR *str; DWORD parens_cnt = 0, parens_size=0, rep_len=0, length; - BSTR rep_str = NULL, match_str = NULL, ret_str; + BSTR rep_str = NULL, match_str = NULL, ret_str, val_str = NULL; DispatchEx *rep_func = NULL, *regexp = NULL; match_result_t *parens = NULL, match; - const WCHAR *str; strbuf_t ret = {NULL,0,0}; BOOL gcheck = FALSE; VARIANT *arg_var; @@ -806,23 +806,36 @@ static HRESULT String_replace(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR TRACE("\n"); - if(is_class(dispex, JSCLASS_STRING)) { - StringInstance *string = (StringInstance*)dispex; - str = string->str; - length = string->length; - }else { - FIXME("not String this\n"); - return E_NOTIMPL; + if(!is_class(dispex, JSCLASS_STRING)) { + VARIANT this; + + V_VT(&this) = VT_DISPATCH; + V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex); + + hres = to_string(dispex->ctx, &this, ei, &val_str); + if(FAILED(hres)) + return hres; + + str = val_str; + length = SysStringLen(val_str); + } + else { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; } if(!arg_cnt(dp)) { if(retv) { - ret_str = SysAllocString(str); - if(!ret_str) - return E_OUTOFMEMORY; + if(!val_str) { + val_str = SysAllocStringLen(str, length); + if(!val_str) + return E_OUTOFMEMORY; + } V_VT(retv) = VT_BSTR; - V_BSTR(retv) = ret_str; + V_BSTR(retv) = val_str; } return S_OK; } @@ -842,8 +855,10 @@ static HRESULT String_replace(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR default: hres = to_string(dispex->ctx, arg_var, ei, &match_str); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } } if(arg_cnt(dp) >= 2) { @@ -936,6 +951,7 @@ static HRESULT String_replace(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR jsdisp_release(rep_func); if(regexp) jsdisp_release(regexp); + SysFreeString(val_str); SysFreeString(rep_str); SysFreeString(match_str); heap_free(parens);

1 0

Piotr Caban : jscript: Make String_match generic.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 0cb6bf5b28486dea0b04a809988405d39e136052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb6bf5b28486dea0b04a8099… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:51:15 2009 +0200 jscript: Make String_match generic. --- dlls/jscript/string.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 0c9e3d6..a291ea1 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -585,12 +585,13 @@ static HRESULT String_link(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS static HRESULT String_match(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - StringInstance *This = (StringInstance*)dispex; + const WCHAR *str; match_result_t *match_result; DispatchEx *regexp; DispatchEx *array; VARIANT var, *arg_var; - DWORD match_cnt, i; + DWORD length, match_cnt, i; + BSTR val_str; HRESULT hres = S_OK; TRACE("\n"); @@ -623,22 +624,50 @@ static HRESULT String_match(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } } - hres = regexp_match(regexp, This->str, This->length, FALSE, &match_result, &match_cnt); + if(!is_class(dispex, JSCLASS_STRING)) { + VARIANT this; + + V_VT(&this) = VT_DISPATCH; + V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex); + + hres = to_string(dispex->ctx, &this, ei, &val_str); + if(FAILED(hres)) { + jsdisp_release(regexp); + return hres; + } + + str = val_str; + length = SysStringLen(val_str); + } + else { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; + } + + hres = regexp_match(regexp, str, length, FALSE, &match_result, &match_cnt); jsdisp_release(regexp); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } if(!match_cnt) { TRACE("no match\n"); if(retv) V_VT(retv) = VT_NULL; + + SysFreeString(val_str); return S_OK; } hres = create_array(dispex->ctx, match_cnt, &array); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } V_VT(&var) = VT_BSTR; @@ -655,6 +684,8 @@ static HRESULT String_match(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM break; } + SysFreeString(val_str); + if(SUCCEEDED(hres) && retv) { V_VT(retv) = VT_DISPATCH; V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(array);

1 0