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

Matteo Bruni : wined3d: Disable ARB_point_sprite on core profile contexts.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: f0c321a8e882a92ea14e0229c6aff04b61d62171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c321a8e882a92ea14e0229c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 28 23:03:30 2016 +0200 wined3d: Disable ARB_point_sprite on core profile contexts. Signed-off-by: Matteo Bruni <mbruni(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 | 5 +++++ dlls/wined3d/glsl_shader.c | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f14eaaf..c666065 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3611,6 +3611,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD if (gl_version >= MAKEDWORD_VERSION(4, 3)) gl_info->supported[WINED3D_GL_VERSION_4_3] = TRUE; + /* All the points are actually point sprites in core contexts, the APIs from + * ARB_point_sprite are not supported anymore. */ + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + gl_info->supported[ARB_POINT_SPRITE] = FALSE; + if (gl_info->supported[APPLE_FENCE]) { /* GL_NV_fence and GL_APPLE_fence provide the same functionality basically. diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2dd7b29..945714e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8554,6 +8554,15 @@ static void glsl_vertex_pipe_pointscale(struct wined3d_context *context, context->constant_update_mask |= WINED3D_SHADER_CONST_VS_POINTSIZE; } +static void glsl_vertex_pointsprite_core(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + static unsigned int once; + + if (state->gl_primitive_type == GL_POINTS && !state->render_states[WINED3D_RS_POINTSPRITEENABLE] && !once++) + FIXME("Non-point sprite points not supported in core profile.\n"); +} + static void glsl_vertex_pipe_shademode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -8662,7 +8671,8 @@ static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = {STATE_RENDER(WINED3D_RS_POINTSIZE), {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), glsl_vertex_pipe_pointsize}, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), state_pointsprite }, ARB_POINT_SPRITE }, - {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), state_pointsprite_w }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), state_pointsprite_w }, WINED3D_GL_LEGACY_CONTEXT }, + {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), glsl_vertex_pointsprite_core}, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), {STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), glsl_vertex_pipe_pointscale}, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_POINTSCALE_A), {STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_POINTSCALE_B), {STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), NULL }, WINED3D_GL_EXT_NONE }, @@ -9028,6 +9038,7 @@ static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = {STATE_RENDER(WINED3D_RS_FOGCOLOR), {STATE_RENDER(WINED3D_RS_FOGCOLOR), glsl_fragment_pipe_fogparams }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGDENSITY), {STATE_RENDER(WINED3D_RS_FOGDENSITY), glsl_fragment_pipe_fogparams }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), glsl_fragment_pipe_shader }, ARB_POINT_SPRITE }, + {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), glsl_fragment_pipe_shader }, WINED3D_GL_VERSION_2_0}, {STATE_TEXTURESTAGE(0,WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(0, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), glsl_fragment_pipe_tex_transform }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(1,WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(1, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), glsl_fragment_pipe_tex_transform }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(2,WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(2, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), glsl_fragment_pipe_tex_transform }, WINED3D_GL_EXT_NONE },

1 0

Jacek Caban : jscript: Moved constructor return logic to interpreter.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: d66b5bf4cb7b8e9b3d5ac80ff754f40b1dba2d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66b5bf4cb7b8e9b3d5ac80ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 17:49:53 2016 +0200 jscript: Moved constructor return logic to interpreter. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 6 ++++++ dlls/jscript/engine.h | 1 + dlls/jscript/function.c | 52 ++++++++++++++++++------------------------------- 3 files changed, 26 insertions(+), 33 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8dab026..4d7c175 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2331,6 +2331,12 @@ static HRESULT interp_ret(script_ctx_t *ctx) if(clear_ret) jsval_release(steal_ret(frame)); + if((frame->flags & EXEC_CONSTRUCTOR) && !is_object_instance(frame->ret)) { + jsval_release(frame->ret); + IDispatch_AddRef(frame->this_obj); + frame->ret = jsval_disp(frame->this_obj); + } + jmp_abs(ctx, -1); return S_OK; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 7044858..4915b60 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -212,6 +212,7 @@ typedef struct _call_frame_t { } call_frame_t; #define EXEC_GLOBAL 0x0001 +#define EXEC_CONSTRUCTOR 0x0002 HRESULT exec_source(script_ctx_t*,DWORD,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 c677d94..bd85fda 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -203,7 +203,7 @@ static HRESULT create_var_disp(script_ctx_t *ctx, FunctionInstance *function, un } static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDispatch *this_obj, unsigned argc, jsval_t *argv, - jsval_t *r) + BOOL is_constructor, jsval_t *r) { jsdisp_t *var_disp, *arg_disp; scope_chain_t *scope; @@ -238,11 +238,14 @@ 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)) { + DWORD exec_flags = 0; jsdisp_t *prev_args; + if(is_constructor) + exec_flags |= EXEC_CONSTRUCTOR; prev_args = function->arguments; function->arguments = arg_disp; - hres = exec_source(ctx, 0, function->code, function->func_code, scope, this_obj, var_disp, r); + hres = exec_source(ctx, exec_flags, function->code, function->func_code, scope, this_obj, var_disp, r); function->arguments = prev_args; scope_release(scope); @@ -257,33 +260,6 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis return hres; } -static HRESULT invoke_constructor(script_ctx_t *ctx, FunctionInstance *function, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - jsdisp_t *this_obj; - jsval_t var; - HRESULT hres; - - hres = create_object(ctx, &function->dispex, &this_obj); - if(FAILED(hres)) - return hres; - - hres = invoke_source(ctx, function, to_disp(this_obj), argc, argv, &var); - if(FAILED(hres)) { - jsdisp_release(this_obj); - return hres; - } - - if(is_object_instance(var)) { - jsdisp_release(this_obj); - *r = var; - }else { - jsval_release(var); - *r = jsval_obj(this_obj); - } - return S_OK; -} - static HRESULT invoke_value_proc(script_ctx_t *ctx, FunctionInstance *function, IDispatch *this_disp, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -309,7 +285,7 @@ static HRESULT call_function(script_ctx_t *ctx, FunctionInstance *function, IDis if(function->value_proc) return invoke_value_proc(ctx, function, this_obj, DISPATCH_METHOD, argc, argv, r); - return invoke_source(ctx, function, this_obj, argc, argv, r); + return invoke_source(ctx, function, this_obj, argc, argv, FALSE, r); } static HRESULT function_to_string(FunctionInstance *function, jsstr_t **ret) @@ -354,11 +330,21 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi if(function->value_proc) return invoke_value_proc(function->dispex.ctx, function, jsthis, flags, argc, argv, r); - if(flags == DISPATCH_CONSTRUCT) - return invoke_constructor(function->dispex.ctx, function, argc, argv, r); + if(flags == DISPATCH_CONSTRUCT) { + jsdisp_t *this_obj; + HRESULT hres; + + hres = create_object(function->dispex.ctx, &function->dispex, &this_obj); + if(FAILED(hres)) + return hres; + + hres = invoke_source(function->dispex.ctx, function, to_disp(this_obj), argc, argv, TRUE, r); + jsdisp_release(this_obj); + return hres; + } assert(flags == DISPATCH_METHOD); - return invoke_source(function->dispex.ctx, function, jsthis, argc, argv, r); + return invoke_source(function->dispex.ctx, function, jsthis, argc, argv, FALSE, r); } static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r)

1 0

Matteo Bruni : wined3d: Don' t try to set line stippling on core profile contexts.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: 73f50876ace489adb03a09970269a3182e2beee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f50876ace489adb03a09970… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 28 23:03:31 2016 +0200 wined3d: Don't try to set line stippling on core profile contexts. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 70f053b..937df15 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1355,6 +1355,14 @@ static void state_linepattern(struct wined3d_context *context, const struct wine } } +static void state_linepattern_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + static unsigned int once; + + if (!once++) + FIXME("Setting line patterns is not supported in OpenGL core contexts.\n"); +} + static void state_normalize(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -4959,7 +4967,8 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_RENDER(WINED3D_RS_WRAPU), { STATE_RENDER(WINED3D_RS_WRAPU), state_wrapu }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPV), { STATE_RENDER(WINED3D_RS_WRAPV), state_wrapv }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_FILLMODE), { STATE_RENDER(WINED3D_RS_FILLMODE), state_fillmode }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, + { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_MONOENABLE), { STATE_RENDER(WINED3D_RS_MONOENABLE), state_monoenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ROP2), { STATE_RENDER(WINED3D_RS_ROP2), state_rop2 }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_PLANEMASK), { STATE_RENDER(WINED3D_RS_PLANEMASK), state_planemask }, WINED3D_GL_EXT_NONE },

1 0

Piotr Caban : msvcrt: Handle frames with CXX_FRAME_MAGIC_VC6 and CXX_FRAME_MAGIC_VC7 magic value.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: 953d6c88d1235548eaa54f1b450f5bba938c4f91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=953d6c88d1235548eaa54f1b4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 20:12:18 2016 +0200 msvcrt: Handle frames with CXX_FRAME_MAGIC_VC6 and CXX_FRAME_MAGIC_VC7 magic value. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 018554e..0379d30 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -177,7 +177,9 @@ static void dump_function_descr(const cxx_function_descr *descr, ULONG64 image_b TRACE(" %d: ip %x state %d\n", i, ipmap[i].ip, ipmap[i].state); } TRACE("unwind_help %d\n", descr->unwind_help); + if (descr->magic <= CXX_FRAME_MAGIC_VC6) return; TRACE("expect list: %x\n", descr->expect_list); + if (descr->magic <= CXX_FRAME_MAGIC_VC7) return; TRACE("flags: %08x\n", descr->flags); } @@ -444,7 +446,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, { cxx_exception_type *exc_type; - if (descr->magic != CXX_FRAME_MAGIC_VC8) + if (descr->magic<CXX_FRAME_MAGIC_VC6 || descr->magic>CXX_FRAME_MAGIC_VC8) { FIXME("unhandled frame magic %x\n", descr->magic); return ExceptionContinueSearch;

1 0

Piotr Caban : msvcrt: Improve dump_function_descr helper.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: 776c4a1617eae0f6a50647614881d81c00be862d URL: http://source.winehq.org/git/wine.git/?a=commit;h=776c4a1617eae0f6a50647614… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 20:11:50 2016 +0200 msvcrt: Improve dump_function_descr helper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index f81bb95..820197d 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -73,7 +73,11 @@ typedef struct UINT type_info; int offset; UINT handler; + UINT frame; } catchblock_info; +#define TYPE_FLAG_CONST 1 +#define TYPE_FLAG_VOLATILE 2 +#define TYPE_FLAG_REFERENCE 8 typedef struct { @@ -84,6 +88,12 @@ typedef struct UINT catchblock; } tryblock_info; +typedef struct +{ + int ip; + int state; +} ipmap_info; + typedef struct __cxx_function_descr { UINT magic; @@ -133,6 +143,7 @@ static void dump_function_descr(const cxx_function_descr *descr, ULONG64 image_b { unwind_info *unwind_table = rva_to_ptr(descr->unwind_table, image_base); tryblock_info *tryblock = rva_to_ptr(descr->tryblock, image_base); + ipmap_info *ipmap = rva_to_ptr(descr->ipmap, image_base); UINT i, j; TRACE("magic %x\n", descr->magic); @@ -147,18 +158,24 @@ static void dump_function_descr(const cxx_function_descr *descr, ULONG64 image_b { catchblock_info *catchblock = rva_to_ptr(tryblock[i].catchblock, image_base); - TRACE(" %d: start %d end %d catchlevel %d catch%x(%p) %d\n", i, + TRACE(" %d: start %d end %d catchlevel %d catch %x(%p) %d\n", i, tryblock[i].start_level, tryblock[i].end_level, tryblock[i].catch_level, tryblock[i].catchblock, catchblock, tryblock[i].catchblock_count); for (j=0; j<tryblock[i].catchblock_count; j++) { - TRACE(" %d: flags %x offset %d handler %x(%p) type %x %s\n", - j, catchblock->flags, catchblock->offset, catchblock->handler, - rva_to_ptr(catchblock->handler, image_base), catchblock->type_info, - dbgstr_type_info(rva_to_ptr(catchblock->type_info, image_base))); + TRACE(" %d: flags %x offset %d handler %x(%p) frame %x type %x %s\n", + j, catchblock[j].flags, catchblock[j].offset, catchblock[j].handler, + rva_to_ptr(catchblock[j].handler, image_base), catchblock[j].frame, + catchblock[j].type_info, + dbgstr_type_info(rva_to_ptr(catchblock[j].type_info, image_base))); } } + TRACE("ipmap: %x(%p) %d\n", descr->ipmap, ipmap, descr->ipmap_count); + for (i=0; i<descr->ipmap_count; i++) + { + TRACE(" %d: ip %x state %d\n", i, ipmap[i].ip, ipmap[i].state); + } TRACE("unwind_help %d\n", descr->unwind_help); TRACE("expect list: %x\n", descr->expect_list); TRACE("flags: %08x\n", descr->flags);

1 0

Jacek Caban : secur32: Use %LATEST_RECORD_VERSION gnutls priority.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: f198b5a45a52aa0bcf79f1909c8f6dc4e56c4143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f198b5a45a52aa0bcf79f1909… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 12:42:05 2016 +0200 secur32: Use %LATEST_RECORD_VERSION gnutls priority. It's based on [1], where it's reported to fix issues with older gnutls. I tested what client hello packages Windows reports for different sets of used protocol versions, and it always uses newest possible version. There may be a concern about not using SSL3 client hello, which still may negotiate newer protocol and was recommended for compatibility reasons, but it's known to be problematic the other way those days and recent gnutls won't use it by default anyway [2]. [1] http://us.battle.net/wow/en/forum/topic/20742995286?page=11 [2] https://gitlab.com/gnutls/gnutls/commit/25ed2750438178ff65d555a49212dc7b5a3… Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 95c9bda..b10b629 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -160,7 +160,7 @@ DWORD schan_imp_enabled_protocols(void) BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; - char priority[64] = "NORMAL", *p; + char priority[128] = "NORMAL:%LATEST_RECORD_VERSION", *p; unsigned i; int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT);

1 0

Jacek Caban : jscript: Moved arguments object destuction to interpreter.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: 42e90ca5925324815958a430324faa2d47eb2f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e90ca5925324815958a4303… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 17:50:59 2016 +0200 jscript: Moved arguments object destuction to interpreter. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 12 +++++++++++- dlls/jscript/engine.h | 4 +++- dlls/jscript/function.c | 6 +----- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 4 ++-- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 4616853..5a4d76f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2381,6 +2381,13 @@ OP_LIST static void release_call_frame(call_frame_t *frame) { + if(frame->arguments_obj) { + /* Reset arguments value to cut the reference cycle. Note that since all activation contexts have + * their own arguments property, it's impossible to use prototype's one during name lookup */ + static const WCHAR argumentsW[] = {'a','r','g','u','m','e','n','t','s',0}; + jsdisp_propput_name(frame->variable_obj, argumentsW, jsval_undefined()); + jsdisp_release(frame->arguments_obj); + } if(frame->variable_obj) jsdisp_release(frame->variable_obj); if(frame->this_obj) @@ -2529,7 +2536,7 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis } HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, - IDispatch *this_obj, jsdisp_t *variable_obj, jsval_t *r) + IDispatch *this_obj, jsdisp_t *variable_obj, jsdisp_t *arguments_obj, jsval_t *r) { call_frame_t *frame; unsigned i; @@ -2597,6 +2604,9 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->this_obj = to_disp(ctx->global); IDispatch_AddRef(frame->this_obj); + if(arguments_obj) + frame->arguments_obj = jsdisp_addref(arguments_obj); + frame->flags = flags; frame->variable_obj = jsdisp_addref(variable_obj); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 4b3bba2..e500ba4 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -204,6 +204,7 @@ typedef struct _call_frame_t { IDispatch *this_obj; jsdisp_t *variable_obj; + jsdisp_t *arguments_obj; DWORD flags; bytecode_t *bytecode; @@ -215,5 +216,6 @@ typedef struct _call_frame_t { #define EXEC_GLOBAL 0x0001 #define EXEC_CONSTRUCTOR 0x0002 -HRESULT exec_source(script_ctx_t*,DWORD,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT exec_source(script_ctx_t*,DWORD,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*, + jsdisp_t*,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 bd85fda..be1f29c 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -245,16 +245,12 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis exec_flags |= EXEC_CONSTRUCTOR; prev_args = function->arguments; function->arguments = arg_disp; - hres = exec_source(ctx, exec_flags, function->code, function->func_code, scope, this_obj, var_disp, r); + hres = exec_source(ctx, exec_flags, function->code, function->func_code, scope, this_obj, var_disp, arg_disp, r); function->arguments = prev_args; scope_release(scope); } - /* Reset arguments value to cut the reference cycle. Note that since all activation contexts have - * their own arguments property, it's impossible to use prototype's one during name lookup */ - jsdisp_propput_name(var_disp, argumentsW, jsval_undefined()); - jsdisp_release(arg_disp); jsdisp_release(var_disp); return hres; diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 33d1f3c..24ec358 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -227,7 +227,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns if(frame->flags & EXEC_GLOBAL) exec_flags |= EXEC_GLOBAL; hres = exec_source(ctx, exec_flags, code, &code->global_code, frame->scope, - frame->this_obj, frame->variable_obj, r); + frame->this_obj, frame->variable_obj, NULL, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index eb336fc..61fa400 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -107,7 +107,7 @@ static HRESULT exec_global_code(JScript *This, bytecode_t *code) IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, This->ctx->global, NULL); + hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, This->ctx->global, NULL, NULL); IActiveScriptSite_OnLeaveScript(This->site); return hres; @@ -773,7 +773,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, This->ctx->global, &r); + hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, This->ctx->global, NULL, &r); if(SUCCEEDED(hres)) { if(pvarResult) hres = jsval_to_variant(r, pvarResult);

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_volume_load_location().
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: 8e117a51f750e1a975ac0b6f112bea5fd13ff060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e117a51f750e1a975ac0b6f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 18:58:00 2016 +0200 wined3d: Get resource info from the texture in wined3d_volume_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index cb27ad8..f23a385 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -263,10 +263,10 @@ BOOL wined3d_volume_load_location(struct wined3d_volume *volume, return TRUE; } - if ((volume->resource.access_flags & required_access) != required_access) + if ((texture->resource.access_flags & required_access) != required_access) { ERR("Operation requires %#x access, but volume only has %#x.\n", - required_access, volume->resource.access_flags); + required_access, texture->resource.access_flags); return FALSE; }

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_volume_upload_data().
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: 2d4080f25d093d20123a40b3ed92b84c282a119b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4080f25d093d20123a40b3e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 18:57:58 2016 +0200 wined3d: Get resource info from the texture in wined3d_volume_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index c846ec4..a4d3eb2 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -77,7 +77,8 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine const struct wined3d_const_bo_address *data) { const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_format *format = volume->resource.format; + struct wined3d_texture *texture = volume->container; + const struct wined3d_format *format = texture->resource.format; UINT width = volume->resource.width; UINT height = volume->resource.height; UINT depth = volume->resource.depth; @@ -95,13 +96,13 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine if (data->buffer_object) ERR("Loading a converted volume from a PBO.\n"); - if (volume->container->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) ERR("Converting a block-based format.\n"); dst_row_pitch = width * format->conv_byte_count; dst_slice_pitch = dst_row_pitch * height; - wined3d_texture_get_pitch(volume->container, volume->texture_level, &src_row_pitch, &src_slice_pitch); + wined3d_texture_get_pitch(texture, volume->texture_level, &src_row_pitch, &src_slice_pitch); converted_mem = HeapAlloc(GetProcessHeap(), 0, dst_slice_pitch * depth); format->convert(data->addr, converted_mem, src_row_pitch, src_slice_pitch,

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_volume_download_data().
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: 9736c861a28f7680159b9ef0ee990dbc65b53dfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9736c861a28f7680159b9ef0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 18:57:59 2016 +0200 wined3d: Get resource info from the texture in wined3d_volume_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index a4d3eb2..cb27ad8 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -152,8 +152,8 @@ void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD loc static void wined3d_volume_download_data(struct wined3d_volume *volume, const struct wined3d_context *context, const struct wined3d_bo_address *data) { + const struct wined3d_format *format = volume->container->resource.format; const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_format *format = volume->resource.format; if (format->convert) {

1 0