February 2013 - Wine-Commits

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

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

Feb. 19, 2013

Module: wine Branch: master Commit: 1223569d644fdfb4e9b920ceeb18079dc6d819c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1223569d644fdfb4e9b920cee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:33 2013 +0800 gdiplus: Reimplement GdipDrawRectangle using GdipDrawPath. --- dlls/gdiplus/graphics.c | 34 +++++++++------------------------- 1 files changed, 9 insertions(+), 25 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 201ef7b..39c2b0f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3398,9 +3398,8 @@ GpStatus WINGDIPAPI GdipDrawPieI(GpGraphics *graphics, GpPen *pen, INT x, GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height) { - INT save_state; - GpPointF ptf[4]; - POINT pti[4]; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x, y, width, height); @@ -3410,30 +3409,15 @@ GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics *graphics, GpPen *pen, REAL x, if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - ptf[0].X = x; - ptf[0].Y = y; - ptf[1].X = x + width; - ptf[1].Y = y; - ptf[2].X = x + width; - ptf[2].Y = y + height; - ptf[3].X = x; - ptf[3].Y = y + height; - - save_state = prepare_dc(graphics, pen); - SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); - - transform_and_round_points(graphics, pti, ptf, 4); - Polygon(graphics->hdc, pti, 4); + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - restore_dc(graphics, save_state); + status = GdipAddPathRectangle(path, x, y, width, height); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); - return Ok; + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x,

1 0

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

Feb. 19, 2013

Module: wine Branch: master Commit: 981223a7363738b2b90030e8e61d52aed186df85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=981223a7363738b2b90030e8e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:28 2013 +0800 gdiplus: Reimplement GdipDrawPie using GdipDrawPath. --- dlls/gdiplus/graphics.c | 55 +++++++--------------------------------------- 1 files changed, 9 insertions(+), 46 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7cf9e0e..201ef7b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -51,18 +51,6 @@ static GpStatus draw_driver_string(GpGraphics *graphics, GDIPCONST UINT16 *text, GDIPCONST GpBrush *brush, GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix); -/* Converts angle (in degrees) to x/y coordinates */ -static void deg2xy(REAL angle, REAL x_0, REAL y_0, REAL *x, REAL *y) -{ - REAL radAngle, hypotenuse; - - radAngle = deg2rad(angle); - hypotenuse = 50.0; /* arbitrary */ - - *x = x_0 + cos(radAngle) * hypotenuse; - *y = y_0 + sin(radAngle) * hypotenuse; -} - /* Converts from gdiplus path point type to gdi path point type. */ static BYTE convert_path_point_type(BYTE type) { @@ -1456,27 +1444,6 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, } } -/* GdipDrawPie/GdipFillPie helper function */ -static void draw_pie(GpGraphics *graphics, REAL x, REAL y, REAL width, - REAL height, REAL startAngle, REAL sweepAngle) -{ - GpPointF ptf[4]; - POINT pti[4]; - - ptf[0].X = x; - ptf[0].Y = y; - ptf[1].X = x + width; - ptf[1].Y = y + height; - - deg2xy(startAngle+sweepAngle, x + width / 2.0, y + width / 2.0, &ptf[2].X, &ptf[2].Y); - deg2xy(startAngle, x + width / 2.0, y + width / 2.0, &ptf[3].X, &ptf[3].Y); - - transform_and_round_points(graphics, pti, ptf, 4); - - Pie(graphics->hdc, pti[0].x, pti[0].y, pti[1].x, pti[1].y, pti[2].x, - pti[2].y, pti[3].x, pti[3].y); -} - /* Draws the linecap the specified color and size on the hdc. The linecap is in * direction of the line from x1, y1 to x2, y2 and is anchored on x2, y2. Probably * should not be called on an hdc that has a path you care about. */ @@ -3396,7 +3363,8 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) GpStatus WINGDIPAPI GdipDrawPie(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) { - INT save_state; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x, y, width, height, startAngle, sweepAngle); @@ -3407,20 +3375,15 @@ GpStatus WINGDIPAPI GdipDrawPie(GpGraphics *graphics, GpPen *pen, REAL x, if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - save_state = prepare_dc(graphics, pen); - SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); - - draw_pie(graphics, x, y, width, height, startAngle, sweepAngle); + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - restore_dc(graphics, save_state); + status = GdipAddPathPie(path, x, y, width, height, startAngle, sweepAngle); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); - return Ok; + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawPieI(GpGraphics *graphics, GpPen *pen, INT x,

1 0

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

Feb. 19, 2013

Module: wine Branch: master Commit: 6df50f1d164cce46b4d79fa78d54ffbe6bcaac2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df50f1d164cce46b4d79fa78… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:23 2013 +0800 gdiplus: Reimplement GdipDrawEllipse using GdipDrawPath. --- dlls/gdiplus/graphics.c | 31 +++++++++---------------------- 1 files changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 997dd28..7cf9e0e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2759,9 +2759,8 @@ GpStatus WINGDIPAPI GdipDrawCurve3I(GpGraphics *graphics, GpPen *pen, GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height) { - INT save_state; - GpPointF ptf[2]; - POINT pti[2]; + GpPath *path; + GpStatus status; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x, y, width, height); @@ -2771,27 +2770,15 @@ GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics *graphics, GpPen *pen, REAL x, if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - ptf[0].X = x; - ptf[0].Y = y; - ptf[1].X = x + width; - ptf[1].Y = y + height; - - save_state = prepare_dc(graphics, pen); - SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); - - transform_and_round_points(graphics, pti, ptf, 2); - - Ellipse(graphics->hdc, pti[0].x, pti[0].y, pti[1].x, pti[1].y); + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - restore_dc(graphics, save_state); + status = GdipAddPathEllipse(path, x, y, width, height); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); - return Ok; + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawEllipseI(GpGraphics *graphics, GpPen *pen, INT x,

1 0

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

Feb. 19, 2013

Module: wine Branch: master Commit: ad49f83c7dbcd60abd60c80409495e2ddb4cfde7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad49f83c7dbcd60abd60c8040… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:18 2013 +0800 gdiplus: Forward GdipDrawBezier to GdipDrawBeziers. --- dlls/gdiplus/graphics.c | 77 +---------------------------------------------- 1 files changed, 1 insertions(+), 76 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3253221..997dd28 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1756,66 +1756,6 @@ static void shorten_bezier_amt(GpPointF * pt, REAL amt, BOOL rev) } } -/* Draws bezier curves between given points, and if caps is true then draws an - * endcap at the end of the last line. */ -static GpStatus draw_polybezier(GpGraphics *graphics, GpPen *pen, - GDIPCONST GpPointF * pt, INT count, BOOL caps) -{ - POINT *pti; - GpPointF *ptcopy; - GpStatus status = GenericError; - - if(!count) - return Ok; - - pti = GdipAlloc(count * sizeof(POINT)); - ptcopy = GdipAlloc(count * sizeof(GpPointF)); - - if(!pti || !ptcopy){ - status = OutOfMemory; - goto end; - } - - memcpy(ptcopy, pt, count * sizeof(GpPointF)); - - if(caps){ - if(pen->endcap == LineCapArrowAnchor) - shorten_bezier_amt(&ptcopy[count-4], pen->width, FALSE); - else if((pen->endcap == LineCapCustom) && pen->customend) - shorten_bezier_amt(&ptcopy[count-4], pen->width * pen->customend->inset, - FALSE); - - if(pen->startcap == LineCapArrowAnchor) - shorten_bezier_amt(ptcopy, pen->width, TRUE); - else if((pen->startcap == LineCapCustom) && pen->customstart) - shorten_bezier_amt(ptcopy, pen->width * pen->customstart->inset, TRUE); - - /* the direction of the line cap is parallel to the direction at the - * end of the bezier (which, if it has been shortened, is not the same - * as the direction from pt[count-2] to pt[count-1]) */ - draw_cap(graphics, get_gdi_brush_color(pen->brush), pen->endcap, pen->width, pen->customend, - pt[count - 1].X - (ptcopy[count - 1].X - ptcopy[count - 2].X), - pt[count - 1].Y - (ptcopy[count - 1].Y - ptcopy[count - 2].Y), - pt[count - 1].X, pt[count - 1].Y); - - draw_cap(graphics, get_gdi_brush_color(pen->brush), pen->startcap, pen->width, pen->customstart, - pt[0].X - (ptcopy[0].X - ptcopy[1].X), - pt[0].Y - (ptcopy[0].Y - ptcopy[1].Y), pt[0].X, pt[0].Y); - } - - transform_and_round_points(graphics, pti, ptcopy, count); - - PolyBezier(graphics->hdc, pti, count); - - status = Ok; - -end: - GdipFree(pti); - GdipFree(ptcopy); - - return status; -} - /* Draws a combination of bezier curves and lines between points. */ static GpStatus draw_poly(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF * pt, GDIPCONST BYTE * types, INT count, BOOL caps) @@ -2538,9 +2478,7 @@ GpStatus WINGDIPAPI GdipDrawArcI(GpGraphics *graphics, GpPen *pen, INT x, GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, REAL y1, REAL x2, REAL y2, REAL x3, REAL y3, REAL x4, REAL y4) { - INT save_state; GpPointF pt[4]; - GpStatus retval; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x1, y1, x2, y2, x3, y3, x4, y4); @@ -2551,12 +2489,6 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, 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; @@ -2565,14 +2497,7 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, 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 GdipDrawBeziers(graphics, pen, pt, 4); } GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics *graphics, GpPen *pen, INT x1,

