December 2017 - Wine-Commits

Matteo Bruni : wined3d: Add texture flag for mipmap generation.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 22eabf1db797178ffb2fe3132a96166bd1eb8a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=22eabf1db797178ffb2fe3132… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 24 23:30:00 2017 +0100 wined3d: Add texture flag for mipmap generation. 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/wined3d/texture.c | 16 +++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ef8545d..7a8e1fb 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -384,6 +384,15 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_GET_DC; if (flags & WINED3D_TEXTURE_CREATE_DISCARD) texture->flags |= WINED3D_TEXTURE_DISCARD; + if (flags & WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS) + { + if (~format->flags[WINED3D_GL_RES_TYPE_TEX_2D] + & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)) + WARN("Format doesn't support mipmaps generation, " + "ignoring WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS flag.\n"); + else + texture->flags |= WINED3D_TEXTURE_GENERATE_MIPMAPS; + } return WINED3D_OK; } @@ -1573,8 +1582,13 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned void CDECL wined3d_texture_generate_mipmaps(struct wined3d_texture *texture) { - /* TODO: Implement filters using GL_SGI_generate_mipmaps. */ FIXME("texture %p stub!\n", texture); + + if (!(texture->flags & WINED3D_TEXTURE_GENERATE_MIPMAPS)) + { + WARN("Texture without the WINED3D_TEXTURE_GENERATE_MIPMAPS flag, ignoring.\n"); + return; + } } static struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(struct wined3d_texture *texture, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bd4a210..0daa861 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3074,6 +3074,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_DC_IN_USE 0x00001000 #define WINED3D_TEXTURE_DISCARD 0x00002000 #define WINED3D_TEXTURE_GET_DC 0x00004000 +#define WINED3D_TEXTURE_GENERATE_MIPMAPS 0x00008000 #define WINED3D_TEXTURE_ASYNC_COLOR_KEY 0x00000001 diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f35d980..a0ac7ba 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1538,6 +1538,7 @@ enum wined3d_shader_byte_code_format #define WINED3D_TEXTURE_CREATE_DISCARD 0x00000002 #define WINED3D_TEXTURE_CREATE_GET_DC_LENIENT 0x00000004 #define WINED3D_TEXTURE_CREATE_GET_DC 0x00000008 +#define WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS 0x00000010 #define WINED3D_APPEND_ALIGNED_ELEMENT 0xffffffff

1 0

Matteo Bruni : d3d11/tests: Add a couple of testcases for UINT format SRVs.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 9f11f4adf1d76f9e819ae4e6888e3dc7735ed84a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f11f4adf1d76f9e819ae4e68… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 24 23:29:59 2017 +0100 d3d11/tests: Add a couple of testcases for UINT format SRVs. 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/d3d11/tests/d3d11.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f636a85..906761d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3274,6 +3274,7 @@ static void test_create_shader_resource_view(void) #define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN #define RGBA8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM +#define RGBA8_UINT DXGI_FORMAT_R8G8B8A8_UINT #define RGBA8_TL DXGI_FORMAT_R8G8B8A8_TYPELESS #define DIM_UNKNOWN D3D11_SRV_DIMENSION_UNKNOWN #define TEX_1D D3D11_SRV_DIMENSION_TEXTURE1D @@ -3344,6 +3345,8 @@ static void test_create_shader_resource_view(void) {{ 1, 13, RGBA8_UNORM}, {0}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, {{ 1, 14, RGBA8_UNORM}, {0}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, {{ 1, 18, RGBA8_UNORM}, {0}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 3}}, + {{ 1, 1, RGBA8_UINT}, {0}, {RGBA8_UINT, TEX_2D, 0, 1, 0, 1}}, + {{ 1, 1, RGBA8_TL}, {RGBA8_UINT, TEX_2D, 0, ~0u}, {RGBA8_UINT, TEX_2D, 0, 1, 0, 1}}, }; static const struct { @@ -3394,6 +3397,8 @@ static void test_create_shader_resource_view(void) {{TEX_2D, 1, 7, RGBA8_UNORM}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 2, ~0u}}, {{TEX_2D, 1, 7, RGBA8_UNORM}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, {{TEX_2D, 1, 9, RGBA8_UNORM}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, + {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_UINT, TEX_2D, 0, 1}}, + {{TEX_2D, 1, 1, RGBA8_UINT}, {RGBA8_UNORM, TEX_2D, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D_ARRAY, 0, 1, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_2D, 0, 1}},

1 0

Józef Kucia : d3d10core/tests: Add test for SM4 discard instruction.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 7afbeb5dddaecdafeecb52fd96ed5acfe08d2029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7afbeb5dddaecdafeecb52fd9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 22 13:11:14 2017 +0100 d3d10core/tests: Add test for SM4 discard 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 | 93 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f947811..4228773 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9715,6 +9715,98 @@ static void test_sm4_continuec_instruction(void) release_test_context(&test_context); } +static void test_sm4_discard_instruction(void) +{ + ID3D10PixelShader *ps_discard_nz, *ps_discard_z; + struct d3d10core_test_context test_context; + ID3D10Device *device; + ID3D10Buffer *cb; + unsigned int i; + HRESULT hr; + + static const DWORD ps_discard_nz_code[] = + { +#if 0 + uint data; + + float4 main() : SV_Target + { + if (data) + discard; + return float4(0.0f, 0.5f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0xfa7e5758, 0xd8716ffc, 0x5ad6a940, 0x2b99bba2, 0x00000001, 0x000000d0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000058, 0x00000040, 0x00000016, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0404000d, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f000000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const DWORD ps_discard_z_code[] = + { +#if 0 + uint data; + + float4 main() : SV_Target + { + if (!data) + discard; + return float4(0.0f, 1.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x5c4dd108, 0x1eb43558, 0x7c02c98c, 0xd81eb34c, 0x00000001, 0x000000d0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000058, 0x00000040, 0x00000016, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0400000d, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct uvec4 values[] = + { + {0x0000000}, + {0x0000001}, + {0x8000000}, + {0xfffffff}, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(*values), NULL); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + + hr = ID3D10Device_CreatePixelShader(device, ps_discard_nz_code, sizeof(ps_discard_nz_code), &ps_discard_nz); + ok(SUCCEEDED(hr), "Failed to create discard_nz pixel shader, hr %#x.\n", hr); + hr = ID3D10Device_CreatePixelShader(device, ps_discard_z_code, sizeof(ps_discard_z_code), &ps_discard_z); + ok(SUCCEEDED(hr), "Failed to create discard_z pixel shader, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(values); ++i) + { + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &values[i], 0, 0); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + ID3D10Device_PSSetShader(device, ps_discard_nz); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, values[i].x ? 0xffffffff : 0xff007f00, 1); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + ID3D10Device_PSSetShader(device, ps_discard_z); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, values[i].x ? 0xff00ff00 : 0xffffffff, 1); + } + + ID3D10Buffer_Release(cb); + ID3D10PixelShader_Release(ps_discard_nz); + ID3D10PixelShader_Release(ps_discard_z); + release_test_context(&test_context); +} + static void test_create_input_layout(void) { D3D10_INPUT_ELEMENT_DESC layout_desc[] = @@ -12979,6 +13071,7 @@ START_TEST(device) test_sm4_if_instruction(); test_sm4_breakc_instruction(); test_sm4_continuec_instruction(); + test_sm4_discard_instruction(); test_create_input_layout(); test_input_assembler(); test_null_sampler();

1 0

Józef Kucia : d3d11/tests: Add test for SM4 discard instruction.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 8fd53fe015f6cf33ca79fe5ac1415d74913154d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd53fe015f6cf33ca79fe5ac… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 22 13:11:13 2017 +0100 d3d11/tests: Add test for SM4 discard 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/d3d11/tests/d3d11.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 59f2e6e..2447cd7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12991,6 +12991,102 @@ static void test_sm4_continuec_instruction(void) release_test_context(&test_context); } +static void test_sm4_discard_instruction(void) +{ + ID3D11PixelShader *ps_discard_nz, *ps_discard_z; + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + ID3D11Device *device; + ID3D11Buffer *cb; + unsigned int i; + HRESULT hr; + + static const DWORD ps_discard_nz_code[] = + { +#if 0 + uint data; + + float4 main() : SV_Target + { + if (data) + discard; + return float4(0.0f, 0.5f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0xfa7e5758, 0xd8716ffc, 0x5ad6a940, 0x2b99bba2, 0x00000001, 0x000000d0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000058, 0x00000040, 0x00000016, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0404000d, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f000000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const DWORD ps_discard_z_code[] = + { +#if 0 + uint data; + + float4 main() : SV_Target + { + if (!data) + discard; + return float4(0.0f, 1.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x5c4dd108, 0x1eb43558, 0x7c02c98c, 0xd81eb34c, 0x00000001, 0x000000d0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000058, 0x00000040, 0x00000016, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0400000d, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct uvec4 values[] = + { + {0x0000000}, + {0x0000001}, + {0x8000000}, + {0xfffffff}, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(*values), NULL); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + + hr = ID3D11Device_CreatePixelShader(device, ps_discard_nz_code, sizeof(ps_discard_nz_code), + NULL, &ps_discard_nz); + ok(SUCCEEDED(hr), "Failed to create discard_nz pixel shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_discard_z_code, sizeof(ps_discard_z_code), + NULL, &ps_discard_z); + ok(SUCCEEDED(hr), "Failed to create discard_z pixel shader, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(values); ++i) + { + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &values[i], 0, 0); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_PSSetShader(context, ps_discard_nz, NULL, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, values[i].x ? 0xffffffff : 0xff007f00, 1); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_PSSetShader(context, ps_discard_z, NULL, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, values[i].x ? 0xff00ff00 : 0xffffffff, 1); + } + + ID3D11Buffer_Release(cb); + ID3D11PixelShader_Release(ps_discard_nz); + ID3D11PixelShader_Release(ps_discard_z); + release_test_context(&test_context); +} + static void test_sm5_swapc_instruction(void) { struct input @@ -22506,6 +22602,7 @@ START_TEST(d3d11) test_sm4_if_instruction(); test_sm4_breakc_instruction(); test_sm4_continuec_instruction(); + test_sm4_discard_instruction(); test_sm5_swapc_instruction(); test_create_input_layout(); test_input_assembler();

1 0

Hans Leidekker : taskschd: Implement IDailyTrigger_get_Enabled.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 3c2d8dc3aef7d0f0a42eff89f82aceb2bf4df41e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c2d8dc3aef7d0f0a42eff89f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 1 12:01:54 2017 +0100 taskschd: Implement IDailyTrigger_get_Enabled. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 11 ++++++++--- dlls/taskschd/tests/scheduler.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index d720d50..a8b819c 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -224,8 +224,13 @@ static HRESULT WINAPI DailyTrigger_put_EndBoundary(IDailyTrigger *iface, BSTR en static HRESULT WINAPI DailyTrigger_get_Enabled(IDailyTrigger *iface, VARIANT_BOOL *enabled) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%p)\n", This, enabled); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, enabled); + + if (!enabled) return E_POINTER; + + *enabled = This->enabled ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI DailyTrigger_put_Enabled(IDailyTrigger *iface, VARIANT_BOOL enabled) @@ -314,7 +319,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) daily_trigger->ref = 1; daily_trigger->interval = 1; daily_trigger->start_boundary = NULL; - daily_trigger->enabled = FALSE; + daily_trigger->enabled = TRUE; *trigger = (ITrigger*)&daily_trigger->IDailyTrigger_iface; return S_OK; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index d0477a8..c60fd1d 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1223,6 +1223,7 @@ static void test_daily_trigger(ITrigger *trigger) }; IDailyTrigger *daily_trigger; BSTR start_boundary; + VARIANT_BOOL enabled; short interval; HRESULT hr; ULONG i; @@ -1281,6 +1282,22 @@ static void test_daily_trigger(ITrigger *trigger) hr = IDailyTrigger_put_StartBoundary(daily_trigger, NULL); ok(hr == S_OK, "put_StartBoundary failed: %08x\n", hr); + hr = IDailyTrigger_get_Enabled(daily_trigger, NULL); + ok(hr == E_POINTER, "get_Enabled failed: %08x\n", hr); + + enabled = VARIANT_FALSE; + hr = IDailyTrigger_get_Enabled(daily_trigger, &enabled); + ok(hr == S_OK, "get_Enabled failed: %08x\n", hr); + ok(enabled == VARIANT_TRUE, "got %d\n", enabled); + + hr = IDailyTrigger_put_Enabled(daily_trigger, VARIANT_FALSE); + ok(hr == S_OK, "put_Enabled failed: %08x\n", hr); + + enabled = VARIANT_TRUE; + hr = IDailyTrigger_get_Enabled(daily_trigger, &enabled); + ok(hr == S_OK, "get_Enabled failed: %08x\n", hr); + ok(enabled == VARIANT_FALSE, "got %d\n", enabled); + IDailyTrigger_Release(daily_trigger); }

1 0

Matteo Bruni : wined3d: Refuse to create texture views changing format from non-typeless.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 21c7b94c810c4722e060a105dbb66958b058f7c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c7b94c810c4722e060a105d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 27 20:17:32 2017 +0100 wined3d: Refuse to create texture views changing format from non-typeless. 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/wined3d/utils.c | 14 ++++++++++++++ dlls/wined3d/view.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 24 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5eda92a..f739685 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3815,6 +3815,20 @@ UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT ali return slice_pitch * depth; } +BOOL wined3d_formats_are_srgb_variants(enum wined3d_format_id format1, enum wined3d_format_id format2) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(format_srgb_info); ++i) + { + if (format1 == format_srgb_info[i].srgb_format_id) + return format2 == format_srgb_info[i].base_format_id; + if (format1 == format_srgb_info[i].base_format_id) + return format2 == format_srgb_info[i].srgb_format_id; + } + return FALSE; +} + /***************************************************************************** * Trace formatting of useful values */ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 62f087b..b35b66b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -128,6 +128,14 @@ static const struct wined3d_format *validate_resource_view(const struct wined3d_ struct wined3d_texture *texture = texture_from_resource(resource); unsigned int depth_or_layer_count; + if (resource->format->id != format->id && !wined3d_format_is_typeless(resource->format) + && !wined3d_formats_are_srgb_variants(resource->format->id, format->id)) + { + WARN("Trying to create incompatible view for non typeless format %s.\n", + debug_d3dformat(format->id)); + return NULL; + } + if (mip_slice && resource->type == WINED3D_RTYPE_TEXTURE_3D) depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3a9ac2e..bd4a210 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4251,6 +4251,8 @@ BOOL wined3d_format_is_depth_view(enum wined3d_format_id resource_format_id, enum wined3d_format_id view_format_id) DECLSPEC_HIDDEN; const struct wined3d_color_key_conversion * wined3d_format_get_color_key_conversion( const struct wined3d_texture *texture, BOOL need_alpha_ck) DECLSPEC_HIDDEN; +BOOL wined3d_formats_are_srgb_variants(enum wined3d_format_id format1, + enum wined3d_format_id format2) DECLSPEC_HIDDEN; BOOL wined3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Introduce helper function to generate conditional instructions.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 577ccfdda991156028496772645ac1f592d03e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=577ccfdda9911560284967726… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 22 13:11:12 2017 +0100 wined3d: Introduce helper function to generate conditional instructions. 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 | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 568514b..98cd321 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5068,13 +5068,20 @@ static void shader_glsl_default(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "default:\n"); } -static void shader_glsl_if(const struct wined3d_shader_instruction *ins) +static void shader_glsl_generate_conditional_op(const struct wined3d_shader_instruction *ins, + const char *op) { - const char *condition = (ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ) ? "bool" : "!bool"; - struct glsl_src_param src0_param; + struct glsl_src_param src_param; + const char *condition; - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); - shader_addline(ins->ctx->buffer, "if (%s(%s)) {\n", condition, src0_param.param_str); + condition = ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ ? "bool" : "!bool"; + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); + shader_addline(ins->ctx->buffer, "if (%s(%s)) %s\n", condition, src_param.param_str, op); +} + +static void shader_glsl_if(const struct wined3d_shader_instruction *ins) +{ + shader_glsl_generate_conditional_op(ins, "{"); } static void shader_glsl_ifc(const struct wined3d_shader_instruction *ins) @@ -5128,22 +5135,19 @@ static void shader_glsl_breakc(const struct wined3d_shader_instruction *ins) static void shader_glsl_conditional_op(const struct wined3d_shader_instruction *ins) { - const char *condition = (ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ) ? "bool" : "!bool"; - struct glsl_src_param src_param; const char *op; switch (ins->handler_idx) { - case WINED3DSIH_BREAKP: op = "break"; break; - case WINED3DSIH_CONTINUEP: op = "continue"; break; - case WINED3DSIH_RETP: op = "return"; break; + case WINED3DSIH_BREAKP: op = "break;"; break; + case WINED3DSIH_CONTINUEP: op = "continue;"; break; + case WINED3DSIH_RETP: op = "return;"; break; default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); return; } - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); - shader_addline(ins->ctx->buffer, "if (%s(%s)) %s;\n", condition, src_param.param_str, op); + shader_glsl_generate_conditional_op(ins, op); } static void shader_glsl_continue(const struct wined3d_shader_instruction *ins) @@ -6604,11 +6608,7 @@ static void shader_glsl_texkill(const struct wined3d_shader_instruction *ins) { if (ins->ctx->reg_maps->shader_version.major >= 4) { - const char *condition = ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ ? "bool" : "!bool"; - struct glsl_src_param src_param; - - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); - shader_addline(ins->ctx->buffer, "if (%s(%s)) discard;\n", condition, src_param.param_str); + shader_glsl_generate_conditional_op(ins, "discard;"); } else {

1 0

Nikolay Sivov : d2d1: Respond to ID2D1Image query.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 4e610f059dc070296bcfc9e71cecde793385a77c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e610f059dc070296bcfc9e71… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 22 17:21:05 2017 +0300 d2d1: Respond to ID2D1Image query. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 1 + dlls/d2d1/tests/d2d1.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 6d9c352..b03482a 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -34,6 +34,7 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_QueryInterface(ID2D1Bitmap *iface, R TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_ID2D1Bitmap) + || IsEqualGUID(iid, &IID_ID2D1Image) || IsEqualGUID(iid, &IID_ID2D1Resource) || IsEqualGUID(iid, &IID_IUnknown)) { diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3a28e38..5116d78 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1476,6 +1476,7 @@ static void test_bitmap_brush(void) IDXGISurface *surface; ID2D1Factory *factory; D2D1_COLOR_F color; + ID2D1Image *image; D2D1_SIZE_U size; unsigned int i; ULONG refcount; @@ -1535,6 +1536,11 @@ static void test_bitmap_brush(void) hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Image, (void **)&image); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Vista */, "Failed to get ID2D1Image, hr %#x.\n", hr); + if (hr == S_OK) + ID2D1Image_Release(image); + /* Creating a brush with a NULL bitmap crashes on Vista, but works fine on * Windows 7+. */ hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &brush);

