February 2013 - Wine-commits

Lucas Zawacki : Portuguese translation for release 1.5.24
by Jeremy Newman 20 Feb '13

20 Feb '13

Module: website Branch: master Commit: 75bffd54131db74adb0ee7380c6c95a6f9fea6c8 URL: http://source.winehq.org/git/website.git/?a=commit;h=75bffd54131db74adb0ee7… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Feb 19 13:50:05 2013 -0300 Portuguese translation for release 1.5.24 --- news/pt/2013021501.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/pt/2013021501.xml b/news/pt/2013021501.xml new file mode 100644 index 0000000..884e9ed --- /dev/null +++ b/news/pt/2013021501.xml @@ -0,0 +1,14 @@ +<news> +<date>15 de Fevereiro de 2013</date> +<title>Wine 1.5.24 lançado</title> +<body> + A versão de desenvolvimento 1.5.24 já está disponível agora. + <a href="{$root}/announce/1.5.24">Novidades</a> desta versão: +<ul> + <li>Suporte a teclado e rodinha do mouse no driver de Mac.</li> + <li>Suporte a expressões regulares em VB Script.</li> + <li>Diversas limpezas no código do RichEdit.</li> + <li>Várias correções de bugs</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.24.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Jacek Caban : oleaut32: Fixed copy&paste mistake in SysFreeString.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 820c7635ab853554a78d8e6e2e9d5825979422db URL: http://source.winehq.org/git/wine.git/?a=commit;h=820c7635ab853554a78d8e6e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 19 12:13:08 2013 +0100 oleaut32: Fixed copy&paste mistake in SysFreeString. Spotted by Piotr. --- dlls/oleaut32/oleaut.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index df9216b..56eea1a 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -265,7 +265,7 @@ void WINAPI SysFreeString(BSTR str) /* According to tests, freeing a string that's already in cache doesn't corrupt anything. * For that to work we need to search the cache. */ for(i=0; i < cache_entry->cnt; i++) { - if(cache_entry->buf[(cache_entry->head+cache_entry->cnt) % BUCKET_BUFFER_SIZE] == bstr) { + if(cache_entry->buf[(cache_entry->head+i) % BUCKET_BUFFER_SIZE] == bstr) { WARN_(heap)("String already is in cache!\n"); LeaveCriticalSection(&cs_bstr_cache); return;

1 0

Piotr Caban : vbscript: Added RegExp2::Test implementation.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 4b0f47534454474720dbb987dab806c3cee62d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b0f47534454474720dbb987d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 19 12:39:47 2013 +0100 vbscript: Added RegExp2::Test implementation. --- dlls/vbscript/Makefile.in | 1 + dlls/vbscript/regexp.c | 3288 +++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/regexp.h | 81 + dlls/vbscript/vbregexp.c | 55 +- dlls/vbscript/vbscript.h | 4 + dlls/vbscript/vbscript_main.c | 58 +- 6 files changed, 3480 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b0f47534454474720dbb…

1 0

Piotr Caban : vbscript: Added RegExp2 flags getters and setters implementation.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 2270f14e1b7bbdfc3d8ce1ea0b10c2603e36b283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2270f14e1b7bbdfc3d8ce1ea0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 19 12:40:12 2013 +0100 vbscript: Added RegExp2 flags getters and setters implementation. --- dlls/vbscript/regexp.c | 18 +++++++++++++ dlls/vbscript/regexp.h | 1 + dlls/vbscript/vbregexp.c | 64 +++++++++++++++++++++++++++++++++++++-------- 3 files changed, 71 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/regexp.c b/dlls/vbscript/regexp.c index 0bd59ac..c74ded5 100644 --- a/dlls/vbscript/regexp.c +++ b/dlls/vbscript/regexp.c @@ -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; +} diff --git a/dlls/vbscript/regexp.h b/dlls/vbscript/regexp.h index de86aa2..5ceb8a0 100644 --- a/dlls/vbscript/regexp.h +++ b/dlls/vbscript/regexp.h @@ -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) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 39ff59d..d1fbcab 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -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);

