April 2017 - Wine-Commits - list.winehq.org

Andrew Wesie : wined3d: Support render target array index semantic value.
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: e5d3908ffa0515e31005ab355b50c42cf73f689a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d3908ffa0515e31005ab355… Author: Andrew Wesie <awesie(a)gmail.com> Date: Thu Apr 6 11:47:52 2017 +0200 wined3d: Support render target array index semantic value. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b112f14..21f543c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6724,6 +6724,11 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv shader_addline(buffer, "gl_PointSize = clamp(shader_out[%u].%c, " "ffp_point.size_min, ffp_point.size_max);\n", output->register_idx, reg_mask[1]); } + else if (output->sysval_semantic == WINED3D_SV_RENDER_TARGET_ARRAY_INDEX && !semantic_idx) + { + shader_addline(buffer, "gl_Layer = floatBitsToInt(shader_out[%u])%s;\n", + output->register_idx, reg_mask); + } else if (output->sysval_semantic) { FIXME("Unhandled sysval semantic %#x.\n", output->sysval_semantic);

1 0

Józef Kucia : wined3d: Store render target info instead of surfaces in "blit_targets".
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: 26b7baa0dd5c5e511231c0022a9ff495459d0458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b7baa0dd5c5e511231c0022… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 6 11:47:50 2017 +0200 wined3d: Store render target info instead of surfaces in "blit_targets". In preparation for extending render target views support. 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 | 112 ++++++++++++++++++++++++++++------------- dlls/wined3d/surface.c | 21 ++++++-- dlls/wined3d/wined3d_private.h | 12 ++++- 3 files changed, 102 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26b7baa0dd5c5e511231c…

1 0

Józef Kucia : d3d11/tests: Use SM5 geometry shader in test_geometry_shader() if possible.
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: ecd64a72465bc32a2febb73dac26463c632f9711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd64a72465bc32a2febb73da… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 6 11:47:48 2017 +0200 d3d11/tests: Use SM5 geometry shader in test_geometry_shader() if possible. 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 | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2c31490..94fd367 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15967,6 +15967,38 @@ void main(point struct gs_data vin[1], inout TriangleStream<gs_data> vout) 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x01000013, 0x0100003e, }; + static const DWORD gs_5_0_code[] = + { + 0x43425844, 0x57251c23, 0x4971d115, 0x8fee0b13, 0xba149ea1, 0x00000001, 0x00000384, 0x00000003, + 0x0000002c, 0x00000080, 0x000000dc, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x3547534f, 0x00000054, 0x00000002, 0x00000008, 0x00000000, 0x00000040, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x00000000, 0x0000004c, 0x00000000, 0x00000000, 0x00000003, + 0x00000001, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x58454853, + 0x000002a0, 0x00020050, 0x000000a8, 0x0100086a, 0x05000061, 0x002010f2, 0x00000001, 0x00000000, + 0x00000001, 0x0400005f, 0x002010f2, 0x00000001, 0x00000001, 0x02000068, 0x00000001, 0x0100085d, + 0x0300008f, 0x00110000, 0x00000000, 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000001, 0x0200005e, 0x00000004, 0x0f000032, 0x00100032, 0x00000000, + 0x80201ff6, 0x00000041, 0x00000000, 0x00000000, 0x00004002, 0x3e4ccccd, 0x3e4ccccd, 0x00000000, + 0x00000000, 0x00201046, 0x00000000, 0x00000000, 0x05000036, 0x00102032, 0x00000000, 0x00100046, + 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, 0x00000000, 0x05000036, + 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, + 0x00000000, 0x00000001, 0x03000075, 0x00110000, 0x00000000, 0x05000036, 0x00102012, 0x00000000, + 0x0010000a, 0x00000000, 0x0e000032, 0x00100052, 0x00000000, 0x00201ff6, 0x00000000, 0x00000000, + 0x00004002, 0x3e4ccccd, 0x00000000, 0x3e4ccccd, 0x00000000, 0x00201106, 0x00000000, 0x00000000, + 0x05000036, 0x00102022, 0x00000000, 0x0010002a, 0x00000000, 0x06000036, 0x00102042, 0x00000000, + 0x0020102a, 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, + 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x03000075, 0x00110000, + 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102022, + 0x00000000, 0x0010001a, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, + 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, + 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x03000075, 0x00110000, 0x00000000, 0x05000036, + 0x00102032, 0x00000000, 0x00100086, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, + 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, + 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x03000075, 0x00110000, 0x00000000, + 0x0100003e, + }; #if 0 struct ps_data { @@ -16018,7 +16050,10 @@ float4 main(struct ps_data ps_input) : SV_Target hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); - hr = ID3D11Device_CreateGeometryShader(device, gs_code, sizeof(gs_code), NULL, &gs); + if (ID3D11Device_GetFeatureLevel(device) >= D3D_FEATURE_LEVEL_11_0) + hr = ID3D11Device_CreateGeometryShader(device, gs_5_0_code, sizeof(gs_5_0_code), NULL, &gs); + else + hr = ID3D11Device_CreateGeometryShader(device, gs_code, sizeof(gs_code), NULL, &gs); ok(SUCCEEDED(hr), "Failed to create geometry shader, hr %#x.\n", hr); hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr);