1 0

Hans Leidekker : taskschd: Implement IDailyTrigger_put_StartBoundary.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: adad0705b0a68f47150527c9d7c3380aea6dbcd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adad0705b0a68f47150527c9d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 1 12:01:51 2017 +0100 taskschd: Implement IDailyTrigger_put_StartBoundary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 15 ++++++++++++++- dlls/taskschd/tests/scheduler.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 9959f04..ee5a7dd 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -39,6 +39,7 @@ typedef struct { IDailyTrigger IDailyTrigger_iface; LONG ref; short interval; + WCHAR *start_boundary; } DailyTrigger; static inline DailyTrigger *impl_from_IDailyTrigger(IDailyTrigger *iface) @@ -88,7 +89,11 @@ static ULONG WINAPI DailyTrigger_Release(IDailyTrigger *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) + { + TRACE("destroying %p\n", iface); + heap_free(This->start_boundary); heap_free(This); + } return ref; } @@ -183,7 +188,14 @@ static HRESULT WINAPI DailyTrigger_get_StartBoundary(IDailyTrigger *iface, BSTR static HRESULT WINAPI DailyTrigger_put_StartBoundary(IDailyTrigger *iface, BSTR start) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(start)); + WCHAR *str = NULL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(start)); + + if (start && !(str = heap_strdupW(start))) return E_OUTOFMEMORY; + heap_free(This->start_boundary); + This->start_boundary = str; + return S_OK; } @@ -290,6 +302,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) daily_trigger->IDailyTrigger_iface.lpVtbl = &DailyTrigger_vtbl; daily_trigger->ref = 1; daily_trigger->interval = 1; + daily_trigger->start_boundary = NULL; *trigger = (ITrigger*)&daily_trigger->IDailyTrigger_iface; return S_OK; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c7de7c7..fb6d626 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1195,9 +1195,37 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) static void test_daily_trigger(ITrigger *trigger) { + static const WCHAR startW[] = + {'2','0','0','4','-','0','1','-','0','1','T','0','0',':','0','0',':','0','0',0}; + static const WCHAR start2W[] = + {'2','0','0','4','-','0','1','-','0','1','T','0','0',':','0','0',':','0','0','Z',0}; + static const WCHAR start3W[] = + {'2','0','0','4','-','0','1','-','0','1','T','0','0',':','0','0',':','0','0','+','0','1',':','0','0',0}; + static const WCHAR start4W[] = + {'2','0','0','4','.','0','1','.','0','1','T','0','0','.','0','0','.','0','0',0}; + static const WCHAR start5W[] = + {'9','9','9','9','-','9','9','-','9','9','T','9','9',':','9','9',':','9','9',0}; + static const WCHAR start6W[] = + {'i','n','v','a','l','i','d',0}; + static const struct + { + const WCHAR *str; + HRESULT hr; + } + start_test[] = + { + {startW, S_OK}, + {start2W, S_OK}, + {start3W, S_OK}, + {start4W, S_OK}, + {start5W, S_OK}, + {start6W, S_OK}, + }; IDailyTrigger *daily_trigger; + BSTR start_boundary; short interval; HRESULT hr; + ULONG i; hr = ITrigger_QueryInterface(trigger, &IID_IDailyTrigger, (void**)&daily_trigger); ok(hr == S_OK, "Could not get IDailyTrigger iface: %08x\n", hr); @@ -1225,6 +1253,17 @@ static void test_daily_trigger(ITrigger *trigger) ok(hr == S_OK, "get_DaysInterval failed: %08x\n", hr); ok(interval == 2, "interval = %d\n", interval); + for (i = 0; i < sizeof(start_test)/sizeof(start_test[0]); i++) + { + start_boundary = SysAllocString(start_test[i].str); + hr = IDailyTrigger_put_StartBoundary(daily_trigger, start_boundary); + ok(hr == start_test[i].hr, "%u: got %08x expected %08x\n", i, hr, start_test[i].hr); + SysFreeString(start_boundary); + } + + hr = IDailyTrigger_put_StartBoundary(daily_trigger, NULL); + ok(hr == S_OK, "put_StartBoundary failed: %08x\n", hr); + IDailyTrigger_Release(daily_trigger); }

