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

Józef Kucia : wined3d: Recognize SM 4.1 gather4 opcode.
by Alexandre Julliard June 10, 2016

June 10, 2016

Module: wine Branch: master Commit: e0c4b23e942d06f929448e0ec6b3428c85ab643c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0c4b23e942d06f929448e0ec… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 10 12:07:04 2016 +0200 wined3d: Recognize SM 4.1 gather4 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 2c510b7..70d7d34 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5276,6 +5276,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_FRC */ shader_hw_map2gl, /* WINED3DSIH_FTOI */ NULL, /* WINED3DSIH_FTOU */ NULL, + /* WINED3DSIH_GATHER4 */ NULL, /* WINED3DSIH_GE */ NULL, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, /* WINED3DSIH_HS_DECLS */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 92849db..9bbf461 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8610,6 +8610,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ shader_glsl_to_int, /* WINED3DSIH_FTOU */ shader_glsl_to_uint, + /* WINED3DSIH_GATHER4 */ NULL, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, /* WINED3DSIH_HS_DECLS */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index bd8d55d..f8fdc50 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -108,6 +108,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_FRC */ "frc", /* WINED3DSIH_FTOI */ "ftoi", /* WINED3DSIH_FTOU */ "ftou", + /* WINED3DSIH_GATHER4 */ "gather4", /* WINED3DSIH_GE */ "ge", /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ "hs_control_point_phase", /* WINED3DSIH_HS_DECLS */ "hs_decls", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ef5fcd2..bff1f27 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_OUTPUT_SIV = 0x67, WINED3D_SM4_OP_DCL_TEMPS = 0x68, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, + WINED3D_SM4_OP_GATHER4 = 0x6d, WINED3D_SM5_OP_HS_DECLS = 0x71, WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE = 0x72, WINED3D_SM5_OP_HS_FORK_PHASE = 0x73, @@ -733,6 +734,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_declaration_count}, {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", "", shader_sm4_read_dcl_global_flags}, + {WINED3D_SM4_OP_GATHER4, WINED3DSIH_GATHER4, "u", "fRS"}, {WINED3D_SM5_OP_HS_DECLS, WINED3DSIH_HS_DECLS, "", ""}, {WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_CONTROL_POINT_PHASE, "", ""}, {WINED3D_SM5_OP_HS_FORK_PHASE, WINED3DSIH_HS_FORK_PHASE, "", ""}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 82d4712..7f45327 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -615,6 +615,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_FRC, WINED3DSIH_FTOI, WINED3DSIH_FTOU, + WINED3DSIH_GATHER4, WINED3DSIH_GE, WINED3DSIH_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_DECLS,

1 0

Józef Kucia : d3d10core/tests: Add test for texturing with custom shader resource views.
by Alexandre Julliard June 10, 2016

June 10, 2016

Module: wine Branch: master Commit: d048d5c201ac8586a1d78a27b84edbf26f956179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d048d5c201ac8586a1d78a27b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 10 12:07:03 2016 +0200 d3d10core/tests: Add test for texturing with custom shader resource views. 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 | 168 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 158 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d048d5c201ac8586a1d78…

1 0

Józef Kucia : d3d11/tests: Add test for texturing with custom shader resource views.
by Alexandre Julliard June 10, 2016

June 10, 2016

Module: wine Branch: master Commit: 932964d9cea92a4e5ac83251d8dac44dc174032b URL: http://source.winehq.org/git/wine.git/?a=commit;h=932964d9cea92a4e5ac83251d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 10 12:07:02 2016 +0200 d3d11/tests: Add test for texturing with custom shader resource views. 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 | 151 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 147 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 88bf8a8..5928c67 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4204,11 +4204,13 @@ static void test_texture(void) D3D11_SUBRESOURCE_DATA data[3]; }; + D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; struct d3d11_test_context test_context; const struct texture *current_texture; D3D11_TEXTURE2D_DESC texture_desc; D3D11_SAMPLER_DESC sampler_desc; const struct shader *current_ps; + D3D_FEATURE_LEVEL feature_level; ID3D11ShaderResourceView *srv; ID3D11DeviceContext *context; ID3D11SamplerState *sampler; @@ -4541,6 +4543,8 @@ static void test_texture(void) }; static const struct texture srgb_texture = {4, 4, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, {{srgb_data, 4 * sizeof(*srgb_data)}}}; + static const struct texture srgb_typeless = {4, 4, 1, 1, DXGI_FORMAT_R8G8B8A8_TYPELESS, + {{srgb_data, 4 * sizeof(*srgb_data)}}}; static const struct texture a8_texture = {4, 4, 1, 1, DXGI_FORMAT_A8_UNORM, {{a8_data, 4 * sizeof(*a8_data)}}}; static const struct texture bc1_texture = {8, 8, 1, 1, DXGI_FORMAT_BC1_UNORM, {{bc1_data, 2 * 8}}}; @@ -4551,6 +4555,9 @@ static void test_texture(void) static const struct texture bc1_texture_srgb = {8, 8, 1, 1, DXGI_FORMAT_BC1_UNORM_SRGB, {{bc1_data, 2 * 8}}}; static const struct texture bc2_texture_srgb = {8, 8, 1, 1, DXGI_FORMAT_BC2_UNORM_SRGB, {{bc2_data, 2 * 16}}}; static const struct texture bc3_texture_srgb = {8, 8, 1, 1, DXGI_FORMAT_BC3_UNORM_SRGB, {{bc3_data, 2 * 16}}}; + static const struct texture bc1_typeless = {8, 8, 1, 1, DXGI_FORMAT_BC1_TYPELESS, {{bc1_data, 2 * 8}}}; + static const struct texture bc2_typeless = {8, 8, 1, 1, DXGI_FORMAT_BC2_TYPELESS, {{bc2_data, 2 * 16}}}; + static const struct texture bc3_typeless = {8, 8, 1, 1, DXGI_FORMAT_BC3_TYPELESS, {{bc3_data, 2 * 16}}}; static const struct texture sint8_texture = {4, 4, 1, 1, DXGI_FORMAT_R8G8B8A8_SINT, {{rgba_level_0, 4 * sizeof(*rgba_level_0)}}}; static const struct texture uint8_texture = {4, 4, 1, 1, DXGI_FORMAT_R8G8B8A8_UINT, @@ -4644,7 +4651,7 @@ static void test_texture(void) static const DWORD zero_colors[4 * 4] = {0}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; - static const struct test + static const struct texture_test { const struct shader *ps; const struct texture *texture; @@ -4655,7 +4662,7 @@ static void test_texture(void) float ps_constant; const DWORD *expected_colors; } - tests[] = + texture_tests[] = { #define POINT D3D11_FILTER_MIN_MAG_MIP_POINT #define POINT_LINEAR D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR @@ -4759,12 +4766,58 @@ static void test_texture(void) #undef POINT_LINEAR #undef MIP_MAX }; + static const struct srv_test + { + const struct shader *ps; + const struct texture *texture; + struct srv_desc srv_desc; + float ps_constant; + const DWORD *expected_colors; + } + srv_tests[] = + { +#define TEX_2D D3D11_SRV_DIMENSION_TEXTURE2D +#define TEX_2D_ARRAY D3D11_SRV_DIMENSION_TEXTURE2DARRAY +#define BC1_UNORM DXGI_FORMAT_BC1_UNORM +#define BC1_UNORM_SRGB DXGI_FORMAT_BC1_UNORM_SRGB +#define BC2_UNORM DXGI_FORMAT_BC2_UNORM +#define BC2_UNORM_SRGB DXGI_FORMAT_BC2_UNORM_SRGB +#define BC3_UNORM DXGI_FORMAT_BC3_UNORM +#define BC3_UNORM_SRGB DXGI_FORMAT_BC3_UNORM_SRGB +#define R8G8B8A8_UNORM_SRGB DXGI_FORMAT_R8G8B8A8_UNORM_SRGB +#define R8G8B8A8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM +#define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN + {&ps_sample, &bc1_typeless, {BC1_UNORM, TEX_2D, 0, 1}, 0.0f, bc_colors}, + {&ps_sample, &bc1_typeless, {BC1_UNORM_SRGB, TEX_2D, 0, 1}, 0.0f, bc_colors}, + {&ps_sample, &bc2_typeless, {BC2_UNORM, TEX_2D, 0, 1}, 0.0f, bc_colors}, + {&ps_sample, &bc2_typeless, {BC2_UNORM_SRGB, TEX_2D, 0, 1}, 0.0f, bc_colors}, + {&ps_sample, &bc3_typeless, {BC3_UNORM, TEX_2D, 0, 1}, 0.0f, bc_colors}, + {&ps_sample, &bc3_typeless, {BC3_UNORM_SRGB, TEX_2D, 0, 1}, 0.0f, bc_colors}, + {&ps_sample, &srgb_typeless, {R8G8B8A8_UNORM_SRGB, TEX_2D, 0, 1}, 0.0f, srgb_colors}, + {&ps_sample, &srgb_typeless, {R8G8B8A8_UNORM, TEX_2D, 0, 1}, 0.0f, srgb_data}, + {&ps_sample, &array_2d_texture, {FMT_UNKNOWN, TEX_2D, 0, 1}, 0.0f, red_colors}, + {&ps_sample_2d_array, &array_2d_texture, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, 0, 1}, 0.0f, red_colors}, + {&ps_sample_2d_array, &array_2d_texture, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, 1, 1}, 0.0f, green_data}, + {&ps_sample_2d_array, &array_2d_texture, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, 2, 1}, 0.0f, blue_colors}, +#undef TEX_2D +#undef TEX_2D_ARRAY +#undef BC1_UNORM +#undef BC1_UNORM_SRGB +#undef BC2_UNORM +#undef BC2_UNORM_SRGB +#undef BC3_UNORM +#undef BC3_UNORM_SRGB +#undef R8G8B8A8_UNORM_SRGB +#undef R8G8B8A8_UNORM +#undef FMT_UNKNOWN + }; if (!init_test_context(&test_context, NULL)) return; device = test_context.device; context = test_context.immediate_context; + feature_level = ID3D11Device_GetFeatureLevel(device); cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(ps_constant), NULL); @@ -4797,9 +4850,9 @@ static void test_texture(void) texture = NULL; current_ps = NULL; current_texture = NULL; - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < sizeof(texture_tests) / sizeof(*texture_tests); ++i) { - const struct test *test = &tests[i]; + const struct texture_test *test = &texture_tests[i]; if (current_ps != test->ps) { @@ -4891,6 +4944,96 @@ static void test_texture(void) ID3D11Texture2D_Release(texture); ID3D11PixelShader_Release(ps); + if (is_warp_device(device) && feature_level < D3D_FEATURE_LEVEL_10_1) + { + win_skip("SRV tests are broken on WARP.\n"); + ID3D11Buffer_Release(cb); + release_test_context(&test_context); + return; + } + + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = D3D11_FLOAT32_MAX; + + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler); + + ps = NULL; + srv = NULL; + texture = NULL; + current_ps = NULL; + current_texture = NULL; + for (i = 0; i < sizeof(srv_tests) / sizeof(*srv_tests); ++i) + { + const struct srv_test *test = &srv_tests[i]; + + if (current_ps != test->ps) + { + if (ps) + ID3D11PixelShader_Release(ps); + + current_ps = test->ps; + + hr = ID3D11Device_CreatePixelShader(device, current_ps->code, current_ps->size, NULL, &ps); + ok(SUCCEEDED(hr), "Test %u: Failed to create pixel shader, hr %#x.\n", i, hr); + + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + } + + if (current_texture != test->texture) + { + if (texture) + ID3D11Texture2D_Release(texture); + + current_texture = test->texture; + + texture_desc.Width = current_texture->width; + texture_desc.Height = current_texture->height; + texture_desc.MipLevels = current_texture->miplevel_count; + texture_desc.ArraySize = current_texture->array_size; + texture_desc.Format = current_texture->format; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, current_texture->data, &texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create 2d texture, hr %#x.\n", i, hr); + } + + if (srv) + ID3D11ShaderResourceView_Release(srv); + + get_srv_desc(&srv_desc, &test->srv_desc); + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, &srv_desc, &srv); + ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + + ps_constant.x = test->ps_constant; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &ps_constant, 0, 0); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + + draw_quad(&test_context); + + get_texture_readback(test_context.backbuffer, 0, &rb); + for (y = 0; y < 4; ++y) + { + for (x = 0; x < 4; ++x) + { + color = get_readback_color(&rb, 80 + x * 160, 60 + y * 120); + ok(compare_color(color, test->expected_colors[y * 4 + x], 1), + "Test %u: Got unexpected color 0x%08x at (%u, %u).\n", i, color, x, y); + } + } + release_texture_readback(&rb); + } + ID3D11PixelShader_Release(ps); + ID3D11Texture2D_Release(texture); + ID3D11ShaderResourceView_Release(srv); + ID3D11SamplerState_Release(sampler); + ID3D11Buffer_Release(cb); release_test_context(&test_context); }

1 0

Józef Kucia : d3d10core/tests: Add more tests for creating depth stencil views.
by Alexandre Julliard June 10, 2016

June 10, 2016

Module: wine Branch: master Commit: cd0a3c23a12031e81e6e8b0de1f3d009ce6fcd6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd0a3c23a12031e81e6e8b0de… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 10 12:07:01 2016 +0200 d3d10core/tests: Add more tests for creating depth stencil views. 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 | 165 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 135 insertions(+), 30 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8c47f42..b2a75cd 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -267,6 +267,71 @@ static void check_rtv_desc_(unsigned int line, const D3D10_RENDER_TARGET_VIEW_DE } } +struct dsv_desc +{ + DXGI_FORMAT format; + D3D10_DSV_DIMENSION dimension; + unsigned int miplevel_idx; + unsigned int layer_idx; + unsigned int layer_count; +}; + +static void get_dsv_desc(D3D10_DEPTH_STENCIL_VIEW_DESC *d3d10_desc, const struct dsv_desc *desc) +{ + d3d10_desc->Format = desc->format; + d3d10_desc->ViewDimension = desc->dimension; + if (desc->dimension == D3D10_DSV_DIMENSION_TEXTURE2D) + { + U(*d3d10_desc).Texture2D.MipSlice = desc->miplevel_idx; + } + else if (desc->dimension == D3D10_DSV_DIMENSION_TEXTURE2DARRAY) + { + U(*d3d10_desc).Texture2DArray.MipSlice = desc->miplevel_idx; + U(*d3d10_desc).Texture2DArray.FirstArraySlice = desc->layer_idx; + U(*d3d10_desc).Texture2DArray.ArraySize = desc->layer_count; + } + else + { + trace("Unhandled view dimension %#x.\n", desc->dimension); + } +} + +#define check_dsv_desc(a, b) check_dsv_desc_(__LINE__, a, b) +static void check_dsv_desc_(unsigned int line, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc, + const struct dsv_desc *expected_desc) +{ + ok_(__FILE__, line)(desc->Format == expected_desc->format, + "Got format %#x, expected %#x.\n", desc->Format, expected_desc->format); + ok_(__FILE__, line)(desc->ViewDimension == expected_desc->dimension, + "Got view dimension %#x, expected %#x.\n", desc->ViewDimension, expected_desc->dimension); + + if (desc->ViewDimension != expected_desc->dimension) + return; + + if (desc->ViewDimension == D3D10_DSV_DIMENSION_TEXTURE2D) + { + ok_(__FILE__, line)(U(*desc).Texture2D.MipSlice == expected_desc->miplevel_idx, + "Got MipSlice %u, expected %u.\n", + U(*desc).Texture2D.MipSlice, expected_desc->miplevel_idx); + } + else if (desc->ViewDimension == D3D10_DSV_DIMENSION_TEXTURE2DARRAY) + { + ok_(__FILE__, line)(U(*desc).Texture2DArray.MipSlice == expected_desc->miplevel_idx, + "Got MipSlice %u, expected %u.\n", + U(*desc).Texture2DArray.MipSlice, expected_desc->miplevel_idx); + ok_(__FILE__, line)(U(*desc).Texture2DArray.FirstArraySlice == expected_desc->layer_idx, + "Got FirstArraySlice %u, expected %u.\n", + U(*desc).Texture2DArray.FirstArraySlice, expected_desc->layer_idx); + ok_(__FILE__, line)(U(*desc).Texture2DArray.ArraySize == expected_desc->layer_count, + "Got ArraySize %u, expected %u.\n", + U(*desc).Texture2DArray.ArraySize, expected_desc->layer_count); + } + else + { + trace("Unhandled view dimension %#x.\n", desc->ViewDimension); + } +} + #define create_buffer(a, b, c, d) create_buffer_(__LINE__, a, b, c, d) static ID3D10Buffer *create_buffer_(unsigned int line, ID3D10Device *device, unsigned int bind_flags, unsigned int size, const void *data) @@ -1416,8 +1481,48 @@ static void test_create_depthstencil_view(void) ID3D10DepthStencilView *dsview; ID3D10Device *device, *tmp; ID3D10Texture2D *texture; + IUnknown *iface; + unsigned int i; HRESULT hr; + static const struct + { + struct + { + unsigned int miplevel_count; + unsigned int array_size; + DXGI_FORMAT format; + } texture; + struct dsv_desc dsv_desc; + struct dsv_desc expected_dsv_desc; + } + tests[] = + { +#define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN +#define D24_S8 DXGI_FORMAT_D24_UNORM_S8_UINT +#define TEX_2D D3D10_DSV_DIMENSION_TEXTURE2D +#define TEX_2D_ARRAY D3D10_DSV_DIMENSION_TEXTURE2DARRAY + {{ 1, 1, D24_S8}, {0}, {D24_S8, TEX_2D, 0}}, + {{10, 1, D24_S8}, {0}, {D24_S8, TEX_2D, 0}}, + {{10, 1, D24_S8}, {FMT_UNKNOWN, TEX_2D, 0}, {D24_S8, TEX_2D, 0}}, + {{10, 1, D24_S8}, {FMT_UNKNOWN, TEX_2D, 1}, {D24_S8, TEX_2D, 1}}, + {{10, 1, D24_S8}, {FMT_UNKNOWN, TEX_2D, 9}, {D24_S8, TEX_2D, 9}}, + {{ 1, 4, D24_S8}, {0}, {D24_S8, TEX_2D_ARRAY, 0, 0, 4}}, + {{10, 4, D24_S8}, {0}, {D24_S8, TEX_2D_ARRAY, 0, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 0, -1}, {D24_S8, TEX_2D_ARRAY, 0, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 1, 0, -1}, {D24_S8, TEX_2D_ARRAY, 1, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 3, 0, -1}, {D24_S8, TEX_2D_ARRAY, 3, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 5, 0, -1}, {D24_S8, TEX_2D_ARRAY, 5, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 9, 0, -1}, {D24_S8, TEX_2D_ARRAY, 9, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, -1}, {D24_S8, TEX_2D_ARRAY, 0, 1, 3}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 2, -1}, {D24_S8, TEX_2D_ARRAY, 0, 2, 2}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 3, -1}, {D24_S8, TEX_2D_ARRAY, 0, 3, 1}}, +#undef FMT_UNKNOWN +#undef D24_S8 +#undef TEX_2D +#undef TEX_2D_ARRAY + }; + if (!(device = create_device())) { skip("Failed to create device, skipping tests.\n"); @@ -1460,44 +1565,44 @@ static void test_create_depthstencil_view(void) ok(!U(dsv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); ID3D10DepthStencilView_Release(dsview); + ID3D10Texture2D_Release(texture); - dsv_desc.Format = DXGI_FORMAT_UNKNOWN; - - hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, &dsv_desc, &dsview); - ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr); + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + D3D10_DEPTH_STENCIL_VIEW_DESC *current_desc; - memset(&dsv_desc, 0, sizeof(dsv_desc)); - ID3D10DepthStencilView_GetDesc(dsview, &dsv_desc); - ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); - ok(dsv_desc.ViewDimension == D3D10_DSV_DIMENSION_TEXTURE2D, - "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); - ok(!U(dsv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + texture_desc.MipLevels = tests[i].texture.miplevel_count; + texture_desc.ArraySize = tests[i].texture.array_size; + texture_desc.Format = tests[i].texture.format; - ID3D10DepthStencilView_Release(dsview); - ID3D10Texture2D_Release(texture); + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create 2d texture, hr %#x.\n", i, hr); - texture_desc.ArraySize = 4; + if (tests[i].dsv_desc.dimension == D3D10_DSV_DIMENSION_UNKNOWN) + { + current_desc = NULL; + } + else + { + current_desc = &dsv_desc; + get_dsv_desc(current_desc, &tests[i].dsv_desc); + } - hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + 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); - hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, NULL, &dsview); - ok(SUCCEEDED(hr), "Failed to create depthstencil view, hr %#x.\n", hr); + hr = ID3D10DepthStencilView_QueryInterface(dsview, &IID_ID3D11DepthStencilView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Test %u: Depth stencil view should implement ID3D11DepthStencilView.\n", i); + if (SUCCEEDED(hr)) IUnknown_Release(iface); - memset(&dsv_desc, 0, sizeof(dsv_desc)); - ID3D10DepthStencilView_GetDesc(dsview, &dsv_desc); - ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); - ok(dsv_desc.ViewDimension == D3D10_DSV_DIMENSION_TEXTURE2DARRAY, - "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); - ok(!U(dsv_desc).Texture2DArray.MipSlice, "Got unexpected mip slice %u.\n", - U(dsv_desc).Texture2DArray.MipSlice); - ok(!U(dsv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", - U(dsv_desc).Texture2DArray.FirstArraySlice); - ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, - "Got unexpected array size %u.\n", U(dsv_desc).Texture2DArray.ArraySize); + memset(&dsv_desc, 0, sizeof(dsv_desc)); + ID3D10DepthStencilView_GetDesc(dsview, &dsv_desc); + check_dsv_desc(&dsv_desc, &tests[i].expected_dsv_desc); - ID3D10DepthStencilView_Release(dsview); - ID3D10Texture2D_Release(texture); + ID3D10DepthStencilView_Release(dsview); + ID3D10Texture2D_Release(texture); + } refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Józef Kucia : d3d10core/tests: Add more tests for creating render target views.
by Alexandre Julliard June 10, 2016

