March 2016 - Wine-Commits - list.winehq.org

Jacek Caban : jscript: Pass script context instead of execution context to op handlers.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 9e03bb2ecea25e22a30fbc4eac659e13a22b8b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e03bb2ecea25e22a30fbc4ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 17:49:14 2016 +0100 jscript: Pass script context instead of execution context to op handlers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 423 ++++++++++++++++++++++++++------------------------ 1 file changed, 218 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e03bb2ecea25e22a30fb…

1 0

Jacek Caban : jscript: Store variable object in call_frame_t.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: b8fb19f160183f480befd7a6b409adebce91b126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8fb19f160183f480befd7a6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 17:49:48 2016 +0100 jscript: Store variable object in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 24 +++++++++++------------- dlls/jscript/engine.h | 6 +++--- dlls/jscript/function.c | 4 ++-- dlls/jscript/global.c | 3 ++- dlls/jscript/jscript.c | 8 ++++---- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 15f71bd..349f932 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -295,8 +295,7 @@ void scope_release(scope_chain_t *scope) heap_free(scope); } -HRESULT create_exec_ctx(script_ctx_t *script_ctx, jsdisp_t *var_disp, - BOOL is_global, exec_ctx_t **ret) +HRESULT create_exec_ctx(script_ctx_t *script_ctx, BOOL is_global, exec_ctx_t **ret) { exec_ctx_t *ctx; @@ -308,9 +307,6 @@ HRESULT create_exec_ctx(script_ctx_t *script_ctx, jsdisp_t *var_disp, ctx->is_global = is_global; ctx->ret = jsval_undefined(); - jsdisp_addref(var_disp); - ctx->var_disp = var_disp; - script_addref(script_ctx); ctx->script = script_ctx; @@ -323,8 +319,6 @@ void exec_release(exec_ctx_t *ctx) if(--ctx->ref) return; - if(ctx->var_disp) - jsdisp_release(ctx->var_disp); if(ctx->script) script_release(ctx->script); jsval_release(ctx->ret); @@ -587,7 +581,7 @@ static HRESULT interp_var_set(script_ctx_t *ctx) TRACE("%s\n", debugstr_w(name)); val = stack_pop(ctx); - hres = jsdisp_propput_name(ctx->call_ctx->exec_ctx->var_disp, name, val); + hres = jsdisp_propput_name(ctx->call_ctx->variable_obj, name, val); jsval_release(val); return hres; } @@ -2390,6 +2384,8 @@ OP_LIST static void release_call_frame(call_frame_t *frame) { + if(frame->variable_obj) + jsdisp_release(frame->variable_obj); if(frame->this_obj) IDispatch_Release(frame->this_obj); if(frame->scope) @@ -2536,7 +2532,7 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis } static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, - IDispatch *this_obj) + IDispatch *this_obj, jsdisp_t *variable_obj) { call_frame_t *frame; @@ -2572,6 +2568,8 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ frame->this_obj = to_disp(ctx->script->global); IDispatch_AddRef(frame->this_obj); + frame->variable_obj = jsdisp_addref(variable_obj); + frame->exec_ctx = ctx; frame->prev_frame = ctx->script->call_ctx; @@ -2580,7 +2578,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ } HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, scope_chain_t *scope, - IDispatch *this_obj, jsval_t *ret) + IDispatch *this_obj, jsdisp_t *variable_obj, jsval_t *ret) { jsval_t val; unsigned i; @@ -2599,7 +2597,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, sc if(func->funcs[i].event_target) hres = bind_event_target(ctx->script, func->funcs+i, func_obj); else - hres = jsdisp_propput_name(ctx->var_disp, func->funcs[i].name, jsval_obj(func_obj)); + hres = jsdisp_propput_name(variable_obj, func->funcs[i].name, jsval_obj(func_obj)); jsdisp_release(func_obj); if(FAILED(hres)) return hres; @@ -2609,13 +2607,13 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, sc if(!ctx->is_global || !lookup_global_members(ctx->script, func->variables[i], NULL)) { DISPID id = 0; - hres = jsdisp_get_id(ctx->var_disp, func->variables[i], fdexNameEnsure, &id); + hres = jsdisp_get_id(variable_obj, func->variables[i], fdexNameEnsure, &id); if(FAILED(hres)) return hres; } } - hres = setup_call_frame(ctx, code, func, scope, this_obj); + hres = setup_call_frame(ctx, code, func, scope, this_obj, variable_obj); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index cd4051f..55ce72a 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -199,6 +199,7 @@ typedef struct _call_frame_t { scope_chain_t *base_scope; IDispatch *this_obj; + jsdisp_t *variable_obj; bytecode_t *bytecode; function_code_t *function; @@ -211,7 +212,6 @@ struct _exec_ctx_t { LONG ref; script_ctx_t *script; - jsdisp_t *var_disp; BOOL is_global; jsval_t ret; @@ -223,6 +223,6 @@ static inline void exec_addref(exec_ctx_t *ctx) } void exec_release(exec_ctx_t*) DECLSPEC_HIDDEN; -HRESULT create_exec_ctx(script_ctx_t*,jsdisp_t*,BOOL,exec_ctx_t**) DECLSPEC_HIDDEN; -HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT create_exec_ctx(script_ctx_t*,BOOL,exec_ctx_t**) DECLSPEC_HIDDEN; +HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 05792bd..8cd363d 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -239,13 +239,13 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis hres = scope_push(function->scope_chain, var_disp, to_disp(var_disp), &scope); if(SUCCEEDED(hres)) { - hres = create_exec_ctx(ctx, var_disp, FALSE, &exec_ctx); + hres = create_exec_ctx(ctx, FALSE, &exec_ctx); if(SUCCEEDED(hres)) { jsdisp_t *prev_args; prev_args = function->arguments; function->arguments = arg_disp; - hres = exec_source(exec_ctx, function->code, function->func_code, scope, this_obj, r); + hres = exec_source(exec_ctx, function->code, function->func_code, scope, this_obj, var_disp, r); function->arguments = prev_args; exec_release(exec_ctx); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 5574f50..73bee82 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -223,7 +223,8 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return throw_syntax_error(ctx, hres, NULL); } - hres = exec_source(ctx->call_ctx->exec_ctx, code, &code->global_code, frame->scope, frame->this_obj, r); + hres = exec_source(ctx->call_ctx->exec_ctx, code, &code->global_code, frame->scope, + frame->this_obj, frame->variable_obj, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 3dda22c..88c1616 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -105,14 +105,14 @@ static HRESULT exec_global_code(JScript *This, bytecode_t *code) exec_ctx_t *exec_ctx; HRESULT hres; - hres = create_exec_ctx(This->ctx, This->ctx->global, TRUE, &exec_ctx); + hres = create_exec_ctx(This->ctx, TRUE, &exec_ctx); if(FAILED(hres)) return hres; IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, NULL); + hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, This->ctx->global, NULL); exec_release(exec_ctx); IActiveScriptSite_OnLeaveScript(This->site); @@ -776,14 +776,14 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(dwFlags & SCRIPTTEXT_ISEXPRESSION) { exec_ctx_t *exec_ctx; - hres = create_exec_ctx(This->ctx, This->ctx->global, TRUE, &exec_ctx); + hres = create_exec_ctx(This->ctx, TRUE, &exec_ctx); if(SUCCEEDED(hres)) { jsval_t r; IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, &r); + hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, This->ctx->global, &r); if(SUCCEEDED(hres)) { if(pvarResult) hres = jsval_to_variant(r, pvarResult);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_blt() in wined3d_swapchain_get_front_buffer_data().
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: a36c7e6bdad29976d7b81bada73a5fc4a820c7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36c7e6bdad29976d7b81bada… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 25 17:52:29 2016 +0100 wined3d: Use wined3d_texture_blt() in wined3d_swapchain_get_front_buffer_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c2883bb..1b6d2e5 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -172,19 +172,11 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain, struct wined3d_texture *dst_texture, unsigned int sub_resource_idx) { - struct wined3d_surface *src_surface, *dst_surface; - struct wined3d_resource *sub_resource; RECT src_rect, dst_rect; TRACE("swapchain %p, dst_texture %p, sub_resource_idx %u.\n", swapchain, dst_texture, sub_resource_idx); - if (!(sub_resource = wined3d_texture_get_sub_resource(dst_texture, sub_resource_idx)) || - sub_resource->type != WINED3D_RTYPE_SURFACE) - return WINED3DERR_INVALIDCALL; - - dst_surface = surface_from_resource(sub_resource); - src_surface = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0)); - SetRect(&src_rect, 0, 0, src_surface->resource.width, src_surface->resource.height); + SetRect(&src_rect, 0, 0, swapchain->front_buffer->resource.width, swapchain->front_buffer->resource.height); dst_rect = src_rect; if (swapchain->desc.windowed) @@ -194,7 +186,8 @@ HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapc wine_dbgstr_rect(&dst_rect)); } - return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT); + return wined3d_texture_blt(dst_texture, sub_resource_idx, &dst_rect, + swapchain->front_buffer, 0, &src_rect, 0, NULL, WINED3D_TEXF_POINT); } struct wined3d_texture * CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain,

