February 2013 - Wine-Commits

Lucas Zawacki : Portuguese translation for release 1.5.23
by Jeremy Newman Feb. 20, 2013

Feb. 20, 2013

Module: website Branch: master Commit: 3e7366ced286b7c72bfe9d3b9f23a3f8951e4baf URL: http://source.winehq.org/git/website.git/?a=commit;h=3e7366ced286b7c72bfe9d… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Feb 19 13:50:04 2013 -0300 Portuguese translation for release 1.5.23 --- news/pt/2013020101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pt/2013020101.xml b/news/pt/2013020101.xml new file mode 100644 index 0000000..f35e476 --- /dev/null +++ b/news/pt/2013020101.xml @@ -0,0 +1,15 @@ +<news> +<date>1 de Fevereiro de 2013</date> +<title>Wine 1.5.23 lançado</title> +<body> + A versão de desenvolvimento 1.5.23 já está disponível agora. + <a href="{$root}/announce/1.5.23">Novidades</a> desta versão: +<ul> + <li>Suporte a HTTPS independentemente do OpenSSL.</li> + <li>Suporte a manipulação de eventos no driver de Mac.</li> + <li>Uma aplicação Netstat funcional embutida.</li> + <li>Várias funções matemáticas do runtime C++.</li> + <li>Várias correções de bugs</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.23.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 : mshtml: Don' t crash if fire_event_obj is called on detached document.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 5069ad71b4ce3a0bf8b084842672573837e1a88a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5069ad71b4ce3a0bf8b084842… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 19 17:05:11 2013 +0100 mshtml: Don't crash if fire_event_obj is called on detached document. --- dlls/mshtml/htmlevent.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ea0201f..97f9ea9 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1057,9 +1057,14 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e TRACE("(%p) %s\n", doc, debugstr_w(event_info[eid].name)); + window = doc->window; + if(!window) { + WARN("NULL window\n"); + return; + } + htmldoc_addref(&doc->basedoc); - window = doc->window; prev_event = window->event; window->event = event_obj ? &event_obj->IHTMLEventObj_iface : NULL;

1 0

Michael Stefaniuc : mshtml: Fix copy and paste error.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 52bdc93e723847240f8a46d0eaff191ac77be903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52bdc93e723847240f8a46d0e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 19 15:17:08 2013 +0100 mshtml: Fix copy and paste error. --- dlls/mshtml/npplugin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index aa74961..e681568 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -470,7 +470,7 @@ static ULONG WINAPI WindowForBindingUI_AddRef(IWindowForBindingUI *iface) static ULONG WINAPI WindowForBindingUI_Release(IWindowForBindingUI *iface) { InstallCallback *This = impl_from_IWindowForBindingUI(iface); - return IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); + return IBindStatusCallback_Release(&This->IBindStatusCallback_iface); } static HRESULT WINAPI WindowForBindingUI_GetWindow(IWindowForBindingUI *iface, REFGUID rguidReason, HWND *phwnd)

1 0

Jörg Höhle : ntdll: Stabilize CreateTimerQueueTimer callbacks over time.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 2f0b93ca134ca68857bef36a3f2a5cf8f620740a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0b93ca134ca68857bef36a3… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Mar 4 07:30:18 2012 +0100 ntdll: Stabilize CreateTimerQueueTimer callbacks over time. --- dlls/ntdll/threadpool.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index f246cfb..e33a025 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -651,13 +651,21 @@ static void queue_timer_expire(struct timer_queue *q) RtlEnterCriticalSection(&q->cs); if (list_head(&q->timers)) { + ULONGLONG now, next; t = LIST_ENTRY(list_head(&q->timers), struct queue_timer, entry); - if (!t->destroy && t->expire <= queue_current_time()) + if (!t->destroy && t->expire <= ((now = queue_current_time()))) { ++t->runcount; - queue_move_timer( - t, t->period ? queue_current_time() + t->period : EXPIRE_NEVER, - FALSE); + if (t->period) + { + next = t->expire + t->period; + /* avoid trigger cascade if overloaded / hibernated */ + if (next < now) + next = now + t->period; + } + else + next = EXPIRE_NEVER; + queue_move_timer(t, next, FALSE); } else t = NULL;

1 0

Piotr Caban : vbscript: Added IMatchCollection2::__NewEnum test.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

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

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

Feb. 19, 2013

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: Silence IDispatchEx queries on RegExp objects.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

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 RegExp2::Test implementation.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

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

Jacek Caban : jscript: Use to_int32 in to_uint32 implementation.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 1926b5617d93adf1a779e640553b8635297caa7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1926b5617d93adf1a779e6405… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 19 12:45:42 2013 +0100 jscript: Use to_int32 in to_uint32 implementation. --- dlls/jscript/jscript.h | 2 +- dlls/jscript/jsutils.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index b060378..35e2c3f 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -320,7 +320,7 @@ HRESULT to_boolean(jsval_t,BOOL*) DECLSPEC_HIDDEN; HRESULT to_number(script_ctx_t*,jsval_t,double*) DECLSPEC_HIDDEN; HRESULT to_integer(script_ctx_t*,jsval_t,double*) DECLSPEC_HIDDEN; HRESULT to_int32(script_ctx_t*,jsval_t,INT*) DECLSPEC_HIDDEN; -HRESULT to_uint32(script_ctx_t*,jsval_t,DWORD*) DECLSPEC_HIDDEN; +HRESULT to_uint32(script_ctx_t*,jsval_t,UINT32*) DECLSPEC_HIDDEN; HRESULT to_string(script_ctx_t*,jsval_t,jsstr_t**) DECLSPEC_HIDDEN; HRESULT to_object(script_ctx_t*,jsval_t,IDispatch**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 863ff33..dd04186 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -665,15 +665,13 @@ HRESULT to_int32(script_ctx_t *ctx, jsval_t v, INT *ret) /* ECMA-262 3rd Edition 9.6 */ HRESULT to_uint32(script_ctx_t *ctx, jsval_t val, DWORD *ret) { - double n; + INT32 n; HRESULT hres; - hres = to_number(ctx, val, &n); - if(FAILED(hres)) - return hres; - - *ret = isnan(n) || isinf(n) ? 0 : n; - return S_OK; + hres = to_int32(ctx, val, &n); + if(SUCCEEDED(hres)) + *ret = n; + return hres; } static jsstr_t *int_to_string(int i)

1 0

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

Feb. 19, 2013

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