1 0

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

Feb. 19, 2013

Module: wine Branch: master Commit: ae8826c43ef782b34cabc8ac38080f21387b4d9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8826c43ef782b34cabc8ac3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:12 2013 +0800 gdiplus: Reimplement GdipDrawBeziers using GdipDrawPath. --- dlls/gdiplus/graphics.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b408db4..3253221 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2587,8 +2587,8 @@ GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics *graphics, GpPen *pen, INT x1, GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count) { - INT i; - GpStatus ret; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %p, %d)\n", graphics, pen, points, count); @@ -2598,17 +2598,15 @@ GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics *graphics, GpPen *pen, if(graphics->busy) return ObjectBusy; - for(i = 0; i < floor(count / 4); i++){ - ret = GdipDrawBezier(graphics, pen, - points[4*i].X, points[4*i].Y, - points[4*i + 1].X, points[4*i + 1].Y, - points[4*i + 2].X, points[4*i + 2].Y, - points[4*i + 3].X, points[4*i + 3].Y); - if(ret != Ok) - return ret; - } + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - return Ok; + status = GdipAddPathBeziers(path, points, count); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); + + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawBeziersI(GpGraphics *graphics, GpPen *pen,

1 0

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

Feb. 19, 2013

Module: wine Branch: master Commit: 2fd1bf60aef8ab14ab128963eb5c009cac9f58e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fd1bf60aef8ab14ab128963e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:02 2013 +0800 gdiplus: Reimplement GdipDrawLines using GdipDrawPath. --- dlls/gdiplus/graphics.c | 79 +++++----------------------------------------- 1 files changed, 9 insertions(+), 70 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7f221bb..738a54c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1713,63 +1713,6 @@ static void shorten_line_amt(REAL x1, REAL y1, REAL *x2, REAL *y2, REAL amt) shorten_line_percent(x1, y1, x2, y2, percent); } -/* Draws lines between the given points, and if caps is true then draws an endcap - * at the end of the last line. */ -static GpStatus draw_polyline(GpGraphics *graphics, GpPen *pen, - GDIPCONST GpPointF * pt, INT count, BOOL caps) -{ - POINT *pti = NULL; - GpPointF *ptcopy = NULL; - GpStatus status = GenericError; - - if(!count) - return Ok; - - pti = GdipAlloc(count * sizeof(POINT)); - ptcopy = GdipAlloc(count * sizeof(GpPointF)); - - if(!pti || !ptcopy){ - status = OutOfMemory; - goto end; - } - - memcpy(ptcopy, pt, count * sizeof(GpPointF)); - - if(caps){ - if(pen->endcap == LineCapArrowAnchor) - shorten_line_amt(ptcopy[count-2].X, ptcopy[count-2].Y, - &ptcopy[count-1].X, &ptcopy[count-1].Y, pen->width); - else if((pen->endcap == LineCapCustom) && pen->customend) - shorten_line_amt(ptcopy[count-2].X, ptcopy[count-2].Y, - &ptcopy[count-1].X, &ptcopy[count-1].Y, - pen->customend->inset * pen->width); - - if(pen->startcap == LineCapArrowAnchor) - shorten_line_amt(ptcopy[1].X, ptcopy[1].Y, - &ptcopy[0].X, &ptcopy[0].Y, pen->width); - else if((pen->startcap == LineCapCustom) && pen->customstart) - shorten_line_amt(ptcopy[1].X, ptcopy[1].Y, - &ptcopy[0].X, &ptcopy[0].Y, - pen->customstart->inset * pen->width); - - draw_cap(graphics, get_gdi_brush_color(pen->brush), pen->endcap, pen->width, pen->customend, - pt[count - 2].X, pt[count - 2].Y, pt[count - 1].X, pt[count - 1].Y); - draw_cap(graphics, get_gdi_brush_color(pen->brush), pen->startcap, pen->width, pen->customstart, - pt[1].X, pt[1].Y, pt[0].X, pt[0].Y); - } - - transform_and_round_points(graphics, pti, ptcopy, count); - - if(Polyline(graphics->hdc, pti, count)) - status = Ok; - -end: - GdipFree(pti); - GdipFree(ptcopy); - - return status; -} - /* Conducts a linear search to find the bezier points that will back off * the endpoint of the curve by a distance of amt. Linear search works * better than binary in this case because there are multiple solutions, @@ -3473,8 +3416,8 @@ GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count) { - INT save_state; - GpStatus retval; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %p, %d)\n", graphics, pen, points, count); @@ -3484,19 +3427,15 @@ GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - save_state = prepare_dc(graphics, pen); - - retval = draw_polyline(graphics, pen, points, count, TRUE); + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - restore_dc(graphics, save_state); + status = GdipAddPathLine2(path, points, count); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); - return retval; + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics *graphics, GpPen *pen, GDIPCONST

1 0

Matteo Bruni : wined3d: Add RESZ support.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 5e28b0c9747369b752102e56b94e58a012b8cf6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e28b0c9747369b752102e56b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 18 13:56:23 2013 +0100 wined3d: Add RESZ support. --- dlls/wined3d/device.c | 22 ++++++++++++++++++++++ dlls/wined3d/utils.c | 11 +++++++++++ include/wine/wined3d.h | 3 +++ 3 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bbd27df..c7874ba 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2212,6 +2212,22 @@ void CDECL wined3d_device_get_viewport(const struct wined3d_device *device, stru *viewport = device->stateBlock->state.viewport; } +static void resolve_depth_buffer(struct wined3d_state *state) +{ + struct wined3d_texture *texture = state->textures[0]; + struct wined3d_surface *depth_stencil, *surface; + + if (!texture || texture->resource.type != WINED3D_RTYPE_TEXTURE + || !(texture->resource.format->flags & WINED3DFMT_FLAG_DEPTH)) + return; + surface = surface_from_resource(texture->sub_resources[0]); + depth_stencil = state->fb->depth_stencil; + if (!depth_stencil) + return; + + wined3d_surface_blt(surface, NULL, depth_stencil, NULL, 0, NULL, WINED3D_TEXF_POINT); +} + void CDECL wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value) { @@ -2234,6 +2250,12 @@ void CDECL wined3d_device_set_render_state(struct wined3d_device *device, TRACE("Application is setting the old value over, nothing to do.\n"); else device_invalidate_state(device, STATE_RENDER(state)); + + if (state == WINED3D_RS_POINTSIZE && value == WINED3D_RESZ_CODE) + { + TRACE("RESZ multisampled depth buffer resolve triggered.\n"); + resolve_depth_buffer(&device->stateBlock->state); + } } DWORD CDECL wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4b29ec8..7c508ee 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -126,6 +126,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_NVDB, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_INST, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_INTZ, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, + {WINED3DFMT_RESZ, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_NVHU, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_NVHS, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_NULL, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, @@ -1712,6 +1713,15 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags |= WINED3DFMT_FLAG_TEXTURE; } + /* RESZ aka AMD DX9-level hack for multisampled depth buffer resolve. You query for RESZ + * support by checking for availability of MAKEFOURCC('R','E','S','Z') surfaces with + * RENDERTARGET usage. */ + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) + { + idx = getFmtIdx(WINED3DFMT_RESZ); + gl_info->formats[idx].flags |= WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET; + } + for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) { struct wined3d_format *format = &gl_info->formats[idx]; @@ -1975,6 +1985,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_B8G8R8A8_UNORM); FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM); FMT_TO_STR(WINED3DFMT_INTZ); + FMT_TO_STR(WINED3DFMT_RESZ); FMT_TO_STR(WINED3DFMT_NULL); FMT_TO_STR(WINED3DFMT_R16); FMT_TO_STR(WINED3DFMT_AL16); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 723d938..378a46b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -245,6 +245,7 @@ enum wined3d_format_id WINED3DFMT_NVHU = WINEMAKEFOURCC('N','V','H','U'), WINED3DFMT_NVHS = WINEMAKEFOURCC('N','V','H','S'), WINED3DFMT_INTZ = WINEMAKEFOURCC('I','N','T','Z'), + WINED3DFMT_RESZ = WINEMAKEFOURCC('R','E','S','Z'), WINED3DFMT_NULL = WINEMAKEFOURCC('N','U','L','L'), WINED3DFMT_R16 = WINEMAKEFOURCC(' ','R','1','6'), WINED3DFMT_AL16 = WINEMAKEFOURCC('A','L','1','6'), @@ -1216,6 +1217,8 @@ enum wined3d_display_rotation #define WINED3D_LEGACY_DEPTH_BIAS 0x00000001 #define WINED3D_NO3D 0x00000002 +#define WINED3D_RESZ_CODE 0x7fa05000 + /* dwDDFX */ /* arithmetic stretching along y axis */ #define WINEDDBLTFX_ARITHSTRETCHY 0x00000001

