February 2013 - Wine-Commits

Dmitry Timoshkov : gdiplus: Slightly simplify GdipDrawClosedCurve2 implementation.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 4233b82872ac56112567b3dbaa6d1e309c487409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4233b82872ac56112567b3dba… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:44:35 2013 +0800 gdiplus: Slightly simplify GdipDrawClosedCurve2 implementation. --- dlls/gdiplus/graphics.c | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 275c93b..c48ed2d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2726,7 +2726,7 @@ GpStatus WINGDIPAPI GdipDrawClosedCurve2(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count, REAL tension) { GpPath *path; - GpStatus stat; + GpStatus status; TRACE("(%p, %p, %p, %d, %.2f)\n", graphics, pen, points, count, tension); @@ -2736,20 +2736,16 @@ GpStatus WINGDIPAPI GdipDrawClosedCurve2(GpGraphics *graphics, GpPen *pen, if(graphics->busy) return ObjectBusy; - if((stat = GdipCreatePath(FillModeAlternate, &path)) != Ok) - return stat; + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - stat = GdipAddPathClosedCurve2(path, points, count, tension); - if(stat != Ok){ - GdipDeletePath(path); - return stat; - } - - stat = GdipDrawPath(graphics, pen, path); + status = GdipAddPathClosedCurve2(path, points, count, tension); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); GdipDeletePath(path); - return stat; + return status; } GpStatus WINGDIPAPI GdipDrawClosedCurve2I(GpGraphics *graphics, GpPen *pen,

1 0

Ken Thomases : winemac: Call sync_window_position() before show_window() since window frame affects whether it shows.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 1561fa41267c9605d304f0b9aaf836769cc63203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1561fa41267c9605d304f0b9a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 18 21:50:22 2013 -0600 winemac: Call sync_window_position() before show_window() since window frame affects whether it shows. --- dlls/winemac.drv/window.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e7ec6c5..3429e7d 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1369,17 +1369,6 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, hide_window(data); } - if (new_style & WS_VISIBLE) - { - if (!data->on_screen || (swp_flags & (SWP_FRAMECHANGED|SWP_STATECHANGED))) - set_cocoa_window_properties(data); - - /* layered windows are not shown until their attributes are set */ - if (!data->on_screen && - (data->layered || !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED))) - show_window(data); - } - /* check if we are currently processing an event relevant to this window */ if (!thread_data || !thread_data->current_event || thread_data->current_event->window != data->cocoa_window || @@ -1391,6 +1380,17 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, set_cocoa_window_properties(data); } + if (new_style & WS_VISIBLE) + { + if (!data->on_screen || (swp_flags & (SWP_FRAMECHANGED|SWP_STATECHANGED))) + set_cocoa_window_properties(data); + + /* layered windows are not shown until their attributes are set */ + if (!data->on_screen && + (data->layered || !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED))) + show_window(data); + } + done: release_win_data(data); }

1 0