June 10, 2016

Module: wine Branch: master Commit: e9ac14596b6d9ec6dd40bcc9a9977362d19f4717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ac14596b6d9ec6dd40bcc9a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 10 12:07:00 2016 +0200 d3d10core/tests: Add more tests for creating render target views. 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 | 266 ++++++++++++++++++++++++++++++++---------- 1 file changed, 203 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9ac14596b6d9ec6dd40b…

1 0

Michael Stefaniuc : ddraw/tests: Use wine_dbgstr_rect() in the ddraw1 tests.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: 420f2329abfdd09682848108a9e46ce461bb5fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=420f2329abfdd09682848108a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 22:22:29 2016 +0200 ddraw/tests: Use wine_dbgstr_rect() in the ddraw1 tests. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 149 ++++++++++++++++++---------------------------- 1 file changed, 59 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=420f2329abfdd09682848…

1 0

Béla Gyebrószki : wined3d: Add Nvidia GeForce GTS 250.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: a6d7a1c6e4f027b29092fa504d5fba1b7833cc24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6d7a1c6e4f027b29092fa504… Author: Béla Gyebrószki <gyebro69(a)gmail.com> Date: Wed Jun 8 18:30:23 2016 +0200 wined3d: Add Nvidia GeForce GTS 250. Signed-off-by: Béla Gyebrószki <gyebro69(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3656b8b..48feeef 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1237,6 +1237,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_210, "NVIDIA GeForce 210", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT220, "NVIDIA GeForce GT 220", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT240, "NVIDIA GeForce GT 240", DRIVER_NVIDIA_GEFORCE8, 512 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS250, "NVIDIA GeForce GTS 250", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", DRIVER_NVIDIA_GEFORCE8, 896 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE8, 1024}, @@ -1833,13 +1834,13 @@ cards_nvidia_binary[] = {"GTX 280", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ {"GTX 275", CARD_NVIDIA_GEFORCE_GTX275}, /* Geforce 200 - midend high */ {"GTX 260", CARD_NVIDIA_GEFORCE_GTX260}, /* Geforce 200 - midend */ + {"GTS 250", CARD_NVIDIA_GEFORCE_GTS250}, /* Geforce 200 - midend */ {"GT 240", CARD_NVIDIA_GEFORCE_GT240}, /* Geforce 200 - midend */ {"GT 220", CARD_NVIDIA_GEFORCE_GT220}, /* Geforce 200 - lowend */ {"GeForce 310", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ {"GeForce 305", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ {"GeForce 210", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ {"G 210", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ - {"GTS 250", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"GTS 150", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"9800", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"9700M GT", CARD_NVIDIA_GEFORCE_9700MGT}, /* Geforce 9 - midend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b4bc901..82d4712 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1777,6 +1777,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_210 = 0x0a23, CARD_NVIDIA_GEFORCE_GT220 = 0x0a20, CARD_NVIDIA_GEFORCE_GT240 = 0x0ca3, + CARD_NVIDIA_GEFORCE_GTS250 = 0x0615, CARD_NVIDIA_GEFORCE_GTX260 = 0x05e2, CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1,

1 0

Józef Kucia : d3d11: Normalize "ArraySize" field in D3D11_DEPTH_STENCIL_VIEW_DESC.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: 6b1bd3ded0211380cabc931b4aed2f826447d47f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b1bd3ded0211380cabc931b4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:55:00 2016 +0200 d3d11: Normalize "ArraySize" field in D3D11_DEPTH_STENCIL_VIEW_DESC. 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/view.c | 56 +++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 5a2ef39..7f5abf7 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -124,50 +124,50 @@ static HRESULT set_dsdesc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3 static void normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; - - if (desc->Format != DXGI_FORMAT_UNKNOWN) - return; + unsigned int layer_count; + DXGI_FORMAT format; ID3D11Resource_GetType(resource, &dimension); switch (dimension) { - case D3D11_RESOURCE_DIMENSION_TEXTURE1D: + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: { - D3D11_TEXTURE1D_DESC texture_desc; - ID3D11Texture1D *texture; + const struct d3d_texture2d *texture; - if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture1D, (void **)&texture))) + if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) { - ERR("Resource of type TEXTURE1D doesn't implement ID3D11Texture1D.\n"); - break; + ERR("Cannot get implementation from ID3D11Texture2D.\n"); + return; } - ID3D11Texture1D_GetDesc(texture, &texture_desc); - ID3D11Texture1D_Release(texture); - - if (desc->Format == DXGI_FORMAT_UNKNOWN) - desc->Format = texture_desc.Format; + format = texture->desc.Format; + layer_count = texture->desc.ArraySize; break; } - case D3D11_RESOURCE_DIMENSION_TEXTURE2D: - { - D3D11_TEXTURE2D_DESC texture_desc; - ID3D11Texture2D *texture; + default: + return; + } - if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture2D, (void **)&texture))) - { - ERR("Resource of type TEXTURE2D doesn't implement ID3D11Texture2D.\n"); - break; - } + if (desc->Format == DXGI_FORMAT_UNKNOWN) + desc->Format = format; - ID3D11Texture2D_GetDesc(texture, &texture_desc); - ID3D11Texture2D_Release(texture); + switch (desc->ViewDimension) + { + case D3D11_DSV_DIMENSION_TEXTURE1DARRAY: + if (desc->u.Texture1DArray.ArraySize == -1 && desc->u.Texture1DArray.FirstArraySlice < layer_count) + desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.ArraySize; + break; + + case D3D11_DSV_DIMENSION_TEXTURE2DARRAY: + if (desc->u.Texture2DArray.ArraySize == -1 && desc->u.Texture2DArray.FirstArraySlice < layer_count) + desc->u.Texture2DArray.ArraySize = layer_count - desc->u.Texture2DArray.FirstArraySlice; + break; - if (desc->Format == DXGI_FORMAT_UNKNOWN) - desc->Format = texture_desc.Format; + case D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY: + if (desc->u.Texture2DMSArray.ArraySize == -1 && desc->u.Texture2DMSArray.FirstArraySlice < layer_count) + desc->u.Texture2DMSArray.ArraySize = layer_count - desc->u.Texture2DMSArray.FirstArraySlice; break; - } default: break;

