February 2017 - Wine-commits

Józef Kucia : d3d11: Do not keep reference to resources.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 57fac9b02e1c113c28c5c07a3f41676153120bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57fac9b02e1c113c28c5c07a3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 12:43:36 2017 +0100 d3d11: Do not keep reference to resources. 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/tests/d3d11.c | 12 ++++++------ dlls/d3d11/view.c | 9 +-------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f83e764..b4f4eef 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2755,7 +2755,7 @@ static void test_create_depthstencil_view(void) hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, current_desc, &dsview); ok(SUCCEEDED(hr), "Test %u: Failed to create depth stencil view, hr %#x.\n", i, hr); refcount = get_refcount((IUnknown *)texture); - todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11DepthStencilView_QueryInterface(dsview, &IID_ID3D10DepthStencilView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -3119,7 +3119,7 @@ static void test_create_rendertarget_view(void) hr = ID3D11Device_CreateRenderTargetView(device, texture, current_desc, &rtview); ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr); refcount = get_refcount((IUnknown *)texture); - todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11RenderTargetView_QueryInterface(rtview, &IID_ID3D10RenderTargetView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -3478,7 +3478,7 @@ static void test_create_shader_resource_view(void) hr = ID3D11Device_CreateShaderResourceView(device, texture, current_desc, &srview); ok(SUCCEEDED(hr), "Test %u: Failed to create a shader resource view, hr %#x.\n", i, hr); refcount = get_refcount((IUnknown *)texture); - todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -8164,7 +8164,7 @@ static void test_swapchain_views(void) context = test_context.immediate_context; refcount = get_refcount((IUnknown *)test_context.backbuffer); - todo_wine ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); draw_color_quad(&test_context, &color); check_texture_color(test_context.backbuffer, 0xff7f4c33, 1); @@ -8177,7 +8177,7 @@ static void test_swapchain_views(void) ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); refcount = get_refcount((IUnknown *)test_context.backbuffer); - todo_wine ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); draw_color_quad(&test_context, &color); todo_wine check_texture_color(test_context.backbuffer, 0xffbc957c, 1); @@ -10396,7 +10396,7 @@ static void test_create_unordered_access_view(void) hr = ID3D11Device_CreateUnorderedAccessView(device, texture, current_desc, &uav); ok(SUCCEEDED(hr), "Test %u: Failed to create unordered access view, hr %#x.\n", i, hr); refcount = get_refcount((IUnknown *)texture); - todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); memset(&uav_desc, 0, sizeof(uav_desc)); ID3D11UnorderedAccessView_GetDesc(uav, &uav_desc); diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 06f4011..92fc37c 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -996,7 +996,6 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci { wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); - ID3D11Resource_Release(view->resource); ID3D11Device_Release(view->device); wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); @@ -1312,7 +1311,6 @@ static HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, st wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); view->resource = resource; - ID3D11Resource_AddRef(resource); view->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(view->device); @@ -1419,7 +1417,6 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTarge { wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); - ID3D11Resource_Release(view->resource); ID3D11Device_Release(view->device); wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); @@ -1740,7 +1737,6 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); view->resource = resource; - ID3D11Resource_AddRef(resource); view->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(view->device); @@ -1848,7 +1844,6 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe { wined3d_mutex_lock(); wined3d_shader_resource_view_decref(view->wined3d_view); - ID3D11Resource_Release(view->resource); ID3D11Device_Release(view->device); wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); @@ -2221,7 +2216,6 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); view->resource = resource; - ID3D11Resource_AddRef(resource); view->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(view->device); @@ -2314,7 +2308,6 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_Release(ID3D11Unorder { wined3d_mutex_lock(); wined3d_unordered_access_view_decref(view->wined3d_view); - ID3D11Resource_Release(view->resource); ID3D11Device_Release(view->device); wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); @@ -2510,7 +2503,7 @@ static HRESULT d3d11_unordered_access_view_init(struct d3d11_unordered_access_vi wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); - ID3D11Resource_AddRef(view->resource = resource); + view->resource = resource; ID3D11Device_AddRef(view->device = &device->ID3D11Device_iface); return S_OK;

1 0

Józef Kucia : d3d10core/tests: Add tests showing that views do not keep resource reference.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 27d8c4d2ccf0355b429ab292263bd5c131c5f529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27d8c4d2ccf0355b429ab2922… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 12:43:37 2017 +0100 d3d10core/tests: Add tests showing that views do not keep resource reference. 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/d3d10core/tests/device.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 2d5115f..7d75487 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1962,8 +1962,11 @@ static void test_create_depthstencil_view(void) get_dsv_desc(current_desc, &tests[i].dsv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, current_desc, &dsview); ok(SUCCEEDED(hr), "Test %u: Failed to create depth stencil view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D10DepthStencilView_QueryInterface(dsview, &IID_ID3D11DepthStencilView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -2322,8 +2325,11 @@ static void test_create_rendertarget_view(void) get_rtv_desc(current_desc, &tests[i].rtv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D10Device_CreateRenderTargetView(device, texture, current_desc, &rtview); ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D10RenderTargetView_QueryInterface(rtview, &IID_ID3D11RenderTargetView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -2737,8 +2743,11 @@ static void test_create_shader_resource_view(void) get_srv_desc(current_desc, &tests[i].srv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D10Device_CreateShaderResourceView(device, texture, current_desc, &srview); ok(SUCCEEDED(hr), "Test %u: Failed to create a shader resource view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D10ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView1, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -7815,6 +7824,7 @@ static void test_swapchain_views(void) ID3D10ShaderResourceView *srv; ID3D10RenderTargetView *rtv; ID3D10Device *device; + ULONG refcount; HRESULT hr; if (!init_test_context(&test_context)) @@ -7822,6 +7832,9 @@ static void test_swapchain_views(void) device = test_context.device; + refcount = get_refcount((IUnknown *)test_context.backbuffer); + ok(refcount == 1, "Got refcount %u.\n", refcount); + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2D; U(rtv_desc).Texture2D.MipSlice = 0;

1 0

Józef Kucia : wined3d: Add ARB_compute_shader extension.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 5061abe43707db20d7dcfe94a2c63be6f3718401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5061abe43707db20d7dcfe94a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 12:43:38 2017 +0100 wined3d: Add ARB_compute_shader extension. 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 | 12 ++++++++++++ dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 54f1cc7..c47052c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -113,6 +113,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, {"GL_ARB_clip_control", ARB_CLIP_CONTROL }, {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT }, + {"GL_ARB_compute_shader", ARB_COMPUTE_SHADER }, {"GL_ARB_copy_buffer", ARB_COPY_BUFFER }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, @@ -2633,6 +2634,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glClipControl) /* GL_ARB_color_buffer_float */ USE_GL_FUNC(glClampColorARB) + /* GL_ARB_compute_shader */ + USE_GL_FUNC(glDispatchCompute) + USE_GL_FUNC(glDispatchComputeIndirect) /* GL_ARB_copy_buffer */ USE_GL_FUNC(glCopyBufferSubData) /* GL_ARB_debug_output */ @@ -3557,6 +3561,13 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_PIXEL], gl_max); } } + if (gl_info->supported[ARB_COMPUTE_SHADER]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMPUTE_UNIFORM_BLOCKS, &gl_max); + gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_COMPUTE] = min(gl_max, WINED3D_MAX_CBS); + TRACE("Max compute uniform blocks: %u (%d).\n", + gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_COMPUTE], gl_max); + } if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMBINED_UNIFORM_BLOCKS, &gl_max); @@ -3674,6 +3685,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_TEXTURE_COMPRESSION_BPTC, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_STORAGE, MAKEDWORD_VERSION(4, 2)}, + {ARB_COMPUTE_SHADER, MAKEDWORD_VERSION(4, 3)}, {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, {ARB_ES3_COMPATIBILITY, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f0c19fc..d8e8202 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8801,6 +8801,7 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s * soon as we introduce them, adjusting the GL / GLSL version checks * accordingly. */ if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 30) && gl_info->supported[WINED3D_GL_VERSION_4_3] + && gl_info->supported[ARB_COMPUTE_SHADER] && gl_info->supported[ARB_DERIVATIVE_CONTROL] && gl_info->supported[ARB_GPU_SHADER5] && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 88da05a..5f57a41 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -46,6 +46,7 @@ enum wined3d_gl_extension ARB_BLEND_FUNC_EXTENDED, ARB_CLIP_CONTROL, ARB_COLOR_BUFFER_FLOAT, + ARB_COMPUTE_SHADER, ARB_COPY_BUFFER, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT,

1 0

Józef Kucia : wined3d: Handle compute shader registers in GLSL backend.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: dc56f7b17a2dc61222df3282c950d3b2f4340c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc56f7b17a2dc61222df3282c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 12:43:39 2017 +0100 wined3d: Handle compute shader registers in GLSL backend. 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/glsl_shader.c | 23 ++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d8e8202..aebf96a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2840,6 +2840,22 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * sprintf(register_name, "X%u[%u]", reg->idx[0].offset, reg->idx[1].offset); break; + case WINED3DSPR_LOCALTHREADINDEX: + sprintf(register_name, "int(gl_LocalInvocationIndex)"); + break; + + case WINED3DSPR_THREADID: + sprintf(register_name, "ivec3(gl_GlobalInvocationID)"); + break; + + case WINED3DSPR_THREADGROUPID: + sprintf(register_name, "ivec3(gl_WorkGroupID)"); + break; + + case WINED3DSPR_LOCALTHREADID: + sprintf(register_name, "ivec3(gl_LocalInvocationID)"); + break; + default: FIXME("Unhandled register type %#x.\n", reg->type); sprintf(register_name, "unrecognized_register"); @@ -2928,7 +2944,12 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio shader_glsl_get_register_name(&wined3d_src->reg, glsl_src->reg_name, &is_color, ins); shader_glsl_get_swizzle(wined3d_src, is_color, mask, swizzle_str); - if (wined3d_src->reg.type == WINED3DSPR_IMMCONST || wined3d_src->reg.type == WINED3DSPR_PRIMID) + if (wined3d_src->reg.type == WINED3DSPR_IMMCONST + || wined3d_src->reg.type == WINED3DSPR_PRIMID + || wined3d_src->reg.type == WINED3DSPR_LOCALTHREADINDEX + || wined3d_src->reg.type == WINED3DSPR_THREADID + || wined3d_src->reg.type == WINED3DSPR_THREADGROUPID + || wined3d_src->reg.type == WINED3DSPR_LOCALTHREADID) { shader_glsl_gen_modifier(wined3d_src->modifiers, glsl_src->reg_name, swizzle_str, glsl_src->param_str); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 43d80d2..2ea6763 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3596,6 +3596,7 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) case WINED3DSPR_LOOP: /* aL */ case WINED3DSPR_PREDICATE: /* p0 */ case WINED3DSPR_PRIMID: /* primID */ + case WINED3DSPR_LOCALTHREADINDEX: /* vThreadIDInGroupFlattened */ return TRUE; case WINED3DSPR_MISCTYPE:

1 0

Józef Kucia : wined3d: Introduce wined3d_device_dispatch_compute().
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 34af6f700e4f5a3e0a36b3966abafa9abd590706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34af6f700e4f5a3e0a36b3966… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 12:43:40 2017 +0100 wined3d: Introduce wined3d_device_dispatch_compute(). 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/context.c | 6 ++++++ dlls/wined3d/cs.c | 36 +++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 9 +++++++++ dlls/wined3d/drawprim.c | 43 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 6 ++++++ include/wine/wined3d.h | 2 ++ 7 files changed, 103 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fdf684e..238ae31 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3564,6 +3564,12 @@ BOOL context_apply_draw_state(struct wined3d_context *context, return TRUE; } +void context_apply_compute_state(struct wined3d_context *context, + const struct wined3d_device *device, const struct wined3d_state *state) +{ + FIXME("Implement applying compute state.\n"); +} + static void context_setup_target(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) { diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d2c334f..220ddee 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -28,6 +28,7 @@ enum wined3d_cs_op { WINED3D_CS_OP_PRESENT, WINED3D_CS_OP_CLEAR, + WINED3D_CS_OP_DISPATCH, WINED3D_CS_OP_DRAW, WINED3D_CS_OP_SET_PREDICATION, WINED3D_CS_OP_SET_VIEWPORT, @@ -83,6 +84,14 @@ struct wined3d_cs_clear RECT rects[1]; }; +struct wined3d_cs_dispatch +{ + enum wined3d_cs_op opcode; + unsigned int group_count_x; + unsigned int group_count_y; + unsigned int group_count_z; +}; + struct wined3d_cs_draw { enum wined3d_cs_op opcode; @@ -482,6 +491,32 @@ static void release_shader_resources(const struct wined3d_state *state, unsigned } } +static void wined3d_cs_exec_dispatch(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_dispatch *op = data; + + dispatch_compute(cs->device, &cs->device->state, + op->group_count_x, op->group_count_y, op->group_count_z); + + release_shader_resources(&cs->device->state, 1u << WINED3D_SHADER_TYPE_COMPUTE); +} + +void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, + unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) +{ + struct wined3d_cs_dispatch *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_DISPATCH; + op->group_count_x = group_count_x; + op->group_count_y = group_count_y; + op->group_count_z = group_count_z; + + acquire_shader_resources(&cs->device->state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + + cs->ops->submit(cs); +} + static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { struct wined3d_state *state = &cs->device->state; @@ -1462,6 +1497,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, /* WINED3D_CS_OP_CLEAR */ wined3d_cs_exec_clear, + /* WINED3D_CS_OP_DISPATCH */ wined3d_cs_exec_dispatch, /* WINED3D_CS_OP_DRAW */ wined3d_cs_exec_draw, /* WINED3D_CS_OP_SET_PREDICATION */ wined3d_cs_exec_set_predication, /* WINED3D_CS_OP_SET_VIEWPORT */ wined3d_cs_exec_set_viewport, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1c69cdd..0e969be 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3483,6 +3483,15 @@ struct wined3d_query * CDECL wined3d_device_get_predication(struct wined3d_devic return device->state.predicate; } +void CDECL wined3d_device_dispatch_compute(struct wined3d_device *device, + unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) +{ + TRACE("device %p, group_count_x %u, group_count_y %u, group_count_z %u.\n", + device, group_count_x, group_count_y, group_count_z); + + wined3d_cs_emit_dispatch(device->cs, group_count_x, group_count_y, group_count_z); +} + void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, enum wined3d_primitive_type primitive_type) { diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index a3d88b9..4980413 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -580,3 +580,46 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s TRACE("Done all gl drawing.\n"); } + +void dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, + unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) +{ + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + + context = context_acquire(device, NULL); + if (!context->valid) + { + context_release(context); + WARN("Invalid context, skipping dispatch.\n"); + return; + } + gl_info = context->gl_info; + + if (!gl_info->supported[ARB_COMPUTE_SHADER]) + { + context_release(context); + FIXME("OpenGL implementation does not support compute shaders.\n"); + return; + } + + context_apply_compute_state(context, device, state); + + if (!state->shader[WINED3D_SHADER_TYPE_COMPUTE]) + { + context_release(context); + WARN("No compute shader bound, skipping dispatch.\n"); + return; + } + + GL_EXTCALL(glDispatchCompute(group_count_x, group_count_y, group_count_z)); + checkGLcall("glDispatchCompute"); + + GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); + checkGLcall("glMemoryBarrier"); + + if (wined3d_settings.strict_draw_ordering) + gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ + + context_release(context); +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3e87ca2..57e1efb 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -39,6 +39,7 @@ @ cdecl wined3d_device_copy_sub_resource_region(ptr ptr long long long long ptr long ptr) @ cdecl wined3d_device_create(ptr long long ptr long long ptr ptr) @ cdecl wined3d_device_decref(ptr) +@ cdecl wined3d_device_dispatch_compute(ptr long long long) @ cdecl wined3d_device_draw_indexed_primitive(ptr long long) @ cdecl wined3d_device_draw_indexed_primitive_instanced(ptr long long long long) @ cdecl wined3d_device_draw_primitive(ptr long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2ea6763..2b70bad 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1343,6 +1343,8 @@ struct wined3d_stream_info void draw_primitive(struct wined3d_device *device, const struct wined3d_state *state, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN; +void dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, + unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) DECLSPEC_HIDDEN; DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; #define eps 1e-8f @@ -1783,6 +1785,8 @@ void context_alloc_occlusion_query(struct wined3d_context *context, void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_state *state, UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; +void context_apply_compute_state(struct wined3d_context *context, + const struct wined3d_device *device, const struct wined3d_state *state) DECLSPEC_HIDDEN; BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, @@ -3134,6 +3138,8 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_destroy_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; +void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, + unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) DECLSPEC_HIDDEN; void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 42a125d..8b8305b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2129,6 +2129,8 @@ HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, HWND focus_window, DWORD behaviour_flags, BYTE surface_alignment, struct wined3d_device_parent *device_parent, struct wined3d_device **device); ULONG __cdecl wined3d_device_decref(struct wined3d_device *device); +void __cdecl wined3d_device_dispatch_compute(struct wined3d_device *device, + unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z); HRESULT __cdecl wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count); void __cdecl wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device *device, UINT start_idx, UINT index_count, UINT start_instance, UINT instance_count);

1 0

Józef Kucia : wined3d: Introduce shader_select_compute() in shader_backend_ops.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 3e0037e31a5a07c3a35bd0ee01caec4be6f4f14a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e0037e31a5a07c3a35bd0ee0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 12:43:41 2017 +0100 wined3d: Introduce shader_select_compute() in shader_backend_ops. 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 | 6 ++++++ dlls/wined3d/glsl_shader.c | 8 ++++++++ dlls/wined3d/shader.c | 3 +++ dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 19 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d433f8c..7fc97b5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4698,6 +4698,11 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context } } +static void shader_arb_select_compute(void *shader_priv, struct wined3d_context *context, + const struct wined3d_state *state) +{ + ERR("Compute pipeline not supported by the ARB shader backend.\n"); +} /* Context activation is done by the caller. */ static void shader_arb_disable(void *shader_priv, struct wined3d_context *context) @@ -5659,6 +5664,7 @@ const struct wined3d_shader_backend_ops arb_program_shader_backend = { shader_arb_handle_instruction, shader_arb_select, + shader_arb_select_compute, shader_arb_disable, shader_arb_update_float_vertex_constants, shader_arb_update_float_pixel_constants, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index aebf96a..2df308e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8497,6 +8497,13 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex } } +/* Context activation is done by the caller. */ +static void shader_glsl_select_compute(void *shader_priv, struct wined3d_context *context, + const struct wined3d_state *state) +{ + FIXME("Compute pipeline not supported yet.\n"); +} + /* "context" is not necessarily the currently active context. */ static void shader_glsl_invalidate_current_program(struct wined3d_context *context) { @@ -9152,6 +9159,7 @@ const struct wined3d_shader_backend_ops glsl_shader_backend = { shader_glsl_handle_instruction, shader_glsl_select, + shader_glsl_select_compute, shader_glsl_disable, shader_glsl_update_float_vertex_constants, shader_glsl_update_float_pixel_constants, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0368ae1..00ed452 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2665,6 +2665,8 @@ struct shader_none_priv }; static void shader_none_handle_instruction(const struct wined3d_shader_instruction *ins) {} +static void shader_none_select_compute(void *shader_priv, struct wined3d_context *context, + const struct wined3d_state *state) {} static void shader_none_update_float_vertex_constants(struct wined3d_device *device, UINT start, UINT count) {} static void shader_none_update_float_pixel_constants(struct wined3d_device *device, UINT start, UINT count) {} static void shader_none_load_constants(void *shader_priv, struct wined3d_context *context, @@ -2786,6 +2788,7 @@ const struct wined3d_shader_backend_ops none_shader_backend = { shader_none_handle_instruction, shader_none_select, + shader_none_select_compute, shader_none_disable, shader_none_update_float_vertex_constants, shader_none_update_float_pixel_constants, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2b70bad..7209ce8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1208,6 +1208,8 @@ struct wined3d_shader_backend_ops void (*shader_handle_instruction)(const struct wined3d_shader_instruction *); void (*shader_select)(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state); + void (*shader_select_compute)(void *shader_priv, struct wined3d_context *context, + const struct wined3d_state *state); void (*shader_disable)(void *shader_priv, struct wined3d_context *context); void (*shader_update_float_vertex_constants)(struct wined3d_device *device, UINT start, UINT count); void (*shader_update_float_pixel_constants)(struct wined3d_device *device, UINT start, UINT count);

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: a1de77cf6daa54322d58aa8edbf1b35478616537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1de77cf6daa54322d58aa8ed… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Feb 2 16:42:32 2017 +0200 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 54 +++++++++++++++++------------------------------------- 1 file changed, 17 insertions(+), 37 deletions(-) diff --git a/po/uk.po b/po/uk.po index 52833b2..1e741dc 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-11-10 15:09+0200\n" +"PO-Revision-Date: 2017-02-02 16:04+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -8442,10 +8442,8 @@ msgid "Wine Control Panel" msgstr "Панель керування Wine" #: shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" -msgstr "Неможливо відобразити діалог Запуск Файлу (внутрішня помилка)" +msgstr "Неможливо відобразити діалог запуску програм (внутрішня помилка)" #: shell32.rc:196 msgid "Unable to display Browse dialog box (internal error)" @@ -11990,52 +11988,44 @@ msgid "(unknown %d)" msgstr "(невідомо %d)" #: regedit.rc:212 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to modify the selected registry value." -msgstr "regedit: Неможливо відкрити ключ '%1'.\n" +msgstr "Неможливо змінити вибране значення реєстру." #: regedit.rc:213 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry key." -msgstr "regedit: Неможливо відкрити ключ '%1'.\n" +msgstr "Неможливо створити новий ключ реєстру." #: regedit.rc:214 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry value." -msgstr "regedit: Неможливо відкрити ключ '%1'.\n" +msgstr "Неможливо створити нове значення реєстру." #: regedit.rc:215 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"Неможливо перейменувати ключ '%1'.\n" +"Вказаний ключ вже існує." #: regedit.rc:216 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"Неможливо перейменувати значення '%1'.\n" +"Вказане значення вже існує." #: regedit.rc:217 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to delete the selected registry key." -msgstr "regedit: Неможливо відкрити ключ '%1'.\n" +msgstr "Неможливо видалити вибраний ключ реєстру." #: regedit.rc:218 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry key." -msgstr "regedit: Неможливо відкрити ключ '%1'.\n" +msgstr "Неможливо перейменувати вибраний ключ реєстру." #: regedit.rc:219 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry value." -msgstr "regedit: Неможливо відкрити ключ '%1'.\n" +msgstr "Неможливо перейменувати вибране значення реєстру." #: regedit.rc:371 msgid "" @@ -12266,32 +12256,24 @@ msgid "Displays program information, version number and copyright" msgstr "Відображає інформацію про програму, номер версії та авторство" #: regedit.rc:181 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry value '%1'." -msgstr "regedit: Неможливо відкрити ключ '%1'.\n" +msgstr "Неможливо прочитати значення реєстру '%1'." #: regedit.rc:182 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "Неможливо редагувати ключі цього типу (%u)" +msgstr "Редагування ключів реєстру даного типу (%1!u!) неможливе." #: regedit.rc:183 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "значення задовге (%u)" +msgstr "Значення занадто довге (%1!u!)." #: regedit.rc:184 msgid "Confirm Value Delete" msgstr "Підтвердження видалення значення" #: regedit.rc:189 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Шукане значення '%s' не знайдене" +msgstr "Пошук завершено. Рядок '%1' не знайдено." #: regedit.rc:186 msgid "Are you sure you want to delete these values?" @@ -12306,10 +12288,8 @@ msgid "New Value #%d" msgstr "Нове значення #%d" #: regedit.rc:180 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry key '%1'." -msgstr "regedit: Неможливо відкрити ключ '%1'.\n" +msgstr "Неможливо прочитати ключ реєстру '%1'." #: regedit.rc:152 msgid "Adds a new multi-string value"

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 02dcc68b198eb7119deea58945d3b14fd720adac URL: http://source.winehq.org/git/wine.git/?a=commit;h=02dcc68b198eb7119deea5894… Author: Kim Malmo <berencamlost(a)msn.com> Date: Thu Feb 2 15:36:36 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 52 ++++++++++++++++------------------------------------ 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 84577b9..e5bfd76 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-06-10 19:00+0200\n" +"PO-Revision-Date: 2017-02-02 16:00+0100\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -8363,8 +8363,6 @@ msgid "Wine Control Panel" msgstr "Wine Kontrollpanel" #: shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" msgstr "Klarte ikke vise Kjør-vinduet (intern feil)" @@ -11897,52 +11895,44 @@ msgid "(unknown %d)" msgstr "(ukjent %d)" #: regedit.rc:212 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to modify the selected registry value." -msgstr "regedit: Kan ikke åpne registernøkkelen \"%1\".\n" +msgstr "Kan ikke modifisere den valgte registerverdien." #: regedit.rc:213 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry key." -msgstr "regedit: Kan ikke åpne registernøkkelen \"%1\".\n" +msgstr "Kan ikke opprette en ny registernøkkel." #: regedit.rc:214 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry value." -msgstr "regedit: Kan ikke åpne registernøkkelen \"%1\".\n" +msgstr "Kan ikke opprette en ny registerverdi." #: regedit.rc:215 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"Kan ikke gi nytt navn til nøkkel \"%1\".\n" +"Det spesifiserte nøkkelnavnet finnes allerede." #: regedit.rc:216 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"Kan ikke gi nytt navn til verdien \"%1\".\n" +"Det spesifiserte verdinavnet finnes allerede." #: regedit.rc:217 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to delete the selected registry key." -msgstr "regedit: Kan ikke åpne registernøkkelen \"%1\".\n" +msgstr "Kan ikke slette den valgte registernøkkelen." #: regedit.rc:218 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry key." -msgstr "regedit: Kan ikke åpne registernøkkelen \"%1\".\n" +msgstr "Kan ikke gi nytt navn til den valgte registernøkkelen." #: regedit.rc:219 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry value." -msgstr "regedit: Kan ikke åpne registernøkkelen \"%1\".\n" +msgstr "Kan ikke gi nytt navn til den valgte registerverdien." #: regedit.rc:371 msgid "" @@ -12176,32 +12166,24 @@ msgid "Displays program information, version number and copyright" msgstr "Viser programinformasjon, versjonnummer og opphavsrett" #: regedit.rc:181 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry value '%1'." -msgstr "regedit: Kan ikke åpne registernøkkelen \"%1\".\n" +msgstr "Kan ikke forespørre registerverdien \"%1\"." #: regedit.rc:182 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "Kan ikke redigere nøkler av typen (%u)" +msgstr "Kan ikke redigere registernøkler av typen (%1!u!)." #: regedit.rc:183 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "Verdien er for stor (%u)" +msgstr "Verdien er for stor (%1!u!)." #: regedit.rc:184 msgid "Confirm Value Delete" msgstr "Bekreft sletting av verdi" #: regedit.rc:189 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Fant ikke søkestrengen \"%s\"" +msgstr "Søk fullført. Fant ikke søkestrengen \"%1\"." #: regedit.rc:186 msgid "Are you sure you want to delete these values?" @@ -12216,10 +12198,8 @@ msgid "New Value #%d" msgstr "Ny verdi #%d" #: regedit.rc:180 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry key '%1'." -msgstr "regedit: Kan ikke åpne registernøkkelen \"%1\".\n" +msgstr "Kan ikke forespørre registernøkkelen \"%1\"." #: regedit.rc:152 msgid "Adds a new multi-string value"

1 0

Jacek Caban : mshtml: Renamed unk_imp to outer_unk.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 2fb4de7b5e72e859160e5aceb4443e3d46917c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb4de7b5e72e859160e5aceb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 2 16:09:52 2017 +0100 mshtml: Renamed unk_imp to outer_unk. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/mshtml_private.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b409e7d..f0b203e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4576,7 +4576,7 @@ static const cpc_entry_t HTMLDocument_cpc[] = { {NULL} }; -static void init_doc(HTMLDocument *doc, IUnknown *unk_impl, IDispatchEx *dispex) +static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) { doc->IHTMLDocument2_iface.lpVtbl = &HTMLDocumentVtbl; doc->IHTMLDocument3_iface.lpVtbl = &HTMLDocument3Vtbl; @@ -4589,7 +4589,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *unk_impl, IDispatchEx *dispex) doc->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; doc->IProvideClassInfo_iface.lpVtbl = &ProvideClassInfoVtbl; - doc->unk_impl = unk_impl; + doc->outer_unk = outer; doc->dispex = dispex; doc->task_magic = get_task_target_magic(); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5a559ea..a18ddafe 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -577,7 +577,7 @@ struct HTMLDocument { IObjectSafety IObjectSafety_iface; IProvideClassInfo IProvideClassInfo_iface; - IUnknown *unk_impl; + IUnknown *outer_unk; IDispatchEx *dispex; HTMLDocumentObj *doc_obj; @@ -593,17 +593,17 @@ struct HTMLDocument { static inline HRESULT htmldoc_query_interface(HTMLDocument *This, REFIID riid, void **ppv) { - return IUnknown_QueryInterface(This->unk_impl, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static inline ULONG htmldoc_addref(HTMLDocument *This) { - return IUnknown_AddRef(This->unk_impl); + return IUnknown_AddRef(This->outer_unk); } static inline ULONG htmldoc_release(HTMLDocument *This) { - return IUnknown_Release(This->unk_impl); + return IUnknown_Release(This->outer_unk); } struct HTMLDocumentObj {

1 0

Jacek Caban : mshtml: Added support for COM aggregation in HTMLDocument object.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 6e94b955c229db99910cede9554843e55031a75a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e94b955c229db99910cede95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 2 16:10:05 2017 +0100 mshtml: Added support for COM aggregation in HTMLDocument object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 93 ++++++++++++++++++++++++++++++++------------ dlls/mshtml/mshtml_private.h | 1 + dlls/msxml3/tests/xmlview.c | 2 +- 3 files changed, 70 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f0b203e..940519a 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4886,25 +4886,22 @@ static HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *do return S_OK; } -/********************************************************** - * ICustomDoc implementation - */ - -static inline HTMLDocumentObj *impl_from_ICustomDoc(ICustomDoc *iface) +static inline HTMLDocumentObj *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, HTMLDocumentObj, ICustomDoc_iface); + return CONTAINING_RECORD(iface, HTMLDocumentObj, IUnknown_outer); } -static HRESULT WINAPI CustomDoc_QueryInterface(ICustomDoc *iface, REFIID riid, void **ppv) +static HRESULT WINAPI HTMLDocumentObj_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - HTMLDocumentObj *This = impl_from_ICustomDoc(iface); + HTMLDocumentObj *This = impl_from_IUnknown(iface); TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - if(htmldoc_qi(&This->basedoc, riid, ppv)) + if(IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = &This->IUnknown_outer; + }else if(htmldoc_qi(&This->basedoc, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; - - if(IsEqualGUID(&IID_ICustomDoc, riid)) { + }else if(IsEqualGUID(&IID_ICustomDoc, riid)) { *ppv = &This->ICustomDoc_iface; }else if(IsEqualGUID(&IID_ITargetContainer, riid)) { *ppv = &This->ITargetContainer_iface; @@ -4920,9 +4917,9 @@ static HRESULT WINAPI CustomDoc_QueryInterface(ICustomDoc *iface, REFIID riid, v return S_OK; } -static ULONG WINAPI CustomDoc_AddRef(ICustomDoc *iface) +static ULONG WINAPI HTMLDocumentObj_AddRef(IUnknown *iface) { - HTMLDocumentObj *This = impl_from_ICustomDoc(iface); + HTMLDocumentObj *This = impl_from_IUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref = %u\n", This, ref); @@ -4930,9 +4927,9 @@ static ULONG WINAPI CustomDoc_AddRef(ICustomDoc *iface) return ref; } -static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) +static ULONG WINAPI HTMLDocumentObj_Release(IUnknown *iface) { - HTMLDocumentObj *This = impl_from_ICustomDoc(iface); + HTMLDocumentObj *This = impl_from_IUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref = %u\n", This, ref); @@ -4992,6 +4989,42 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) return ref; } +static const IUnknownVtbl HTMLDocumentObjVtbl = { + HTMLDocumentObj_QueryInterface, + HTMLDocumentObj_AddRef, + HTMLDocumentObj_Release +}; + +/********************************************************** + * ICustomDoc implementation + */ + +static inline HTMLDocumentObj *impl_from_ICustomDoc(ICustomDoc *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocumentObj, ICustomDoc_iface); +} + +static HRESULT WINAPI CustomDoc_QueryInterface(ICustomDoc *iface, REFIID riid, void **ppv) +{ + HTMLDocumentObj *This = impl_from_ICustomDoc(iface); + + return htmldoc_query_interface(&This->basedoc, riid, ppv); +} + +static ULONG WINAPI CustomDoc_AddRef(ICustomDoc *iface) +{ + HTMLDocumentObj *This = impl_from_ICustomDoc(iface); + + return htmldoc_addref(&This->basedoc); +} + +static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) +{ + HTMLDocumentObj *This = impl_from_ICustomDoc(iface); + + return htmldoc_release(&This->basedoc); +} + static HRESULT WINAPI CustomDoc_SetUIHandler(ICustomDoc *iface, IDocHostUIHandler *pUIHandler) { HTMLDocumentObj *This = impl_from_ICustomDoc(iface); @@ -5042,7 +5075,7 @@ static dispex_static_data_t HTMLDocumentObj_dispex = { HTMLDocumentObj_iface_tids }; -HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) +HRESULT HTMLDocument_Create(IUnknown *outer, REFIID riid, void **ppv) { mozIDOMWindowProxy *mozwindow; HTMLDocumentObj *doc; @@ -5050,18 +5083,24 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) nsresult nsres; HRESULT hres; - TRACE("(%p %s %p)\n", pUnkOuter, debugstr_mshtml_guid(riid), ppvObject); + TRACE("(%p %s %p)\n", outer, debugstr_mshtml_guid(riid), ppv); + + if(outer && !IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = NULL; + return E_INVALIDARG; + } doc = heap_alloc_zero(sizeof(HTMLDocumentObj)); if(!doc) return E_OUTOFMEMORY; + doc->ref = 1; + doc->IUnknown_outer.lpVtbl = &HTMLDocumentObjVtbl; + doc->ICustomDoc_iface.lpVtbl = &CustomDocVtbl; + init_dispex(&doc->dispex, (IUnknown*)&doc->ICustomDoc_iface, &HTMLDocumentObj_dispex); - init_doc(&doc->basedoc, (IUnknown*)&doc->ICustomDoc_iface, &doc->dispex.IDispatchEx_iface); + init_doc(&doc->basedoc, outer ? outer : &doc->IUnknown_outer, &doc->dispex.IDispatchEx_iface); TargetContainer_Init(doc); - - doc->ICustomDoc_iface.lpVtbl = &CustomDocVtbl; - doc->ref = 1; doc->basedoc.doc_obj = doc; doc->usermode = UNKNOWN_USERMODE; @@ -5075,10 +5114,14 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) return hres; } - hres = htmldoc_query_interface(&doc->basedoc, riid, ppvObject); - htmldoc_release(&doc->basedoc); - if(FAILED(hres)) - return hres; + if(IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = &doc->IUnknown_outer; + }else { + hres = htmldoc_query_interface(&doc->basedoc, riid, ppv); + htmldoc_release(&doc->basedoc); + if(FAILED(hres)) + return hres; + } nsres = nsIWebBrowser_GetContentDOMWindow(doc->nscontainer->webbrowser, &mozwindow); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a18ddafe..9c8b94c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -609,6 +609,7 @@ static inline ULONG htmldoc_release(HTMLDocument *This) struct HTMLDocumentObj { HTMLDocument basedoc; DispatchEx dispex; + IUnknown IUnknown_outer; ICustomDoc ICustomDoc_iface; ITargetContainer ITargetContainer_iface; diff --git a/dlls/msxml3/tests/xmlview.c b/dlls/msxml3/tests/xmlview.c index 3e3bd29..3c1d8d9 100644 --- a/dlls/msxml3/tests/xmlview.c +++ b/dlls/msxml3/tests/xmlview.c @@ -181,7 +181,7 @@ static void test_QueryInterface(void) ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument) returned %x, expected S_OK\n", hres); hres = IHTMLDocument_QueryInterface(htmldoc, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "QueryInterface(IID_IUnknown) returned %x, expected S_OK\n", hres); - todo_wine ok(unk == xmlview, "Aggregation is not working as expected\n"); + ok(unk == xmlview, "Aggregation is not working as expected\n"); IUnknown_Release(unk); IHTMLDocument_Release(htmldoc);

1 0