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

Jacek Caban : jscript: Use already running interpreter for execution of member source function.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 66632091bf31929dc50fdaf60cab819ff0088157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66632091bf31929dc50fdaf60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 17:49:01 2016 +0200 jscript: Use already running interpreter for execution of member source function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 9 +++++++-- dlls/jscript/engine.c | 36 ++++++++++++++++++++++++++++-------- dlls/jscript/engine.h | 1 + dlls/jscript/function.c | 12 ++++++++---- dlls/jscript/jscript.h | 8 ++++++++ 5 files changed, 52 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 40e1749..5abb3a7 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -377,6 +377,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) { vdisp_t vthis; + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(jsthis) set_disp(&vthis, jsthis); else @@ -1060,7 +1061,7 @@ HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsig { HRESULT hres; - assert(!(flags & ~(DISPATCH_METHOD|DISPATCH_CONSTRUCT))); + assert(!(flags & ~(DISPATCH_METHOD|DISPATCH_CONSTRUCT|DISPATCH_JSCRIPT_INTERNAL_MASK))); if(is_class(jsfunc, JSCLASS_FUNCTION)) { hres = Function_invoke(jsfunc, jsthis, flags, argc, argv, r); @@ -1073,6 +1074,7 @@ HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsig } set_disp(&vdisp, jsthis); + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; hres = jsfunc->builtin_info->value_prop.invoke(jsfunc->ctx, &vdisp, flags, argc, argv, r); vdisp_release(&vdisp); } @@ -1123,6 +1125,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns return hres; } + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(ret && argc) flags |= DISPATCH_PROPERTYGET; @@ -1187,6 +1190,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns hres = variant_to_jsval(&retv, ret); VariantClear(&retv); } + return hres; } @@ -1200,7 +1204,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W unsigned i; HRESULT hres; - assert(!(flags & ~(DISPATCH_METHOD|DISPATCH_CONSTRUCT))); + assert(!(flags & ~(DISPATCH_METHOD|DISPATCH_CONSTRUCT|DISPATCH_JSCRIPT_INTERNAL_MASK))); jsdisp = iface_to_jsdisp((IUnknown*)disp); if(jsdisp) { @@ -1209,6 +1213,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W return hres; } + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(r && argc && flags == DISPATCH_METHOD) flags |= DISPATCH_PROPERTYGET; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e600e62..31c592c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1002,7 +1002,7 @@ static HRESULT interp_call_member(script_ctx_t *ctx) return throw_type_error(ctx, id, NULL); clear_ret(frame); - return disp_call(ctx, obj, id, DISPATCH_METHOD, + return disp_call(ctx, obj, id, DISPATCH_METHOD | DISPATCH_JSCRIPT_CALLEREXECSSOURCE, argn, stack_args(ctx, argn), do_ret ? &frame->ret : NULL); } @@ -2403,21 +2403,25 @@ static void release_call_frame(call_frame_t *frame) static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres) { - call_frame_t *frame = ctx->call_ctx; except_frame_t *except_frame; + call_frame_t *frame; jsval_t except_val; BSTR ident; HRESULT hres; - if(!frame->except_frame) { + for(frame = ctx->call_ctx; !frame->except_frame; frame = ctx->call_ctx) { + DWORD flags; + while(frame->scope != frame->base_scope) scope_pop(&frame->scope); stack_popn(ctx, ctx->stack_top-frame->stack_base); ctx->call_ctx = frame->prev_frame; + flags = frame->flags; release_call_frame(frame); - return exception_hres; + if(!(flags & EXEC_RETURN_TO_INTERP)) + return exception_hres; } except_frame = frame->except_frame; @@ -2472,9 +2476,8 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, jsval_t *r) TRACE("\n"); - frame = ctx->call_ctx; - while(1) { + frame = ctx->call_ctx; op = frame->bytecode->instrs[frame->ip].op; hres = op_funcs[op](ctx); if(FAILED(hres)) { @@ -2484,14 +2487,21 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, jsval_t *r) if(FAILED(hres)) return hres; }else if(frame->ip == -1) { + const DWORD return_to_interp = frame->flags & EXEC_RETURN_TO_INTERP; + assert(ctx->stack_top == frame->stack_base); assert(frame->scope == frame->base_scope); ctx->call_ctx = frame->prev_frame; - if(r) + if(return_to_interp) { + clear_ret(ctx->call_ctx); + ctx->call_ctx->ret = steal_ret(frame); + }else if(r) { *r = steal_ret(frame); + } release_call_frame(frame); - break; + if(!return_to_interp) + break; }else { frame->ip += op_move[op]; } @@ -2617,5 +2627,15 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->prev_frame = ctx->call_ctx; ctx->call_ctx = frame; + if(flags & EXEC_RETURN_TO_INTERP) { + /* + * We're called directly from interpreter, so we may just setup call frame and return. + * Already running interpreter will take care of execution. + */ + if(r) + *r = jsval_undefined(); + return S_OK; + } + return enter_bytecode(ctx, r); } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 4c29694..4094303 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -216,6 +216,7 @@ typedef struct _call_frame_t { #define EXEC_GLOBAL 0x0001 #define EXEC_CONSTRUCTOR 0x0002 +#define EXEC_RETURN_TO_INTERP 0x0004 HRESULT exec_source(script_ctx_t*,DWORD,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*, jsdisp_t*,jsdisp_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 51d1060..55a34e1 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -202,7 +202,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, - BOOL is_constructor, jsval_t *r) + BOOL is_constructor, BOOL caller_execs_source, jsval_t *r) { jsdisp_t *var_disp, *arg_disp; scope_chain_t *scope; @@ -239,6 +239,8 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis if(SUCCEEDED(hres)) { DWORD exec_flags = 0; + if(caller_execs_source) + exec_flags |= EXEC_RETURN_TO_INTERP; if(is_constructor) exec_flags |= EXEC_CONSTRUCTOR; hres = exec_source(ctx, exec_flags, function->code, function->func_code, scope, this_obj, @@ -277,7 +279,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, FALSE, r); + return invoke_source(ctx, function, this_obj, argc, argv, FALSE, FALSE, r); } static HRESULT function_to_string(FunctionInstance *function, jsstr_t **ret) @@ -312,6 +314,7 @@ static HRESULT function_to_string(FunctionInstance *function, jsstr_t **ret) HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + const BOOL caller_execs_source = (flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) != 0; FunctionInstance *function; TRACE("func %p this %p\n", func_this, jsthis); @@ -319,6 +322,7 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi assert(is_class(func_this, JSCLASS_FUNCTION)); function = (FunctionInstance*)func_this; + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(function->value_proc) return invoke_value_proc(function->dispex.ctx, function, jsthis, flags, argc, argv, r); @@ -330,13 +334,13 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi if(FAILED(hres)) return hres; - hres = invoke_source(function->dispex.ctx, function, to_disp(this_obj), argc, argv, TRUE, r); + hres = invoke_source(function->dispex.ctx, function, to_disp(this_obj), argc, argv, TRUE, FALSE, r); jsdisp_release(this_obj); return hres; } assert(flags == DISPATCH_METHOD); - return invoke_source(function->dispex.ctx, function, jsthis, argc, argv, FALSE, r); + return invoke_source(function->dispex.ctx, function, jsthis, argc, argv, FALSE, caller_execs_source, r); } static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 53272c9..cc66418 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -101,6 +101,14 @@ extern HINSTANCE jscript_hinstance DECLSPEC_HIDDEN; #define PROPF_CONST 0x0800 #define PROPF_DONTDELETE 0x1000 +/* + * This is our internal dispatch flag informing calee that it's called directly from interpreter. + * If calee is executed as interpreted function, we may let already running interpreter to take + * of execution. + */ +#define DISPATCH_JSCRIPT_CALLEREXECSSOURCE 0x8000 +#define DISPATCH_JSCRIPT_INTERNAL_MASK DISPATCH_JSCRIPT_CALLEREXECSSOURCE + /* NOTE: Keep in sync with names in Object.toString implementation */ typedef enum { JSCLASS_NONE,

1 0

Jacek Caban : jscript: Use already running interpreter for execution expressions that are source functions.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 2d35954adbcb1edbb7223a61042b10c7b018b889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d35954adbcb1edbb7223a610… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 17:49:08 2016 +0200 jscript: Use already running interpreter for execution expressions that are source functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 31c592c..1bbc2ba 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -982,7 +982,7 @@ static HRESULT interp_call(script_ctx_t *ctx) return throw_type_error(ctx, JS_E_INVALID_PROPERTY, NULL); clear_ret(frame); - return disp_call_value(ctx, get_object(obj), NULL, DISPATCH_METHOD, + return disp_call_value(ctx, get_object(obj), NULL, DISPATCH_METHOD | DISPATCH_JSCRIPT_CALLEREXECSSOURCE, argn, stack_args(ctx, argn), do_ret ? &frame->ret : NULL); }

1 0

Daniel Lehman : ucrtbase: Add hypot forward.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 31bc775c65814fc0fc14f3871b5291b4c885e3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31bc775c65814fc0fc14f3871… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Mar 28 11:38:46 2016 -0700 ucrtbase: Add hypot forward. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 2a2ed6e..1ea4f2d 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -252,7 +252,7 @@ @ cdecl fmod(double double) ucrtbase.fmod @ cdecl -arch=arm,x86_64 fmodf(float float) ucrtbase.fmodf @ cdecl frexp(double ptr) ucrtbase.frexp -@ stub hypot +@ cdecl hypot(double double) ucrtbase.hypot @ stub ilogb @ stub ilogbf @ stub ilogbl diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index eb68178..3bbab33 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2339,7 +2339,7 @@ @ stub gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar -@ stub hypot +@ cdecl hypot(double double) _hypot @ stub ilogb @ stub ilogbf @ stub ilogbl

1 0

Henri Verbeet : wined3d: Get rid of the d3d_surface and d3d_texture debug channels.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 97f4034e58e0bd12f1da6e1d9f840bd0e18ed7c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f4034e58e0bd12f1da6e1d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 16:45:35 2016 +0200 wined3d: Get rid of the d3d_surface and d3d_texture debug channels. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 13 +++++-------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volume.c | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cd8c863..4a59c5a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -30,9 +30,8 @@ #include "wine/port.h" #include "wined3d_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); +WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -WINE_DECLARE_DEBUG_CHANNEL(d3d); #define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy. */ @@ -3262,7 +3261,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co return WINED3D_OK; } - if (WARN_ON(d3d_surface)) + if (WARN_ON(d3d)) { DWORD required_access = resource_access_from_location(location); if ((texture->resource.access_flags & required_access) != required_access) @@ -3400,7 +3399,7 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, } case WINED3D_BLIT_OP_COLOR_BLIT: case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: - if (TRACE_ON(d3d_surface) && TRACE_ON(d3d)) + if (TRACE_ON(d3d)) { TRACE("Checking support for fixup:\n"); dump_color_fixup_desc(src_format->color_fixup); @@ -4128,10 +4127,8 @@ do { \ } error: - if (flags && FIXME_ON(d3d_surface)) - { - FIXME("\tUnsupported flags: %#x.\n", flags); - } + if (flags) + FIXME(" Unsupported flags %#x.\n", flags); release: wined3d_resource_unmap(&dst_texture->resource, dst_sub_resource_idx); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4cf445a..ce6162f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -24,7 +24,7 @@ #include "wine/port.h" #include "wined3d_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); +WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(winediag); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index fe1b6ee..bfc0d0b 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -24,7 +24,7 @@ #include "wine/port.h" #include "wined3d_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); +WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); static BOOL volume_prepare_system_memory(struct wined3d_volume *volume)

1 0

Józef Kucia : wined3d: Add hull shader type.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 403459fd914788f180ad9eea6459274ac62f8c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=403459fd914788f180ad9eea6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 29 12:14:53 2016 +0200 wined3d: Add hull shader type. 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/arb_program_shader.c | 10 ++++++---- dlls/wined3d/context.c | 3 ++- dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 8 +++++++- dlls/wined3d/shader.c | 19 ++++++++++++++++++- dlls/wined3d/utils.c | 3 ++- dlls/wined3d/wined3d_main.c | 3 +++ dlls/wined3d/wined3d_private.h | 12 ++++++++---- 8 files changed, 47 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=403459fd914788f180ad9…

1 0

Józef Kucia : d3d11: Add ID3D11HullShader interface stub.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 210b78258f703edccfbeb0748587c5da6bd22a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=210b78258f703edccfbeb0748… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 29 12:14:52 2016 +0200 d3d11: Add ID3D11HullShader interface stub. 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/d3d11/d3d11_private.h | 13 +++++ dlls/d3d11/device.c | 16 +++++- dlls/d3d11/shader.c | 128 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 155 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 655bae5..e743598 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -250,6 +250,19 @@ HRESULT d3d_vertex_shader_create(struct d3d_device *device, const void *byte_cod struct d3d_vertex_shader *unsafe_impl_from_ID3D11VertexShader(ID3D11VertexShader *iface) DECLSPEC_HIDDEN; struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) DECLSPEC_HIDDEN; +/* ID3D11HullShader */ +struct d3d11_hull_shader +{ + ID3D11HullShader ID3D11HullShader_iface; + LONG refcount; + + struct wined3d_private_store private_store; + ID3D11Device *device; +}; + +HRESULT d3d11_hull_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d11_hull_shader **shader) DECLSPEC_HIDDEN; + /* ID3D11GeometryShader, ID3D10GeometryShader */ struct d3d_geometry_shader { diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e1bfb70..deafdf1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2178,10 +2178,22 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePixelShader(ID3D11Device *if static HRESULT STDMETHODCALLTYPE d3d11_device_CreateHullShader(ID3D11Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11HullShader **shader) { - FIXME("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p stub!\n", + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d11_hull_shader *object; + HRESULT hr; + + FIXME("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p partial-stub!\n", iface, byte_code, byte_code_length, class_linkage, shader); - return E_NOTIMPL; + if (class_linkage) + FIXME("Class linkage is not implemented yet.\n"); + + if (FAILED(hr = d3d11_hull_shader_create(device, byte_code, byte_code_length, &object))) + return hr; + + *shader = &object->ID3D11HullShader_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device *iface, const void *byte_code, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 06e4b8c..0659e2a 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -471,6 +471,134 @@ struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader return impl_from_ID3D10VertexShader(iface); } +/* ID3D11HullShader methods */ + +static inline struct d3d11_hull_shader *impl_from_ID3D11HullShader(ID3D11HullShader *iface) +{ + return CONTAINING_RECORD(iface, struct d3d11_hull_shader, ID3D11HullShader_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d11_hull_shader_QueryInterface(ID3D11HullShader *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D11HullShader) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID3D11HullShader_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d11_hull_shader_AddRef(ID3D11HullShader *iface) +{ + struct d3d11_hull_shader *shader = impl_from_ID3D11HullShader(iface); + ULONG refcount = InterlockedIncrement(&shader->refcount); + + TRACE("%p increasing refcount to %u.\n", shader, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d11_hull_shader_Release(ID3D11HullShader *iface) +{ + struct d3d11_hull_shader *shader = impl_from_ID3D11HullShader(iface); + ULONG refcount = InterlockedDecrement(&shader->refcount); + + TRACE("%p decreasing refcount to %u.\n", shader, refcount); + + if (!refcount) + { + ID3D11Device_Release(shader->device); + HeapFree(GetProcessHeap(), 0, shader); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d3d11_hull_shader_GetDevice(ID3D11HullShader *iface, + ID3D11Device **device) +{ + struct d3d11_hull_shader *shader = impl_from_ID3D11HullShader(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = shader->device; + ID3D11Device_AddRef(*device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_hull_shader_GetPrivateData(ID3D11HullShader *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d11_hull_shader *shader = impl_from_ID3D11HullShader(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&shader->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_hull_shader_SetPrivateData(ID3D11HullShader *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d11_hull_shader *shader = impl_from_ID3D11HullShader(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&shader->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_hull_shader_SetPrivateDataInterface(ID3D11HullShader *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d11_hull_shader *shader = impl_from_ID3D11HullShader(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&shader->private_store, guid, data); +} + +static const struct ID3D11HullShaderVtbl d3d11_hull_shader_vtbl = +{ + /* IUnknown methods */ + d3d11_hull_shader_QueryInterface, + d3d11_hull_shader_AddRef, + d3d11_hull_shader_Release, + /* ID3D11DeviceChild methods */ + d3d11_hull_shader_GetDevice, + d3d11_hull_shader_GetPrivateData, + d3d11_hull_shader_SetPrivateData, + d3d11_hull_shader_SetPrivateDataInterface, +}; + +HRESULT d3d11_hull_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d11_hull_shader **shader) +{ + struct d3d11_hull_shader *object; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID3D11HullShader_iface.lpVtbl = &d3d11_hull_shader_vtbl; + object->refcount = 1; + wined3d_private_store_init(&object->private_store); + + object->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(object->device); + + TRACE("Created hull shader %p.\n", object); + *shader = object; + + return S_OK; +} + /* ID3D11GeometryShader methods */ static inline struct d3d_geometry_shader *impl_from_ID3D11GeometryShader(ID3D11GeometryShader *iface)

1 0

Józef Kucia : wined3d: Introduce wined3d_shader_create_hs().
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: afa74b5c0f1c3aeda4e529ea3b59282a834628a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa74b5c0f1c3aeda4e529ea3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 29 12:14:54 2016 +0200 wined3d: Introduce wined3d_shader_create_hs(). 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/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 2 +- dlls/d3d11/shader.c | 84 ++++++++++++++++++++++++++++++++++++++---- dlls/wined3d/shader.c | 41 ++++++++++++++++++++- dlls/wined3d/shader_sm4.c | 10 +++-- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 2 + 8 files changed, 129 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afa74b5c0f1c3aeda4e52…

1 0

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

March 30, 2016

Module: wine Branch: master Commit: 5f05acfcff7259ed6e5b15e2a28eac2eafdb3400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f05acfcff7259ed6e5b15e2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 16:45:31 2016 +0200 wined3d: Use wined3d_texture_blt() in swapchain_gl_present(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 09cc45a..3c282ce 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -480,6 +480,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0)); const struct wined3d_fb_state *fb = &swapchain->device->fb; const struct wined3d_gl_info *gl_info; + struct wined3d_texture *logo_texture; struct wined3d_context *context; struct wined3d_surface *front; BOOL render_to_fbo; @@ -494,23 +495,19 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, gl_info = context->gl_info; - if (swapchain->device->logo_texture) + if ((logo_texture = swapchain->device->logo_texture)) { - struct wined3d_surface *src_surface = surface_from_resource( - wined3d_texture_get_sub_resource(swapchain->device->logo_texture, 0)); - RECT rect = {0, 0, src_surface->resource.width, src_surface->resource.height}; + RECT rect = {0, 0, logo_texture->resource.width, logo_texture->resource.height}; /* Blit the logo into the upper left corner of the drawable. */ - wined3d_surface_blt(back_buffer, &rect, src_surface, &rect, + wined3d_texture_blt(swapchain->back_buffers[0], 0, &rect, logo_texture, 0, &rect, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); } if (swapchain->device->bCursorVisible && swapchain->device->cursor_texture && !swapchain->device->hardwareCursor) { - struct wined3d_surface *cursor = surface_from_resource( - wined3d_texture_get_sub_resource(swapchain->device->cursor_texture, 0)); - RECT destRect = + RECT dst_rect = { swapchain->device->xScreenSpace - swapchain->device->xHotSpot, swapchain->device->yScreenSpace - swapchain->device->yHotSpot, @@ -523,14 +520,17 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, swapchain->device->cursor_texture->resource.width, swapchain->device->cursor_texture->resource.height }; - const RECT clip_rect = {0, 0, back_buffer->resource.width, back_buffer->resource.height}; + const RECT clip_rect = {0, 0, + swapchain->back_buffers[0]->resource.width, + swapchain->back_buffers[0]->resource.height}; TRACE("Rendering the software cursor.\n"); if (swapchain->desc.windowed) - MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&destRect, 2); - if (wined3d_clip_blit(&clip_rect, &destRect, &src_rect)) - wined3d_surface_blt(back_buffer, &destRect, cursor, &src_rect, + MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&dst_rect, 2); + if (wined3d_clip_blit(&clip_rect, &dst_rect, &src_rect)) + wined3d_texture_blt(swapchain->back_buffers[0], 0, &dst_rect, + swapchain->device->cursor_texture, 0, &src_rect, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); }

1 0

Nikolay Sivov : d2d1/tests: Basic test for ID2D1DCRenderTarget creation.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: ea7df313190eb4aa3ebf46f134e72dd8ed253129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7df313190eb4aa3ebf46f13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 14:12:31 2016 +0300 d2d1/tests: Basic test for ID2D1DCRenderTarget creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 2a78d2c..7f9632f 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2626,6 +2626,71 @@ todo_wine DestroyWindow(window); } +static void test_dc_target(void) +{ + static const D2D1_PIXEL_FORMAT invalid_formats[] = + { + { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_PREMULTIPLIED }, + { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_UNKNOWN }, + { DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED }, + }; + D2D1_RENDER_TARGET_PROPERTIES desc; + ID2D1SolidColorBrush *brush; + ID2D1DCRenderTarget *rt; + ID2D1Factory *factory; + D2D1_COLOR_F color; + D2D1_SIZE_F size; + unsigned int i; + HRESULT hr; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + for (i = 0; i < sizeof(invalid_formats) / sizeof(*invalid_formats); ++i) + { + desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; + desc.pixelFormat = invalid_formats[i]; + desc.dpiX = 96.0f; + desc.dpiY = 96.0f; + desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + + hr = ID2D1Factory_CreateDCRenderTarget(factory, &desc, &rt); + todo_wine + ok(hr == D2DERR_UNSUPPORTED_PIXEL_FORMAT, "Got unexpected hr %#x.\n", hr); + } + + desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; + desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + desc.dpiX = 96.0f; + desc.dpiY = 96.0f; + desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + hr = ID2D1Factory_CreateDCRenderTarget(factory, &desc, &rt); +todo_wine + ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr); +if (SUCCEEDED(hr)) +{ + size = ID2D1DCRenderTarget_GetSize(rt); + ok(size.width == 0.0f, "got width %.08e.\n", size.width); + ok(size.height == 0.0f, "got height %.08e.\n", size.height); + + /* object creation methods work without BindDC() */ + set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f); + hr = ID2D1DCRenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush); + ok(SUCCEEDED(hr), "Failed to create a brush, hr %#x.\n", hr); + ID2D1SolidColorBrush_Release(brush); + + ID2D1DCRenderTarget_BeginDraw(rt); + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + + ID2D1DCRenderTarget_Release(rt); +} + ID2D1Factory_Release(factory); +} + START_TEST(d2d1) { test_clip(); @@ -2640,4 +2705,5 @@ START_TEST(d2d1) test_opacity_brush(); test_create_target(); test_draw_text_layout(); + test_dc_target(); }

1 0

Henri Verbeet : wined3d: Store the context' s current rendertarget as a texture and sub-resource index.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: d6e2f650d5d141cea1982269b3367d6b45cf8694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e2f650d5d141cea1982269b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 16:45:32 2016 +0200 wined3d: Store the context's current rendertarget as a texture and sub-resource index. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 119 ++++++++++++++++++++++++++--------------- dlls/wined3d/query.c | 14 ++--- dlls/wined3d/surface.c | 44 +++++++-------- dlls/wined3d/wined3d_private.h | 15 +++++- 4 files changed, 119 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6e2f650d5d141cea1982…

1 0