wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Jacek Caban : jscript: Use bytecode for delete member expression.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 962307da6c74685876939dd148bd3d80c3b7a913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=962307da6c74685876939dd14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 30 10:14:33 2011 +0100 jscript: Use bytecode for delete member expression. --- dlls/jscript/compile.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index adcd749..b0fa861 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -321,6 +321,22 @@ static HRESULT compile_delete_expression(compiler_ctx_t *ctx, unary_expression_t return E_OUTOFMEMORY; break; } + case EXPR_MEMBER: { + member_expression_t *member_expr = (member_expression_t*)expr->expression; + + hres = compile_expression(ctx, member_expr->expression); + if(FAILED(hres)) + return hres; + + /* FIXME: Potential optimization */ + hres = push_instr_str(ctx, OP_str, member_expr->identifier); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_delete) == -1) + return E_OUTOFMEMORY; + break; + } default: expr->expr.eval = delete_expression_eval; return compile_interp_fallback(ctx, &expr->expr);

1 0

Jacek Caban : jscript: Use bytecode for delete on array expression implementation.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: facc2189d298ad0a76844c178fd2609e2fc7406c URL: http://source.winehq.org/git/wine.git/?a=commit;h=facc2189d298ad0a76844c178… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 30 10:14:22 2011 +0100 jscript: Use bytecode for delete on array expression implementation. --- dlls/jscript/compile.c | 30 +++++++++++++++++++++++++ dlls/jscript/engine.c | 52 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/engine.h | 1 + dlls/jscript/parser.y | 2 +- dlls/jscript/tests/lang.js | 7 ++++++ 5 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index b7abdda..adcd749 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -301,6 +301,34 @@ static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, expression_t *expr) return S_OK; } +static HRESULT compile_delete_expression(compiler_ctx_t *ctx, unary_expression_t *expr) +{ + HRESULT hres; + + switch(expr->expression->type) { + case EXPR_ARRAY: { + array_expression_t *array_expr = (array_expression_t*)expr->expression; + + hres = compile_expression(ctx, array_expr->member_expr); + if(FAILED(hres)) + return hres; + + hres = compile_expression(ctx, array_expr->expression); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_delete) == -1) + return E_OUTOFMEMORY; + break; + } + default: + expr->expr.eval = delete_expression_eval; + return compile_interp_fallback(ctx, &expr->expr); + } + + return S_OK; +} + static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) { switch(literal->type) { @@ -352,6 +380,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_comma_expression(ctx, (binary_expression_t*)expr); case EXPR_COND: return compile_conditional_expression(ctx, (conditional_expression_t*)expr); + case EXPR_DELETE: + return compile_delete_expression(ctx, (unary_expression_t*)expr); case EXPR_DIV: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_div); case EXPR_EQ: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 48633cf..6567d68 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2498,6 +2498,53 @@ HRESULT delete_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla } /* ECMA-262 3rd Edition 11.4.2 */ +static HRESULT interp_delete(exec_ctx_t *ctx) +{ + VARIANT *obj_var, *name_var; + IDispatchEx *dispex; + IDispatch *obj; + BSTR name; + BOOL ret; + HRESULT hres; + + TRACE("\n"); + + name_var = stack_pop(ctx); + obj_var = stack_pop(ctx); + + hres = to_object(ctx->parser->script, obj_var, &obj); + VariantClear(obj_var); + if(FAILED(hres)) { + VariantClear(name_var); + return hres; + } + + hres = to_string(ctx->parser->script, name_var, &ctx->ei, &name); + VariantClear(name_var); + if(FAILED(hres)) { + IDispatch_Release(obj); + return hres; + } + + hres = IDispatch_QueryInterface(obj, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_DeleteMemberByName(dispex, name, make_grfdex(ctx->parser->script, fdexNameCaseSensitive)); + ret = TRUE; + IDispatchEx_Release(dispex); + }else { + hres = S_OK; + ret = FALSE; + } + + IDispatch_Release(obj); + SysFreeString(name); + if(FAILED(hres)) + return hres; + + return stack_push_bool(ctx, ret); +} + +/* ECMA-262 3rd Edition 11.4.2 */ static HRESULT interp_void(exec_ctx_t *ctx) { VARIANT v; @@ -3469,5 +3516,8 @@ HRESULT compiled_expression_eval(script_ctx_t *ctx, expression_t *expr, DWORD fl if(FAILED(hres)) return hres; - return (expr->eval = interp_expression_eval)(ctx, expr, flags, ei, ret); + if(expr->eval == compiled_expression_eval) + expr->eval = interp_expression_eval; + + return expr->eval(ctx, expr, flags, ei, ret); } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 58f12c7..f2af36f 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -45,6 +45,7 @@ typedef struct _func_stack { X(add, 1, 0,0) \ X(bool, 1, ARG_INT, 0) \ X(bneg, 1, 0,0) \ + X(delete, 1, 0,0) \ X(div, 1, 0,0) \ X(double, 1, ARG_SBL, 0) \ X(eq, 1, 0,0) \ diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 0912107..3fffbe9 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1318,7 +1318,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - delete_expression_eval, + compiled_expression_eval, compiled_expression_eval, typeof_expression_eval, compiled_expression_eval, diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index c85907c..4f3d509 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -830,9 +830,16 @@ tmp = new Object(); tmp.test = false; ok((delete tmp.test) === true, "delete returned false"); ok(typeof(tmp.test) === "undefined", "tmp.test type = " + typeof(tmp.test)); +ok(!("test" in tmp), "test is still in tmp after delete?"); for(iter in tmp) ok(false, "tmp has prop " + iter); +tmp = new Object(); +tmp.test = false; +ok((delete tmp["test"]) === true, "delete returned false"); +ok(typeof(tmp.test) === "undefined", "tmp.test type = " + typeof(tmp.test)); +ok(!("test" in tmp), "test is still in tmp after delete?"); + tmp.testWith = true; with(tmp) ok(testWith === true, "testWith !== true");