1 0

Piotr Caban : vbscript: Added RegExp2::Execute implementation.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: f26bdf92ccd1b1e63621bd142aa4518de8a49389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26bdf92ccd1b1e63621bd142… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 19 12:41:30 2013 +0100 vbscript: Added RegExp2::Execute implementation. --- dlls/vbscript/vbregexp.c | 718 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 715 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f26bdf92ccd1b1e63621b…

1 0

Piotr Caban : vbscript: Silence IDispatchEx queries on RegExp objects.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: e618241c2752f54cc9bf3fadacc9e55e4c7e0053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e618241c2752f54cc9bf3fada… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 19 12:41:45 2013 +0100 vbscript: Silence IDispatchEx queries on RegExp objects. --- dlls/vbscript/vbregexp.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 39c5a23..7e2a1cf 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -139,6 +139,10 @@ static HRESULT WINAPI SubMatches_QueryInterface( }else if(IsEqualGUID(riid, &IID_ISubMatches)) { TRACE("(%p)->(IID_ISubMatches %p)\n", This, ppv); *ppv = &This->ISubMatches_iface; + }else if(IsEqualGUID(riid, &IID_IDispatchEx)) { + TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + *ppv = NULL; + return E_NOINTERFACE; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -339,6 +343,10 @@ static HRESULT WINAPI Match2_QueryInterface( }else if(IsEqualGUID(riid, &IID_IMatch2)) { TRACE("(%p)->(IID_IMatch2 %p)\n", This, ppv); *ppv = &This->IMatch2_iface; + }else if(IsEqualGUID(riid, &IID_IDispatchEx)) { + TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + *ppv = NULL; + return E_NOINTERFACE; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -539,6 +547,10 @@ static HRESULT WINAPI MatchCollection2_QueryInterface( }else if(IsEqualGUID(riid, &IID_IMatchCollection2)) { TRACE("(%p)->(IID_IMatchCollection2 %p)\n", This, ppv); *ppv = &This->IMatchCollection2_iface; + }else if(IsEqualGUID(riid, &IID_IDispatchEx)) { + TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + *ppv = NULL; + return E_NOINTERFACE; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -738,6 +750,10 @@ static HRESULT WINAPI RegExp2_QueryInterface(IRegExp2 *iface, REFIID riid, void }else if(IsEqualGUID(riid, &IID_IRegExp)) { TRACE("(%p)->(IID_IRegExp %p)\n", This, ppv); *ppv = &This->IRegExp_iface; + }else if(IsEqualGUID(riid, &IID_IDispatchEx)) { + TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + *ppv = NULL; + return E_NOINTERFACE; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL;

1 0

Piotr Caban : vbscript: Added RegExp.Execute tests.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: d4ccce8ddb32955fabdf9207067741a6c4ce51ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ccce8ddb32955fabdf92070… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 19 12:42:13 2013 +0100 vbscript: Added RegExp.Execute tests. --- dlls/vbscript/tests/regexp.vbs | 171 ++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/rsrc.rc | 3 + dlls/vbscript/tests/run.c | 20 ++++- 3 files changed, 190 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4ccce8ddb32955fabdf9…

1 0

Piotr Caban : vbscript: Added IMatchCollection2::_NewEnum implementation.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 56b2a7b1bd86211d5bad9bda8c238b0b7aa133d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b2a7b1bd86211d5bad9bda8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 19 12:42:27 2013 +0100 vbscript: Added IMatchCollection2::_NewEnum implementation. --- dlls/vbscript/vbregexp.c | 162 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 160 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 7e2a1cf..0aaa140 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -98,6 +98,16 @@ typedef struct Match2 { SubMatches *sub_matches; } Match2; +typedef struct MatchCollectionEnum { + IEnumVARIANT IEnumVARIANT_iface; + + LONG ref; + + IMatchCollection2 *mc; + LONG pos; + LONG count; +} MatchCollectionEnum; + typedef struct MatchCollection2 { IMatchCollection2 IMatchCollection2_iface; @@ -528,6 +538,149 @@ static HRESULT create_match2(DWORD pos, match_state_t **result, IMatch2 **match) return hres; } +static inline MatchCollectionEnum* impl_from_IMatchCollectionEnum(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, MatchCollectionEnum, IEnumVARIANT_iface); +} + +static HRESULT WINAPI MatchCollectionEnum_QueryInterface( + IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IEnumVARIANT_iface; + }else if(IsEqualGUID(riid, &IID_IEnumVARIANT)) { + TRACE("(%p)->(IID_IEnumVARIANT %p)\n", This, ppv); + *ppv = &This->IEnumVARIANT_iface; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI MatchCollectionEnum_AddRef(IEnumVARIANT *iface) +{ + MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI MatchCollectionEnum_Release(IEnumVARIANT *iface) +{ + MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + IMatchCollection2_Release(This->mc); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI MatchCollectionEnum_Next(IEnumVARIANT *iface, + ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface); + DWORD i; + HRESULT hres = S_OK; + + TRACE("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + + if(This->pos>=This->count) { + if(pCeltFetched) + *pCeltFetched = 0; + return S_FALSE; + } + + for(i=0; i<celt && This->pos+i<This->count; i++) { + V_VT(rgVar+i) = VT_DISPATCH; + hres = IMatchCollection2_get_Item(This->mc, This->pos+i, &V_DISPATCH(rgVar+i)); + if(FAILED(hres)) + break; + } + if(FAILED(hres)) { + while(i--) + VariantClear(rgVar+i); + return hres; + } + + if(pCeltFetched) + *pCeltFetched = i; + This->pos += i; + return S_OK; +} + +static HRESULT WINAPI MatchCollectionEnum_Skip(IEnumVARIANT *iface, ULONG celt) +{ + MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface); + + TRACE("(%p)->(%u)\n", This, celt); + + if(This->pos+celt <= This->count) + This->pos += celt; + else + This->pos = This->count; + return S_OK; +} + +static HRESULT WINAPI MatchCollectionEnum_Reset(IEnumVARIANT *iface) +{ + MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface); + + TRACE("(%p)\n", This); + + This->pos = 0; + return S_OK; +} + +static HRESULT WINAPI MatchCollectionEnum_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl MatchCollectionEnum_Vtbl = { + MatchCollectionEnum_QueryInterface, + MatchCollectionEnum_AddRef, + MatchCollectionEnum_Release, + MatchCollectionEnum_Next, + MatchCollectionEnum_Skip, + MatchCollectionEnum_Reset, + MatchCollectionEnum_Clone +}; + +static HRESULT create_enum_variant_mc2(IMatchCollection2 *mc, ULONG pos, IEnumVARIANT **enum_variant) +{ + MatchCollectionEnum *ret; + + ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumVARIANT_iface.lpVtbl = &MatchCollectionEnum_Vtbl; + ret->ref = 1; + ret->pos = pos; + IMatchCollection2_get_Count(mc, &ret->count); + ret->mc = mc; + IMatchCollection2_AddRef(mc); + + *enum_variant = &ret->IEnumVARIANT_iface; + return S_OK; +} + static inline MatchCollection2* impl_from_IMatchCollection2(IMatchCollection2 *iface) { return CONTAINING_RECORD(iface, MatchCollection2, IMatchCollection2_iface); @@ -667,8 +820,13 @@ static HRESULT WINAPI MatchCollection2_get_Count(IMatchCollection2 *iface, LONG static HRESULT WINAPI MatchCollection2_get__NewEnum(IMatchCollection2 *iface, IUnknown **ppEnum) { MatchCollection2 *This = impl_from_IMatchCollection2(iface); - FIXME("(%p)->(%p)\n", This, ppEnum); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppEnum); + + if(!ppEnum) + return E_POINTER; + + return create_enum_variant_mc2(&This->IMatchCollection2_iface, 0, (IEnumVARIANT**)ppEnum); } static const IMatchCollection2Vtbl MatchCollection2Vtbl = {

1 0

Piotr Caban : vbscript: Added tests for invalid parameters in regular expression functions.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 6b8a34a396b5158a3c87c965de57dd45a9af0ebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8a34a396b5158a3c87c965d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 19 12:42:41 2013 +0100 vbscript: Added tests for invalid parameters in regular expression functions. --- dlls/vbscript/tests/vbscript.c | 75 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 40b03ae..a4b447f 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -797,8 +797,15 @@ static void test_vbscript_initializing(void) static void test_RegExp(void) { IRegExp2 *regexp; + IMatchCollection2 *mc; + IMatch2 *match; + ISubMatches *sm; IUnknown *unk; + IDispatch *disp; HRESULT hres; + BSTR bstr; + LONG count; + VARIANT v; hres = CoCreateInstance(&CLSID_VBScriptRegExp, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -824,6 +831,74 @@ static void test_RegExp(void) hres = IRegExp2_QueryInterface(regexp, &IID_IDispatchEx, (void**)&unk); ok(hres == E_NOINTERFACE, "QueryInterface(IID_IDispatchEx) returned %x\n", hres); + hres = IRegExp2_get_Pattern(regexp, &bstr); + ok(bstr == NULL, "bstr != NULL\n"); + ok(hres == S_OK, "get_Pattern returned %x, expected S_OK\n", hres); + + hres = IRegExp2_get_Pattern(regexp, NULL); + ok(hres == E_POINTER, "get_Pattern returned %x, expected E_POINTER\n", hres); + + hres = IRegExp2_get_IgnoreCase(regexp, NULL); + ok(hres == E_POINTER, "get_IgnoreCase returned %x, expected E_POINTER\n", hres); + + hres = IRegExp2_get_Global(regexp, NULL); + ok(hres == E_POINTER, "get_Global returned %x, expected E_POINTER\n", hres); + + hres = IRegExp2_Execute(regexp, NULL, &disp); + ok(hres == S_OK, "Execute returned %x, expected S_OK\n", hres); + hres = IDispatch_QueryInterface(disp, &IID_IMatchCollection2, (void**)&mc); + ok(hres == S_OK, "QueryInterface(IID_IMatchCollection2) returned %x\n", hres); + IDispatch_Release(disp); + + hres = IMatchCollection2_get_Count(mc, NULL); + ok(hres == E_POINTER, "get_Count returned %x, expected E_POINTER\n", hres); + + hres = IMatchCollection2_get_Count(mc, &count); + ok(hres == S_OK, "get_Count returned %x, expected S_OK\n", hres); + ok(count == 1, "count = %d\n", count); + + hres = IMatchCollection2_get_Item(mc, 1, &disp); + ok(hres == E_INVALIDARG, "get_Item returned %x, expected E_INVALIDARG\n", hres); + + hres = IMatchCollection2_get_Item(mc, 1, NULL); + ok(hres == E_POINTER, "get_Item returned %x, expected E_POINTER\n", hres); + + hres = IMatchCollection2_get_Item(mc, 0, &disp); + ok(hres == S_OK, "get_Item returned %x, expected S_OK\n", hres); + IMatchCollection2_Release(mc); + hres = IDispatch_QueryInterface(disp, &IID_IMatch2, (void**)&match); + ok(hres == S_OK, "QueryInterface(IID_IMatch2) returned %x\n", hres); + IDispatch_Release(disp); + + hres = IMatch2_get_Value(match, NULL); + ok(hres == E_POINTER, "get_Value returned %x, expected E_POINTER\n", hres); + + hres = IMatch2_get_FirstIndex(match, NULL); + ok(hres == E_POINTER, "get_FirstIndex returned %x, expected E_POINTER\n", hres); + + hres = IMatch2_get_Length(match, NULL); + ok(hres == E_POINTER, "get_Length returned %x, expected E_POINTER\n", hres); + + hres = IMatch2_get_SubMatches(match, NULL); + ok(hres == E_POINTER, "get_SubMatches returned %x, expected E_POINTER\n", hres); + + hres = IMatch2_get_SubMatches(match, &disp); + ok(hres == S_OK, "get_SubMatches returned %x, expected S_OK\n", hres); + IMatch2_Release(match); + hres = IDispatch_QueryInterface(disp, &IID_ISubMatches, (void**)&sm); + ok(hres == S_OK, "QueryInterface(IID_ISubMatches) returned %x\n", hres); + IDispatch_Release(disp); + + hres = ISubMatches_get_Item(sm, 0, &v); + ok(hres == E_INVALIDARG, "get_Item returned %x, expected E_INVALIDARG\n", hres); + + hres = ISubMatches_get_Item(sm, 0, NULL); + ok(hres == E_POINTER, "get_Item returned %x, expected E_POINTER\n", hres); + + hres = ISubMatches_get_Count(sm, NULL); + ok(hres == E_POINTER, "get_Count returned %x, expected E_POINTER\n", hres); + ISubMatches_Release(sm); + IRegExp2_Release(regexp); }

1 0

Piotr Caban : vbscript: Added IMatchCollection2::__NewEnum test.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: add71cb91d4e23491c4add1d257684c4c60205bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=add71cb91d4e23491c4add1d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 19 12:42:56 2013 +0100 vbscript: Added IMatchCollection2::__NewEnum test. --- dlls/vbscript/tests/vbscript.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index a4b447f..6b25ddd 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -800,12 +800,14 @@ static void test_RegExp(void) IMatchCollection2 *mc; IMatch2 *match; ISubMatches *sm; + IEnumVARIANT *ev; IUnknown *unk; IDispatch *disp; HRESULT hres; BSTR bstr; LONG count; VARIANT v; + ULONG fetched; hres = CoCreateInstance(&CLSID_VBScriptRegExp, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -865,7 +867,6 @@ static void test_RegExp(void) hres = IMatchCollection2_get_Item(mc, 0, &disp); ok(hres == S_OK, "get_Item returned %x, expected S_OK\n", hres); - IMatchCollection2_Release(mc); hres = IDispatch_QueryInterface(disp, &IID_IMatch2, (void**)&match); ok(hres == S_OK, "QueryInterface(IID_IMatch2) returned %x\n", hres); IDispatch_Release(disp); @@ -899,6 +900,29 @@ static void test_RegExp(void) ok(hres == E_POINTER, "get_Count returned %x, expected E_POINTER\n", hres); ISubMatches_Release(sm); + hres = IMatchCollection2_get__NewEnum(mc, &unk); + ok(hres == S_OK, "get__NewEnum returned %x, expected S_OK\n", hres); + hres = IUnknown_QueryInterface(unk, &IID_IEnumVARIANT, (void**)&ev); + ok(hres == S_OK, "QueryInterface(IID_IEnumVARIANT) returned %x\n", hres); + IUnknown_Release(unk); + IMatchCollection2_Release(mc); + + hres = IEnumVARIANT_Skip(ev, 2); + ok(hres == S_OK, "Skip returned %x\n", hres); + + hres = IEnumVARIANT_Next(ev, 1, &v, &fetched); + ok(hres == S_FALSE, "Next returned %x, expected S_FALSE\n", hres); + ok(fetched == 0, "fetched = %d\n", fetched); + + hres = IEnumVARIANT_Skip(ev, -1); + ok(hres == S_OK, "Skip returned %x\n", hres); + + hres = IEnumVARIANT_Next(ev, 1, &v, &fetched); + ok(hres == S_OK, "Next returned %x\n", hres); + ok(fetched == 1, "fetched = %d\n", fetched); + VariantClear(&v); + IEnumVARIANT_Release(ev); + IRegExp2_Release(regexp); }

1 0