wine-commits February 2013

wine-commits@winehq.org

2 participants
459 discussions

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 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: 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::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

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

Jacek Caban : mshtml: Fixed tests on some broken Vista versions.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: f5cb8c175c736eb51f105f8b308119bb8933fa08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5cb8c175c736eb51f105f8b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 19 11:30:32 2013 +0100 mshtml: Fixed tests on some broken Vista versions. --- dlls/mshtml/tests/activex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index ce9b711..fab2c92 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -2348,7 +2348,7 @@ static void release_doc(IHTMLDocument2 *doc) set_client_site(doc, FALSE); ref = IHTMLDocument2_Release(doc); - ok(!ref, "ref = %d\n", ref); + ok(!ref || broken(ref == 1) /* Vista */, "ref = %d\n", ref); if(client_site) { IOleClientSite_Release(client_site);

1 0

Piotr Caban : jscript: Avoid copying regular expression results.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: f16c9877bd662ee3a464dc85000ca7fc4ac6a02c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f16c9877bd662ee3a464dc850… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 19 10:12:27 2013 +0100 jscript: Avoid copying regular expression results. --- dlls/jscript/jscript.h | 6 +- dlls/jscript/jsregexp.c | 198 +++++++++++++++++++++++++--------------------- dlls/jscript/string.c | 111 ++++++++++++++------------ 3 files changed, 172 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f16c9877bd662ee3a464d…

1 0

Piotr Caban : jscript: Cleanup regular expressions engine API.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 67c7cc5517cc49fb6f9ef964cf322c2e934c6aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67c7cc5517cc49fb6f9ef964c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 19 10:12:12 2013 +0100 jscript: Cleanup regular expressions engine API. --- dlls/jscript/jsregexp.c | 42 +++++++++------- dlls/jscript/regexp.c | 124 ++++++++++++++++++++++++++++------------------- dlls/jscript/regexp.h | 71 ++++++++++++--------------- 3 files changed, 128 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67c7cc5517cc49fb6f9ef…

1 0

Piotr Caban : jscript: Rename JSREG_* defines to REG_*.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 4c6a1d1d92b011362adff644a8e8b485b7bb6dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6a1d1d92b011362adff644a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 19 10:11:51 2013 +0100 jscript: Rename JSREG_* defines to REG_*. --- dlls/jscript/jsregexp.c | 16 ++++++++-------- dlls/jscript/regexp.c | 30 +++++++++++++++--------------- dlls/jscript/regexp.h | 10 +++++----- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index bda9886..92d1166 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -165,7 +165,7 @@ HRESULT regexp_match_next(script_ctx_t *ctx, jsdisp_t *dispex, DWORD rem_flags, heap_pool_t *mark; HRESULT hres; - if((rem_flags & REM_CHECK_GLOBAL) && !(regexp->jsregexp->flags & JSREG_GLOB)) + if((rem_flags & REM_CHECK_GLOBAL) && !(regexp->jsregexp->flags & REG_GLOB)) return S_FALSE; mark = heap_pool_mark(&ctx->tmp_heap); @@ -216,7 +216,7 @@ static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, jsstr_t *str, B ret[i++] = cres; - if(!gflag && !(This->jsregexp->flags & JSREG_GLOB)) { + if(!gflag && !(This->jsregexp->flags & REG_GLOB)) { hres = S_OK; break; } @@ -407,7 +407,7 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsstr_t if(FAILED(hres)) return hres; - if(regexp->jsregexp->flags & JSREG_GLOB) { + if(regexp->jsregexp->flags & REG_GLOB) { if(regexp->last_index < 0) { jsstr_release(string); set_last_index(regexp, 0); @@ -668,7 +668,7 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval jsdisp_t *array; HRESULT hres; - if(!(regexp->jsregexp->flags & JSREG_GLOB)) { + if(!(regexp->jsregexp->flags & REG_GLOB)) { match_result_t match, *parens = NULL; DWORD parens_cnt, parens_size = 0; const WCHAR *cp = str->str; @@ -991,16 +991,16 @@ HRESULT parse_regexp_flags(const WCHAR *str, DWORD str_len, DWORD *ret) for (p = str; p < str+str_len; p++) { switch (*p) { case 'g': - flags |= JSREG_GLOB; + flags |= REG_GLOB; break; case 'i': - flags |= JSREG_FOLD; + flags |= REG_FOLD; break; case 'm': - flags |= JSREG_MULTILINE; + flags |= REG_MULTILINE; break; case 'y': - flags |= JSREG_STICKY; + flags |= REG_STICKY; break; default: WARN("wrong flag %c\n", *p); diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 87f64d2..8b4a1aa 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -638,14 +638,14 @@ EmitREBytecode(CompilerState *state, JSRegExp *re, size_t treeDepth, } } if (t->kid && t->u.flat.length > 1) { - pc[-1] = (state->flags & JSREG_FOLD) ? REOP_FLATi : REOP_FLAT; + pc[-1] = (state->flags & REG_FOLD) ? REOP_FLATi : REOP_FLAT; pc = WriteCompactIndex(pc, (WCHAR*)t->kid - state->cpbegin); pc = WriteCompactIndex(pc, t->u.flat.length); } else if (t->u.flat.chr < 256) { - pc[-1] = (state->flags & JSREG_FOLD) ? REOP_FLAT1i : REOP_FLAT1; + pc[-1] = (state->flags & REG_FOLD) ? REOP_FLAT1i : REOP_FLAT1; *pc++ = (jsbytecode) t->u.flat.chr; } else { - pc[-1] = (state->flags & JSREG_FOLD) + pc[-1] = (state->flags & REG_FOLD) ? REOP_UCFLAT1i : REOP_UCFLAT1; SET_ARG(pc, t->u.flat.chr); @@ -804,7 +804,7 @@ ProcessOp(CompilerState *state, REOpData *opData, RENode **operandStack, */ if (((RENode *) result->kid)->op == REOP_FLAT && ((RENode *) result->u.kid2)->op == REOP_FLAT && - (state->flags & JSREG_FOLD) == 0) { + (state->flags & REG_FOLD) == 0) { result->op = REOP_ALTPREREQ; result->u.altprereq.ch1 = ((RENode *) result->kid)->u.flat.chr; result->u.altprereq.ch2 = ((RENode *) result->u.kid2)->u.flat.chr; @@ -816,7 +816,7 @@ ProcessOp(CompilerState *state, REOpData *opData, RENode **operandStack, if (((RENode *) result->kid)->op == REOP_CLASS && ((RENode *) result->kid)->u.ucclass.index < 256 && ((RENode *) result->u.kid2)->op == REOP_FLAT && - (state->flags & JSREG_FOLD) == 0) { + (state->flags & REG_FOLD) == 0) { result->op = REOP_ALTPREREQ2; result->u.altprereq.ch1 = ((RENode *) result->u.kid2)->u.flat.chr; result->u.altprereq.ch2 = ((RENode *) result->kid)->u.ucclass.index; @@ -828,7 +828,7 @@ ProcessOp(CompilerState *state, REOpData *opData, RENode **operandStack, if (((RENode *) result->kid)->op == REOP_FLAT && ((RENode *) result->u.kid2)->op == REOP_CLASS && ((RENode *) result->u.kid2)->u.ucclass.index < 256 && - (state->flags & JSREG_FOLD) == 0) { + (state->flags & REG_FOLD) == 0) { result->op = REOP_ALTPREREQ2; result->u.altprereq.ch1 = ((RENode *) result->kid)->u.flat.chr; result->u.altprereq.ch2 = @@ -1108,11 +1108,11 @@ lexHex: continue; } } - if (state->flags & JSREG_FOLD) + if (state->flags & REG_FOLD) rangeStart = localMax; /* one run of the uc/dc loop below */ } - if (state->flags & JSREG_FOLD) { + if (state->flags & REG_FOLD) { WCHAR maxch = localMax; for (i = rangeStart; i <= localMax; i++) { @@ -2009,7 +2009,7 @@ BackrefMatcher(REGlobalData *gData, REMatchState *x, size_t parenIndex) return NULL; parenContent = &gData->cpbegin[cap->index]; - if (gData->regexp->flags & JSREG_FOLD) { + if (gData->regexp->flags & REG_FOLD) { for (i = 0; i < len; i++) { if (toupperW(parenContent[i]) != toupperW(x->cp[i])) return NULL; @@ -2233,7 +2233,7 @@ ProcessCharSet(REGlobalData *gData, RECharSet *charSet) } if (inRange) { - if (gData->regexp->flags & JSREG_FOLD) { + if (gData->regexp->flags & REG_FOLD) { assert(rangeStart <= thisCh); for (i = rangeStart; i <= thisCh; i++) { WCHAR uch, dch; @@ -2251,7 +2251,7 @@ ProcessCharSet(REGlobalData *gData, RECharSet *charSet) } inRange = FALSE; } else { - if (gData->regexp->flags & JSREG_FOLD) { + if (gData->regexp->flags & REG_FOLD) { AddCharacterToCharSet(charSet, toupperW(thisCh)); AddCharacterToCharSet(charSet, tolowerW(thisCh)); } else { @@ -2325,7 +2325,7 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, case REOP_BOL: if (x->cp != gData->cpbegin) { if (/*!gData->cx->regExpStatics.multiline && FIXME !!! */ - !(gData->regexp->flags & JSREG_MULTILINE)) { + !(gData->regexp->flags & REG_MULTILINE)) { break; } if (!RE_IS_LINE_TERM(x->cp[-1])) @@ -2336,7 +2336,7 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, case REOP_EOL: if (x->cp != gData->cpend) { if (/*!gData->cx->regExpStatics.multiline &&*/ - !(gData->regexp->flags & JSREG_MULTILINE)) { + !(gData->regexp->flags & REG_MULTILINE)) { break; } if (!RE_IS_LINE_TERM(*x->cp)) @@ -2532,7 +2532,7 @@ ExecuteREBytecode(REGlobalData *gData, REMatchState *x) * If the first node is a simple match, step the index into the string * until that match is made, or fail if it can't be found at all. */ - if (REOP_IS_SIMPLE(op) && !(gData->regexp->flags & JSREG_STICKY)) { + if (REOP_IS_SIMPLE(op) && !(gData->regexp->flags & REG_STICKY)) { anchor = FALSE; while (x->cp <= gData->cpend) { nextpc = pc; /* reset back to start each time */ @@ -3063,7 +3063,7 @@ static REMatchState *MatchRegExp(REGlobalData *gData, REMatchState *x) for (j = 0; j < gData->regexp->parenCount; j++) x->parens[j].index = -1; result = ExecuteREBytecode(gData, x); - if (!gData->ok || result || (gData->regexp->flags & JSREG_STICKY)) + if (!gData->ok || result || (gData->regexp->flags & REG_STICKY)) return result; gData->backTrackSP = gData->backTrackStack; gData->cursz = 0; diff --git a/dlls/jscript/regexp.h b/dlls/jscript/regexp.h index e039af5..a882878 100644 --- a/dlls/jscript/regexp.h +++ b/dlls/jscript/regexp.h @@ -31,10 +31,10 @@ * the Initial Developer. All Rights Reserved. */ -#define JSREG_FOLD 0x01 /* fold uppercase to lowercase */ -#define JSREG_GLOB 0x02 /* global exec, creates array of matches */ -#define JSREG_MULTILINE 0x04 /* treat ^ and $ as begin and end of line */ -#define JSREG_STICKY 0x08 /* only match starting at lastIndex */ +#define REG_FOLD 0x01 /* fold uppercase to lowercase */ +#define REG_GLOB 0x02 /* global exec, creates array of matches */ +#define REG_MULTILINE 0x04 /* treat ^ and $ as begin and end of line */ +#define REG_STICKY 0x08 /* only match starting at lastIndex */ typedef struct RECapture { ptrdiff_t index; /* start of contents, -1 for empty */ @@ -73,7 +73,7 @@ typedef struct RECharSet { } RECharSet; typedef struct JSRegExp { - WORD flags; /* flags, see jsapi.h's JSREG_* defines */ + WORD flags; /* flags, see jsapi.h's REG_* defines */ size_t parenCount; /* number of parenthesized submatches */ size_t classCount; /* count [...] bitmaps */ RECharSet *classList; /* list of [...] bitmaps */

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipFillRectangles using GdipFillPath.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 6b474b555eb1affba22d436d61d02fbc2f8c9169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b474b555eb1affba22d436d6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:50 2013 +0800 gdiplus: Reimplement GdipFillRectangles using GdipFillPath. --- dlls/gdiplus/graphics.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ffb36bb..01e127c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3829,20 +3829,23 @@ GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics *graphics, GpBrush *brush, GpStatus WINGDIPAPI GdipFillRectangles(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpRectF *rects, INT count) { - GpStatus ret; - INT i; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %p, %d)\n", graphics, brush, rects, count); if(!rects) return InvalidParameter; - for(i = 0; i < count; i++){ - ret = GdipFillRectangle(graphics, brush, rects[i].X, rects[i].Y, rects[i].Width, rects[i].Height); - if(ret != Ok) return ret; - } + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - return Ok; + status = GdipAddPathRectangles(path, rects, count); + if (status == Ok) + status = GdipFillPath(graphics, brush, path); + + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpRect *rects,

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2013