1 0

Nikolay Sivov : msscript: Implement GetExtent().
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: 03b06fb76ba4204df5c20fda8955da09e16ec095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b06fb76ba4204df5c20fda8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 8 07:47:27 2016 +0300 msscript: Implement GetExtent(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/Makefile.in | 2 +- dlls/msscript.ocx/msscript.c | 19 +++++++++++++++++-- dlls/msscript.ocx/tests/Makefile.in | 2 +- dlls/msscript.ocx/tests/msscript.c | 34 +++++++++++++++++++++++++++++++++- 4 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/msscript.ocx/Makefile.in b/dlls/msscript.ocx/Makefile.in index bc12e76..7d76896 100644 --- a/dlls/msscript.ocx/Makefile.in +++ b/dlls/msscript.ocx/Makefile.in @@ -1,7 +1,7 @@ MODULE = msscript.ocx RC_SRCS = msscript.rc IDL_SRCS = msscript.idl -IMPORTS = ole32 oleaut32 +IMPORTS = gdi32 user32 ole32 oleaut32 C_SRCS = \ msscript.c diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index d525b57..efa20c0 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -35,6 +35,7 @@ struct ScriptControl { IOleObject IOleObject_iface; LONG ref; IOleClientSite *site; + SIZEL extent; }; static HINSTANCE msscript_instance; @@ -611,9 +612,13 @@ static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD aspect, SIZEL { ScriptControl *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, aspect, size); + TRACE("(%p)->(%d %p)\n", This, aspect, size); - return E_NOTIMPL; + if (aspect != DVASPECT_CONTENT) + return DV_E_DVASPECT; + + *size = This->extent; + return S_OK; } static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *sink, DWORD *connection) @@ -775,7 +780,9 @@ static const IPersistStreamInitVtbl PersistStreamInitVtbl = { static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { ScriptControl *script_control; + DWORD dpi_x, dpi_y; HRESULT hres; + HDC hdc; TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); @@ -789,6 +796,14 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->ref = 1; script_control->site = NULL; + hdc = GetDC(0); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + + script_control->extent.cx = MulDiv(38, 2540, dpi_x); + script_control->extent.cy = MulDiv(38, 2540, dpi_y); + hres = IScriptControl_QueryInterface(&script_control->IScriptControl_iface, riid, ppv); IScriptControl_Release(&script_control->IScriptControl_iface); return hres; diff --git a/dlls/msscript.ocx/tests/Makefile.in b/dlls/msscript.ocx/tests/Makefile.in index 597214a..8d769d3 100644 --- a/dlls/msscript.ocx/tests/Makefile.in +++ b/dlls/msscript.ocx/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = msscript.ocx -IMPORTS = ole32 +IMPORTS = user32 gdi32 ole32 C_SRCS = \ msscript.c diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 7c96f99..6dd7d67 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -96,10 +96,12 @@ static IOleClientSite testclientsite = { &OleClientSiteVtbl }; static void test_oleobject(void) { + DWORD status, dpi_x, dpi_y; IOleClientSite *site; IOleObject *obj; - DWORD status; + SIZEL extent; HRESULT hr; + HDC hdc; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IOleObject, (void**)&obj); @@ -131,6 +133,36 @@ static void test_oleobject(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(site == NULL, "got %p\n", site); + /* extents */ + hdc = GetDC(0); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + + memset(&extent, 0, sizeof(extent)); + hr = IOleObject_GetExtent(obj, DVASPECT_CONTENT, &extent); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(extent.cx == MulDiv(38, 2540, dpi_x), "got %d\n", extent.cx); + ok(extent.cy == MulDiv(38, 2540, dpi_y), "got %d\n", extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hr = IOleObject_GetExtent(obj, DVASPECT_THUMBNAIL, &extent); + ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); + ok(extent.cx == 0xdeadbeef, "got %d\n", extent.cx); + ok(extent.cy == 0xdeadbeef, "got %d\n", extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hr = IOleObject_GetExtent(obj, DVASPECT_ICON, &extent); + ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); + ok(extent.cx == 0xdeadbeef, "got %d\n", extent.cx); + ok(extent.cy == 0xdeadbeef, "got %d\n", extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hr = IOleObject_GetExtent(obj, DVASPECT_DOCPRINT, &extent); + ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); + ok(extent.cx == 0xdeadbeef, "got %d\n", extent.cx); + ok(extent.cy == 0xdeadbeef, "got %d\n", extent.cy); + IOleObject_Release(obj); }

1 0

Nikolay Sivov : msscript: Added IPersistStreamInit stub.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: 859d880b669a103242eeee06d6a3e6e34ccae545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=859d880b669a103242eeee06d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 8 07:47:26 2016 +0300 msscript: Added IPersistStreamInit stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 98 ++++++++++++++++++++++++++++++++++++++ dlls/msscript.ocx/tests/msscript.c | 14 ++++++ 2 files changed, 112 insertions(+) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index a53266c..d525b57 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -21,6 +21,7 @@ #include "windows.h" #include "initguid.h" #include "ole2.h" +#include "olectl.h" #include "rpcproxy.h" #include "msscript.h" @@ -30,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msscript); struct ScriptControl { IScriptControl IScriptControl_iface; + IPersistStreamInit IPersistStreamInit_iface; IOleObject IOleObject_iface; LONG ref; IOleClientSite *site; @@ -126,6 +128,11 @@ static inline ScriptControl *impl_from_IOleObject(IOleObject *iface) return CONTAINING_RECORD(iface, ScriptControl, IOleObject_iface); } +static inline ScriptControl *impl_from_IPersistStreamInit(IPersistStreamInit *iface) +{ + return CONTAINING_RECORD(iface, ScriptControl, IPersistStreamInit_iface); +} + static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID riid, void **ppv) { ScriptControl *This = impl_from_IScriptControl(iface); @@ -142,6 +149,12 @@ static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID }else if(IsEqualGUID(&IID_IOleObject, riid)) { TRACE("(%p)->(IID_IOleObject %p\n", This, ppv); *ppv = &This->IOleObject_iface; + }else if(IsEqualGUID(&IID_IPersistStreamInit, riid)) { + TRACE("(%p)->(IID_IPersistStreamInit %p\n", This, ppv); + *ppv = &This->IPersistStreamInit_iface; + }else if(IsEqualGUID(&IID_IPersist, riid)) { + TRACE("(%p)->(IID_IPersist %p\n", This, ppv); + *ppv = &This->IPersistStreamInit_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -675,6 +688,90 @@ static const IOleObjectVtbl OleObjectVtbl = { OleObject_SetColorScheme }; +static HRESULT WINAPI PersistStreamInit_QueryInterface(IPersistStreamInit *iface, REFIID riid, void **obj) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + return IScriptControl_QueryInterface(&This->IScriptControl_iface, riid, obj); +} + +static ULONG WINAPI PersistStreamInit_AddRef(IPersistStreamInit *iface) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + return IScriptControl_AddRef(&This->IScriptControl_iface); +} + +static ULONG WINAPI PersistStreamInit_Release(IPersistStreamInit *iface) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + return IScriptControl_Release(&This->IScriptControl_iface); +} + +static HRESULT WINAPI PersistStreamInit_GetClassID(IPersistStreamInit *iface, CLSID *clsid) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)->(%p)\n", This, clsid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream *stream) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)->(%p)\n", This, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, IStream *stream, BOOL clear_dirty) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)->(%p %d)\n", This, stream, clear_dirty); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_GetSizeMax(IPersistStreamInit *iface, ULARGE_INTEGER *size) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)->(%p)\n", This, size); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static const IPersistStreamInitVtbl PersistStreamInitVtbl = { + PersistStreamInit_QueryInterface, + PersistStreamInit_AddRef, + PersistStreamInit_Release, + PersistStreamInit_GetClassID, + PersistStreamInit_IsDirty, + PersistStreamInit_Load, + PersistStreamInit_Save, + PersistStreamInit_GetSizeMax, + PersistStreamInit_InitNew +}; + static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { ScriptControl *script_control; @@ -687,6 +784,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow return E_OUTOFMEMORY; script_control->IScriptControl_iface.lpVtbl = &ScriptControlVtbl; + script_control->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; script_control->IOleObject_iface.lpVtbl = &OleObjectVtbl; script_control->ref = 1; script_control->site = NULL; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index ab1c3c1..7c96f99 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -21,6 +21,7 @@ #include <initguid.h> #include <ole2.h> +#include <olectl.h> #include "msscript.h" #include "wine/test.h" @@ -133,6 +134,18 @@ static void test_oleobject(void) IOleObject_Release(obj); } +static void test_persiststreaminit(void) +{ + IPersistStreamInit *init; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IPersistStreamInit, (void**)&init); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IPersistStreamInit_Release(init); +} + START_TEST(msscript) { IUnknown *unk; @@ -149,6 +162,7 @@ START_TEST(msscript) IUnknown_Release(unk); test_oleobject(); + test_persiststreaminit(); CoUninitialize(); }

1 0