1 0

Józef Kucia : wined3d: Store stream index in shader signature elements.
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: 18e5bbe6f0f4bcbbcb109636035a74e6466b1b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=18e5bbe6f0f4bcbbcb1096360… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 6 11:47:46 2017 +0200 wined3d: Store stream index in shader signature elements. 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/shader.c | 1 + dlls/wined3d/glsl_shader.c | 6 ++++++ dlls/wined3d/shader.c | 2 ++ include/wine/wined3d.h | 5 +++-- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 22b8bbf..d1b3e38 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -201,6 +201,7 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d { UINT name_offset; + e[i].stream_idx = 0; read_dword(&ptr, &name_offset); if (!(e[i].semantic_name = shader_get_string(data, data_size, name_offset))) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8bb8a27..3a84a43 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6647,6 +6647,9 @@ static void shader_glsl_setup_sm4_shader_output(struct shader_glsl_priv *priv, if (!(reg_maps_out->output_registers & (1u << output->register_idx))) continue; + if (output->stream_idx) + continue; + if (output->register_idx >= input_count) continue; @@ -6702,6 +6705,9 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv if (!(reg_maps_out->output_registers & (1u << output->register_idx))) continue; + if (output->stream_idx) + continue; + semantic_name = output->semantic_name; semantic_idx = output->semantic_idx; shader_glsl_write_mask_to_str(output->mask, reg_mask); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e96c15f..3783006 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -379,6 +379,7 @@ static void shader_signature_from_semantic(struct wined3d_shader_signature_eleme { e->semantic_name = shader_semantic_name_from_usage(s->usage); e->semantic_idx = s->usage_idx; + e->stream_idx = 0; e->sysval_semantic = shader_sysval_semantic_from_usage(s->usage); e->component_type = WINED3D_TYPE_FLOAT; e->register_idx = s->reg.reg.idx[0].offset; @@ -390,6 +391,7 @@ static void shader_signature_from_usage(struct wined3d_shader_signature_element { e->semantic_name = shader_semantic_name_from_usage(usage); e->semantic_idx = usage_idx; + e->stream_idx = 0; e->sysval_semantic = shader_sysval_semantic_from_usage(usage); e->component_type = WINED3D_TYPE_FLOAT; e->register_idx = reg_idx; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f575547..4f37392 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1953,10 +1953,11 @@ struct wined3d_sampler_desc struct wined3d_shader_signature_element { const char *semantic_name; - UINT semantic_idx; + unsigned int semantic_idx; + unsigned int stream_idx; enum wined3d_sysval_semantic sysval_semantic; enum wined3d_component_type component_type; - UINT register_idx; + unsigned int register_idx; DWORD mask; };

1 0

Alexandre Julliard : glu32: Load libGLU only when functions are actually called.
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: ade10ebc9ed25363cd0bf4aa5d3b50d224e31ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ade10ebc9ed25363cd0bf4aa5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 6 14:40:46 2017 +0200 glu32: Load libGLU only when functions are actually called. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 - configure.ac | 2 - dlls/glu32/glu.c | 156 +++++++++++++++++++++++++++++-------------------------- 3 files changed, 81 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ade10ebc9ed25363cd0bf…

1 0

Alexandre Julliard : glu32: Use the correct data types.
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: 488bdbaf19daf84216e979f58b82e1197eee105c URL: http://source.winehq.org/git/wine.git/?a=commit;h=488bdbaf19daf84216e979f58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 6 13:48:07 2017 +0200 glu32: Use the correct data types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/glu.c | 445 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 249 insertions(+), 196 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=488bdbaf19daf84216e97…

1 0

Józef Kucia : wined3d: Add support for cube shadow samplers.
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: 90bf175f4d9685c4d2c70e35c8f1efe0d71478aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=90bf175f4d9685c4d2c70e35c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 6 11:47:49 2017 +0200 wined3d: Add support for cube shadow samplers. 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 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3a84a43..b112f14 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2396,8 +2396,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont case WINED3D_SHADER_RESOURCE_TEXTURE_CUBE: if (shadow_sampler) - FIXME("Unsupported Cube shadow sampler.\n"); - sampler_type = "samplerCube"; + sampler_type = "samplerCubeShadow"; + else + sampler_type = "samplerCube"; break; case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: @@ -2409,8 +2410,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont case WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY: if (shadow_sampler) - FIXME("Unsupported Cube array shadow sampler.\n"); - sampler_type = "samplerCubeArray"; + sampler_type = "samplerCubeArrayShadow"; + else + sampler_type = "samplerCubeArray"; break; default:

1 0

Józef Kucia : d3d11: Parse OSG5 output signatures.
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: 7277000eb5abbfb6282b08f78339fefb838af12a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7277000eb5abbfb6282b08f78… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 6 11:47:47 2017 +0200 d3d11: Parse OSG5 output signatures. Fixes geometry shaders compiled as gs_5_0. 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 | 6 ++++-- dlls/d3d11/inputlayout.c | 4 ++-- dlls/d3d11/shader.c | 40 ++++++++++++++++++++++++++++------------ 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 6caca05..10709c4 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -47,6 +47,7 @@ #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') +#define TAG_OSG5 MAKE_TAG('O', 'S', 'G', '5') #define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') #define TAG_SHEX MAKE_TAG('S', 'H', 'E', 'X') #define TAG_AON9 MAKE_TAG('A', 'o', 'n', '9') @@ -358,9 +359,10 @@ HRESULT d3d11_compute_shader_create(struct d3d_device *device, const void *byte_ struct d3d11_compute_shader **shader) DECLSPEC_HIDDEN; struct d3d11_compute_shader *unsafe_impl_from_ID3D11ComputeShader(ID3D11ComputeShader *iface) DECLSPEC_HIDDEN; -HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; +HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_size, + struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; struct wined3d_shader_signature_element *shader_find_signature_element(const struct wined3d_shader_signature *s, - const char *semantic_name, unsigned int semantic_idx) DECLSPEC_HIDDEN; + const char *semantic_name, unsigned int semantic_idx, unsigned int stream_idx) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; /* ID3D11ClassLinkage */ diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 1fdb2c3..e9c3094 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -36,7 +36,7 @@ static HRESULT isgn_handler(const char *data, DWORD data_size, DWORD tag, void * FIXME("Multiple input signatures.\n"); shader_free_signature(is); } - return shader_parse_signature(data, data_size, is); + return shader_parse_signature(tag, data, data_size, is); } static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEMENT_DESC *element_descs, @@ -77,7 +77,7 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME e->usage = 0; e->usage_idx = 0; - if ((element = shader_find_signature_element(&is, f->SemanticName, f->SemanticIndex))) + if ((element = shader_find_signature_element(&is, f->SemanticName, f->SemanticIndex, 0))) e->output_slot = element->register_idx; else WARN("Unused input element %u.\n", i); diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index d1b3e38..420a47d 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -52,17 +52,28 @@ static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void * TRACE("Skipping shader input signature on feature level %#x.\n", ctx->feature_level); break; } - if (FAILED(hr = shader_parse_signature(data, data_size, &desc->input_signature))) + if (desc->input_signature.elements) + { + FIXME("Multiple input signatures.\n"); + break; + } + if (FAILED(hr = shader_parse_signature(tag, data, data_size, &desc->input_signature))) return hr; break; case TAG_OSGN: + case TAG_OSG5: if (ctx->feature_level <= D3D_FEATURE_LEVEL_9_3) { TRACE("Skipping shader output signature on feature level %#x.\n", ctx->feature_level); break; } - if (FAILED(hr = shader_parse_signature(data, data_size, &desc->output_signature))) + if (desc->output_signature.elements) + { + FIXME("Multiple output signatures.\n"); + break; + } + if (FAILED(hr = shader_parse_signature(tag, data, data_size, &desc->output_signature))) return hr; break; @@ -167,7 +178,8 @@ static const char *shader_get_string(const char *data, size_t data_size, DWORD o return data + offset; } -HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) +HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_size, + struct wined3d_shader_signature *s) { struct wined3d_shader_signature_element *e; const char *ptr = data; @@ -181,7 +193,7 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d } read_dword(&ptr, &count); - TRACE("%u elements\n", count); + TRACE("%u elements.\n", count); skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000008. */ @@ -199,9 +211,12 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d for (i = 0; i < count; ++i) { - UINT name_offset; + DWORD name_offset; - e[i].stream_idx = 0; + if (tag == TAG_OSG5) + read_dword(&ptr, &e[i].stream_idx); + else + e[i].stream_idx = 0; read_dword(&ptr, &name_offset); if (!(e[i].semantic_name = shader_get_string(data, data_size, name_offset))) { @@ -215,9 +230,9 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d read_dword(&ptr, &e[i].register_idx); read_dword(&ptr, &e[i].mask); - TRACE("semantic: %s, semantic idx: %u, sysval_semantic %#x, " - "type %u, register idx: %u, use_mask %#x, input_mask %#x\n", - debugstr_a(e[i].semantic_name), e[i].semantic_idx, e[i].sysval_semantic, + TRACE("Stream: %u, semantic: %s, semantic idx: %u, sysval_semantic %#x, " + "type %u, register idx: %u, use_mask %#x, input_mask %#x.\n", + e[i].stream_idx, debugstr_a(e[i].semantic_name), e[i].semantic_idx, e[i].sysval_semantic, e[i].component_type, e[i].register_idx, (e[i].mask >> 8) & 0xff, e[i].mask & 0xff); } @@ -228,14 +243,15 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d } struct wined3d_shader_signature_element *shader_find_signature_element(const struct wined3d_shader_signature *s, - const char *semantic_name, unsigned int semantic_idx) + const char *semantic_name, unsigned int semantic_idx, unsigned int stream_idx) { struct wined3d_shader_signature_element *e = s->elements; unsigned int i; for (i = 0; i < s->element_count; ++i) { - if (!strcasecmp(e[i].semantic_name, semantic_name) && e[i].semantic_idx == semantic_idx) + if (!strcasecmp(e[i].semantic_name, semantic_name) && e[i].semantic_idx == semantic_idx + && e[i].stream_idx == stream_idx) return &e[i]; } @@ -1248,7 +1264,7 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o e->register_idx = WINED3D_STREAM_OUTPUT_GAP; } - else if ((output = shader_find_signature_element(os, f->SemanticName, f->SemanticIndex))) + else if ((output = shader_find_signature_element(os, f->SemanticName, f->SemanticIndex, f->Stream))) { if (e->component_idx > 3 || e->component_count > 4 || !e->component_count || e->component_idx + e->component_count > 4)

1 0

Andrey Gusev : uiautomationcore: Add UiaReturnRawElementProvider stub.
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: 20ed82860a26b98e07fc869b29dcb8d25fa039b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ed82860a26b98e07fc869b2… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Apr 6 12:46:53 2017 +0300 uiautomationcore: Add UiaReturnRawElementProvider stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 10 ++++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index af98681..6e795ab 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -74,3 +74,13 @@ int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid) FIXME("(%d, %s) stub!\n", type, debugstr_guid(guid)); return 1; } + +/*********************************************************************** + * UiaReturnRawElementProvider (uiautomationcore.@) + */ +LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, + LPARAM lParam, IRawElementProviderSimple *elprov) +{ + FIXME("(%p, %lx, %lx, %p) stub!\n", hwnd, wParam, lParam, elprov); + return 0; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index ddf84f6..bff1303 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -83,7 +83,7 @@ @ stub UiaRaiseStructureChangedEvent @ stub UiaRegisterProviderCallback @ stub UiaRemoveEvent -@ stub UiaReturnRawElementProvider +@ stdcall UiaReturnRawElementProvider(long long long ptr) @ stub UiaSetFocus @ stub UiaTextRangeRelease @ stub ValuePattern_SetValue diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index fbe47ad..6c1752e 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -52,6 +52,7 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value); HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); +LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); #ifdef __cplusplus

1 0

Alistair Leslie-Hughes : odbccp32: Implement SQLRemoveTranslator/W.
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: e7afcb98508eb2b087a23ad0cdf94cc1b3e3a1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7afcb98508eb2b087a23ad0c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 6 10:03:52 2017 +0000 odbccp32: Implement SQLRemoveTranslator/W. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 78 +++++++++++++++++++++++++++++++++++++++++----- dlls/odbccp32/tests/misc.c | 17 +++++++--- 2 files changed, 84 insertions(+), 11 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 7b2f020..773c5d2 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -1229,20 +1229,84 @@ BOOL WINAPI SQLRemoveDSNFromIni(LPCSTR lpszDSN) return FALSE; } -BOOL WINAPI SQLRemoveTranslatorW(LPCWSTR lpszTranslator, LPDWORD lpdwUsageCount) +BOOL WINAPI SQLRemoveTranslatorW(const WCHAR *translator, DWORD *usage_count) { + HKEY hkey; + DWORD usagecount = 1; + BOOL ret = TRUE; + clear_errors(); - FIXME("%s %p\n", debugstr_w(lpszTranslator), lpdwUsageCount); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("%s %p\n", debugstr_w(translator), usage_count); + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey) == ERROR_SUCCESS) + { + HKEY hkeydriver; + + if (RegOpenKeyW(hkey, translator, &hkeydriver) == ERROR_SUCCESS) + { + DWORD size, type; + DWORD count; + + size = sizeof(usagecount); + RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); + TRACE("Usage count %d\n", usagecount); + count = usagecount - 1; + if (count) + { + if (RegSetValueExA(hkeydriver, "UsageCount", 0, REG_DWORD, (BYTE*)&count, sizeof(count)) != ERROR_SUCCESS) + ERR("Failed to write registry UsageCount key\n"); + } + + RegCloseKey(hkeydriver); + } + + if (usagecount) + usagecount--; + + if (!usagecount) + { + if(RegDeleteKeyW(hkey, translator) != ERROR_SUCCESS) + { + push_error(ODBC_ERROR_COMPONENT_NOT_FOUND, odbc_error_component_not_found); + WARN("Failed to delete registry key: %s\n", debugstr_w(translator)); + ret = FALSE; + } + + if (ret && RegOpenKeyW(hkey, odbctranslators, &hkeydriver) == ERROR_SUCCESS) + { + if(RegDeleteValueW(hkeydriver, translator) != ERROR_SUCCESS) + { + push_error(ODBC_ERROR_COMPONENT_NOT_FOUND, odbc_error_component_not_found); + WARN("Failed to delete registry key: %s\n", debugstr_w(translator)); + ret = FALSE; + } + + RegCloseKey(hkeydriver); + } + } + + RegCloseKey(hkey); + } + + if (ret && usage_count) + *usage_count = usagecount; + + return ret; } BOOL WINAPI SQLRemoveTranslator(LPCSTR lpszTranslator, LPDWORD lpdwUsageCount) { + WCHAR *translator; + BOOL ret; + clear_errors(); - FIXME("%s %p\n", debugstr_a(lpszTranslator), lpdwUsageCount); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("%s %p\n", debugstr_a(lpszTranslator), lpdwUsageCount); + + translator = SQLInstall_strdup(lpszTranslator); + ret = SQLRemoveTranslatorW(translator, lpdwUsageCount); + + HeapFree(GetProcessHeap(), 0, translator); + return ret; } BOOL WINAPI SQLSetConfigMode(UWORD wConfigMode) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 7a6e8db..ed8e6f1 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -530,13 +530,22 @@ void test_SQLInstallTranslatorEx(void) cnt = 100; ret = SQLRemoveTranslator("WINE ODBC Translator", &cnt); - todo_wine ok(ret, "SQLRemoveTranslator failed\n"); - todo_wine ok(cnt == 0, "SQLRemoveTranslator failed %d\n", cnt); + ok(ret, "SQLRemoveTranslator failed\n"); + ok(cnt == 0, "SQLRemoveTranslator failed %d\n", cnt); cnt = 100; ret = SQLRemoveTranslator("WINE ODBC Translator Path", &cnt); - todo_wine ok(ret, "SQLRemoveTranslator failed\n"); - todo_wine ok(cnt == 0, "SQLRemoveTranslator failed %d\n", cnt); + ok(ret, "SQLRemoveTranslator failed\n"); + ok(cnt == 0, "SQLRemoveTranslator failed %d\n", cnt); + + cnt = 100; + ret = SQLRemoveTranslator("WINE ODBC Translator NonExist", &cnt); + ok(!ret, "SQLRemoveTranslator succeeded\n"); + ok(cnt == 100, "SQLRemoveTranslator succeeded %d\n", cnt); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(sql_ret && error_code == ODBC_ERROR_COMPONENT_NOT_FOUND, + "SQLInstallTranslatorEx failed %d, %u\n", sql_ret, error_code); + } START_TEST(misc)

1 0