1 0

Stefan Dösinger : d3d8/tests: Test mode change messages.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 90c7e55190377f3e2643daae60f6cf6066606a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=90c7e55190377f3e2643daae6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 15 23:21:17 2017 +0100 d3d8/tests: Test mode change messages. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9cebd17..94b3e2e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2435,6 +2435,7 @@ struct message enum message_window window; BOOL check_wparam; WPARAM expect_wparam; + WINDOWPOS *store_wp; }; static const struct message *expect_messages; @@ -2483,6 +2484,9 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM "Got unexpected wparam %lx for message %x, expected %lx.\n", wparam, message, expect_messages->expect_wparam); + if (expect_messages->store_wp) + *expect_messages->store_wp = *(WINDOWPOS *)lparam; + ++expect_messages; } } @@ -2549,8 +2553,9 @@ static void test_wndproc(void) D3DDISPLAYMODE d3ddm; DWORD d3d_width = 0, d3d_height = 0, user32_width = 0, user32_height = 0; DEVMODEW devmode; - LONG change_ret; + LONG change_ret, device_style; BOOL ret; + WINDOWPOS windowpos; static const struct message create_messages[] = { @@ -2649,6 +2654,31 @@ static void test_wndproc(void) {WM_SIZE, FOCUS_WINDOW, TRUE, SIZE_MAXIMIZED}, {0, 0, FALSE, 0}, }; + struct message mode_change_messages[] = + { + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + {WM_SIZE, DEVICE_WINDOW, FALSE, 0}, + /* TODO: WM_DISPLAYCHANGE is sent to the focus window too, but the order is + * differs between Wine and Windows. */ + /* TODO 2: Windows sends a second WM_WINDOWPOSCHANGING(SWP_NOMOVE | SWP_NOSIZE + * | SWP_NOACTIVATE) in this situation, suggesting a difference in their ShowWindow + * implementation. This SetWindowPos call could in theory affect the Z order. Wine's + * ShowWindow does not send such a message because the window is already visible. */ + {0, 0, FALSE, 0}, + }; + struct message mode_change_messages_hidden[] = + { + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + {WM_SIZE, DEVICE_WINDOW, FALSE, 0}, + {WM_SHOWWINDOW, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0, &windowpos}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + /* TODO: WM_DISPLAYCHANGE is sent to the focus window too, but the order is + * differs between Wine and Windows. */ + {0, 0, FALSE, 0}, + }; d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); @@ -3010,13 +3040,63 @@ static void test_wndproc(void) ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + filter_messages = NULL; + + ShowWindow(device_window, SW_RESTORE); + SetForegroundWindow(focus_window); + flush_events(); + filter_messages = focus_window; device_desc.device_window = device_window; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; } + filter_messages = NULL; + flush_events(); + + device_desc.width = user32_width; + device_desc.height = user32_height; + + expect_messages = mode_change_messages; + filter_messages = focus_window; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + filter_messages = NULL; + + flush_events(); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", + expect_messages->message, expect_messages->window, i); + + /* World of Warplanes hides the window by removing WS_VISIBLE and expects Reset() to show it again. */ + device_style = GetWindowLongA(device_window, GWL_STYLE); + SetWindowLongA(device_window, GWL_STYLE, device_style & ~WS_VISIBLE); + + flush_events(); + device_desc.width = d3d_width; + device_desc.height = d3d_height; + memset(&windowpos, 0, sizeof(windowpos)); + + expect_messages = mode_change_messages_hidden; + filter_messages = focus_window; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + filter_messages = NULL; + + flush_events(); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + + ok(windowpos.hwnd == device_window && !windowpos.hwndInsertAfter + && !windowpos.x && !windowpos.y && !windowpos.cx && !windowpos.cy + && windowpos.flags == (SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE), + "Got unexpected WINDOWPOS hwnd=%p, insertAfter=%p, x=%d, y=%d, cx=%d, cy=%d, flags=%x\n", + windowpos.hwnd, windowpos.hwndInsertAfter, windowpos.x, windowpos.y, windowpos.cx, + windowpos.cy, windowpos.flags); + + device_style = GetWindowLongA(device_window, GWL_STYLE); + ok(device_style & WS_VISIBLE, "Expected the device window to be visible.\n"); proc = SetWindowLongPtrA(focus_window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);

1 0