February 2013 - Wine-Commits

Piotr Caban : vbscript: Added partial implementation of IDispatch methods in IRegExp2.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 08a16a28767923391b870132bd19dbb7cd94cf46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a16a28767923391b870132b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 15:10:27 2013 +0100 vbscript: Added partial implementation of IDispatch methods in IRegExp2. --- dlls/vbscript/vbregexp.c | 97 +++++++++++++++++++++++++++++++++++++--- dlls/vbscript/vbscript.h | 1 + dlls/vbscript/vbscript_main.c | 1 + 3 files changed, 91 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 2bf866b..1afe44b 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -23,6 +23,62 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +#define REGEXP_TID_LIST \ + XDIID(RegExp2) \ + XDIID(Match2) \ + XDIID(MatchCollection2) \ + XDIID(SubMatches) + +typedef enum { +#define XDIID(iface) iface ## _tid, +REGEXP_TID_LIST +#undef XDIID + REGEXP_LAST_tid +} regexp_tid_t; + +static REFIID tid_ids[] = { +#define XDIID(iface) &IID_I ## iface, +REGEXP_TID_LIST +#undef XDIID +}; + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[REGEXP_LAST_tid]; + +static HRESULT init_regexp_typeinfo(regexp_tid_t tid) +{ + HRESULT hres; + + if(!typelib) { + static const WCHAR vbscript_dll3W[] = {'v','b','s','c','r','i','p','t','.','d','l','l','\\','3',0}; + ITypeLib *tl; + + hres = LoadTypeLib(vbscript_dll3W, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + } + + if(!typeinfos[tid]) { + ITypeInfo *ti; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + return S_OK; +} + typedef struct { IRegExp2 IRegExp2_iface; IRegExp IRegExp_iface; @@ -78,8 +134,9 @@ static ULONG WINAPI RegExp2_Release(IRegExp2 *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { heap_free(This); + } return ref; } @@ -87,8 +144,11 @@ static ULONG WINAPI RegExp2_Release(IRegExp2 *iface) static HRESULT WINAPI RegExp2_GetTypeInfoCount(IRegExp2 *iface, UINT *pctinfo) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI RegExp2_GetTypeInfo(IRegExp2 *iface, @@ -103,9 +163,11 @@ static HRESULT WINAPI RegExp2_GetIDsOfNames(IRegExp2 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), + rgszNames, cNames, lcid, rgDispId); + + return ITypeInfo_GetIDsOfNames(typeinfos[RegExp2_tid], rgszNames, cNames, rgDispId); } static HRESULT WINAPI RegExp2_Invoke(IRegExp2 *iface, DISPID dispIdMember, @@ -113,9 +175,12 @@ static HRESULT WINAPI RegExp2_Invoke(IRegExp2 *iface, DISPID dispIdMember, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + return ITypeInfo_Invoke(typeinfos[RegExp2_tid], iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI RegExp2_get_Pattern(IRegExp2 *iface, BSTR *pPattern) @@ -357,6 +422,10 @@ HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory *iface, IUnkno TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); + hres = init_regexp_typeinfo(RegExp2_tid); + if(FAILED(hres)) + return hres; + ret = heap_alloc_zero(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; @@ -370,3 +439,15 @@ HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory *iface, IUnkno IRegExp2_Release(&ret->IRegExp2_iface); return hres; } + +void release_regexp_typelib(void) +{ + DWORD i; + + for(i=0; i<REGEXP_LAST_tid; i++) { + if(typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + } + if(typelib) + ITypeLib_Release(typelib); +} diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 868a9f4..e3d96d8 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -342,6 +342,7 @@ TID_LIST } tid_t; HRESULT get_typeinfo(tid_t,ITypeInfo**) DECLSPEC_HIDDEN; +void release_regexp_typelib(void) DECLSPEC_HIDDEN; #ifndef INT32_MIN #define INT32_MIN (-2147483647-1) diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index eefb7a5..9ff2a51 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -285,6 +285,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) break; case DLL_PROCESS_DETACH: release_typelib(); + release_regexp_typelib(); } return TRUE;

1 0

