November 2011 - Wine-commits

Piotr Caban : advapi32: Send shutdown notification to services.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: e849691fcc2cad223f1bb75699c4e7d2044150a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e849691fcc2cad223f1bb7569… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 30 15:29:15 2011 +0100 advapi32: Send shutdown notification to services. --- dlls/advapi32/service.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 7c45f94..bdebc91 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -61,6 +61,7 @@ typedef struct service_data_t LPVOID context; HANDLE thread; SC_HANDLE handle; + SC_HANDLE full_access_handle; BOOL unicode : 1; union { LPSERVICE_MAIN_FUNCTIONA a; @@ -425,7 +426,8 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) case WINESERV_STARTINFO: if (!service->handle) { - if (!(service->handle = OpenServiceW( manager, data, SERVICE_SET_STATUS ))) + if (!(service->handle = OpenServiceW( manager, data, SERVICE_SET_STATUS )) || + !(service->full_access_handle = OpenServiceW( manager, data, GENERIC_READ|GENERIC_WRITE ))) FIXME( "failed to open service %s\n", debugstr_w(data) ); } result = service_handle_start(service, data + info.name_size, @@ -484,8 +486,41 @@ static BOOL service_run_main_thread(void) ret = WaitForMultipleObjects( n, wait_handles, FALSE, INFINITE ); if (!ret) /* system process event */ { - TRACE( "last user process exited, shutting down\n" ); - /* FIXME: we should maybe send a shutdown control to running services */ + SERVICE_STATUS st; + SERVICE_PRESHUTDOWN_INFO spi; + DWORD timeout = 5000; + BOOL res; + + EnterCriticalSection( &service_cs ); + n = 0; + for (i = 0; i < nb_services && n < MAXIMUM_WAIT_OBJECTS; i++) + { + if (!services[i]->thread) continue; + + res = QueryServiceStatus(services[i]->full_access_handle, &st); + ret = ERROR_SUCCESS; + if (res && (st.dwControlsAccepted & SERVICE_ACCEPT_PRESHUTDOWN)) + { + res = QueryServiceConfig2W( services[i]->full_access_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, + (LPBYTE)&spi, sizeof(spi), &i ); + if (res) + { + FIXME("service should be able to delay shutdown\n"); + timeout += spi.dwPreshutdownTimeout; + ret = service_handle_control( services[i], SERVICE_CONTROL_PRESHUTDOWN ); + wait_handles[n++] = services[i]->thread; + } + } + else if (res && (st.dwControlsAccepted & SERVICE_ACCEPT_SHUTDOWN)) + { + ret = service_handle_control( services[i], SERVICE_CONTROL_SHUTDOWN ); + wait_handles[n++] = services[i]->thread; + } + } + LeaveCriticalSection( &service_cs ); + + TRACE("last user process exited, shutting down (timeout: %d)\n", timeout); + WaitForMultipleObjects( n, wait_handles, TRUE, timeout ); ExitProcess(0); } else if (ret == 1)

1 0

Francois Gouget : cmd/tests: Use resynchronization points to better deal with two IF statements tests.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 66db270d227dd58050a4681b33451d9cec6eeee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66db270d227dd58050a4681b3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 30 13:05:29 2011 +0100 cmd/tests: Use resynchronization points to better deal with two IF statements tests. --- programs/cmd/tests/test_builtins.cmd | 2 ++ programs/cmd/tests/test_builtins.cmd.exp | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 40a94e6..f03a05e 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -136,10 +136,12 @@ if exist foo (type foo) else echo not supported echo --- redirections within IF statements if 1==1 echo foo1>bar type bar & del bar +echo ----- if 1==1 (echo foo2>bar) else echo baz2>bar type bar & del bar if 1==1 (echo foo3) else echo baz3>bar type bar || echo file does not exist, ok +echo ----- if 1==1 (echo foo4>bar) else echo baz4>bar type bar & del bar if 1==0 (echo foo5>bar) else echo baz5>bar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 069bb0b..a005fc2 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -163,9 +163,11 @@ food21 @todo_wine(a)foo@or_broken(a)not supported --- redirections within IF statements @todo_wine(a)foo1 -(a)todo_wine@foo2 -(a)todo_wine@foo3 -file does not exist, ok +----- +foo2 +foo3 +(a)todo_wine@file does not exist, ok +(a)todo_wine@----- foo4 baz5 baz6(a)space@

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

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

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: 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: Get rid of no longer needed EXPRVAL_NAMEREF.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 82368f5cfea6dc4ebf91d13bab523aaebc190226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82368f5cfea6dc4ebf91d13ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 30 10:14:48 2011 +0100 jscript: Get rid of no longer needed EXPRVAL_NAMEREF. --- dlls/jscript/engine.c | 39 +++++---------------------------------- dlls/jscript/engine.h | 5 ----- 2 files changed, 5 insertions(+), 39 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 6567d68..62efc44 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -31,7 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); #define EXPR_NOVAL 0x0001 #define EXPR_NEWREF 0x0002 -#define EXPR_STRREF 0x0004 struct _return_type_t { enum{ @@ -154,11 +153,6 @@ static void exprval_release(exprval_t *val) if(val->u.idref.disp) IDispatch_Release(val->u.idref.disp); return; - case EXPRVAL_NAMEREF: - if(val->u.nameref.disp) - IDispatch_Release(val->u.nameref.disp); - SysFreeString(val->u.nameref.name); - return; case EXPRVAL_INVALID: SysFreeString(val->u.identifier); } @@ -179,8 +173,6 @@ static HRESULT exprval_value(script_ctx_t *ctx, exprval_t *val, jsexcept_t *ei, } return disp_propget(ctx, val->u.idref.disp, val->u.idref.id, ret, ei, NULL/*FIXME*/); - case EXPRVAL_NAMEREF: - break; case EXPRVAL_INVALID: return throw_type_error(ctx, ei, JS_E_UNDEFINED_VARIABLE, val->u.identifier); } @@ -1494,13 +1486,6 @@ HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flag hres = to_string(ctx, &val, ei, &str); VariantClear(&val); if(SUCCEEDED(hres)) { - if(flags & EXPR_STRREF) { - ret->type = EXPRVAL_NAMEREF; - ret->u.nameref.disp = obj; - ret->u.nameref.name = str; - return S_OK; - } - hres = disp_get_id(ctx, obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); SysFreeString(str); } @@ -1546,11 +1531,9 @@ HRESULT member_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla return hres; str = SysAllocString(expr->identifier); - if(flags & EXPR_STRREF) { - ret->type = EXPRVAL_NAMEREF; - ret->u.nameref.disp = obj; - ret->u.nameref.name = str; - return S_OK; + if(!str) { + IDispatch_Release(obj); + return E_OUTOFMEMORY; } hres = disp_get_id(ctx, obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); @@ -2457,7 +2440,7 @@ HRESULT delete_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla TRACE("\n"); - hres = expr_eval(ctx, expr->expression, EXPR_STRREF, ei, &exprval); + hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); if(FAILED(hres)) return hres; @@ -2465,7 +2448,7 @@ HRESULT delete_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla case EXPRVAL_IDREF: { IDispatchEx *dispex; - hres = IDispatch_QueryInterface(exprval.u.nameref.disp, &IID_IDispatchEx, (void**)&dispex); + hres = IDispatch_QueryInterface(exprval.u.idref.disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { hres = IDispatchEx_DeleteMemberByDispID(dispex, exprval.u.idref.id); b = VARIANT_TRUE; @@ -2473,18 +2456,6 @@ HRESULT delete_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla } break; } - case EXPRVAL_NAMEREF: { - IDispatchEx *dispex; - - hres = IDispatch_QueryInterface(exprval.u.nameref.disp, &IID_IDispatchEx, (void**)&dispex); - if(SUCCEEDED(hres)) { - hres = IDispatchEx_DeleteMemberByName(dispex, exprval.u.nameref.name, - make_grfdex(ctx, fdexNameCaseSensitive)); - b = VARIANT_TRUE; - IDispatchEx_Release(dispex); - } - break; - } default: FIXME("unsupported type %d\n", exprval.type); hres = E_NOTIMPL; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index f2af36f..362e9d1 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -364,7 +364,6 @@ typedef struct { enum { EXPRVAL_VARIANT, EXPRVAL_IDREF, - EXPRVAL_NAMEREF, EXPRVAL_INVALID } type; union { @@ -373,10 +372,6 @@ typedef struct { IDispatch *disp; DISPID id; } idref; - struct { - IDispatch *disp; - BSTR name; - } nameref; BSTR identifier; } u; } exprval_t;

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 361d746fbd26a53eba8e1b2c817b6be91b353a80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=361d746fbd26a53eba8e1b2c8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 00:39:15 2011 -0700 po: Update Catalan translation. --- po/ca.po | 1039 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 430 insertions(+), 609 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=361d746fbd26a53eba8e1…

1 0