Ken Thomases : winemac: Always use proper z-order when putting a window on screen.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: abb0161c4c06be5e8606811cf51d89ac8950cf00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abb0161c4c06be5e8606811cf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 18 21:50:19 2013 -0600 winemac: Always use proper z-order when putting a window on screen. --- dlls/winemac.drv/window.c | 103 ++++++++++++++++++++++----------------------- 1 files changed, 50 insertions(+), 53 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index c7513f0..e7ec6c5 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -151,35 +151,6 @@ static void get_mac_rect_offset(struct macdrv_win_data *data, DWORD style, RECT /*********************************************************************** - * show_window - */ -static void show_window(struct macdrv_win_data *data) -{ - TRACE("win %p/%p\n", data->hwnd, data->cocoa_window); - - data->on_screen = macdrv_order_cocoa_window(data->cocoa_window, NULL, NULL); - if (data->on_screen) - { - HWND hwndFocus = GetFocus(); - if (hwndFocus && (data->hwnd == hwndFocus || IsChild(data->hwnd, hwndFocus))) - macdrv_SetFocus(hwndFocus); - } -} - - -/*********************************************************************** - * hide_window - */ -static void hide_window(struct macdrv_win_data *data) -{ - TRACE("win %p/%p\n", data->hwnd, data->cocoa_window); - - macdrv_hide_cocoa_window(data->cocoa_window); - data->on_screen = FALSE; -} - - -/*********************************************************************** * macdrv_window_to_mac_rect * * Convert a rect from client to Mac window coordinates @@ -605,6 +576,55 @@ static struct macdrv_win_data *macdrv_create_win_data(HWND hwnd, const RECT *win /*********************************************************************** + * show_window + */ +static void show_window(struct macdrv_win_data *data) +{ + HWND prev = NULL; + HWND next = NULL; + macdrv_window prev_window = NULL; + macdrv_window next_window = NULL; + + /* find window that this one must be after */ + prev = GetWindow(data->hwnd, GW_HWNDPREV); + while (prev && !((GetWindowLongW(prev, GWL_STYLE) & WS_VISIBLE) && + (prev_window = macdrv_get_cocoa_window(prev, TRUE)))) + prev = GetWindow(prev, GW_HWNDPREV); + if (!prev_window) + { + /* find window that this one must be before */ + next = GetWindow(data->hwnd, GW_HWNDNEXT); + while (next && !((GetWindowLongW(next, GWL_STYLE) & WS_VISIBLE) && + (next_window = macdrv_get_cocoa_window(next, TRUE)))) + next = GetWindow(next, GW_HWNDNEXT); + } + + TRACE("win %p/%p below %p/%p above %p/%p\n", + data->hwnd, data->cocoa_window, prev, prev_window, next, next_window); + + data->on_screen = macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window); + if (data->on_screen) + { + HWND hwndFocus = GetFocus(); + if (hwndFocus && (data->hwnd == hwndFocus || IsChild(data->hwnd, hwndFocus))) + macdrv_SetFocus(hwndFocus); + } +} + + +/*********************************************************************** + * hide_window + */ +static void hide_window(struct macdrv_win_data *data) +{ + TRACE("win %p/%p\n", data->hwnd, data->cocoa_window); + + macdrv_hide_cocoa_window(data->cocoa_window); + data->on_screen = FALSE; +} + + +/*********************************************************************** * get_region_data * * Calls GetRegionData on the given region and converts the rectangle @@ -692,30 +712,7 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags) wine_dbgstr_rect(&data->whole_rect)); if (data->on_screen && (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW))) - { - HWND next = NULL; - macdrv_window prev_window = NULL; - macdrv_window next_window = NULL; - - /* find window that this one must be after */ - HWND prev = GetWindow(data->hwnd, GW_HWNDPREV); - while (prev && !((GetWindowLongW(prev, GWL_STYLE) & WS_VISIBLE) && - (prev_window = macdrv_get_cocoa_window(prev, TRUE)))) - prev = GetWindow(prev, GW_HWNDPREV); - if (!prev_window) - { - /* find window that this one must be before */ - next = GetWindow(data->hwnd, GW_HWNDNEXT); - while (next && !((GetWindowLongW(next, GWL_STYLE) & WS_VISIBLE) && - (next_window = macdrv_get_cocoa_window(next, TRUE)))) - next = GetWindow(next, GW_HWNDNEXT); - } - - data->on_screen = macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window); - - TRACE("win %p/%p below %p/%p above %p/%p\n", - data->hwnd, data->cocoa_window, prev, prev_window, next, next_window); - } + show_window(data); }

1 0

Austin English : riched20: Make sure to load dll below 2GB address space.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: d50baaa1df6dd56b4e84b828785b54cae558d3d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50baaa1df6dd56b4e84b8287… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 18 13:48:14 2013 -0600 riched20: Make sure to load dll below 2GB address space. --- dlls/riched20/Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in index 9975537..49ba7a1 100644 --- a/dlls/riched20/Makefile.in +++ b/dlls/riched20/Makefile.in @@ -1,6 +1,7 @@ MODULE = riched20.dll IMPORTLIB = riched20 IMPORTS = uuid ole32 oleaut32 imm32 user32 gdi32 +EXTRADLLFLAGS = -Wl,--image-base,0x7ac00000 C_SRCS = \ caret.c \

1 0