Piotr Caban : jscript: Move code operating on JSRegExp out of do_regexp_match_next function.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: deca5e1aca54e8ed3948a3c53604aa48ab176add URL: http://source.winehq.org/git/wine.git/?a=commit;h=deca5e1aca54e8ed3948a3c53… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:04:59 2013 +0100 jscript: Move code operating on JSRegExp out of do_regexp_match_next function. --- dlls/jscript/regexp.c | 67 +++++++++++++++++++++++++++++++----------------- 1 files changed, 43 insertions(+), 24 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index db04e9b..ea25c64 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3202,6 +3202,42 @@ bad: return NULL; } +static HRESULT MatchRegExpNext(JSRegExp *jsregexp, const WCHAR *str, DWORD str_len, + const WCHAR **cp, heap_pool_t *pool, REMatchState **result, DWORD *matchlen) +{ + REMatchState *x, *res; + REGlobalData gData; + + gData.cpbegin = str; + gData.cpend = str+str_len; + gData.start = *cp-str; + gData.skipped = 0; + gData.pool = pool; + + x = InitMatch(NULL, &gData, jsregexp, gData.cpend - gData.cpbegin); + if(!x) { + WARN("InitMatch failed\n"); + return E_FAIL; + } + + x->cp = *cp; + res = MatchRegExp(&gData, x); + if(!gData.ok) { + WARN("MatchRegExp failed\n"); + return E_FAIL; + } + + *result = res; + if(!res) { + *matchlen = 0; + return S_FALSE; + } + + *matchlen = (res->cp-*cp) - gData.skipped; + *cp = res->cp; + return S_OK; +} + static void js_DestroyRegExp(JSRegExp *re) { @@ -3327,30 +3363,15 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D jsstr_t *str, const WCHAR **cp, match_result_t **parens, DWORD *parens_size, DWORD *parens_cnt, match_result_t *ret) { - REMatchState *x, *result; - REGlobalData gData; + REMatchState *result; DWORD matchlen; + HRESULT hres; - gData.cpbegin = str->str; - gData.cpend = str->str + jsstr_length(str); - gData.start = *cp-str->str; - gData.skipped = 0; - gData.pool = &ctx->tmp_heap; - - x = InitMatch(NULL, &gData, regexp->jsregexp, gData.cpend - gData.cpbegin); - if(!x) { - WARN("InitMatch failed\n"); - return E_FAIL; - } - - x->cp = *cp; - result = MatchRegExp(&gData, x); - if(!gData.ok) { - WARN("MatchRegExp failed\n"); - return E_FAIL; - } - - if(!result) { + hres = MatchRegExpNext(regexp->jsregexp, str->str, jsstr_length(str), + cp, &ctx->tmp_heap, &result, &matchlen); + if(FAILED(hres)) + return hres; + if(hres == S_FALSE) { if(rem_flags & REM_RESET_INDEX) set_last_index(regexp, 0); return S_FALSE; @@ -3410,8 +3431,6 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D memset(ctx->match_parens+n, 0, sizeof(ctx->match_parens) - n*sizeof(ctx->match_parens[0])); } - matchlen = (result->cp-*cp) - gData.skipped; - *cp = result->cp; ret->str = result->cp-matchlen; ret->len = matchlen; set_last_index(regexp, result->cp-str->str);

1 0