1 0

Ken Thomases : winemac: Don't bring a window onto the screen in SetFocus().
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 6cfa0a31d8f6436049e0af22918a8e4984bbc954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cfa0a31d8f6436049e0af229… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 18 21:50:24 2013 -0600 winemac: Don't bring a window onto the screen in SetFocus(). --- dlls/winemac.drv/window.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 3429e7d..3f344df 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -852,11 +852,10 @@ void CDECL macdrv_SetFocus(HWND hwnd) if (!(hwnd = GetAncestor(hwnd, GA_ROOT))) return; if (!(data = get_win_data(hwnd))) return; - if (data->cocoa_window) + if (data->cocoa_window && data->on_screen) { /* Set Mac focus */ macdrv_give_cocoa_window_focus(data->cocoa_window); - data->on_screen = TRUE; } release_win_data(data);

1 0

Matteo Bruni : wined3d: Make (wined3d_) surface_depth_blt_fbo handle locations other than SFLAG_INTEXTURE.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 25d0d0876d290e1e803ce16ed9d96189ba5948e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d0d0876d290e1e803ce16ed… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 18 13:56:22 2013 +0100 wined3d: Make (wined3d_)surface_depth_blt_fbo handle locations other than SFLAG_INTEXTURE. --- dlls/d3d9/tests/visual.c | 11 +++-------- dlls/wined3d/surface.c | 42 ++++++++++++++++++++++++++---------------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4d429c4..81926ab 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13411,14 +13411,9 @@ static void multisampled_depth_buffer_test(IDirect3D9 *d3d9) for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) { D3DCOLOR color = getPixelColorFromSurface(readback, expected_colors[i].x, expected_colors[i].y); - if (i % 4 < 2) - todo_wine ok(color_match(color, expected_colors[i].color, 1), - "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", - expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); - else - ok(color_match(color, expected_colors[i].color, 1), - "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", - expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); + ok(color_match(color, expected_colors[i].color, 1), + "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", + expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 57527e4..51a7578 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1040,17 +1040,20 @@ static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RE return TRUE; } -static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, struct wined3d_surface *src_surface, - const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect) +static void surface_depth_blt_fbo(const struct wined3d_device *device, + struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, + struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; DWORD src_mask, dst_mask; GLbitfield gl_mask; - TRACE("device %p, src_surface %p, src_rect %s, dst_surface %p, dst_rect %s.\n", - device, src_surface, wine_dbgstr_rect(src_rect), - dst_surface, wine_dbgstr_rect(dst_rect)); + TRACE("device %p\n", device); + TRACE("src_surface %p, src_location %s, src_rect %s,\n", + src_surface, debug_surflocation(src_location), wine_dbgstr_rect(src_rect)); + TRACE("dst_surface %p, dst_location %s, dst_rect %s.\n", + dst_surface, debug_surflocation(dst_location), wine_dbgstr_rect(dst_rect)); src_mask = src_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); dst_mask = dst_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); @@ -1078,9 +1081,9 @@ static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, s /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */ - surface_load_location(src_surface, SFLAG_INTEXTURE, NULL); + surface_load_location(src_surface, src_location, NULL); if (!surface_is_full_rect(dst_surface, dst_rect)) - surface_load_location(dst_surface, SFLAG_INTEXTURE, NULL); + surface_load_location(dst_surface, dst_location, NULL); context = context_acquire(device, NULL); if (!context->valid) @@ -1092,12 +1095,12 @@ static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, s gl_info = context->gl_info; - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, src_surface, SFLAG_INTEXTURE); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, src_surface, src_location); gl_info->gl_ops.gl.p_glReadBuffer(GL_NONE); checkGLcall("glReadBuffer()"); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, dst_surface, SFLAG_INTEXTURE); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, dst_surface, dst_location); context_set_draw_buffer(context, GL_NONE); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -1404,8 +1407,8 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const return blitter->depth_fill(device, surface, rect, depth); } -static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, const RECT *src_rect, - struct wined3d_surface *dst_surface, const RECT *dst_rect) +static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, + struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect) { struct wined3d_device *device = src_surface->resource.device; @@ -1414,9 +1417,9 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, co dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) return WINED3DERR_INVALIDCALL; - wined3d_surface_depth_blt_fbo(device, src_surface, src_rect, dst_surface, dst_rect); + surface_depth_blt_fbo(device, src_surface, src_location, src_rect, dst_surface, dst_location, dst_rect); - surface_modify_ds_location(dst_surface, SFLAG_INTEXTURE, + surface_modify_ds_location(dst_surface, dst_location, dst_surface->ds_current_size.cx, dst_surface->ds_current_size.cy); return WINED3D_OK; @@ -1612,7 +1615,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC return WINED3DERR_INVALIDCALL; } - if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, &src_rect, dst_surface, &dst_rect))) + if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, src_surface->draw_binding, &src_rect, + dst_surface, dst_surface->draw_binding, &dst_rect))) return WINED3D_OK; } } @@ -6168,16 +6172,22 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { - if (location == SFLAG_INTEXTURE) + if (location == SFLAG_INTEXTURE && surface->flags & SFLAG_INDRAWABLE) { struct wined3d_context *context = context_acquire(device, NULL); surface_load_ds_location(surface, context, location); context_release(context); return WINED3D_OK; } + else if (location & surface->flags && surface->draw_binding != SFLAG_INDRAWABLE) + { + /* Already up to date, nothing to do. */ + return WINED3D_OK; + } else { - FIXME("Unimplemented location %s for depth/stencil buffers.\n", debug_surflocation(location)); + FIXME("Unimplemented copy from %s to %s for depth/stencil buffers.\n", + debug_surflocation(surface->flags & SFLAG_LOCATIONS), debug_surflocation(location)); return WINED3DERR_INVALIDCALL; } }

