marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vbscript: Added RegExp2 flags getters and setters implementation.

oldstable
Piotr Caban 2013-02-19 12:40:12 +01:00 committed by Alexandre Julliard
parent 4b0f475344
commit 2270f14e1b
3 changed files with 71 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/vbscript/regexp.c
View File

@ -3286,3 +3286,21 @@ out:
heap_pool_clear(mark);
return re;
}
HRESULT regexp_set_flags(regexp_t **regexp, void *cx, heap_pool_t *pool, WORD flags)
{
if(((*regexp)->flags & REG_FOLD) != (flags & REG_FOLD)) {
regexp_t *new_regexp = regexp_new(cx, pool, (*regexp)->source,
(*regexp)->source_len, flags, FALSE);
if(!new_regexp)
return E_FAIL;
regexp_destroy(*regexp);
*regexp = new_regexp;
}else {
(*regexp)->flags = flags;
}
return S_OK;
}

1
dlls/vbscript/regexp.h
View File

@ -65,6 +65,7 @@ regexp_t* regexp_new(void*, heap_pool_t*, const WCHAR*, DWORD, WORD, BOOL) DECLS
void regexp_destroy(regexp_t*) DECLSPEC_HIDDEN;
HRESULT regexp_execute(regexp_t*, void*, heap_pool_t*, const WCHAR*,
DWORD, match_state_t*) DECLSPEC_HIDDEN;
HRESULT regexp_set_flags(regexp_t**, void*, heap_pool_t*, WORD) DECLSPEC_HIDDEN;
static inline match_state_t* alloc_match_state(regexp_t *regexp,
heap_pool_t *pool, const WCHAR *pos)

64
dlls/vbscript/vbregexp.c
View File

@ -247,43 +247,79 @@ static HRESULT WINAPI RegExp2_put_Pattern(IRegExp2 *iface, BSTR pattern)
static HRESULT WINAPI RegExp2_get_IgnoreCase(IRegExp2 *iface, VARIANT_BOOL *pIgnoreCase)
{
RegExp2 *This = impl_from_IRegExp2(iface);
FIXME("(%p)->(%p)\n", This, pIgnoreCase);
return E_NOTIMPL;
TRACE("(%p)->(%p)\n", This, pIgnoreCase);
if(!pIgnoreCase)
return E_POINTER;
*pIgnoreCase = This->flags & REG_FOLD ? VARIANT_TRUE : VARIANT_FALSE;
return S_OK;
}
static HRESULT WINAPI RegExp2_put_IgnoreCase(IRegExp2 *iface, VARIANT_BOOL ignoreCase)
{
RegExp2 *This = impl_from_IRegExp2(iface);
FIXME("(%p)->(%s)\n", This, ignoreCase ? "true" : "false");
return E_NOTIMPL;
TRACE("(%p)->(%s)\n", This, ignoreCase ? "true" : "false");
if(ignoreCase)
This->flags |= REG_FOLD;
else
This->flags &= ~REG_FOLD;
return S_OK;
}
static HRESULT WINAPI RegExp2_get_Global(IRegExp2 *iface, VARIANT_BOOL *pGlobal)
{
RegExp2 *This = impl_from_IRegExp2(iface);
FIXME("(%p)->(%p)\n", This, pGlobal);
return E_NOTIMPL;
TRACE("(%p)->(%p)\n", This, pGlobal);
if(!pGlobal)
return E_POINTER;
*pGlobal = This->flags & REG_GLOB ? VARIANT_TRUE : VARIANT_FALSE;
return S_OK;
}
static HRESULT WINAPI RegExp2_put_Global(IRegExp2 *iface, VARIANT_BOOL global)
{
RegExp2 *This = impl_from_IRegExp2(iface);
FIXME("(%p)->(%s)\n", This, global ? "true" : "false");
return E_NOTIMPL;
TRACE("(%p)->(%s)\n", This, global ? "true" : "false");
if(global)
This->flags |= REG_GLOB;
else
This->flags &= ~REG_GLOB;
return S_OK;
}
static HRESULT WINAPI RegExp2_get_Multiline(IRegExp2 *iface, VARIANT_BOOL *pMultiline)
{
RegExp2 *This = impl_from_IRegExp2(iface);
FIXME("(%p)->(%p)\n", This, pMultiline);
return E_NOTIMPL;
TRACE("(%p)->(%p)\n", This, pMultiline);
if(!pMultiline)
return E_POINTER;
*pMultiline = This->flags & REG_MULTILINE ? VARIANT_TRUE : VARIANT_FALSE;
return S_OK;
}
static HRESULT WINAPI RegExp2_put_Multiline(IRegExp2 *iface, VARIANT_BOOL multiline)
{
RegExp2 *This = impl_from_IRegExp2(iface);
FIXME("(%p)->(%s)\n", This, multiline ? "true" : "false");
return E_NOTIMPL;
TRACE("(%p)->(%s)\n", This, multiline ? "true" : "false");
if(multiline)
This->flags |= REG_MULTILINE;
else
This->flags &= ~REG_MULTILINE;
return S_OK;
}
static HRESULT WINAPI RegExp2_Execute(IRegExp2 *iface,
@ -313,6 +349,10 @@ static HRESULT WINAPI RegExp2_Test(IRegExp2 *iface, BSTR sourceString, VARIANT_B
strlenW(This->pattern), This->flags, FALSE);
if(!This->regexp)
return E_FAIL;
}else {
hres = regexp_set_flags(&This->regexp, NULL, &This->pool, This->flags);
if(FAILED(hres))
return hres;
}
mark = heap_pool_mark(&This->pool);