ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Make RegExp contructor implementation more generic.

This commit is contained in:
Jacek Caban 2010-01-23 23:56:48 +01:00 committed by Alexandre Julliard
parent 520fcae5d2
commit 7749951d35
2 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/jscript/jscript.h
View File

@ -226,6 +226,7 @@ HRESULT create_object(script_ctx_t*,DispatchEx*,DispatchEx**);
HRESULT create_math(script_ctx_t*,DispatchEx**); HRESULT create_math(script_ctx_t*,DispatchEx**);
HRESULT create_array(script_ctx_t*,DWORD,DispatchEx**); HRESULT create_array(script_ctx_t*,DWORD,DispatchEx**);
HRESULT create_regexp(script_ctx_t*,const WCHAR *,int,DWORD,DispatchEx**); HRESULT create_regexp(script_ctx_t*,const WCHAR *,int,DWORD,DispatchEx**);
HRESULT create_regexp_var(script_ctx_t*,VARIANT*,VARIANT*,DispatchEx**);
HRESULT create_string(script_ctx_t*,const WCHAR*,DWORD,DispatchEx**); HRESULT create_string(script_ctx_t*,const WCHAR*,DWORD,DispatchEx**);
HRESULT create_bool(script_ctx_t*,VARIANT_BOOL,DispatchEx**); HRESULT create_bool(script_ctx_t*,VARIANT_BOOL,DispatchEx**);
HRESULT create_number(script_ctx_t*,VARIANT*,DispatchEx**); HRESULT create_number(script_ctx_t*,VARIANT*,DispatchEx**);

73
dlls/jscript/regexp.c
View File

@ -3833,74 +3833,50 @@ HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD flags,
return S_OK; return S_OK;
} }
static HRESULT regexp_constructor(script_ctx_t *ctx, DISPPARAMS *dp, VARIANT *retv) HRESULT create_regexp_var(script_ctx_t *ctx, VARIANT *src_arg, VARIANT *flags_arg, DispatchEx **ret)
{ {
const WCHAR *opt = emptyW, *src; const WCHAR *opt = emptyW, *src;
DispatchEx *ret;
VARIANT *arg;
DWORD flags; DWORD flags;
HRESULT hres; HRESULT hres;
if(!arg_cnt(dp)) { if(V_VT(src_arg) == VT_DISPATCH) {
FIXME("no args\n");
return E_NOTIMPL;
}
arg = get_arg(dp,0);
if(V_VT(arg) == VT_DISPATCH) {
DispatchEx *obj; DispatchEx *obj;
obj = iface_to_jsdisp((IUnknown*)V_DISPATCH(arg)); obj = iface_to_jsdisp((IUnknown*)V_DISPATCH(src_arg));
if(obj) { if(obj) {
if(is_class(obj, JSCLASS_REGEXP)) { if(is_class(obj, JSCLASS_REGEXP)) {
RegExpInstance *regexp = (RegExpInstance*)obj; RegExpInstance *regexp = (RegExpInstance*)obj;
hres = create_regexp(ctx, regexp->str, -1, regexp->jsregexp->flags, &ret); hres = create_regexp(ctx, regexp->str, -1, regexp->jsregexp->flags, ret);
jsdisp_release(obj); jsdisp_release(obj);
if(FAILED(hres)) return hres;
return hres;
V_VT(retv) = VT_DISPATCH;
V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(ret);
return S_OK;
} }
jsdisp_release(obj); jsdisp_release(obj);
} }
} }
if(V_VT(arg) != VT_BSTR) { if(V_VT(src_arg) != VT_BSTR) {
FIXME("vt arg0 = %d\n", V_VT(arg)); FIXME("flags_arg = %s\n", debugstr_variant(flags_arg));
return E_NOTIMPL; return E_NOTIMPL;
} }
src = V_BSTR(arg); src = V_BSTR(src_arg);
if(arg_cnt(dp) >= 2) { if(flags_arg) {
arg = get_arg(dp,1); if(V_VT(flags_arg) != VT_BSTR) {
if(V_VT(arg) != VT_BSTR) { FIXME("unimplemented for vt %d\n", V_VT(flags_arg));
FIXME("unimplemented for vt %d\n", V_VT(arg));
return E_NOTIMPL; return E_NOTIMPL;
} }
opt = V_BSTR(arg); opt = V_BSTR(flags_arg);
} }
hres = parse_regexp_flags(opt, strlenW(opt), &flags); hres = parse_regexp_flags(opt, strlenW(opt), &flags);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
hres = create_regexp(ctx, src, -1, flags, &ret); return create_regexp(ctx, src, -1, flags, ret);
if(FAILED(hres))
return hres;
if(retv) {
V_VT(retv) = VT_DISPATCH;
V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(ret);
}else {
jsdisp_release(ret);
}
return S_OK;
} }
static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp,
@ -3934,8 +3910,27 @@ static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
} }
} }
/* fall through */ /* fall through */
case DISPATCH_CONSTRUCT: case DISPATCH_CONSTRUCT: {
return regexp_constructor(ctx, dp, retv); DispatchEx *ret;
HRESULT hres;
if(!arg_cnt(dp)) {
FIXME("no args\n");
return E_NOTIMPL;
}
hres = create_regexp_var(ctx, get_arg(dp,0), arg_cnt(dp) > 1 ? get_arg(dp,1) : NULL, &ret);
if(FAILED(hres))
return hres;
if(retv) {
V_VT(retv) = VT_DISPATCH;
V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(ret);
}else {
jsdisp_release(ret);
}
return S_OK;
}
default: default:
FIXME("unimplemented flags: %x\n", flags); FIXME("unimplemented flags: %x\n", flags);
return E_NOTIMPL; return E_NOTIMPL;