1 0

Michael Stefaniuc : Revert "dsound/tests: Primary and secondary buffers use the same IDirectSoundBuffer vtbl.".
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 621d9e444a14885830a1a87178f3d3cce47ab562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=621d9e444a14885830a1a8717… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 18 22:55:08 2013 +0100 Revert "dsound/tests: Primary and secondary buffers use the same IDirectSoundBuffer vtbl.". This reverts commit 7959778d3f84680fcee2e0d43cfcd0e613d68242. This is not always the case on Windows. --- dlls/dsound/tests/dsound.c | 3 --- dlls/dsound/tests/dsound8.c | 3 --- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 0f199a4..ed17f2a 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -642,9 +642,6 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); if (rc==DS_OK && secondary!=NULL) { - todo_wine ok(primary->lpVtbl==secondary->lpVtbl, - "Primary and secondary buffers have different vtbls.\n"); - test_buffer(dso,&secondary,0,FALSE,0,FALSE,0, winetest_interactive,1.0,0,NULL,0,0,FALSE,0); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index a0b78e5..664ba0c 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -648,9 +648,6 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) "buffer %08x\n",rc); if (rc==DS_OK && secondary!=NULL) { - todo_wine ok(primary->lpVtbl==secondary->lpVtbl, - "Primary and secondary buffers have different vtbls.\n"); - test_buffer8(dso,&secondary,0,FALSE,0,FALSE,0, winetest_interactive,1.0,0,NULL,0,0);

1 0

Jacek Caban : urlmon: Skip https tests on IE6.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 2544999ed2b27ccd3cf1ddd68fe2c2c61cd05e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2544999ed2b27ccd3cf1ddd68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 15:05:04 2013 +0100 urlmon: Skip https tests on IE6. --- dlls/urlmon/tests/protocol.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 5133ec8..6255d6f 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -3095,10 +3095,10 @@ static void test_ftp_protocol(void) trace("Testing ftp protocol...\n"); + init_test(FTP_TEST, 0); + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; state = STATE_STARTDOWNLOADING; - tested_protocol = FTP_TEST; - first_data_notif = TRUE; expect_hrResult = E_PENDING; hres = CoGetClassObject(&CLSID_FtpProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); @@ -3629,7 +3629,10 @@ START_TEST(protocol) test_file_protocol(); test_http_protocol(); - test_https_protocol(); + if(pCreateUri) + test_https_protocol(); + else + win_skip("Skipping https tests on too old platform\n"); test_ftp_protocol(); test_gopher_protocol(); test_mk_protocol();

1 0

André Hentschel : winhlp32: Properly detect non-ASCII chars.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 147d4bc88a4059e129073effa30bd615eef54632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=147d4bc88a4059e129073effa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 17 17:44:44 2013 +0100 winhlp32: Properly detect non-ASCII chars. --- programs/winhlp32/hlpfile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 96c1e75..3c49c33 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -712,7 +712,7 @@ static BOOL HLPFILE_RtfAddText(struct RtfData* rd, const char* str) } for (last = p = str; *p; p++) { - if (*p < 0) /* escape non ASCII chars */ + if (*p & 0x80) /* escape non-ASCII chars */ { static char xx[8]; rlen = sprintf(xx, "\\'%x", *(const BYTE*)p);

1 0

Alexandre Julliard : winegcc: Don't use prelink when cross-compiling.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 381bbe1b28a3c9c9313e65118374ecc85266a4ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=381bbe1b28a3c9c9313e65118… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 16:36:03 2013 +0100 winegcc: Don't use prelink when cross-compiling. --- tools/winegcc/winegcc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 2432bf3..7d528e0 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1065,7 +1065,7 @@ static void build(struct options* opts) strarray_free (link_args); /* set the base address */ - if (opts->image_base) + if (opts->image_base && !opts->target) { const char *prelink = PRELINK; if (prelink[0] && strcmp(prelink,"false"))

1 0

Nikolay Sivov : dwrite: Added more dwrite interfaces.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: c44942789cbca6150b0b6a5e5ebc16b311c1c7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c44942789cbca6150b0b6a5e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 18 18:23:29 2013 +0400 dwrite: Added more dwrite interfaces. --- .gitignore | 1 + include/Makefile.in | 1 + include/dwrite_1.idl | 827 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 829 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c44942789cbca6150b0b6…

1 0

Jacek Caban : wininet: Removed broken cache tests.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: aa4ccd807d163c2f0ff8bc70e18a8442bcbb9da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4ccd807d163c2f0ff8bc70e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 15:45:43 2013 +0100 wininet: Removed broken cache tests. --- dlls/wininet/tests/http.c | 78 --------------------------------------------- 1 files changed, 0 insertions(+), 78 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 52ad8a7..5f7a961 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1702,7 +1702,6 @@ static const char page1[] = struct server_info { HANDLE hEvent; int port; - int num_testH_retrievals; }; static DWORD CALLBACK server_thread(LPVOID param) @@ -1893,17 +1892,6 @@ static DWORD CALLBACK server_thread(LPVOID param) { send(c, page1, sizeof page1-1, 0); } - if (strstr(buffer, "GET /testH")) - { - si->num_testH_retrievals++; - if (!strstr(buffer, "Content-Length: 0")) - { - send(c, okmsg, sizeof okmsg-1, 0); - send(c, page1, sizeof page1-1, 0); - } - else - send(c, notokmsg, sizeof notokmsg-1, 0); - } if (strstr(buffer, "GET /test_no_content")) { static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"; @@ -2814,70 +2802,6 @@ static void test_options(int port) InternetCloseHandle(ses); } -static void test_url_caching(int port, int *num_retrievals) -{ - HINTERNET hi, hc, hr; - DWORD r, count; - char buffer[0x100]; - - ok(*num_retrievals == 0, "expected 0 retrievals prior to test\n"); - - hi = InternetOpen(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); - ok(hi != NULL, "open failed\n"); - - hc = InternetConnect(hi, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - ok(hc != NULL, "connect failed\n"); - - /* Pre-load the cache: */ - hr = HttpOpenRequest(hc, "GET", "/testH", NULL, NULL, NULL, 0, 0); - ok(hr != NULL, "HttpOpenRequest failed\n"); - - r = HttpSendRequest(hr, NULL, 0, NULL, 0); - ok(r, "HttpSendRequest failed\n"); - - ok(*num_retrievals == 1, "expected 1 retrievals, got %d\n", *num_retrievals); - - count = 0; - memset(buffer, 0, sizeof buffer); - SetLastError(0xdeadbeef); - r = InternetReadFile(hr, buffer, sizeof buffer, &count); - ok(r, "InternetReadFile failed %u\n", GetLastError()); - ok(count == sizeof page1 - 1, "count was wrong\n"); - ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); - - InternetCloseHandle(hr); - - /* Send the same request, requiring it to be retrieved from the cache */ - hr = HttpOpenRequest(hc, "GET", "/testH", NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); - ok(hr != NULL, "HttpOpenRequest failed\n"); - - r = HttpSendRequest(hr, NULL, 0, NULL, 0); - /* Older Windows versions succeed with this request, newer ones fail with - * ERROR_FILE_NOT_FOUND. Accept either, as the older version allows us - * to verify that the server isn't contacted. - */ - if (!r) - ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); - else - { - /* The server shouldn't be contacted for this request. */ - todo_wine - ok(*num_retrievals == 1, "expected 1 retrievals\n"); - - count = 0; - memset(buffer, 0, sizeof buffer); - SetLastError(0xdeadbeef); - r = InternetReadFile(hr, buffer, sizeof buffer, &count); - ok(r, "InternetReadFile failed %u\n", GetLastError()); - ok(count == sizeof page1 - 1, "count was wrong\n"); - ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); - } - - InternetCloseHandle(hc); - InternetCloseHandle(hi); -} - static void test_http_connection(void) { struct server_info si; @@ -2886,7 +2810,6 @@ static void test_http_connection(void) si.hEvent = CreateEvent(NULL, 0, 0, NULL); si.port = 7531; - si.num_testH_retrievals = 0; hThread = CreateThread(NULL, 0, server_thread, (LPVOID) &si, 0, &id); ok( hThread != NULL, "create thread failed\n"); @@ -2915,7 +2838,6 @@ static void test_http_connection(void) test_HttpSendRequestW(si.port); test_last_error(si.port); test_options(si.port); - test_url_caching(si.port, &si.num_testH_retrievals); test_no_content(si.port); test_conn_close(si.port);

1 0

Jacek Caban : wininet: Address string should never be converted to UNICODE in status notifications .
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 3098e3c355775a6c0f6199fe73ad36befb455608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3098e3c355775a6c0f6199fe7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 15:45:30 2013 +0100 wininet: Address string should never be converted to UNICODE in status notifications. --- dlls/urlmon/protocol.c | 15 +++++++++-- dlls/wininet/tests/http.c | 30 ++++++++++++++++++---- dlls/wininet/utility.c | 60 +++++++++++++++++--------------------------- 3 files changed, 59 insertions(+), 46 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index e404e4d..c7c61da 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -115,10 +115,19 @@ static void WINAPI internet_status_callback(HINTERNET internet, DWORD_PTR contex report_progress(protocol, BINDSTATUS_FINDINGRESOURCE, (LPWSTR)status_info); break; - case INTERNET_STATUS_CONNECTING_TO_SERVER: - TRACE("%p INTERNET_STATUS_CONNECTING_TO_SERVER\n", protocol); - report_progress(protocol, BINDSTATUS_CONNECTING, (LPWSTR)status_info); + case INTERNET_STATUS_CONNECTING_TO_SERVER: { + WCHAR *info; + + TRACE("%p INTERNET_STATUS_CONNECTING_TO_SERVER %s\n", protocol, (const char*)status_info); + + info = heap_strdupAtoW(status_info); + if(!info) + return; + + report_progress(protocol, BINDSTATUS_CONNECTING, info); + heap_free(info); break; + } case INTERNET_STATUS_SENDING_REQUEST: TRACE("%p INTERNET_STATUS_SENDING_REQUEST\n", protocol); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6083900..52ad8a7 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -159,6 +159,7 @@ static const test_data_t test_data[] = { }; static INTERNET_STATUS_CALLBACK (WINAPI *pInternetSetStatusCallbackA)(HINTERNET ,INTERNET_STATUS_CALLBACK); +static INTERNET_STATUS_CALLBACK (WINAPI *pInternetSetStatusCallbackW)(HINTERNET ,INTERNET_STATUS_CALLBACK); static BOOL (WINAPI *pInternetGetSecurityInfoByURLA)(LPSTR,PCCERT_CHAIN_CONTEXT*,DWORD*); static int strcmp_wa(LPCWSTR strw, const char *stra) @@ -321,12 +322,16 @@ static VOID WINAPI callback( trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTING_TO_SERVER \"%s\" %d\n", GetCurrentThreadId(), hInternet, dwContext, (LPCSTR)lpvStatusInformation,dwStatusInformationLength); + ok(dwStatusInformationLength == strlen(lpvStatusInformation)+1, "unexpected size %u\n", + dwStatusInformationLength); *(LPSTR)lpvStatusInformation = '\0'; break; case INTERNET_STATUS_CONNECTED_TO_SERVER: trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTED_TO_SERVER \"%s\" %d\n", GetCurrentThreadId(), hInternet, dwContext, (LPCSTR)lpvStatusInformation,dwStatusInformationLength); + ok(dwStatusInformationLength == strlen(lpvStatusInformation)+1, "unexpected size %u\n", + dwStatusInformationLength); *(LPSTR)lpvStatusInformation = '\0'; break; case INTERNET_STATUS_SENDING_REQUEST: @@ -3595,19 +3600,27 @@ static void WINAPI cb(HINTERNET handle, DWORD_PTR context, DWORD status, LPVOID trace("%p 0x%08lx %u %p 0x%08x\n", handle, context, status, info, size); - if (status == INTERNET_STATUS_REQUEST_COMPLETE) - { + switch(status) { + case INTERNET_STATUS_REQUEST_COMPLETE: trace("request handle: 0x%08lx\n", result->dwResult); ctx->req = (HINTERNET)result->dwResult; SetEvent(ctx->event); - } - if (status == INTERNET_STATUS_HANDLE_CLOSING) - { + break; + case INTERNET_STATUS_HANDLE_CLOSING: { DWORD type = INTERNET_HANDLE_TYPE_CONNECT_HTTP, size = sizeof(type); if (InternetQueryOption(handle, INTERNET_OPTION_HANDLE_TYPE, &type, &size)) ok(type != INTERNET_HANDLE_TYPE_CONNECT_HTTP, "unexpected callback\n"); SetEvent(ctx->event); + break; + } + case INTERNET_STATUS_NAME_RESOLVED: + case INTERNET_STATUS_CONNECTING_TO_SERVER: + case INTERNET_STATUS_CONNECTED_TO_SERVER: { + char *str = info; + ok(str[0] && str[1], "Got string: %s\n", str); + ok(size == strlen(str)+1, "unexpected size %u\n", size); + } } } @@ -3619,6 +3632,10 @@ static void test_open_url_async(void) struct context ctx; ULONG type; + /* Collect all existing persistent connections */ + ret = InternetSetOptionA(NULL, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); + ok(ret, "InternetSetOption(INTERNET_OPTION_END_BROWSER_SESSION) failed: %u\n", GetLastError()); + ctx.req = NULL; ctx.event = CreateEvent(NULL, TRUE, FALSE, "Z:_home_hans_jaman-installer.exe_ev1"); @@ -3636,7 +3653,7 @@ static void test_open_url_async(void) ok(!ret, "InternetSetOptionA failed\n"); ok(error == ERROR_INTERNET_OPTION_NOT_SETTABLE, "got %u expected ERROR_INTERNET_OPTION_NOT_SETTABLE\n", error); - pInternetSetStatusCallbackA(ses, cb); + pInternetSetStatusCallbackW(ses, cb); ResetEvent(ctx.event); req = InternetOpenUrl(ses, "http://test.winehq.org", NULL, 0, 0, (DWORD_PTR)&ctx); @@ -4123,6 +4140,7 @@ START_TEST(http) } pInternetSetStatusCallbackA = (void*)GetProcAddress(hdll, "InternetSetStatusCallbackA"); + pInternetSetStatusCallbackW = (void*)GetProcAddress(hdll, "InternetSetStatusCallbackW"); pInternetGetSecurityInfoByURLA = (void*)GetProcAddress(hdll, "InternetGetSecurityInfoByURLA"); init_status_tests(); diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 8879b8d..16ee059 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -298,62 +298,48 @@ static const char *debugstr_status_info(DWORD status, void *info) } } -VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, - DWORD dwInternetStatus, LPVOID lpvStatusInfo, - DWORD dwStatusInfoLength) +void INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR context, DWORD status, void *info, DWORD info_len) { - LPVOID lpvNewInfo = NULL; + void *new_info = info; if( !hdr->lpfnStatusCB ) return; /* the IE5 version of wininet does not send callbacks if dwContext is zero */ - if( !dwContext ) + if(!context) return; - lpvNewInfo = lpvStatusInfo; - if(hdr->dwInternalFlags & INET_CALLBACKW) { - switch(dwInternetStatus) { - case INTERNET_STATUS_NAME_RESOLVED: - case INTERNET_STATUS_CONNECTING_TO_SERVER: - case INTERNET_STATUS_CONNECTED_TO_SERVER: - lpvNewInfo = heap_strdupAtoW(lpvStatusInfo); - dwStatusInfoLength *= sizeof(WCHAR); - break; - case INTERNET_STATUS_RESOLVING_NAME: - case INTERNET_STATUS_REDIRECT: - lpvNewInfo = heap_strdupW(lpvStatusInfo); - break; - } - }else { - switch(dwInternetStatus) - { - case INTERNET_STATUS_NAME_RESOLVED: - case INTERNET_STATUS_CONNECTING_TO_SERVER: - case INTERNET_STATUS_CONNECTED_TO_SERVER: - lpvNewInfo = heap_alloc(strlen(lpvStatusInfo) + 1); - if (lpvNewInfo) strcpy(lpvNewInfo, lpvStatusInfo); + switch(status) { + case INTERNET_STATUS_NAME_RESOLVED: + case INTERNET_STATUS_CONNECTING_TO_SERVER: + case INTERNET_STATUS_CONNECTED_TO_SERVER: + new_info = heap_alloc(info_len); + if(new_info) + memcpy(new_info, info, info_len); + break; + case INTERNET_STATUS_RESOLVING_NAME: + case INTERNET_STATUS_REDIRECT: + if(hdr->dwInternalFlags & INET_CALLBACKW) { + new_info = heap_strdupW(info); break; - case INTERNET_STATUS_RESOLVING_NAME: - case INTERNET_STATUS_REDIRECT: - lpvNewInfo = heap_strdupWtoA(lpvStatusInfo); - dwStatusInfoLength /= sizeof(WCHAR); + }else { + new_info = heap_strdupWtoA(info); + info_len = strlen(new_info)+1; break; } } TRACE(" callback(%p) (%p (%p), %08lx, %d (%s), %s, %d)\n", - hdr->lpfnStatusCB, hdr->hInternet, hdr, dwContext, dwInternetStatus, get_callback_name(dwInternetStatus), - debugstr_status_info(dwInternetStatus, lpvNewInfo), dwStatusInfoLength); + hdr->lpfnStatusCB, hdr->hInternet, hdr, context, status, get_callback_name(status), + debugstr_status_info(status, new_info), info_len); - hdr->lpfnStatusCB(hdr->hInternet, dwContext, dwInternetStatus, - lpvNewInfo, dwStatusInfoLength); + hdr->lpfnStatusCB(hdr->hInternet, context, status, new_info, info_len); TRACE(" end callback().\n"); - if(lpvNewInfo != lpvStatusInfo) - heap_free(lpvNewInfo); + if(new_info != info) + heap_free(new_info); } typedef struct {

1 0

Huw Davies : riched20: Add the ability to CharFromPoint to either pick the closest leading edge or the leading edge of the selected character .
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: acaad0a842f2cee5e9f24260a4647a9ce5256202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acaad0a842f2cee5e9f24260a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 18 13:43:48 2013 +0000 riched20: Add the ability to CharFromPoint to either pick the closest leading edge or the leading edge of the selected character. --- dlls/riched20/caret.c | 4 +- dlls/riched20/editor.h | 3 +- dlls/riched20/run.c | 55 +++++++++++++++++++++++++++--------------------- dlls/riched20/wrap.c | 35 +----------------------------- 4 files changed, 36 insertions(+), 61 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 76c169b..ddaa37a 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -873,7 +873,7 @@ static BOOL ME_ReturnFoundPos(ME_TextEditor *editor, ME_DisplayItem *found, if ((found->member.run.nFlags & MERF_ENDPARA) || rx < 0) rx = 0; result->pRun = found; - result->nOffset = ME_CharFromPointCursor(editor, rx, &found->member.run); + result->nOffset = ME_CharFromPoint(editor, rx, &found->member.run, TRUE); if (result->nOffset == found->member.run.len && rx) { result->pRun = ME_FindItemFwd(result->pRun, diRun); @@ -1194,7 +1194,7 @@ static ME_DisplayItem *ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pR } if (x >= run_x && x < run_x+width) { - int ch = ME_CharFromPointCursor(editor, x-run_x, &pNext->member.run); + int ch = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE); if (ch < pNext->member.run.len) { if (pOffset) *pOffset = ch; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index de95448..95818cd 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -141,7 +141,8 @@ ME_DisplayItem *ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, void ME_CheckCharOffsets(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_PropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; /* this one accounts for 1/2 char tolerance */ -int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) DECLSPEC_HIDDEN; +int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest) DECLSPEC_HIDDEN; +int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest) DECLSPEC_HIDDEN; int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset) DECLSPEC_HIDDEN; int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) DECLSPEC_HIDDEN; int ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 2808045..010fb80 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -404,22 +404,22 @@ void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) } /****************************************************************************** - * ME_CharFromPointCursor + * ME_CharFromPointContext * * Returns a character position inside the run given a run-relative - * pixel horizontal position. This version rounds to the nearest character edge - * (ie. if the second character is at pixel position 8, then for cx=0..3 - * it returns 0, and for cx=4..7 it returns 1). + * pixel horizontal position. * - * It is used for mouse click handling, for better usability (and compatibility - * with the native control). + * If closest is FALSE return the actual character + * If closest is TRUE will round to the closest leading edge. + * ie. if the second character is at pixel position 8 and third at 16 then for: + * closest = FALSE cx = 0..7 return 0, cx = 8..15 return 1 + * closest = TRUE cx = 0..3 return 0, cx = 4..11 return 1. */ -int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) +int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest) { ME_String *mask_text = NULL; WCHAR *str; int fit = 0; - ME_Context c; HGDIOBJ hOldFont; SIZE sz, sz2, sz3; if (!run->len || cx <= 0) @@ -427,47 +427,54 @@ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) if (run->nFlags & (MERF_TAB | MERF_ENDCELL)) { - if (cx < run->nWidth/2) - return 0; + if (!closest || cx < run->nWidth / 2) return 0; return 1; } - ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); + if (run->nFlags & MERF_GRAPHICS) { SIZE sz; - ME_GetOLEObjectSize(&c, run, &sz); - ME_DestroyContext(&c); - if (cx < sz.cx/2) - return 0; + ME_GetOLEObjectSize(c, run, &sz); + if (!closest || cx < sz.cx / 2) return 0; return 1; } - if (editor->cPasswordMask) + if (c->editor->cPasswordMask) { - mask_text = ME_MakeStringR( editor->cPasswordMask, run->len ); + mask_text = ME_MakeStringR( c->editor->cPasswordMask, run->len ); str = mask_text->szData; } else str = get_text( run, 0 ); - hOldFont = ME_SelectStyleFont(&c, run->style); - GetTextExtentExPointW(c.hDC, str, run->len, + hOldFont = ME_SelectStyleFont(c, run->style); + GetTextExtentExPointW(c->hDC, str, run->len, cx, &fit, NULL, &sz); - if (fit != run->len) + if (closest && fit != run->len) { - GetTextExtentPoint32W(c.hDC, str, fit, &sz2); - GetTextExtentPoint32W(c.hDC, str, fit + 1, &sz3); + GetTextExtentPoint32W(c->hDC, str, fit, &sz2); + GetTextExtentPoint32W(c->hDC, str, fit + 1, &sz3); if (cx >= (sz2.cx+sz3.cx)/2) fit = fit + 1; } ME_DestroyString( mask_text ); - ME_UnselectStyleFont(&c, run->style, hOldFont); - ME_DestroyContext(&c); + ME_UnselectStyleFont(c, run->style, hOldFont); return fit; } +int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest) +{ + ME_Context c; + int ret; + + ME_InitContext( &c, editor, ITextHost_TxGetDC( editor->texthost ) ); + ret = ME_CharFromPointContext( &c, cx, run, closest ); + ME_DestroyContext(&c); + return ret; +} + /****************************************************************************** * ME_GetTextExtent * diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index aed04806..7c34876 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -106,41 +106,8 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite */ static int find_split_point( ME_Context *c, int cx, ME_Run *run ) { - int fit = 0; - HGDIOBJ hOldFont; - SIZE sz; - if (!run->len || cx <= 0) return 0; - - if (run->nFlags & MERF_TAB || - (run->nFlags & (MERF_ENDCELL|MERF_ENDPARA)) == MERF_ENDCELL) - { - if (cx < run->nWidth / 2) return 0; - return 1; - } - if (run->nFlags & MERF_GRAPHICS) - { - SIZE sz; - ME_GetOLEObjectSize( c, run, &sz ); - if (cx < sz.cx) return 0; - return 1; - } - hOldFont = ME_SelectStyleFont( c, run->style ); - - if (c->editor->cPasswordMask) - { - ME_String *strMasked = ME_MakeStringR( c->editor->cPasswordMask, run->len ); - GetTextExtentExPointW( c->hDC, strMasked->szData, run->len, cx, &fit, NULL, &sz ); - ME_DestroyString( strMasked ); - } - else - { - GetTextExtentExPointW( c->hDC, get_text( run, 0 ), run->len, cx, &fit, NULL, &sz ); - } - - ME_UnselectStyleFont( c, run->style, hOldFont ); - - return fit; + return ME_CharFromPointContext( c, cx, run, FALSE ); } static ME_DisplayItem *ME_MakeRow(int height, int baseline, int width)