Piotr Caban : jscript: Don't use jsstr_t in js_NewRegExp.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 1d61b4581ab1b0daa343041f4165f1849ce948d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d61b4581ab1b0daa343041f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:04:44 2013 +0100 jscript: Don't use jsstr_t in js_NewRegExp. --- dlls/jscript/regexp.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index decabcc..db04e9b 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3218,7 +3218,7 @@ js_DestroyRegExp(JSRegExp *re) } static JSRegExp * -js_NewRegExp(script_ctx_t *cx, jsstr_t *str, UINT flags, BOOL flat) +js_NewRegExp(script_ctx_t *cx, const WCHAR *str, DWORD str_len, UINT flags, BOOL flat) { JSRegExp *re; heap_pool_t *mark; @@ -3230,10 +3230,10 @@ js_NewRegExp(script_ctx_t *cx, jsstr_t *str, UINT flags, BOOL flat) re = NULL; mark = heap_pool_mark(&cx->tmp_heap); - len = jsstr_length(str); + len = str_len; state.context = cx; - state.cp = str->str; + state.cp = str; if (!state.cp) goto out; state.cpbegin = state.cp; @@ -3303,8 +3303,8 @@ js_NewRegExp(script_ctx_t *cx, jsstr_t *str, UINT flags, BOOL flat) re->flags = flags; re->parenCount = state.parenCount; - re->source = str->str; - re->source_len = jsstr_length(str); + re->source = str; + re->source_len = str_len; out: heap_pool_clear(mark); @@ -3865,7 +3865,8 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r regexp->str = jsstr_addref(src); regexp->last_index_val = jsval_number(0); - regexp->jsregexp = js_NewRegExp(ctx, regexp->str, flags, FALSE); + regexp->jsregexp = js_NewRegExp(ctx, regexp->str->str, + jsstr_length(regexp->str), flags, FALSE); if(!regexp->jsregexp) { WARN("js_NewRegExp failed\n"); jsdisp_release(&regexp->dispex);

1 0

Piotr Caban : jscript: Don't use jsstr_t in JSRegExp structure.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 89711e35c1dab1b9fe98ceff142cd703606dc0bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=89711e35c1dab1b9fe98ceff1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:04:29 2013 +0100 jscript: Don't use jsstr_t in JSRegExp structure. --- dlls/jscript/regexp.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index bca73a4..decabcc 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -74,7 +74,8 @@ typedef struct { size_t parenCount; /* number of parenthesized submatches */ size_t classCount; /* count [...] bitmaps */ RECharSet *classList; /* list of [...] bitmaps */ - jsstr_t *source; /* locked source string, sans // */ + const WCHAR *source; /* locked source string, sans // */ + DWORD source_len; jsbytecode program[1]; /* regular expression bytecode */ } JSRegExp; @@ -2038,7 +2039,7 @@ PushBackTrackState(REGlobalData *gData, REOp op, } static inline REMatchState * -FlatNIMatcher(REGlobalData *gData, REMatchState *x, WCHAR *matchChars, +FlatNIMatcher(REGlobalData *gData, REMatchState *x, const WCHAR *matchChars, size_t length) { size_t i; @@ -2157,13 +2158,12 @@ ProcessCharSet(REGlobalData *gData, RECharSet *charSet) * source string. */ assert(1 <= charSet->u.src.startIndex); - assert(charSet->u.src.startIndex - < jsstr_length(gData->regexp->source)); - assert(charSet->u.src.length <= jsstr_length(gData->regexp->source) - - 1 - charSet->u.src.startIndex); + assert(charSet->u.src.startIndex < gData->regexp->source_len); + assert(charSet->u.src.length <= gData->regexp->source_len + - 1 - charSet->u.src.startIndex); charSet->converted = TRUE; - src = gData->regexp->source->str + charSet->u.src.startIndex; + src = gData->regexp->source + charSet->u.src.startIndex; end = src + charSet->u.src.length; @@ -2392,7 +2392,7 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, size_t parenIndex; size_t offset, length, index; jsbytecode *pc = *startpc; /* pc has already been incremented past op */ - WCHAR *source; + const WCHAR *source; const WCHAR *startcp = x->cp; WCHAR ch; RECharSet *charSet; @@ -2488,12 +2488,12 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, break; case REOP_FLAT: pc = ReadCompactIndex(pc, &offset); - assert(offset < jsstr_length(gData->regexp->source)); + assert(offset < gData->regexp->source_len); pc = ReadCompactIndex(pc, &length); assert(1 <= length); - assert(length <= jsstr_length(gData->regexp->source) - offset); + assert(length <= gData->regexp->source_len - offset); if (length <= (size_t)(gData->cpend - x->cp)) { - source = gData->regexp->source->str + offset; + source = gData->regexp->source + offset; TRACE("%s\n", debugstr_wn(source, length)); for (index = 0; index != length; index++) { if (source[index] != x->cp[index]) @@ -2513,11 +2513,11 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, break; case REOP_FLATi: pc = ReadCompactIndex(pc, &offset); - assert(offset < jsstr_length(gData->regexp->source)); + assert(offset < gData->regexp->source_len); pc = ReadCompactIndex(pc, &length); assert(1 <= length); - assert(length <= jsstr_length(gData->regexp->source) - offset); - source = gData->regexp->source->str; + assert(length <= gData->regexp->source_len - offset); + source = gData->regexp->source; result = FlatNIMatcher(gData, x, source + offset, length); break; case REOP_FLAT1i: @@ -3303,7 +3303,8 @@ js_NewRegExp(script_ctx_t *cx, jsstr_t *str, UINT flags, BOOL flat) re->flags = flags; re->parenCount = state.parenCount; - re->source = str; + re->source = str->str; + re->source_len = jsstr_length(str); out: heap_pool_clear(mark);

1 0

Dmitry Timoshkov : kernel32: There is no need for lock/ unlock heap in GlobalAlloc.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 70c21c8e6c5b6f7f0b543a704b292824ca0a307b URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c21c8e6c5b6f7f0b543a704… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 15 16:40:43 2013 +0800 kernel32: There is no need for lock/unlock heap in GlobalAlloc. --- dlls/kernel32/heap.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index b74763f..e0b86e5 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -370,8 +370,6 @@ HGLOBAL WINAPI GlobalAlloc( return 0; } - RtlLockHeap(GetProcessHeap()); - pintern = HeapAlloc(GetProcessHeap(), 0, sizeof(GLOBAL32_INTERN)); if (pintern) { @@ -400,7 +398,6 @@ HGLOBAL WINAPI GlobalAlloc( pintern->Pointer = NULL; } - RtlUnlockHeap(GetProcessHeap()); if (!pintern) return 0; TRACE( "(flags=%04x) returning handle %p pointer %p\n", flags, INTERN_TO_HANDLE(pintern), pintern->Pointer );

1 0

Piotr Caban : jscript: Rename jsheap_t to heap_pool_t.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 02d63cb3120d89a5107d4e26a92eb4bd06e2213d URL: http://source.winehq.org/git/wine.git/?a=commit;h=02d63cb3120d89a5107d4e26a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:04:14 2013 +0100 jscript: Rename jsheap_t to heap_pool_t. --- dlls/jscript/compile.c | 6 +++--- dlls/jscript/engine.h | 8 ++++---- dlls/jscript/jscript.c | 4 ++-- dlls/jscript/jscript.h | 16 ++++++++-------- dlls/jscript/jsutils.c | 18 +++++++++--------- dlls/jscript/parser.y | 10 +++++----- dlls/jscript/regexp.c | 32 ++++++++++++++++---------------- 7 files changed, 47 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02d63cb3120d89a5107d4…

1 0

Francois Gouget : ws2_32/tests: Fix the GetAcceptExSockaddrs() test.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 867615419e7ff3aac203743a03fdb661e28089b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=867615419e7ff3aac203743a0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 15 11:34:00 2013 +0100 ws2_32/tests: Fix the GetAcceptExSockaddrs() test. --- dlls/ws2_32/tests/sock.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ebde182..804c66b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4771,6 +4771,7 @@ static void test_AcceptEx(void) ok(!iret, "getsockopt failed %d\n", WSAGetLastError()); ok(connect_time == ~0u, "unexpected connect time %u\n", connect_time); + /* AcceptEx() still won't complete until we send data */ iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); @@ -4786,6 +4787,13 @@ static void test_AcceptEx(void) iret = getsockname( connector, (struct sockaddr *)&peerAddress, &remoteSize); ok( !iret, "getsockname failed.\n"); + /* AcceptEx() could complete any time now */ + iret = send(connector, buffer, 1, 0); + ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); + + dwret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + /* Check if the buffer from AcceptEx is decoded correctly */ pGetAcceptExSockaddrs(buffer, 2, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, (struct sockaddr **)&readBindAddress, &localSize, @@ -4805,12 +4813,6 @@ static void test_AcceptEx(void) "Remote socket port is different: %d != %d\n", readRemoteAddress->sin_port, peerAddress.sin_port); - iret = send(connector, buffer, 1, 0); - ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); - - dwret = WaitForSingleObject(overlapped.hEvent, 1000); - ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); - bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); ok(bytesReturned == 1, "bytesReturned isn't supposed to be %d\n", bytesReturned);

1 0

Dmitry Timoshkov : gdi32: SelectClipPath should update actual clipping region for a EMF DC.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: e069662c0c8d76f3935c20bca255f1e4fec057da URL: http://source.winehq.org/git/wine.git/?a=commit;h=e069662c0c8d76f3935c20bca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 15 13:06:33 2013 +0800 gdi32: SelectClipPath should update actual clipping region for a EMF DC. --- dlls/gdi32/enhmfdrv/dc.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 3af7ef4..389dc38 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -159,7 +159,6 @@ INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT botto { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pExcludeClipRect ); EMREXCLUDECLIPRECT emr; - BOOL ret; emr.emr.iType = EMR_EXCLUDECLIPRECT; emr.emr.nSize = sizeof(emr); @@ -167,15 +166,14 @@ INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT botto emr.rclClip.top = top; emr.rclClip.right = right; emr.rclClip.bottom = bottom; - ret = EMFDRV_WriteRecord( dev, &emr.emr ); - return ret ? next->funcs->pExcludeClipRect( next, left, top, right, bottom ) : ERROR; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR; + return next->funcs->pExcludeClipRect( next, left, top, right, bottom ); } INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pIntersectClipRect ); EMRINTERSECTCLIPRECT emr; - BOOL ret; emr.emr.iType = EMR_INTERSECTCLIPRECT; emr.emr.nSize = sizeof(emr); @@ -183,22 +181,21 @@ INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bot emr.rclClip.top = top; emr.rclClip.right = right; emr.rclClip.bottom = bottom; - ret = EMFDRV_WriteRecord( dev, &emr.emr ); - return ret ? next->funcs->pIntersectClipRect( next, left, top, right, bottom ) : ERROR; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR; + return next->funcs->pIntersectClipRect( next, left, top, right, bottom ); } INT EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pOffsetClipRgn ); EMROFFSETCLIPRGN emr; - BOOL ret; emr.emr.iType = EMR_OFFSETCLIPRGN; emr.emr.nSize = sizeof(emr); emr.ptlOffset.x = x; emr.ptlOffset.y = y; - ret = EMFDRV_WriteRecord( dev, &emr.emr ); - return ret ? next->funcs->pOffsetClipRgn( next, x, y ) : ERROR; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR; + return next->funcs->pOffsetClipRgn( next, x, y ); } INT EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) @@ -477,13 +474,15 @@ BOOL EMFDRV_FlattenPath( PHYSDEV dev ) BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) { + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectClipPath ); EMRSELECTCLIPPATH emr; emr.emr.iType = EMR_SELECTCLIPPATH; emr.emr.nSize = sizeof(emr); emr.iMode = iMode; - return EMFDRV_WriteRecord( dev, &emr.emr ); + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; + return next->funcs->pSelectClipPath( next, iMode ); } BOOL EMFDRV_StrokeAndFillPath( PHYSDEV dev )

1 0

Piotr Caban : jscript: Moved generic regular expressions code to separate file.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 06e8d830e21804defd06a7423ec23ee47036829f URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e8d830e21804defd06a7423… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:05:42 2013 +0100 jscript: Moved generic regular expressions code to separate file. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jsregexp.c | 1013 ++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/regexp.c | 1047 +--------------------------------------------- dlls/jscript/regexp.h | 90 ++++ 4 files changed, 1108 insertions(+), 1043 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06e8d830e21804defd06a…

1 0

Piotr Caban : jscript: Make context generic in internal regular expression functions.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 5f06c6de285d78caaae497e8b573e7fe238d1343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f06c6de285d78caaae497e8b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:05:15 2013 +0100 jscript: Make context generic in internal regular expression functions. --- dlls/jscript/regexp.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index ea25c64..9df7372 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -294,7 +294,7 @@ typedef struct REBackTrackData { #define INITIAL_BACKTRACK 8000 typedef struct REGlobalData { - script_ctx_t *cx; + void *cx; JSRegExp *regexp; /* the RE in execution */ BOOL ok; /* runtime error (out_of_memory only?) */ size_t start; /* offset to start at */ @@ -354,7 +354,7 @@ struct RENode { #define CLASS_CACHE_SIZE 4 typedef struct CompilerState { - script_ctx_t *context; + void *context; const WCHAR *cpbegin; const WCHAR *cpend; const WCHAR *cp; @@ -370,6 +370,9 @@ typedef struct CompilerState { size_t index; } classCache[CLASS_CACHE_SIZE]; WORD flags; + + heap_pool_t *pool; /* It's faster to use one malloc'd pool + than to malloc/free */ } CompilerState; typedef struct EmitStateStackEntry { @@ -469,7 +472,7 @@ NewRENode(CompilerState *state, REOp op) { RENode *ren; - ren = heap_pool_alloc(&state->context->tmp_heap, sizeof(*ren)); + ren = heap_pool_alloc(state->pool, sizeof(*ren)); if (!ren) { /* js_ReportOutOfScriptQuota(cx); */ return NULL; @@ -3254,7 +3257,7 @@ js_DestroyRegExp(JSRegExp *re) } static JSRegExp * -js_NewRegExp(script_ctx_t *cx, const WCHAR *str, DWORD str_len, UINT flags, BOOL flat) +js_NewRegExp(void *cx, heap_pool_t *pool, const WCHAR *str, DWORD str_len, UINT flags, BOOL flat) { JSRegExp *re; heap_pool_t *mark; @@ -3265,10 +3268,11 @@ js_NewRegExp(script_ctx_t *cx, const WCHAR *str, DWORD str_len, UINT flags, BOOL size_t len; re = NULL; - mark = heap_pool_mark(&cx->tmp_heap); + mark = heap_pool_mark(pool); len = str_len; state.context = cx; + state.pool = pool; state.cp = str; if (!state.cp) goto out; @@ -3884,7 +3888,7 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r regexp->str = jsstr_addref(src); regexp->last_index_val = jsval_number(0); - regexp->jsregexp = js_NewRegExp(ctx, regexp->str->str, + regexp->jsregexp = js_NewRegExp(ctx, &ctx->tmp_heap, regexp->str->str, jsstr_length(regexp->str), flags, FALSE); if(!regexp->jsregexp) { WARN("js_NewRegExp failed\n");

1 0