1 0

Henri Verbeet : wined3d: Use wined3d_texture_blt() in wined3d_device_copy_sub_resource_region().
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 1c91fd4b388c039431380e92c68bfcbf928ab5af URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c91fd4b388c039431380e92c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 25 17:52:28 2016 +0100 wined3d: Use wined3d_texture_blt() in wined3d_device_copy_sub_resource_region(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e2c6e5d..f91e3f7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3915,9 +3915,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) { - struct wined3d_surface *dst_surface, *src_surface; struct wined3d_texture *dst_texture, *src_texture; - struct wined3d_resource *tmp; RECT dst_rect, src_rect; HRESULT hr; @@ -4003,30 +4001,25 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev } dst_texture = wined3d_texture_from_resource(dst_resource); - if (!(tmp = wined3d_texture_get_sub_resource(dst_texture, dst_sub_resource_idx))) - { - WARN("Invalid dst_sub_resource_idx %u.\n", dst_sub_resource_idx); - return WINED3DERR_INVALIDCALL; - } - dst_surface = surface_from_resource(tmp); - src_texture = wined3d_texture_from_resource(src_resource); - if (!(tmp = wined3d_texture_get_sub_resource(src_texture, src_sub_resource_idx))) - { - WARN("Invalid src_sub_resource_idx %u.\n", src_sub_resource_idx); - return WINED3DERR_INVALIDCALL; - } - src_surface = surface_from_resource(tmp); if (src_box) + { SetRect(&src_rect, src_box->left, src_box->top, src_box->right, src_box->bottom); + } else - SetRect(&src_rect, 0, 0, src_surface->resource.width, src_surface->resource.height); + { + unsigned int level = src_sub_resource_idx % src_texture->level_count; + + SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(src_texture, level), + wined3d_texture_get_level_height(src_texture, level)); + } SetRect(&dst_rect, dst_x, dst_y, dst_x + (src_rect.right - src_rect.left), dst_y + (src_rect.bottom - src_rect.top)); - if (FAILED(hr = wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) + if (FAILED(hr = wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &dst_rect, + src_texture, src_sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) WARN("Failed to blit, hr %#x.\n", hr); return hr;

1 0

Jacek Caban : jscript: Moved stack from execution context to script context.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 0224f1829b34f260291e810706e69b7a1d6f0191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0224f1829b34f260291e81070… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 17:49:24 2016 +0100 jscript: Moved stack from execution context to script context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 42 ++++++++++++++++++------------------------ dlls/jscript/engine.h | 3 --- dlls/jscript/jscript.c | 2 ++ dlls/jscript/jscript.h | 4 ++++ 4 files changed, 24 insertions(+), 27 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d459939..c74aa75 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -61,15 +61,14 @@ typedef struct { } u; } exprval_t; -static HRESULT stack_push(script_ctx_t *script_ctx, jsval_t v) +static HRESULT stack_push(script_ctx_t *ctx, jsval_t v) { - exec_ctx_t *ctx = script_ctx->call_ctx->exec_ctx; if(!ctx->stack_size) { ctx->stack = heap_alloc(16*sizeof(*ctx->stack)); if(!ctx->stack) return E_OUTOFMEMORY; ctx->stack_size = 16; - }else if(ctx->stack_size == ctx->top) { + }else if(ctx->stack_size == ctx->stack_top) { jsval_t *new_stack; new_stack = heap_realloc(ctx->stack, ctx->stack_size*2*sizeof(*new_stack)); @@ -82,7 +81,7 @@ static HRESULT stack_push(script_ctx_t *script_ctx, jsval_t v) ctx->stack_size *= 2; } - ctx->stack[ctx->top++] = v; + ctx->stack[ctx->stack_top++] = v; return S_OK; } @@ -110,32 +109,28 @@ static HRESULT stack_push_objid(script_ctx_t *ctx, IDispatch *disp, DISPID id) static inline jsval_t stack_top(script_ctx_t *ctx) { - exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; - assert(exec_ctx->top > ctx->call_ctx->stack_base); - return exec_ctx->stack[exec_ctx->top-1]; + assert(ctx->stack_top > ctx->call_ctx->stack_base); + return ctx->stack[ctx->stack_top-1]; } static inline jsval_t stack_topn(script_ctx_t *ctx, unsigned n) { - exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; - assert(exec_ctx->top > ctx->call_ctx->stack_base+n); - return exec_ctx->stack[exec_ctx->top-1-n]; + assert(ctx->stack_top > ctx->call_ctx->stack_base+n); + return ctx->stack[ctx->stack_top-1-n]; } -static inline jsval_t *stack_args(script_ctx_t *script_ctx, unsigned n) +static inline jsval_t *stack_args(script_ctx_t *ctx, unsigned n) { - exec_ctx_t *ctx = script_ctx->call_ctx->exec_ctx; if(!n) return NULL; - assert(ctx->top > script_ctx->call_ctx->stack_base+n-1); - return ctx->stack + ctx->top-n; + assert(ctx->stack_top > ctx->call_ctx->stack_base+n-1); + return ctx->stack + ctx->stack_top-n; } static inline jsval_t stack_pop(script_ctx_t *ctx) { - exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; - assert(exec_ctx->top > ctx->call_ctx->stack_base); - return exec_ctx->stack[--exec_ctx->top]; + assert(ctx->stack_top > ctx->call_ctx->stack_base); + return ctx->stack[--ctx->stack_top]; } static void stack_popn(script_ctx_t *ctx, unsigned n) @@ -355,7 +350,6 @@ void exec_release(exec_ctx_t *ctx) if(ctx->script) script_release(ctx->script); jsval_release(ctx->ret); - heap_free(ctx->stack); heap_free(ctx); } @@ -778,7 +772,7 @@ static HRESULT interp_push_except(script_ctx_t *ctx) TRACE("\n"); - stack_top = ctx->call_ctx->exec_ctx->top; + stack_top = ctx->stack_top; if(!arg2) { HRESULT hres; @@ -2435,8 +2429,8 @@ static HRESULT unwind_exception(script_ctx_t *ctx) except_frame = frame->except_frame; frame->except_frame = except_frame->next; - assert(except_frame->stack_top <= frame->exec_ctx->top); - stack_popn(ctx, frame->exec_ctx->top - except_frame->stack_top); + assert(except_frame->stack_top <= ctx->stack_top); + stack_popn(ctx, ctx->stack_top - except_frame->stack_top); while(except_frame->scope != frame->scope) scope_pop(&frame->scope); @@ -2509,10 +2503,10 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t if(FAILED(hres)) { while(frame->scope != frame->base_scope) scope_pop(&frame->scope); - stack_popn(ctx, exec_ctx->top-frame->stack_base); + stack_popn(ctx, ctx->stack_top-frame->stack_base); } - assert(exec_ctx->top == frame->stack_base); + assert(ctx->stack_top == frame->stack_base); assert(frame->scope == frame->base_scope); ctx->call_ctx = frame->prev_frame; release_call_frame(frame); @@ -2573,7 +2567,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ frame->bytecode = bytecode; frame->function = function; frame->ip = function->instr_off; - frame->stack_base = ctx->top; + frame->stack_base = ctx->script->stack_top; if(scope) frame->base_scope = frame->scope = scope_addref(scope); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 82ff4ed..6c738ebe 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -213,9 +213,6 @@ struct _exec_ctx_t { IDispatch *this_obj; BOOL is_global; - jsval_t *stack; - unsigned stack_size; - unsigned top; jsval_t ret; }; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 13a5b47..c5c7705 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -74,6 +74,8 @@ void script_release(script_ctx_t *ctx) heap_pool_free(&ctx->tmp_heap); if(ctx->last_match) jsstr_release(ctx->last_match); + assert(!ctx->stack_top); + heap_free(ctx->stack); ctx->jscaller->ctx = NULL; IServiceProvider_Release(&ctx->jscaller->IServiceProvider_iface); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 18be0c1..1c7303e 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -400,6 +400,10 @@ struct _script_ctx_t { IDispatch *host_global; + jsval_t *stack; + unsigned stack_size; + unsigned stack_top; + jsstr_t *last_match; match_result_t match_parens[9]; DWORD last_match_index;

1 0

Jacek Caban : jscript: Added new helpers for jumps.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: 53ecdb6549eccd84657d8b20ad0d9ba6dd7f987f URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ecdb6549eccd84657d8b20a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:03:25 2016 +0100 jscript: Added new helpers for jumps. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 333df27..3118994 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -587,6 +587,16 @@ static inline double get_op_double(exec_ctx_t *ctx){ return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.dbl; } +static inline void jmp_next(exec_ctx_t *ctx) +{ + ctx->ip++; +} + +static inline void jmp_abs(exec_ctx_t *ctx, unsigned dst) +{ + ctx->ip = dst; +} + /* ECMA-262 3rd Edition 12.2 */ static HRESULT interp_var_set(exec_ctx_t *ctx) { @@ -656,10 +666,10 @@ static HRESULT interp_forin(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - ctx->ip++; + jmp_next(ctx); }else { stack_popn(ctx, 4); - ctx->ip = arg; + jmp_abs(ctx, arg); } return S_OK; } @@ -711,9 +721,9 @@ static HRESULT interp_case(exec_ctx_t *ctx) if(b) { stack_popn(ctx, 1); - ctx->ip = arg; + jmp_abs(ctx, arg); }else { - ctx->ip++; + jmp_next(ctx); } return S_OK; } @@ -1260,10 +1270,10 @@ static HRESULT interp_cnd_nz(exec_ctx_t *ctx) return hres; if(b) { - ctx->ip = arg; + jmp_abs(ctx, arg); }else { stack_popn(ctx, 1); - ctx->ip++; + jmp_next(ctx); } return S_OK; } @@ -1283,9 +1293,9 @@ static HRESULT interp_cnd_z(exec_ctx_t *ctx) if(b) { stack_popn(ctx, 1); - ctx->ip++; + jmp_next(ctx); }else { - ctx->ip = arg; + jmp_abs(ctx, arg); } return S_OK; } @@ -2327,7 +2337,7 @@ static HRESULT interp_jmp(exec_ctx_t *ctx) TRACE("%u\n", arg); - ctx->ip = arg; + jmp_abs(ctx, arg); return S_OK; } @@ -2347,9 +2357,9 @@ static HRESULT interp_jmp_z(exec_ctx_t *ctx) return hres; if(b) - ctx->ip++; + jmp_next(ctx); else - ctx->ip = arg; + jmp_abs(ctx, arg); return S_OK; } @@ -2367,7 +2377,7 @@ static HRESULT interp_ret(exec_ctx_t *ctx) { TRACE("\n"); - ctx->ip = -1; + jmp_abs(ctx, -1); return S_OK; }