André Hentschel : ntdll: Correctly align the stack for odd numbers of arguments in relay traces on ARM .
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 242da6708202c1bd4835e49e2dd2315c95ba0e24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=242da6708202c1bd4835e49e2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 18 23:24:15 2013 +0100 ntdll: Correctly align the stack for odd numbers of arguments in relay traces on ARM. --- dlls/ntdll/relay.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index b3c4aea..81e1593 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -364,7 +364,8 @@ __ASM_GLOBAL_FUNC( call_entry_point, "cmp r3, #0\n\t" "beq 5f\n\t" "sub SP, SP, r3\n\t" - "bic SP, SP, #15\n\t" + "tst r1, #1\n\t" + "subeq SP, SP, #4\n\t" "1:\tsub r3, r3, #4\n\t" "ldr r0, [r2, r3]\n\t" "str r0, [SP, r3]\n\t"

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipDrawCurve2 using GdipDrawPath.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 03228b1784c6d7b66aed6d106fdb5bae120cdb66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03228b1784c6d7b66aed6d106… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:44:57 2013 +0800 gdiplus: Reimplement GdipDrawCurve2 using GdipDrawPath. --- dlls/gdiplus/graphics.c | 59 +++++++--------------------------------------- 1 files changed, 9 insertions(+), 50 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c48ed2d..7f221bb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2815,11 +2815,8 @@ GpStatus WINGDIPAPI GdipDrawCurveI(GpGraphics *graphics, GpPen *pen, GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count, REAL tension) { - /* PolyBezier expects count*3-2 points. */ - INT i, len_pt = count*3-2, save_state; - GpPointF *pt; - REAL x1, x2, y1, y2; - GpStatus retval; + GpPath *path; + GpStatus status; TRACE("(%p, %p, %p, %d, %.2f)\n", graphics, pen, points, count, tension); @@ -2832,53 +2829,15 @@ GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics *graphics, GpPen *pen, if(count < 2) return InvalidParameter; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - pt = GdipAlloc(len_pt * sizeof(GpPointF)); - if(!pt) - return OutOfMemory; - - tension = tension * TENSION_CONST; - - calc_curve_bezier_endp(points[0].X, points[0].Y, points[1].X, points[1].Y, - tension, &x1, &y1); - - pt[0].X = points[0].X; - pt[0].Y = points[0].Y; - pt[1].X = x1; - pt[1].Y = y1; - - for(i = 0; i < count-2; i++){ - calc_curve_bezier(&(points[i]), tension, &x1, &y1, &x2, &y2); - - pt[3*i+2].X = x1; - pt[3*i+2].Y = y1; - pt[3*i+3].X = points[i+1].X; - pt[3*i+3].Y = points[i+1].Y; - pt[3*i+4].X = x2; - pt[3*i+4].Y = y2; - } - - calc_curve_bezier_endp(points[count-1].X, points[count-1].Y, - points[count-2].X, points[count-2].Y, tension, &x1, &y1); - - pt[len_pt-2].X = x1; - pt[len_pt-2].Y = y1; - pt[len_pt-1].X = points[count-1].X; - pt[len_pt-1].Y = points[count-1].Y; - - save_state = prepare_dc(graphics, pen); - - retval = draw_polybezier(graphics, pen, pt, len_pt, TRUE); + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - GdipFree(pt); - restore_dc(graphics, save_state); + status = GdipAddPathCurve2(path, points, count, tension); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); - return retval; + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics *graphics, GpPen *pen,

1 0

Dmitry Timoshkov : gdiplus: Forward GdipDrawBezierI to GdipDrawBezier.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: cc54d1eb68f6eeba921b3ce1bd4cc90754c7ad50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc54d1eb68f6eeba921b3ce1b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:44:11 2013 +0800 gdiplus: Forward GdipDrawBezierI to GdipDrawBezier. --- dlls/gdiplus/graphics.c | 33 +-------------------------------- 1 files changed, 1 insertions(+), 32 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7d54871..275c93b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2642,41 +2642,10 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics *graphics, GpPen *pen, INT x1, INT y1, INT x2, INT y2, INT x3, INT y3, INT x4, INT y4) { - INT save_state; - GpPointF pt[4]; - GpStatus retval; - TRACE("(%p, %p, %d, %d, %d, %d, %d, %d, %d, %d)\n", graphics, pen, x1, y1, x2, y2, x3, y3, x4, y4); - if(!graphics || !pen) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - pt[0].X = x1; - pt[0].Y = y1; - pt[1].X = x2; - pt[1].Y = y2; - pt[2].X = x3; - pt[2].Y = y3; - pt[3].X = x4; - pt[3].Y = y4; - - save_state = prepare_dc(graphics, pen); - - retval = draw_polybezier(graphics, pen, pt, 4, TRUE); - - restore_dc(graphics, save_state); - - return retval; + return GdipDrawBezier(graphics, pen, (REAL)x1, (REAL)y1, (REAL)x2, (REAL)y2, (REAL)x3, (REAL)y3, (REAL)x4, (REAL)y4); } GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics *graphics, GpPen *pen,

1 0

Piotr Caban : jscript: Avoid copying regular expression results.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

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 Feb. 19, 2013

Feb. 19, 2013

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 Feb. 19, 2013

Feb. 19, 2013

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