1 0

Nikolay Sivov : dwrite: Remove testing for exact script code value.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 1cb663f5ce7acec0f73f611756b4a45559f9632f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb663f5ce7acec0f73f61175… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 16 20:23:04 2013 +0400 dwrite: Remove testing for exact script code value. --- dlls/dwrite/analyzer.c | 7 +- dlls/dwrite/tests/analyzer.c | 200 ++++++++++++++++-------------------------- 2 files changed, 81 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1cb663f5ce7acec0f73f6…

1 0

Dmitry Timoshkov : gdiplus: Avoid a crash in GdipDrawImagePointRect.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: f817fb56e87cae9049d5d917382445345baeea3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f817fb56e87cae9049d5d9173… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 18 21:29:12 2013 +0800 gdiplus: Avoid a crash in GdipDrawImagePointRect. --- dlls/gdiplus/graphics.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b9aa912..7d54871 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3053,6 +3053,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics *graphics, GpImage *image, TRACE("(%p, %p, %f, %f, %f, %f, %f, %f, %d)\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); + if (!graphics || !image) return InvalidParameter; + scale_x = units_scale(srcUnit, graphics->unit, graphics->xres); scale_x *= graphics->xres / image->xres; scale_y = units_scale(srcUnit, graphics->unit, graphics->yres);

1 0

Alexandre Julliard : kernel32: Attempt to buffer the full directory in FindFirstFile to avoid races.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 7ce90cc7198a6dee75a999e9502ff997e5d3a763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ce90cc7198a6dee75a999e95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 14:50:57 2013 +0100 kernel32: Attempt to buffer the full directory in FindFirstFile to avoid races. --- dlls/kernel32/file.c | 63 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 52 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 91e8c8c..89e0fad 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -61,11 +61,14 @@ typedef struct BOOL is_root; /* is directory the root of the drive? */ UINT data_pos; /* current position in dir data */ UINT data_len; /* length of dir data */ - BYTE data[8192]; /* directory data */ + UINT data_size; /* size of data buffer, or 0 when everything has been read */ + BYTE *data; /* directory data */ } FIND_FIRST_INFO; #define FIND_FIRST_MAGIC 0xc0ffee11 +static const UINT max_entry_size = offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[256] ); + static BOOL oem_file_apis; static const WCHAR wildcardsW[] = { '*','?',0 }; @@ -1930,6 +1933,8 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, info->magic = FIND_FIRST_MAGIC; info->data_pos = 0; info->data_len = 0; + info->data_size = 0; + info->data = NULL; info->search_op = search_op; if (device) @@ -1945,16 +1950,44 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, else { IO_STATUS_BLOCK io; + BOOL has_wildcard = strpbrkW( info->mask.Buffer, wildcardsW ) != NULL; + + info->data_size = has_wildcard ? 8192 : max_entry_size; - NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, sizeof(info->data), - FileBothDirectoryInformation, FALSE, &info->mask, TRUE ); - if (io.u.Status) + while (info->data_size) { - FindClose( info ); - SetLastError( RtlNtStatusToDosError( io.u.Status ) ); - return INVALID_HANDLE_VALUE; + if (!(info->data = HeapAlloc( GetProcessHeap(), 0, info->data_size ))) + { + FindClose( info ); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return INVALID_HANDLE_VALUE; + } + + NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, info->data_size, + FileBothDirectoryInformation, FALSE, &info->mask, TRUE ); + if (io.u.Status) + { + FindClose( info ); + SetLastError( RtlNtStatusToDosError( io.u.Status ) ); + return INVALID_HANDLE_VALUE; + } + + if (io.Information < info->data_size - max_entry_size) + { + info->data_size = 0; /* we read everything */ + } + else if (info->data_size < 1024 * 1024) + { + HeapFree( GetProcessHeap(), 0, info->data ); + info->data_size *= 2; + } + else break; } + info->data_len = io.Information; + if (!info->data_size && has_wildcard) /* release unused buffer space */ + HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, info->data, info->data_len ); + if (!FindNextFileW( info, data )) { TRACE( "%s not found\n", debugstr_w(filename) ); @@ -1962,11 +1995,12 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, SetLastError( ERROR_FILE_NOT_FOUND ); return INVALID_HANDLE_VALUE; } - if (!strpbrkW( info->mask.Buffer, wildcardsW )) + if (!has_wildcard) /* we can't find two files with the same name */ { - /* we can't find two files with the same name */ CloseHandle( info->handle ); + HeapFree( GetProcessHeap(), 0, info->data ); info->handle = 0; + info->data = NULL; } } return info; @@ -2010,15 +2044,21 @@ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data ) { IO_STATUS_BLOCK io; - NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, sizeof(info->data), - FileBothDirectoryInformation, FALSE, &info->mask, FALSE ); + if (info->data_size) + NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, info->data_size, + FileBothDirectoryInformation, FALSE, &info->mask, FALSE ); + else + io.u.Status = STATUS_NO_MORE_FILES; + if (io.u.Status) { SetLastError( RtlNtStatusToDosError( io.u.Status ) ); if (io.u.Status == STATUS_NO_MORE_FILES) { CloseHandle( info->handle ); + HeapFree( GetProcessHeap(), 0, info->data ); info->handle = 0; + info->data = NULL; } break; } @@ -2101,6 +2141,7 @@ BOOL WINAPI FindClose( HANDLE handle ) RtlFreeUnicodeString( &info->path ); info->data_pos = 0; info->data_len = 0; + HeapFree( GetProcessHeap(), 0, info->data ); RtlLeaveCriticalSection( &info->cs ); info->cs.DebugInfo->Spare[0] = 0; RtlDeleteCriticalSection( &info->cs );

1 0