1 0

Józef Kucia : wined3d: Improve advertized driver version for Windows 10.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: 4315caeff699325cd681b9beb7d22908b098411b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4315caeff699325cd681b9beb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 14:26:25 2016 +0100 wined3d: Improve advertized driver version for Windows 10. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 02c8a26..6bf1247 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1151,7 +1151,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_AMD_R300, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6764}, {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 17, 10, 1280}, {DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, - {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 17, 10, 1280 }, + {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 17, 10, 1280}, /* Intel * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp @@ -1514,6 +1514,11 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, } break; + case 10: + driver_os_version = 10; + driver_model = DRIVER_MODEL_NT6X; + break; + default: FIXME("Unhandled OS version %u.%u, reporting 2000/XP.\n", os_version.dwMajorVersion, os_version.dwMinorVersion);

1 0

Józef Kucia : d3d9: Avoid '\n' in middle of TRACE() messages.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: 1f8de0696f75632b34ad461b71865cc4995849d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8de0696f75632b34ad461b7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 14:26:24 2016 +0100 d3d9: Avoid '\n' in middle of TRACE() messages. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 47f4f7b..bd9f935 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2314,7 +2314,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); HRESULT hr; - TRACE("iface %p, primitive_type %#x, base_vertex_idx %u, min_vertex_idx %u,\n" + TRACE("iface %p, primitive_type %#x, base_vertex_idx %u, min_vertex_idx %u, " "vertex_count %u, start_idx %u, primitive_count %u.\n", iface, primitive_type, base_vertex_idx, min_vertex_idx, vertex_count, start_idx, primitive_count); @@ -2339,13 +2339,13 @@ static HRESULT d3d9_device_prepare_vertex_buffer(struct d3d9_device *device, UIN UINT size = max(device->vertex_buffer_size * 2, min_size); struct wined3d_buffer *buffer; - TRACE("Growing vertex buffer to %u bytes\n", size); + TRACE("Growing vertex buffer to %u bytes.\n", size); hr = wined3d_buffer_create_vb(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, WINED3D_POOL_DEFAULT, NULL, &d3d9_null_wined3d_parent_ops, &buffer); if (FAILED(hr)) { - ERR("(%p) wined3d_buffer_create_vb failed with hr = %08x\n", device, hr); + ERR("(%p) wined3d_buffer_create_vb failed with hr = %08x.\n", device, hr); return hr; } @@ -2423,13 +2423,13 @@ static HRESULT d3d9_device_prepare_index_buffer(struct d3d9_device *device, UINT UINT size = max(device->index_buffer_size * 2, min_size); struct wined3d_buffer *buffer; - TRACE("Growing index buffer to %u bytes\n", size); + TRACE("Growing index buffer to %u bytes.\n", size); hr = wined3d_buffer_create_ib(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, WINED3D_POOL_DEFAULT, NULL, &d3d9_null_wined3d_parent_ops, &buffer); if (FAILED(hr)) { - ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x\n", device, hr); + ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x.\n", device, hr); return hr; } @@ -2460,14 +2460,14 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa UINT vtx_size = vertex_count * vertex_stride; UINT vb_pos, align; - TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u,\n" + TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u, " "index_data %p, index_format %#x, vertex_data %p, vertex_stride %u.\n", iface, primitive_type, min_vertex_idx, vertex_count, primitive_count, index_data, index_format, vertex_data, vertex_stride); if (!primitive_count) { - WARN("primitive_count is 0, returning D3D_OK\n"); + WARN("primitive_count is 0, returning D3D_OK.\n"); return D3D_OK; } @@ -3259,7 +3259,7 @@ static HRESULT WINAPI d3d9_device_ComposeRects(IDirect3DDevice9Ex *iface, IDirect3DSurface9 *src_surface, IDirect3DSurface9 *dst_surface, IDirect3DVertexBuffer9 *src_descs, UINT rect_count, IDirect3DVertexBuffer9 *dst_descs, D3DCOMPOSERECTSOP operation, INT offset_x, INT offset_y) { - FIXME("iface %p, src_surface %p, dst_surface %p, src_descs %p, rect_count %u,\n" + FIXME("iface %p, src_surface %p, dst_surface %p, src_descs %p, rect_count %u, " "dst_descs %p, operation %#x, offset_x %u, offset_y %u stub!\n", iface, src_surface, dst_surface, src_descs, rect_count, dst_descs, operation, offset_x, offset_y); @@ -3372,7 +3372,7 @@ static HRESULT WINAPI d3d9_device_CreateRenderTargetEx(IDirect3DDevice9Ex *iface UINT width, UINT height, D3DFORMAT format, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL lockable, IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage) { - FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u,\n" + FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u, " "lockable %#x, surface %p, shared_handle %p, usage %#x stub!\n", iface, width, height, format, multisample_type, multisample_quality, lockable, surface, shared_handle, usage);

1 0

Józef Kucia : d3d8: Avoid '\n' in middle of TRACE() messages.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: 0aa885e75a38478a727882b079438fe08bd63627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa885e75a38478a727882b07… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 14:26:23 2016 +0100 d3d8: Avoid '\n' in middle of TRACE() messages. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1cad4be..154d817 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -942,8 +942,8 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width struct wined3d_texture *texture; HRESULT hr; - TRACE("device %p, width %u, height %u, format %#x, flags %#x, surface %p,\n" - "\tusage %#x, pool %#x, multisample_type %#x, multisample_quality %u.\n", + TRACE("device %p, width %u, height %u, format %#x, flags %#x, surface %p, " + "usage %#x, pool %#x, multisample_type %#x, multisample_quality %u.\n", device, width, height, format, flags, surface, usage, pool, multisample_type, multisample_quality); @@ -2130,7 +2130,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface UINT vtx_size = vertex_count * vertex_stride; UINT vb_pos, align; - TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u,\n" + TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u, " "index_data %p, index_format %#x, vertex_data %p, vertex_stride %u.\n", iface, primitive_type, min_vertex_idx, vertex_count, primitive_count, index_data, index_format, vertex_data, vertex_stride);

1 0

Jacek Caban : jscript: Store current scope chain in call_frame_t.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: 49ecfa950b207c97155dc285d5456e7caf74cb9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ecfa950b207c97155dc285d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:04:13 2016 +0100 jscript: Store current scope chain in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 47 ++++++++++++++++++++++------------------------- dlls/jscript/engine.h | 9 +++++---- dlls/jscript/function.c | 8 ++++---- dlls/jscript/global.c | 5 +++-- dlls/jscript/jscript.c | 8 ++++---- 5 files changed, 38 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49ecfa950b207c97155dc…

1 0