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

Henri Verbeet : usp10: Use heap_alloc_zero() instead of HeapAlloc() with HEAP_ZERO_MEMORY.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 77e5a2fba9c89a7c33fb2e2790c2433f4fdd928a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e5a2fba9c89a7c33fb2e279… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 9 10:37:06 2017 +0100 usp10: Use heap_alloc_zero() instead of HeapAlloc() with HEAP_ZERO_MEMORY. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 8 ++++---- dlls/usp10/usp10.c | 15 --------------- dlls/usp10/usp10_internal.h | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 3bbf5ec..6d6a25e 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2472,7 +2472,7 @@ static void GSUB_initialize_script_cache(ScriptCache *psc) TRACE("initializing %i scripts in this font\n",psc->script_count); if (psc->script_count) { - psc->scripts = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(LoadedScript) * psc->script_count); + psc->scripts = heap_alloc_zero(psc->script_count * sizeof(*psc->scripts)); for (i = 0; i < psc->script_count; i++) { int offset = GET_BE_WORD(script->ScriptRecord[i].Script); @@ -2504,7 +2504,7 @@ static void GPOS_expand_script_cache(ScriptCache *psc) TRACE("initializing %i scripts in this font\n",psc->script_count); if (psc->script_count) { - psc->scripts = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(LoadedScript) * psc->script_count); + psc->scripts = heap_alloc_zero(psc->script_count * sizeof(*psc->scripts)); for (i = 0; i < psc->script_count; i++) { int offset = GET_BE_WORD(script->ScriptRecord[i].Script); @@ -2602,7 +2602,7 @@ static void GSUB_initialize_language_cache(LoadedScript *script) { TRACE("Deflang %p, LangCount %i\n",script->default_language.gsub_table, script->language_count); - script->languages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LoadedLanguage) * script->language_count); + script->languages = heap_alloc_zero(script->language_count * sizeof(*script->languages)); for (i = 0; i < script->language_count; i++) { @@ -2639,7 +2639,7 @@ static void GPOS_expand_language_cache(LoadedScript *script) int i; script->language_count = count; - script->languages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LoadedLanguage) * script->language_count); + script->languages = heap_alloc_zero(script->language_count * sizeof(*script->languages)); for (i = 0; i < script->language_count; i++) { diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 8a8a62f..a1be308 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -708,21 +708,6 @@ typedef struct { WORD target; } FindGlyph_struct; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - /* TODO Fix font properties on Arabic locale */ static inline BOOL set_cache_font_properties(const HDC hdc, ScriptCache *sc) { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 989620d..fa9b6c2 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -212,6 +212,21 @@ typedef struct { enum {lex_Halant, lex_Composed_Vowel, lex_Matra_post, lex_Matra_pre, lex_Matra_above, lex_Matra_below, lex_ZWJ, lex_ZWNJ, lex_NBSP, lex_Modifier, lex_Vowel, lex_Consonant, lex_Generic, lex_Ra, lex_Vedic, lex_Anudatta, lex_Nukta}; +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + static inline BOOL is_consonant( int type ) { return (type == lex_Ra || type == lex_Consonant);

1 0

Henri Verbeet : usp10: Use heap_alloc() instead of HeapAlloc().
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 6a0e5bb79dbc66c062fcb068c1c12baca901fc8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0e5bb79dbc66c062fcb068c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 9 10:37:07 2017 +0100 usp10: Use heap_alloc() instead of HeapAlloc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 18 ++++++------- dlls/usp10/breaking.c | 4 +-- dlls/usp10/indic.c | 2 +- dlls/usp10/opentype.c | 70 +++++++++++++++++++++++++++++++-------------------- dlls/usp10/shape.c | 46 ++++++++++++++++----------------- 5 files changed, 78 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a0e5bb79dbc66c062fcb…

1 0

Józef Kucia : d3d10core/tests: Add test for cube maps.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 8e2697e2a06585a96657c6c55a4f215fb3ac1d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2697e2a06585a96657c6c55… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 10 09:10:58 2017 +0100 d3d10core/tests: Add test for cube maps. 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 | 201 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e289329..fda0c64 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6110,6 +6110,206 @@ static void test_texture(void) release_test_context(&test_context); } +static void test_cube_maps(void) +{ + unsigned int i, j, sub_resource_idx, sub_resource_count; + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10ShaderResourceView *srv; + ID3D10Texture2D *rtv_texture; + ID3D10RenderTargetView *rtv; + struct vec4 expected_result; + ID3D10Resource *texture; + ID3D10PixelShader *ps; + ID3D10Device *device; + float data[64 * 64]; + ID3D10Buffer *cb; + HRESULT hr; + RECT rect; + struct + { + unsigned int face; + unsigned int level; + unsigned int padding[2]; + } constant; + + static const DWORD ps_cube_code[] = + { +#if 0 + TextureCube t; + SamplerState s; + + uint face; + uint level; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 p; + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; + + float3 coord; + switch (face) + { + case 0: + coord = float3(1.0f, p.x, p.y); + break; + case 1: + coord = float3(-1.0f, p.x, p.y); + break; + case 2: + coord = float3(p.x, 1.0f, p.y); + break; + case 3: + coord = float3(p.x, -1.0f, p.y); + break; + case 4: + coord = float3(p.x, p.y, 1.0f); + break; + case 5: + default: + coord = float3(p.x, p.y, -1.0f); + break; + } + return t.SampleLevel(s, coord, level); + } +#endif + 0x43425844, 0x039aee18, 0xfd630453, 0xb884cf0f, 0x10100744, 0x00000001, 0x00000310, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000274, 0x00000040, + 0x0000009d, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000, 0x00000000, + 0x04003058, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0400004c, 0x0020800a, 0x00000000, + 0x00000000, 0x03000006, 0x00004001, 0x00000000, 0x05000036, 0x00100012, 0x00000000, 0x00004001, + 0x3f800000, 0x0a000038, 0x00100062, 0x00000000, 0x00101106, 0x00000000, 0x00004002, 0x00000000, + 0x3acccccd, 0x3b088889, 0x00000000, 0x01000002, 0x03000006, 0x00004001, 0x00000001, 0x05000036, + 0x00100012, 0x00000000, 0x00004001, 0xbf800000, 0x0a000038, 0x00100062, 0x00000000, 0x00101106, + 0x00000000, 0x00004002, 0x00000000, 0x3acccccd, 0x3b088889, 0x00000000, 0x01000002, 0x03000006, + 0x00004001, 0x00000002, 0x0a000038, 0x00100052, 0x00000000, 0x00101106, 0x00000000, 0x00004002, + 0x3acccccd, 0x00000000, 0x3b088889, 0x00000000, 0x05000036, 0x00100022, 0x00000000, 0x00004001, + 0x3f800000, 0x01000002, 0x03000006, 0x00004001, 0x00000003, 0x0a000038, 0x00100052, 0x00000000, + 0x00101106, 0x00000000, 0x00004002, 0x3acccccd, 0x00000000, 0x3b088889, 0x00000000, 0x05000036, + 0x00100022, 0x00000000, 0x00004001, 0xbf800000, 0x01000002, 0x03000006, 0x00004001, 0x00000004, + 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, + 0x00000000, 0x00000000, 0x05000036, 0x00100042, 0x00000000, 0x00004001, 0x3f800000, 0x01000002, + 0x0100000a, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, + 0x3b088889, 0x00000000, 0x00000000, 0x05000036, 0x00100042, 0x00000000, 0x00004001, 0xbf800000, + 0x01000002, 0x01000017, 0x06000056, 0x00100082, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, + 0x0b000048, 0x001020f2, 0x00000000, 0x00100246, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, + 0x00000000, 0x0010003a, 0x00000000, 0x0100003e, + }; + static const struct test + { + unsigned int miplevel_count; + unsigned int array_size; + } + tests[] = + { + {1, 6}, + {2, 6}, + {3, 6}, + {0, 0}, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &rtv_texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)rtv_texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + memset(&constant, 0, sizeof(constant)); + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(constant), &constant); + + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + + hr = ID3D10Device_CreatePixelShader(device, ps_cube_code, sizeof(ps_cube_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + const struct test *test = &tests[i]; + + if (!test->miplevel_count) + { + srv = NULL; + ID3D10Device_PSSetShaderResources(device, 0, 1, &srv); + + memset(&expected_result, 0, sizeof(expected_result)); + + memset(&constant, 0, sizeof(constant)); + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_vec4(rtv_texture, &expected_result, 0); + constant.level = 1; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_vec4(rtv_texture, &expected_result, 0); + continue; + } + + texture_desc.Width = 64; + texture_desc.Height = 64; + texture_desc.MipLevels = test->miplevel_count; + texture_desc.ArraySize = test->array_size; + texture_desc.Format = DXGI_FORMAT_R32_FLOAT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = D3D10_RESOURCE_MISC_TEXTURECUBE; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D10Texture2D **)&texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create 2d texture, hr %#x.\n", i, hr); + + hr = ID3D10Device_CreateShaderResourceView(device, texture, NULL, &srv); + ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + ID3D10Device_PSSetShaderResources(device, 0, 1, &srv); + + sub_resource_count = texture_desc.MipLevels * texture_desc.ArraySize; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + { + for (j = 0; j < sizeof(data) / sizeof(*data); ++j) + data[j] = sub_resource_idx; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)texture, sub_resource_idx, NULL, + data, texture_desc.Width * sizeof(*data), 0); + } + + expected_result.y = expected_result.z = 0.0f; + expected_result.w = 1.0f; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + { + constant.face = (sub_resource_idx / texture_desc.MipLevels) % 6; + constant.level = sub_resource_idx % texture_desc.MipLevels; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + + draw_quad(&test_context); + expected_result.x = sub_resource_idx; + /* Avoid testing values affected by seamless cube map filtering. */ + SetRect(&rect, 100, 100, 540, 380); + check_texture_sub_resource_vec4(rtv_texture, 0, &rect, &expected_result, 0); + } + + ID3D10Resource_Release(texture); + ID3D10ShaderResourceView_Release(srv); + } + + ID3D10Buffer_Release(cb); + ID3D10PixelShader_Release(ps); + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture2D_Release(rtv_texture); + release_test_context(&test_context); +} + static void test_depth_stencil_sampling(void) { ID3D10PixelShader *ps_cmp, *ps_depth, *ps_stencil, *ps_depth_stencil; @@ -11296,6 +11496,7 @@ START_TEST(device) test_clear_state(); test_blend(); test_texture(); + test_cube_maps(); test_depth_stencil_sampling(); test_multiple_render_targets(); test_private_data();

1 0

Józef Kucia : wined3d: Recognize SM4 dcl_index_range opcode.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: a0f2b5b9321356d2d1207b61e19d0bc7aff92dcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f2b5b9321356d2d1207b61e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 10 09:10:57 2017 +0100 wined3d: Recognize SM4 dcl_index_range opcode. 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 | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 7 +++++++ dlls/wined3d/shader_sm4.c | 11 +++++++++++ dlls/wined3d/wined3d_private.h | 8 ++++++++ 5 files changed, 28 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 66b91ca..4b8e7fb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5058,6 +5058,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, + /* WINED3DSIH_DCL_INDEX_RANGE */ NULL, /* WINED3DSIH_DCL_INDEXABLE_TEMP */ NULL, /* WINED3DSIH_DCL_INPUT */ NULL, /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1dfe48a..16cf6b0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9641,6 +9641,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ shader_glsl_nop, + /* WINED3DSIH_DCL_INDEX_RANGE */ NULL, /* WINED3DSIH_DCL_INDEXABLE_TEMP */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 83a72fe..011aee4 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -78,6 +78,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT */ "dcl_hs_join_phase_instance_count", /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ "dcl_hs_max_tessfactor", /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ "dcl_immediateConstantBuffer", + /* WINED3DSIH_DCL_INDEX_RANGE */ "dcl_index_range", /* WINED3DSIH_DCL_INDEXABLE_TEMP */ "dcl_indexableTemp", /* WINED3DSIH_DCL_INPUT */ "dcl_input", /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ "dcl_input_control_point_count", @@ -2555,6 +2556,12 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe } shader_addline(&buffer, "}"); } + else if (ins.handler_idx == WINED3DSIH_DCL_INDEX_RANGE) + { + shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); + shader_dump_dst_param(&buffer, &ins.declaration.index_range.first_register, &shader_version); + shader_addline(&buffer, " %u", ins.declaration.index_range.last_register); + } else if (ins.handler_idx == WINED3DSIH_DCL_INDEXABLE_TEMP) { shader_addline(&buffer, "%s x[%u][%u], %u", shader_opcode_names[ins.handler_idx], diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index d71cbcb..770ef18 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -200,6 +200,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_RESOURCE = 0x58, WINED3D_SM4_OP_DCL_CONSTANT_BUFFER = 0x59, WINED3D_SM4_OP_DCL_SAMPLER = 0x5a, + WINED3D_SM4_OP_DCL_INDEX_RANGE = 0x5b, WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY = 0x5c, WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE = 0x5d, WINED3D_SM4_OP_DCL_VERTICES_OUT = 0x5e, @@ -571,6 +572,14 @@ static void shader_sm4_read_dcl_sampler(struct wined3d_shader_instruction *ins, shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_SAMPLER, &ins->declaration.dst); } +static void shader_sm4_read_dcl_index_range(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_OPAQUE, &ins->declaration.index_range.first_register); + ins->declaration.index_range.last_register = *tokens; +} + static void shader_sm4_read_dcl_output_topology(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -909,6 +918,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_dcl_constant_buffer}, {WINED3D_SM4_OP_DCL_SAMPLER, WINED3DSIH_DCL_SAMPLER, "", "", shader_sm4_read_dcl_sampler}, + {WINED3D_SM4_OP_DCL_INDEX_RANGE, WINED3DSIH_DCL_INDEX_RANGE, "", "", + shader_sm4_read_dcl_index_range}, {WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY, WINED3DSIH_DCL_OUTPUT_TOPOLOGY, "", "", shader_sm4_read_dcl_output_topology}, {WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_INPUT_PRIMITIVE, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0bb61af..1b3e543 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -695,6 +695,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT, WINED3DSIH_DCL_HS_MAX_TESSFACTOR, WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER, + WINED3DSIH_DCL_INDEX_RANGE, WINED3DSIH_DCL_INDEXABLE_TEMP, WINED3DSIH_DCL_INPUT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, @@ -1070,6 +1071,12 @@ struct wined3d_shader_src_param enum wined3d_shader_src_modifier modifiers; }; +struct wined3d_shader_index_range +{ + struct wined3d_shader_dst_param first_register; + unsigned int last_register; +}; + struct wined3d_shader_semantic { enum wined3d_decl_usage usage; @@ -1158,6 +1165,7 @@ struct wined3d_shader_instruction enum wined3d_tessellator_output_primitive tessellator_output_primitive; enum wined3d_tessellator_partitioning tessellator_partitioning; float max_tessellation_factor; + struct wined3d_shader_index_range index_range; struct wined3d_shader_indexable_temp indexable_temp; struct wined3d_shader_function_table_pointer fp; } declaration;

1 0

Józef Kucia : wined3d: Recognize SM4 umul opcode.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 5f4e49dea6ab4386232f4844e53ba8f2c98605dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4e49dea6ab4386232f4844e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 10 09:10:55 2017 +0100 wined3d: Recognize SM4 umul opcode. 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 | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 150342b..66b91ca 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5246,6 +5246,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ULT */ NULL, /* WINED3DSIH_UMAX */ NULL, /* WINED3DSIH_UMIN */ NULL, + /* WINED3DSIH_UMUL */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, /* WINED3DSIH_XOR */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fe6e8c8..eca7f71 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9829,6 +9829,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ULT */ shader_glsl_relop, /* WINED3DSIH_UMAX */ shader_glsl_map2gl, /* WINED3DSIH_UMIN */ shader_glsl_map2gl, + /* WINED3DSIH_UMUL */ NULL, /* WINED3DSIH_USHR */ shader_glsl_binop, /* WINED3DSIH_UTOF */ shader_glsl_to_float, /* WINED3DSIH_XOR */ shader_glsl_binop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d7a4c04..83a72fe 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -266,6 +266,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ULT */ "ult", /* WINED3DSIH_UMAX */ "umax", /* WINED3DSIH_UMIN */ "umin", + /* WINED3DSIH_UMUL */ "umul", /* WINED3DSIH_USHR */ "ushr", /* WINED3DSIH_UTOF */ "utof", /* WINED3DSIH_XOR */ "xor", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ef68754..d71cbcb 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -191,6 +191,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_UDIV = 0x4e, WINED3D_SM4_OP_ULT = 0x4f, WINED3D_SM4_OP_UGE = 0x50, + WINED3D_SM4_OP_UMUL = 0x51, WINED3D_SM4_OP_UMAX = 0x53, WINED3D_SM4_OP_UMIN = 0x54, WINED3D_SM4_OP_USHR = 0x55, @@ -896,6 +897,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_UDIV, WINED3DSIH_UDIV, "uu", "uu"}, {WINED3D_SM4_OP_ULT, WINED3DSIH_ULT, "u", "uu"}, {WINED3D_SM4_OP_UGE, WINED3DSIH_UGE, "u", "uu"}, + {WINED3D_SM4_OP_UMUL, WINED3DSIH_UMUL, "uu", "uu"}, {WINED3D_SM4_OP_UMAX, WINED3DSIH_UMAX, "u", "uu"}, {WINED3D_SM4_OP_UMIN, WINED3DSIH_UMIN, "u", "uu"}, {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "u", "uu"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cdc2400..0bb61af 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -883,6 +883,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ULT, WINED3DSIH_UMAX, WINED3DSIH_UMIN, + WINED3DSIH_UMUL, WINED3DSIH_USHR, WINED3DSIH_UTOF, WINED3DSIH_XOR,

1 0

Józef Kucia : d3d10core/tests: Fix render target format in test_resinfo_instruction().
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 3b684f8175e7c2ab53855eff84fbd9b205196b7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b684f8175e7c2ab53855eff8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 10 09:11:01 2017 +0100 d3d10core/tests: Fix render target format in test_resinfo_instruction(). 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 7819362..4b757d8 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -11202,7 +11202,7 @@ static void test_resinfo_instruction(void) texture_desc.Height = 64; texture_desc.MipLevels = 1; texture_desc.ArraySize = 1; - texture_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; texture_desc.Usage = D3D10_USAGE_DEFAULT;

1 0

Józef Kucia : wined3d: Implement SM4 umul instruction.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 2059beda577b22434fb4250e56656a6a37fa4d79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2059beda577b22434fb4250e5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 10 09:10:56 2017 +0100 wined3d: Implement SM4 umul instruction. 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, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index eca7f71..1dfe48a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3595,15 +3595,15 @@ static void shader_glsl_unary_op(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "%s%s);\n", op, src_param.param_str); } -static void shader_glsl_imul(const struct wined3d_shader_instruction *ins) +static void shader_glsl_mul_extended(const struct wined3d_shader_instruction *ins) { struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct glsl_src_param src0_param; struct glsl_src_param src1_param; DWORD write_mask; - /* If we have ARB_gpu_shader5 or GLSL 4.0, we can use imulExtended(). If - * not, we can emulate it. */ + /* If we have ARB_gpu_shader5, we can use imulExtended() / umulExtended(). + * If not, we can emulate it. */ if (ins->dst[0].reg.type != WINED3DSPR_NULL) FIXME("64-bit integer multiplies not implemented.\n"); @@ -9733,7 +9733,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_UMAX */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_UMIN */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_XOR */ shader_glsl_atomic, - /* WINED3DSIH_IMUL */ shader_glsl_imul, + /* WINED3DSIH_IMUL */ shader_glsl_mul_extended, /* WINED3DSIH_INE */ shader_glsl_relop, /* WINED3DSIH_INEG */ shader_glsl_unary_op, /* WINED3DSIH_ISHL */ shader_glsl_binop, @@ -9829,7 +9829,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ULT */ shader_glsl_relop, /* WINED3DSIH_UMAX */ shader_glsl_map2gl, /* WINED3DSIH_UMIN */ shader_glsl_map2gl, - /* WINED3DSIH_UMUL */ NULL, + /* WINED3DSIH_UMUL */ shader_glsl_mul_extended, /* WINED3DSIH_USHR */ shader_glsl_binop, /* WINED3DSIH_UTOF */ shader_glsl_to_float, /* WINED3DSIH_XOR */ shader_glsl_binop,

1 0

Matteo Bruni : ddraw/tests: Add a ddraw7 vertex buffer refcount test.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: d2fe7bfd7ca79e94038bf065f956fb4dfb8f5aa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fe7bfd7ca79e94038bf065f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 10 00:31:58 2017 +0100 ddraw/tests: Add a ddraw7 vertex buffer refcount test. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e7e09a9..2068741 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13059,6 +13059,74 @@ done: DestroyWindow(window); } +static void test_vb_refcount(void) +{ + ULONG prev_d3d_refcount, prev_device_refcount; + ULONG cur_d3d_refcount, cur_device_refcount; + IDirect3DVertexBuffer7 *vb, *vb7; + D3DVERTEXBUFFERDESC vb_desc; + IDirect3DVertexBuffer *vb1; + IDirect3DDevice7 *device; + IDirect3D7 *d3d; + ULONG refcount; + IUnknown *unk; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d7_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr); + + prev_d3d_refcount = get_refcount((IUnknown *)d3d); + prev_device_refcount = get_refcount((IUnknown *)device); + + memset(&vb_desc, 0, sizeof(vb_desc)); + vb_desc.dwSize = sizeof(vb_desc); + vb_desc.dwFVF = D3DFVF_XYZ; + vb_desc.dwNumVertices = 4; + hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &vb, 0); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + cur_d3d_refcount = get_refcount((IUnknown *)d3d); + cur_device_refcount = get_refcount((IUnknown *)device); + ok(cur_d3d_refcount > prev_d3d_refcount, "D3D object refcount didn't change from %u.\n", prev_d3d_refcount); + ok(cur_device_refcount == prev_device_refcount, "Device refcount changed from %u to %u.\n", + prev_device_refcount, cur_device_refcount); + + prev_d3d_refcount = cur_d3d_refcount; + hr = IDirect3DVertexBuffer7_QueryInterface(vb, &IID_IDirect3DVertexBuffer7, (void **)&vb7); + ok(hr == DD_OK, "Failed to query IDirect3DVertexBuffer7, hr %#x.\n", hr); + cur_d3d_refcount = get_refcount((IUnknown *)d3d); + ok(cur_d3d_refcount == prev_d3d_refcount, "D3D object refcount changed from %u to %u.\n", + prev_d3d_refcount, cur_d3d_refcount); + IDirect3DVertexBuffer7_Release(vb7); + + hr = IDirect3DVertexBuffer7_QueryInterface(vb, &IID_IDirect3DVertexBuffer, (void **)&vb1); + ok(hr == E_NOINTERFACE, "Querying IDirect3DVertexBuffer returned unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer_QueryInterface(vb, &IID_IUnknown, (void **)&unk); + ok(hr == DD_OK, "Failed to query IUnknown, hr %#x.\n", hr); + ok((IUnknown *)vb == unk, + "IDirect3DVertexBuffer7 and IUnknown interface pointers don't match, %p != %p.\n", vb, unk); + IUnknown_Release(unk); + + refcount = IDirect3DVertexBuffer7_Release(vb); + ok(!refcount, "Vertex buffer has %u references left.\n", refcount); + + IDirect3D7_Release(d3d); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -13173,4 +13241,5 @@ START_TEST(ddraw7) test_surface_desc_size(); test_get_surface_from_dc(); test_ck_operation(); + test_vb_refcount(); }

1 0

Alistair Leslie-Hughes : include: Add msstkppg.h.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 18c594a6b44aacaaaab6501a49eee4a17bb43b41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c594a6b44aacaaaab6501a4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 10 03:25:01 2017 +0000 include: Add msstkppg.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msstkppg.h | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 4fbfd16..9ee3d52 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -464,6 +464,7 @@ HEADER_SRCS = \ msidefs.h \ msiquery.h \ mssip.h \ + msstkppg.h \ mstcpip.h \ msvcrt/assert.h \ msvcrt/conio.h \ diff --git a/include/msstkppg.h b/include/msstkppg.h new file mode 100644 index 0000000..bf53aaa --- /dev/null +++ b/include/msstkppg.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _MS_STOCK_PROP_PAGES_H_ +#define _MS_STOCK_PROP_PAGES_H_ + +DEFINE_GUID(CLSID_StockColorPage, 0x7ebdaae1, 0x8120, 0x11cf, 0x89, 0x9f, 0x0, 0xaa, 0x0, 0x68, 0x8b, 0x10); +DEFINE_GUID(CLSID_StockFontPage, 0x7ebdaae0, 0x8120, 0x11cf, 0x89, 0x9f, 0x0, 0xaa, 0x0, 0x68, 0x8b, 0x10); +DEFINE_GUID(CLSID_StockPicturePage, 0x7ebdaae2, 0x8120, 0x11cf, 0x89, 0x9f, 0x0, 0xaa, 0x0, 0x68, 0x8b, 0x10); + +#endif

1 0

Jacek Caban : wininet: Get rid of no longer needed blocking_mode_t.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: fd0ac40798c029e4d971245dbea73d87057601c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0ac40798c029e4d971245db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 9 18:20:28 2017 +0100 wininet: Get rid of no longer needed blocking_mode_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 64 +++++++++++++++++++++++------------------------------ 1 file changed, 28 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd0ac40798c029e4d9712…

1 0