1 0

Jacek Caban : jscript: Mark some functions as static.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 6c47177cb1aa52f89aed54c16c8d943556b52b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c47177cb1aa52f89aed54c16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 30 10:14:04 2011 +0100 jscript: Mark some functions as static. --- dlls/jscript/engine.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2d766e4..48633cf 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1636,7 +1636,7 @@ static void jsstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) } /* ECMA-262 3rd Edition 11.2.2 */ -HRESULT interp_new(exec_ctx_t *ctx) +static HRESULT interp_new(exec_ctx_t *ctx) { const LONG arg = ctx->parser->code->instrs[ctx->ip].arg1.lng; VARIANT *constr, v; @@ -1721,7 +1721,7 @@ HRESULT call_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags } /* ECMA-262 3rd Edition 11.1.1 */ -HRESULT interp_this(exec_ctx_t *ctx) +static HRESULT interp_this(exec_ctx_t *ctx) { VARIANT v; @@ -1775,7 +1775,7 @@ static HRESULT interp_ident(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 7.8.1 */ -HRESULT interp_null(exec_ctx_t *ctx) +static HRESULT interp_null(exec_ctx_t *ctx) { VARIANT v; @@ -1786,7 +1786,7 @@ HRESULT interp_null(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 7.8.2 */ -HRESULT interp_bool(exec_ctx_t *ctx) +static HRESULT interp_bool(exec_ctx_t *ctx) { const LONG arg = ctx->parser->code->instrs[ctx->ip].arg1.lng; @@ -1796,7 +1796,7 @@ HRESULT interp_bool(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 7.8.3 */ -HRESULT interp_int(exec_ctx_t *ctx) +static HRESULT interp_int(exec_ctx_t *ctx) { const LONG arg = ctx->parser->code->instrs[ctx->ip].arg1.lng; VARIANT v; @@ -1809,7 +1809,7 @@ HRESULT interp_int(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 7.8.3 */ -HRESULT interp_double(exec_ctx_t *ctx) +static HRESULT interp_double(exec_ctx_t *ctx) { const double arg = *ctx->parser->code->instrs[ctx->ip].arg1.dbl; VARIANT v; @@ -1822,7 +1822,7 @@ HRESULT interp_double(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 7.8.4 */ -HRESULT interp_str(exec_ctx_t *ctx) +static HRESULT interp_str(exec_ctx_t *ctx) { const WCHAR *str = ctx->parser->code->instrs[ctx->ip].arg1.str; VARIANT v; @@ -1838,7 +1838,7 @@ HRESULT interp_str(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 7.8 */ -HRESULT interp_regexp(exec_ctx_t *ctx) +static HRESULT interp_regexp(exec_ctx_t *ctx) { const WCHAR *source = ctx->parser->code->instrs[ctx->ip].arg1.str; const LONG flags = ctx->parser->code->instrs[ctx->ip].arg2.lng; @@ -1960,7 +1960,7 @@ HRESULT property_value_expression_eval(script_ctx_t *ctx, expression_t *_expr, D } /* ECMA-262 3rd Edition 11.11 */ -HRESULT interp_jmp_nz(exec_ctx_t *ctx) +static HRESULT interp_jmp_nz(exec_ctx_t *ctx) { const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; VARIANT_BOOL b; @@ -1982,7 +1982,7 @@ HRESULT interp_jmp_nz(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.11 */ -HRESULT interp_jmp_z(exec_ctx_t *ctx) +static HRESULT interp_jmp_z(exec_ctx_t *ctx) { const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; VARIANT_BOOL b; @@ -2177,7 +2177,7 @@ HRESULT instanceof_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD } /* ECMA-262 3rd Edition 11.8.7 */ -HRESULT interp_in(exec_ctx_t *ctx) +static HRESULT interp_in(exec_ctx_t *ctx) { VARIANT *obj, *v; DISPID id = 0; @@ -2280,7 +2280,7 @@ static HRESULT add_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep } /* ECMA-262 3rd Edition 11.6.1 */ -HRESULT interp_add(exec_ctx_t *ctx) +static HRESULT interp_add(exec_ctx_t *ctx) { VARIANT *l, *r, ret; HRESULT hres; @@ -2318,7 +2318,7 @@ static HRESULT sub_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep } /* ECMA-262 3rd Edition 11.6.2 */ -HRESULT interp_sub(exec_ctx_t *ctx) +static HRESULT interp_sub(exec_ctx_t *ctx) { VARIANT l, r; HRESULT hres; @@ -2355,7 +2355,7 @@ static HRESULT mul_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep } /* ECMA-262 3rd Edition 11.5.1 */ -HRESULT interp_mul(exec_ctx_t *ctx) +static HRESULT interp_mul(exec_ctx_t *ctx) { VARIANT l, r; HRESULT hres; @@ -2498,7 +2498,7 @@ HRESULT delete_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla } /* ECMA-262 3rd Edition 11.4.2 */ -HRESULT interp_void(exec_ctx_t *ctx) +static HRESULT interp_void(exec_ctx_t *ctx) { VARIANT v; @@ -2603,7 +2603,7 @@ HRESULT typeof_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla } /* ECMA-262 3rd Edition 11.4.7 */ -HRESULT interp_minus(exec_ctx_t *ctx) +static HRESULT interp_minus(exec_ctx_t *ctx) { VARIANT n; HRESULT hres; @@ -2618,7 +2618,7 @@ HRESULT interp_minus(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.4.6 */ -HRESULT interp_tonum(exec_ctx_t *ctx) +static HRESULT interp_tonum(exec_ctx_t *ctx) { VARIANT *v, num; HRESULT hres; @@ -2871,7 +2871,7 @@ static HRESULT equal_values(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jse } /* ECMA-262 3rd Edition 11.9.1 */ -HRESULT interp_eq(exec_ctx_t *ctx) +static HRESULT interp_eq(exec_ctx_t *ctx) { VARIANT *l, *r; BOOL b; @@ -2892,7 +2892,7 @@ HRESULT interp_eq(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.9.2 */ -HRESULT interp_neq(exec_ctx_t *ctx) +static HRESULT interp_neq(exec_ctx_t *ctx) { VARIANT *l, *r; BOOL b; @@ -3090,7 +3090,7 @@ HRESULT greatereq_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD } /* ECMA-262 3rd Edition 11.4.8 */ -HRESULT interp_bneg(exec_ctx_t *ctx) +static HRESULT interp_bneg(exec_ctx_t *ctx) { VARIANT *v, r; INT i; @@ -3110,7 +3110,7 @@ HRESULT interp_bneg(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.4.9 */ -HRESULT interp_neg(exec_ctx_t *ctx) +static HRESULT interp_neg(exec_ctx_t *ctx) { VARIANT *v; VARIANT_BOOL b; @@ -3361,7 +3361,7 @@ HRESULT assign_xor_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD return assign_oper_eval(ctx, expr->expression1, expr->expression2, xor_eval, ei, ret); } -HRESULT interp_jmp(exec_ctx_t *ctx) +static HRESULT interp_jmp(exec_ctx_t *ctx) { const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint;

1 0

Henri Verbeet : wined3d: Get rid of WINED3DDEVINFO_PIPELINETIMINGS.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 04a7ae43d5dee2de0de6a2b1011f6f8ec15a61ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a7ae43d5dee2de0de6a2b10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 30 06:01:48 2011 +0100 wined3d: Get rid of WINED3DDEVINFO_PIPELINETIMINGS. --- include/wine/wined3d.h | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fea107f..edab31b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1696,14 +1696,6 @@ struct wined3d_device_creation_parameters DWORD flags; }; -typedef struct _WINED3DDEVINFO_PIPELINETIMINGS -{ - float VertexProcessingTimePercent; - float PixelProcessingTimePercent; - float OtherGPUProcessingTimePercent; - float GPUIdleTimePercent; -} WINED3DDEVINFO_PIPELINETIMINGS; - typedef struct _WINED3DDEVINFO_STAGETIMINGS { float MemoryProcessingPercent;

1 0

Henri Verbeet : wined3d: Get rid of WINED3DDEVINFO_INTERFACETIMINGS.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 3c75024210a1c2e31c5c8b74724e087ef314cb95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c75024210a1c2e31c5c8b747… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 30 06:01:47 2011 +0100 wined3d: Get rid of WINED3DDEVINFO_INTERFACETIMINGS. --- include/wine/wined3d.h | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c79137e..fea107f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1696,15 +1696,6 @@ struct wined3d_device_creation_parameters DWORD flags; }; -typedef struct _WINED3DDEVINFO_INTERFACETIMINGS -{ - float WaitingForGPUToUseApplicationResourceTimePercent; - float WaitingForGPUToAcceptMoreCommandsTimePercent; - float WaitingForGPUToStayWithinLatencyTimePercent; - float WaitingForGPUExclusiveResourceTimePercent; - float WaitingForGPUOtherTimePercent; -} WINED3DDEVINFO_INTERFACETIMINGS; - typedef struct _WINED3DDEVINFO_PIPELINETIMINGS { float VertexProcessingTimePercent;

1 0

Henri Verbeet : ddraw: Keep the primary surface mapped at the same address for early ddraw versions .
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 3a2921c5598b0ae9e17f7065ae06cce6a86ef225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2921c5598b0ae9e17f7065a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 30 06:01:46 2011 +0100 ddraw: Keep the primary surface mapped at the same address for early ddraw versions. --- dlls/ddraw/surface.c | 10 +++++++++- dlls/wined3d/surface.c | 4 +++- dlls/wined3d/wined3d_private.h | 4 +++- include/wine/wined3d.h | 1 + 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 05d9b2b..9bd6774 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5254,6 +5254,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr DDSURFACEDESC2 *desc, UINT mip_level, UINT version) { WINED3DPOOL pool = WINED3DPOOL_DEFAULT; + DWORD flags = WINED3D_SURFACE_MAPPABLE; enum wined3d_format_id format; DWORD usage = 0; HRESULT hr; @@ -5269,6 +5270,13 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { + /* Some applications assume that the primary surface will always be + * mapped at the same address. Some of those also assume that this + * address is valid even when the surface isn't mapped, and that + * updates done this way will be visible on the screen. The game Nox + * is such an application. */ + if (version == 1) + flags |= WINED3D_SURFACE_PIN_SYSMEM; usage |= WINED3DUSAGE_RENDERTARGET; desc->ddsCaps.dwCaps |= DDSCAPS_VISIBLE; } @@ -5343,7 +5351,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr surface->first_attached = surface; hr = wined3d_surface_create(ddraw->wined3d_device, desc->dwWidth, desc->dwHeight, format, mip_level, - usage, pool, WINED3DMULTISAMPLE_NONE, 0, DefaultSurfaceType, WINED3D_SURFACE_MAPPABLE, + usage, pool, WINED3DMULTISAMPLE_NONE, 0, DefaultSurfaceType, flags, surface, &ddraw_surface_wined3d_parent_ops, &surface->wined3d_surface); if (FAILED(hr)) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4110345..5ec4daa 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -544,7 +544,7 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) * converted or NPOT surfaces. Also don't create a PBO for systemmem * surfaces. */ if (gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && (surface->flags & SFLAG_DYNLOCK) - && !(surface->flags & (SFLAG_PBO | SFLAG_CONVERTED | SFLAG_NONPOW2)) + && !(surface->flags & (SFLAG_PBO | SFLAG_CONVERTED | SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)) && (surface->resource.pool != WINED3DPOOL_SYSTEMMEM)) { struct wined3d_context *context; @@ -7186,6 +7186,8 @@ static HRESULT surface_init(struct wined3d_surface *surface, WINED3DSURFTYPE sur surface->flags = SFLAG_NORMCOORD; /* Default to normalized coords. */ if (flags & WINED3D_SURFACE_DISCARD) surface->flags |= SFLAG_DISCARD; + if (flags & WINED3D_SURFACE_PIN_SYSMEM) + surface->flags |= SFLAG_PIN_SYSMEM; if (lockable || format_id == WINED3DFMT_D16_LOCKABLE) surface->flags |= SFLAG_LOCKABLE; /* I'm not sure if this qualifies as a hack or as an optimization. It diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e524c3d..41e1388 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2140,6 +2140,7 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_INRB_RESOLVED 0x00400000 /* The resolved renderbuffer is current. */ #define SFLAG_DS_ONSCREEN 0x00800000 /* This is a depth / stencil surface, last modified onscreen. */ #define SFLAG_DS_OFFSCREEN 0x01000000 /* This is a depth / stencil surface, last modified offscreen. */ +#define SFLAG_PIN_SYSMEM 0x02000000 /* Keep the surface in sysmem, at the same address. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long @@ -2155,7 +2156,8 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D SFLAG_CLIENT | \ SFLAG_DIBSECTION | \ SFLAG_USERPTR | \ - SFLAG_PBO) + SFLAG_PBO | \ + SFLAG_PIN_SYSMEM) #define SFLAG_LOCATIONS (SFLAG_INSYSMEM | \ SFLAG_INTEXTURE | \ diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2f68f14..c79137e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1511,6 +1511,7 @@ enum wined3d_sysval_semantic #define WINED3D_SURFACE_MAPPABLE 0x00000001 #define WINED3D_SURFACE_DISCARD 0x00000002 +#define WINED3D_SURFACE_PIN_SYSMEM 0x00000004 struct wined3d_display_mode {

1 0

Henri Verbeet : wined3d: Add a flags parameter to wined3d_surface_create().
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 3430e1160524801b1e6aebc1283120d5e7dc7528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3430e1160524801b1e6aebc12… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 30 06:01:45 2011 +0100 wined3d: Add a flags parameter to wined3d_surface_create(). --- dlls/d3d10core/texture.c | 4 ++-- dlls/d3d8/surface.c | 10 ++++++++-- dlls/d3d9/surface.c | 10 ++++++++-- dlls/ddraw/ddraw.c | 8 ++++++-- dlls/ddraw/surface.c | 7 +++---- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/surface.c | 28 +++++++++++++++------------- include/wine/wined3d.h | 7 +++++-- 8 files changed, 50 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3430e1160524801b1e6ae…

1 0

Henri Verbeet : ddraw: Resize the swapchain window on mode changes in exclusive mode.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 82dd612d50f8557714f204ca6fa90bee571ca9df URL: http://source.winehq.org/git/wine.git/?a=commit;h=82dd612d50f8557714f204ca6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 30 06:01:44 2011 +0100 ddraw: Resize the swapchain window on mode changes in exclusive mode. --- dlls/d3d10core/device.c | 6 ++++++ dlls/d3d8/device.c | 6 ++++++ dlls/d3d9/device.c | 6 ++++++ dlls/ddraw/ddraw.c | 36 +++++++++++++++++++++++++++++++++--- dlls/ddraw/tests/d3d.c | 5 +---- dlls/wined3d/device.c | 4 ++++ include/wine/wined3d.h | 1 + 7 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 45b7c3a..2a84c98 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1357,6 +1357,11 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par device->wined3d_device = wined3d_device; } +static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) +{ + TRACE("device_parent %p.\n", device_parent); +} + static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface) @@ -1538,6 +1543,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent static const struct wined3d_device_parent_ops d3d10_wined3d_device_parent_ops = { device_parent_wined3d_device_created, + device_parent_mode_changed, device_parent_create_surface, device_parent_create_rendertarget, device_parent_create_depth_stencil, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a8c042d..bbc69b4 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2798,6 +2798,11 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par TRACE("device_parent %p, device %p\n", device_parent, device); } +static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) +{ + TRACE("device_parent %p.\n", device_parent); +} + static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface) @@ -2999,6 +3004,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent static const struct wined3d_device_parent_ops d3d8_wined3d_device_parent_ops = { device_parent_wined3d_device_created, + device_parent_mode_changed, device_parent_create_surface, device_parent_create_rendertarget, device_parent_create_depth_stencil, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f8044ff..e5c9d1e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3043,6 +3043,11 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par TRACE("device_parent %p, device %p.\n", device_parent, device); } +static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) +{ + TRACE("device_parent %p.\n", device_parent); +} + static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface) @@ -3247,6 +3252,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent static const struct wined3d_device_parent_ops d3d9_wined3d_device_parent_ops = { device_parent_wined3d_device_created, + device_parent_mode_changed, device_parent_create_surface, device_parent_create_rendertarget, device_parent_create_depth_stencil, diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index dfe7b37..098165a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1008,9 +1008,6 @@ static HRESULT ddraw_set_display_mode(IDirectDrawImpl *ddraw, DWORD Width, DWORD /* TODO: Lose the primary surface */ hr = wined3d_device_set_display_mode(ddraw->wined3d_device, 0, &mode); - if (ddraw->cooperative_level & DDSCL_EXCLUSIVE) - SetWindowPos(ddraw->dest_window, HWND_TOP, 0, 0, Width, Height, SWP_SHOWWINDOW | SWP_NOACTIVATE); - wined3d_mutex_unlock(); switch(hr) @@ -5268,6 +5265,38 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par TRACE("device_parent %p, device %p.\n", device_parent, device); } +static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) +{ + struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent); + MONITORINFO monitor_info; + HMONITOR monitor; + BOOL ret; + RECT *r; + + TRACE("device_parent %p.\n", device_parent); + + if (!(ddraw->cooperative_level & DDSCL_EXCLUSIVE) || !ddraw->swapchain_window) + { + TRACE("Nothing to resize.\n"); + return; + } + + monitor = MonitorFromWindow(ddraw->swapchain_window, MONITOR_DEFAULTTOPRIMARY); + monitor_info.cbSize = sizeof(monitor_info); + if (!(ret = GetMonitorInfoW(monitor, &monitor_info))) + { + ERR("Failed to get monitor info.\n"); + return; + } + + r = &monitor_info.rcMonitor; + TRACE("Resizing window %p to %s.\n", ddraw->swapchain_window, wine_dbgstr_rect(r)); + + if (!(ret = SetWindowPos(ddraw->swapchain_window, HWND_TOP, r->left, r->top, + r->right - r->left, r->bottom - r->top, SWP_SHOWWINDOW | SWP_NOACTIVATE))) + ERR("Failed to resize window.\n"); +} + static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface) @@ -5424,6 +5453,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops = { device_parent_wined3d_device_created, + device_parent_mode_changed, device_parent_create_surface, device_parent_create_rendertarget, device_parent_create_depth_stencil, diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 0a42083..153d39f 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -4175,10 +4175,7 @@ static void test_coop_level_mode_set(void) WM_WINDOWPOSCHANGING, WM_WINDOWPOSCHANGED, WM_SIZE, - /* WM_DISPLAYCHANGE, This message is received after WM_SIZE on native. However, the - * more important behaviour is that at the time the WM_SIZE message - * is processed SM_CXSCREEN and SM_CYSCREEN already have the new - * values. */ + WM_DISPLAYCHANGE, 0, }; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0c71232..4c585d4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6033,6 +6033,10 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL if (device->focus_window == window) device->focus_window = NULL; else ERR("Window %p is not the focus window for device %p.\n", window, device); } + else if (message == WM_DISPLAYCHANGE) + { + device->device_parent->ops->mode_changed(device->device_parent); + } if (unicode) return CallWindowProcW(proc, window, message, wparam, lparam); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1ee94b7..0ba3a08 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2066,6 +2066,7 @@ struct wined3d_device_parent struct wined3d_device_parent_ops { void (__cdecl *wined3d_device_created)(struct wined3d_device_parent *device_parent, struct wined3d_device *device); + void (__cdecl *mode_changed)(struct wined3d_device_parent *device_parent); HRESULT (__cdecl *create_surface)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format_id, DWORD usage, WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface);

1 0

Ken Thomases : secur32: Eliminate broken clean-up "cheat".
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: d977044e7680362d89de101fc866b12cda40577c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d977044e7680362d89de101fc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Nov 29 19:16:32 2011 -0600 secur32: Eliminate broken clean-up "cheat". --- dlls/secur32/ntlm.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index c1e4466..d002b37 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -2030,21 +2030,17 @@ void SECUR32_initNTLMSP(void) NULL }; if(fork_helper(&helper, ntlm_auth, args) != SEC_E_OK) - { - /* Cheat and allocate a helper anyway, so cleanup later will work. */ - helper = HeapAlloc(GetProcessHeap(),0, sizeof(NegoHelper)); - helper->major = helper->minor = helper->micro = -1; - helper->pipe_in = helper->pipe_out = -1; - } + helper = NULL; else check_version(helper); - if( (helper->major > MIN_NTLM_AUTH_MAJOR_VERSION) || - (helper->major == MIN_NTLM_AUTH_MAJOR_VERSION && - helper->minor > MIN_NTLM_AUTH_MINOR_VERSION) || - (helper->major == MIN_NTLM_AUTH_MAJOR_VERSION && - helper->minor == MIN_NTLM_AUTH_MINOR_VERSION && - helper->micro >= MIN_NTLM_AUTH_MICRO_VERSION) ) + if( helper && + ((helper->major > MIN_NTLM_AUTH_MAJOR_VERSION) || + (helper->major == MIN_NTLM_AUTH_MAJOR_VERSION && + helper->minor > MIN_NTLM_AUTH_MINOR_VERSION) || + (helper->major == MIN_NTLM_AUTH_MAJOR_VERSION && + helper->minor == MIN_NTLM_AUTH_MINOR_VERSION && + helper->micro >= MIN_NTLM_AUTH_MICRO_VERSION)) ) { SecureProvider *provider = SECUR32_addProvider(&ntlmTableA, &ntlmTableW, NULL); SecureProvider *nego_provider = SECUR32_addProvider(&ntlmTableA, &ntlmTableW, NULL);

1 0

Ken Thomases : secur32: Clean up the helper in all cases where it was allocated.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: f4ac641af55be232781018ff3939132c7f86df81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4ac641af55be232781018ff3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Nov 29 19:16:13 2011 -0600 secur32: Clean up the helper in all cases where it was allocated. --- dlls/secur32/ntlm.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 4c353c3..c1e4466 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -694,7 +694,10 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( lstrcpynA(buffer, want_flags, max_len-1); if((ret = run_helper(helper, buffer, max_len, &buffer_len)) != SEC_E_OK) + { + cleanup_helper(helper); goto isc_end; + } if(!strncmp(buffer, "BH", 2)) ERR("Helper doesn't understand new command set. Expect more things to fail.\n"); }

1 0

← Newer
1
2
3
4
5
6
7
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2011