wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Józef Kucia : wined3d: Disable transform feedback when there are no varyings to record.
by Alexandre Julliard 26 Apr '18

26 Apr '18

Module: wine Branch: master Commit: f6160d2ae80d6dd53ce74b53fe006163ee3e720a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6160d2ae80d6dd53ce74b53… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 26 14:53:24 2018 +0200 wined3d: Disable transform feedback when there are no varyings to record. In order to avoid GL errors when glBeginTransformFeedback() is called. This is required only because we do not fully support stream output component ranges. 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 | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e29730c..5d1f118 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -804,11 +804,12 @@ static void append_transform_feedback_skip_components(const char **varyings, } } -static void shader_glsl_generate_transform_feedback_varyings(const struct wined3d_stream_output_desc *so_desc, +static BOOL shader_glsl_generate_transform_feedback_varyings(const struct wined3d_stream_output_desc *so_desc, struct wined3d_string_buffer *buffer, const char **varyings, unsigned int *varying_count, char *strings, unsigned int *strings_length, GLenum buffer_mode) { unsigned int i, buffer_idx, count, length, highest_output_slot, stride; + BOOL have_varyings_to_record = FALSE; count = length = 0; highest_output_slot = 0; @@ -858,6 +859,8 @@ static void shader_glsl_generate_transform_feedback_varyings(const struct wined3 string_buffer_sprintf(buffer, "shader_in_out.reg%u", e->register_idx); append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); } + + have_varyings_to_record = TRUE; } if (buffer_idx < so_desc->buffer_stride_count @@ -882,10 +885,12 @@ static void shader_glsl_generate_transform_feedback_varyings(const struct wined3 *varying_count = count; if (strings_length) *strings_length = length; + + return have_varyings_to_record; } static void shader_glsl_init_transform_feedback(const struct wined3d_context *context, - struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader *shader) + struct shader_glsl_priv *priv, GLuint program_id, struct wined3d_shader *shader) { const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -941,7 +946,12 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context *co buffer = string_buffer_get(&priv->string_buffers); - shader_glsl_generate_transform_feedback_varyings(so_desc, buffer, NULL, &count, NULL, &length, mode); + if (!shader_glsl_generate_transform_feedback_varyings(so_desc, buffer, NULL, &count, NULL, &length, mode)) + { + FIXME("No varyings to record, disabling transform feedback.\n"); + shader->u.gs.so_desc.element_count = 0; + return; + } if (!(varyings = heap_calloc(count, sizeof(*varyings)))) {

1 0

Józef Kucia : dxgi: Remove useless FIXME() messages about adapter type.
by Alexandre Julliard 26 Apr '18

26 Apr '18

Module: wine Branch: master Commit: 0d90a7ba893347b843e596baf751dd541b31186c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d90a7ba893347b843e596ba… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 26 14:53:23 2018 +0200 dxgi: Remove useless FIXME() messages about adapter type. 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/dxgi/device.c | 2 -- dlls/dxgi/utils.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index c266cae..5a810fa 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -422,8 +422,6 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l return E_FAIL; } - FIXME("Ignoring adapter type.\n"); - hr = wined3d_device_create(dxgi_factory->wined3d, dxgi_adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, NULL, 0, 4, wined3d_device_parent, &device->wined3d_device); if (FAILED(hr)) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 74f0ae05..063ec5a 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -645,8 +645,6 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, WINED3DCAPS caps; HRESULT hr; - FIXME("Ignoring adapter type.\n"); - wined3d_mutex_lock(); hr = wined3d_get_device_caps(factory->wined3d, adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, &caps); wined3d_mutex_unlock();

1 0

Józef Kucia : d3d10core/tests: Add test for draws with NULL render target views.
by Alexandre Julliard 26 Apr '18

26 Apr '18

Module: wine Branch: master Commit: 6f541ad7c3e06eb99249fb30cf340d73203d3303 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f541ad7c3e06eb99249fb30… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 26 14:53:22 2018 +0200 d3d10core/tests: Add test for draws with NULL 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 | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index a50e759..a5c048c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -7732,10 +7732,10 @@ static void test_depth_stencil_sampling(void) static void test_multiple_render_targets(void) { + ID3D10RenderTargetView *rtv[4], *tmp_rtv[4]; D3D10_TEXTURE2D_DESC texture_desc; ID3D10InputLayout *input_layout; unsigned int stride, offset, i; - ID3D10RenderTargetView *rtv[4]; ID3D10Texture2D *rt[4]; ID3D10VertexShader *vs; ID3D10PixelShader *ps; @@ -7860,9 +7860,21 @@ static void test_multiple_render_targets(void) for (i = 0; i < ARRAY_SIZE(rtv); ++i) ID3D10Device_ClearRenderTargetView(device, rtv[i], red); - ID3D10Device_Draw(device, 4, 0); + check_texture_color(rt[0], 0xffffffff, 2); + check_texture_color(rt[1], 0x7f7f7f7f, 2); + check_texture_color(rt[2], 0x33333333, 2); + check_texture_color(rt[3], 0xff7f3300, 2); + for (i = 0; i < ARRAY_SIZE(rtv); ++i) + ID3D10Device_ClearRenderTargetView(device, rtv[i], red); + for (i = 0; i < ARRAY_SIZE(tmp_rtv); ++i) + { + memset(tmp_rtv, 0, sizeof(tmp_rtv)); + tmp_rtv[i] = rtv[i]; + ID3D10Device_OMSetRenderTargets(device, 4, tmp_rtv, NULL); + ID3D10Device_Draw(device, 4, 0); + } check_texture_color(rt[0], 0xffffffff, 2); check_texture_color(rt[1], 0x7f7f7f7f, 2); check_texture_color(rt[2], 0x33333333, 2); @@ -7873,9 +7885,10 @@ static void test_multiple_render_targets(void) ID3D10VertexShader_Release(vs); ID3D10InputLayout_Release(input_layout); for (i = 0; i < ARRAY_SIZE(rtv); ++i) + { ID3D10RenderTargetView_Release(rtv[i]); - for (i = 0; i < ARRAY_SIZE(rt); ++i) ID3D10Texture2D_Release(rt[i]); + } refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); }

1 0

Józef Kucia : d3d10core/tests: Introduce helper function to set viewport.
by Alexandre Julliard 26 Apr '18

26 Apr '18

Module: wine Branch: master Commit: e17cf8a99cbbeb2fa2094a3144139edea63175db URL: https://source.winehq.org/git/wine.git/?a=commit;h=e17cf8a99cbbeb2fa2094a31… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 26 14:53:21 2018 +0200 d3d10core/tests: Introduce helper function to set viewport. 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 | 85 ++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 57 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 55b3977..a50e759 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -488,6 +488,21 @@ static void check_dsv_desc_(unsigned int line, const D3D10_DEPTH_STENCIL_VIEW_DE } } +static void set_viewport(ID3D10Device *device, int x, int y, + unsigned int width, unsigned int height, float min_depth, float max_depth) +{ + D3D10_VIEWPORT vp; + + vp.TopLeftX = x; + vp.TopLeftY = y; + vp.Width = width; + vp.Height = height; + vp.MinDepth = min_depth; + vp.MaxDepth = max_depth; + + ID3D10Device_RSSetViewports(device, 1, &vp); +} + #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) @@ -1091,7 +1106,6 @@ static BOOL init_test_context_(unsigned int line, struct d3d10core_test_context const struct swapchain_desc *swapchain_desc) { unsigned int rt_width, rt_height; - D3D10_VIEWPORT vp; HRESULT hr; RECT rect; @@ -1119,13 +1133,7 @@ static BOOL init_test_context_(unsigned int line, struct d3d10core_test_context ID3D10Device_OMSetRenderTargets(context->device, 1, &context->backbuffer_rtv, NULL); - vp.TopLeftX = 0; - vp.TopLeftY = 0; - vp.Width = rt_width; - vp.Height = rt_height; - vp.MinDepth = 0.0f; - vp.MaxDepth = 1.0f; - ID3D10Device_RSSetViewports(context->device, 1, &vp); + set_viewport(context->device, 0, 0, rt_width, rt_height, 0.0f, 1.0f); return TRUE; } @@ -4289,7 +4297,6 @@ static void test_occlusion_query(void) unsigned int data_size, i; ID3D10Texture2D *texture; ID3D10Device *device; - D3D10_VIEWPORT vp; union { UINT64 uint; @@ -4380,13 +4387,7 @@ static void test_occlusion_query(void) ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); - vp.TopLeftX = 0; - vp.TopLeftY = 0; - vp.Width = texture_desc.Width; - vp.Height = texture_desc.Height; - vp.MinDepth = 0.0f; - vp.MaxDepth = 1.0f; - ID3D10Device_RSSetViewports(device, 1, &vp); + set_viewport(device, 0, 0, texture_desc.Width, texture_desc.Height, 0.0f, 1.0f); ID3D10Asynchronous_Begin(query); for (i = 0; i < 100; i++) @@ -5554,7 +5555,6 @@ static void test_blend(void) ID3D10VertexShader *vs; ID3D10PixelShader *ps; ID3D10Device *device; - D3D10_VIEWPORT vp; ID3D10Buffer *vb; DWORD color; HRESULT hr; @@ -5718,13 +5718,7 @@ static void test_blend(void) ID3D10Device_OMSetRenderTargets(device, 1, &offscreen_rtv, NULL); - vp.TopLeftX = 0; - vp.TopLeftY = 0; - vp.Width = 128; - vp.Height = 128; - vp.MinDepth = 0.0f; - vp.MaxDepth = 1.0f; - ID3D10Device_RSSetViewports(device, 1, &vp); + set_viewport(device, 0, 0, 128, 128, 0.0f, 1.0f); ID3D10Device_ClearRenderTargetView(device, offscreen_rtv, red); @@ -7746,7 +7740,6 @@ static void test_multiple_render_targets(void) ID3D10VertexShader *vs; ID3D10PixelShader *ps; ID3D10Device *device; - D3D10_VIEWPORT vp; ID3D10Buffer *vb; ULONG refcount; HRESULT hr; @@ -7863,13 +7856,7 @@ static void test_multiple_render_targets(void) ID3D10Device_VSSetShader(device, vs); ID3D10Device_PSSetShader(device, ps); - vp.TopLeftX = 0; - vp.TopLeftY = 0; - vp.Width = 640; - vp.Height = 480; - vp.MinDepth = 0.0f; - vp.MaxDepth = 1.0f; - ID3D10Device_RSSetViewports(device, 1, &vp); + set_viewport(device, 0, 0, 640, 480, 0.0f, 1.0f); for (i = 0; i < ARRAY_SIZE(rtv); ++i) ID3D10Device_ClearRenderTargetView(device, rtv[i], red); @@ -9954,18 +9941,17 @@ static void test_swapchain_views(void) static void test_swapchain_flip(void) { - IDXGISwapChain *swapchain; ID3D10Texture2D *backbuffer_0, *backbuffer_1, *backbuffer_2, *offscreen; - ID3D10RenderTargetView *backbuffer_0_rtv, *offscreen_rtv; ID3D10ShaderResourceView *backbuffer_0_srv, *backbuffer_1_srv; + ID3D10RenderTargetView *backbuffer_0_rtv, *offscreen_rtv; D3D10_TEXTURE2D_DESC texture_desc; - ID3D10VertexShader *vs; - ID3D10PixelShader *ps; ID3D10InputLayout *input_layout; - ID3D10Buffer *vb; unsigned int stride, offset; + IDXGISwapChain *swapchain; + ID3D10VertexShader *vs; + ID3D10PixelShader *ps; ID3D10Device *device; - D3D10_VIEWPORT vp; + ID3D10Buffer *vb; ULONG refcount; DWORD color; HWND window; @@ -10102,13 +10088,7 @@ static void test_swapchain_flip(void) hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)offscreen, NULL, &offscreen_rtv); ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); ID3D10Device_OMSetRenderTargets(device, 1, &offscreen_rtv, NULL); - vp.TopLeftX = 0; - vp.TopLeftY = 0; - vp.Width = 640; - vp.Height = 480; - vp.MinDepth = 0.0f; - vp.MaxDepth = 1.0f; - ID3D10Device_RSSetViewports(device, 1, &vp); + set_viewport(device, 0, 0, 640, 480, 0.0f, 1.0f); vb = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, sizeof(quad), quad); @@ -10418,12 +10398,10 @@ static void test_initial_depth_stencil_state(void) /* check if depth function is D3D10_COMPARISON_LESS */ ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 0.5f, 0); - vp.MinDepth = vp.MaxDepth = 0.4f; - ID3D10Device_RSSetViewports(device, 1, &vp); + set_viewport(device, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.4f); draw_color_quad(&test_context, &green); draw_color_quad(&test_context, &red); - vp.MinDepth = vp.MaxDepth = 0.6f; - ID3D10Device_RSSetViewports(device, 1, &vp); + set_viewport(device, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.6f, 0.6f); draw_color_quad(&test_context, &red); check_texture_color(test_context.backbuffer, 0xff00ff00, 1); check_texture_float(texture, 0.4f, 1); @@ -10443,7 +10421,6 @@ static void test_draw_depth_only(void) ID3D10Texture2D *texture; ID3D10Device *device; unsigned int i, j; - D3D10_VIEWPORT vp; struct vec4 depth; ID3D10Buffer *cb; HRESULT hr; @@ -10539,13 +10516,7 @@ static void test_draw_depth_only(void) depth.x = 1.0f / 16.0f * (j + 4 * i); ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &depth, 0, 0); - vp.TopLeftX = 160 * j; - vp.TopLeftY = 120 * i; - vp.Width = 160; - vp.Height = 120; - vp.MinDepth = 0.0f; - vp.MaxDepth = 1.0f; - ID3D10Device_RSSetViewports(device, 1, &vp); + set_viewport(device, 160 * j, 120 * i, 160, 120, 0.0f, 1.0f); draw_quad(&test_context); }

1 0

Józef Kucia : wined3d: Parse SM5 precise instruction modifier.
by Alexandre Julliard 26 Apr '18

26 Apr '18

Module: wine Branch: master Commit: 0322fb69a12c1d9c30d16c12a6d019031b91e8de URL: https://source.winehq.org/git/wine.git/?a=commit;h=0322fb69a12c1d9c30d16c12… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 26 14:53:20 2018 +0200 wined3d: Parse SM5 precise instruction modifier. 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/shader.c | 21 +++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 8 ++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c893945..4986f3c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1917,6 +1917,23 @@ static void shader_dump_sync_flags(struct wined3d_string_buffer *buffer, DWORD s shader_addline(buffer, "_unknown_flags(%#x)", sync_flags); } +static void shader_dump_precise_flags(struct wined3d_string_buffer *buffer, DWORD precise_flags) +{ + if (!precise_flags) + return; + + shader_addline(buffer, " [precise"); + if (precise_flags != WINED3DSI_PRECISE_XYZW) + { + shader_addline(buffer, "(%s%s%s%s)", + precise_flags & WINED3DSI_PRECISE_X ? "x" : "", + precise_flags & WINED3DSI_PRECISE_Y ? "y" : "", + precise_flags & WINED3DSI_PRECISE_Z ? "z" : "", + precise_flags & WINED3DSI_PRECISE_W ? "w" : ""); + } + shader_addline(buffer, "]"); +} + static void shader_dump_uav_flags(struct wined3d_string_buffer *buffer, DWORD uav_flags) { if (uav_flags & WINED3DSUF_GLOBALLY_COHERENT) @@ -3080,6 +3097,10 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe { shader_dump_sync_flags(&buffer, ins.flags); } + else + { + shader_dump_precise_flags(&buffer, ins.flags); + } if (wined3d_shader_instruction_has_texel_offset(&ins)) shader_addline(&buffer, "(%d,%d,%d)", ins.texel_offset.u, ins.texel_offset.v, ins.texel_offset.w); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f11af76..b56f16a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -61,6 +61,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_GLOBAL_FLAGS_SHIFT 11 #define WINED3D_SM4_GLOBAL_FLAGS_MASK (0xffu << WINED3D_SM4_GLOBAL_FLAGS_SHIFT) +#define WINED3D_SM5_PRECISE_SHIFT 19 +#define WINED3D_SM5_PRECISE_MASK (0xfu << WINED3D_SM5_PRECISE_SHIFT) + #define WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT 11 #define WINED3D_SM5_CONTROL_POINT_COUNT_MASK (0xffu << WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT) @@ -1643,6 +1646,7 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi unsigned int i, len; SIZE_T remaining; const DWORD *p; + DWORD precise; list_move_head(&priv->src_free, &priv->src); @@ -1717,12 +1721,13 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi shader_sm4_read_instruction_modifier(previous_token = *p++, ins); ins->flags = (opcode_token & WINED3D_SM4_INSTRUCTION_FLAGS_MASK) >> WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT; - if (ins->flags & WINED3D_SM4_INSTRUCTION_FLAG_SATURATE) { ins->flags &= ~WINED3D_SM4_INSTRUCTION_FLAG_SATURATE; instruction_dst_modifier = WINED3DSPDM_SATURATE; } + precise = (opcode_token & WINED3D_SM5_PRECISE_MASK) >> WINED3D_SM5_PRECISE_SHIFT; + ins->flags |= precise << WINED3DSI_PRECISE_SHIFT; for (i = 0; i < ins->dst_count; ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 10bb607..ab13a29 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -618,6 +618,14 @@ enum wined3d_tessellator_partitioning #define WINED3DSI_SAMPLE_INFO_UINT 0x1 #define WINED3DSI_SAMPLER_COMPARISON_MODE 0x1 +#define WINED3DSI_PRECISE_X 0x100 +#define WINED3DSI_PRECISE_Y 0x200 +#define WINED3DSI_PRECISE_Z 0x400 +#define WINED3DSI_PRECISE_W 0x800 +#define WINED3DSI_PRECISE_XYZW (WINED3DSI_PRECISE_X | WINED3DSI_PRECISE_Y \ + | WINED3DSI_PRECISE_Z | WINED3DSI_PRECISE_W) +#define WINED3DSI_PRECISE_SHIFT 8 + enum wined3d_shader_rel_op { WINED3D_SHADER_REL_OP_GT = 1,

1 0

Nikolay Sivov : d3d11: Add support for returning multiple scissor rectangles.
by Alexandre Julliard 26 Apr '18

26 Apr '18

Module: wine Branch: master Commit: a1c2cd0154a4a9ca72887102bc3d79acd192cfe4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1c2cd0154a4a9ca72887102… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 26 10:58:40 2018 +0300 d3d11: Add support for returning multiple scissor rectangles. 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/d3d10core/tests/device.c | 13 ++++++------- dlls/d3d11/device.c | 40 ++++++++++++++++++++++------------------ dlls/d3d11/tests/d3d11.c | 6 +++--- dlls/d3dx10_43/tests/d3dx10.c | 15 +++++++-------- 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 3fdac8c..55b3977 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -4924,7 +4924,7 @@ float4 main(float4 color : COLOR) : SV_TARGET ok(!tmp_dsv, "Got unexpected depth stencil view %p.\n", tmp_dsv); ID3D10Device_RSGetScissorRects(device, &count, NULL); - todo_wine ok(!count, "Got unexpected scissor rect count %u.\n", count); + ok(!count, "Got unexpected scissor rect count %u.\n", count); memset(tmp_rect, 0x55, sizeof(tmp_rect)); count = D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ID3D10Device_RSGetScissorRects(device, &count, tmp_rect); @@ -5316,7 +5316,7 @@ float4 main(float4 color : COLOR) : SV_TARGET ID3D10DepthStencilView_Release(tmp_dsv); ID3D10Device_RSGetScissorRects(device, &count, NULL); - todo_wine ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, + ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, "Got unexpected scissor rect count %u.\n", count); memset(tmp_rect, 0x55, sizeof(tmp_rect)); ID3D10Device_RSGetScissorRects(device, &count, tmp_rect); @@ -5455,16 +5455,15 @@ float4 main(float4 color : COLOR) : SV_TARGET ok(!tmp_dsv, "Got unexpected depth stencil view %p.\n", tmp_dsv); ID3D10Device_RSGetScissorRects(device, &count, NULL); - todo_wine ok(!count, "Got unexpected scissor rect count %u.\n", count); + ok(!count, "Got unexpected scissor rect count %u.\n", count); memset(tmp_rect, 0x55, sizeof(tmp_rect)); count = D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ID3D10Device_RSGetScissorRects(device, &count, tmp_rect); for (i = 0; i < D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i) { - todo_wine_if(!i) - ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom, - "Got unexpected scissor rect %s in slot %u.\n", - wine_dbgstr_rect(&tmp_rect[i]), i); + ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom, + "Got unexpected scissor rect %s in slot %u.\n", + wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D10Device_RSGetViewports(device, &count, NULL); ok(!count, "Got unexpected viewport count %u.\n", count); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d49f08b..538f4af 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2127,23 +2127,25 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11De UINT *rect_count, D3D11_RECT *rects) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int actual_count; TRACE("iface %p, rect_count %p, rects %p.\n", iface, rect_count, rects); + if (!rect_count) + return; + + wined3d_mutex_lock(); + wined3d_device_get_scissor_rects(device->wined3d_device, &actual_count, rects); + wined3d_mutex_unlock(); + if (!rects) { - *rect_count = 1; + *rect_count = actual_count; return; } - if (!*rect_count) - return; - - wined3d_mutex_lock(); - wined3d_device_get_scissor_rects(device->wined3d_device, NULL, rects); - wined3d_mutex_unlock(); - if (*rect_count > 1) - memset(&rects[1], 0, (*rect_count - 1) * sizeof(*rects)); + if (*rect_count > actual_count) + memset(&rects[actual_count], 0, (*rect_count - actual_count) * sizeof(*rects)); } static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShaderResources(ID3D11DeviceContext *iface, @@ -4930,23 +4932,25 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetViewports(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_RSGetScissorRects(ID3D10Device1 *iface, UINT *rect_count, D3D10_RECT *rects) { struct d3d_device *device = impl_from_ID3D10Device(iface); + unsigned int actual_count; TRACE("iface %p, rect_count %p, rects %p.\n", iface, rect_count, rects); + if (!rect_count) + return; + + wined3d_mutex_lock(); + wined3d_device_get_scissor_rects(device->wined3d_device, &actual_count, rects); + wined3d_mutex_unlock(); + if (!rects) { - *rect_count = 1; + *rect_count = actual_count; return; } - if (!*rect_count) - return; - - wined3d_mutex_lock(); - wined3d_device_get_scissor_rects(device->wined3d_device, NULL, rects); - wined3d_mutex_unlock(); - if (*rect_count > 1) - memset(&rects[1], 0, (*rect_count - 1) * sizeof(*rects)); + if (*rect_count > actual_count) + memset(&rects[actual_count], 0, (*rect_count - actual_count) * sizeof(*rects)); } static HRESULT STDMETHODCALLTYPE d3d10_device_GetDeviceRemovedReason(ID3D10Device1 *iface) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1a0634f..465e2d5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9808,7 +9808,7 @@ static void test_clear_state(void) } ID3D11DeviceContext_RSGetScissorRects(context, &count, NULL); - todo_wine ok(!count, "Got unexpected scissor rect count %u.\n", count); + ok(!count, "Got unexpected scissor rect count %u.\n", count); memset(tmp_rect, 0x55, sizeof(tmp_rect)); count = D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ID3D11DeviceContext_RSGetScissorRects(context, &count, tmp_rect); @@ -10337,7 +10337,7 @@ static void test_clear_state(void) ID3D11UnorderedAccessView_Release(tmp_uav[i]); ID3D11DeviceContext_RSGetScissorRects(context, &count, NULL); - todo_wine ok(count == D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, + ok(count == D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, "Got unexpected scissor rect count %u.\n", count); memset(tmp_rect, 0x55, sizeof(tmp_rect)); ID3D11DeviceContext_RSGetScissorRects(context, &count, tmp_rect); @@ -10557,7 +10557,7 @@ static void test_clear_state(void) } ID3D11DeviceContext_RSGetScissorRects(context, &count, NULL); - todo_wine ok(!count, "Got unexpected scissor rect count %u.\n", count); + ok(!count, "Got unexpected scissor rect count %u.\n", count); memset(tmp_rect, 0x55, sizeof(tmp_rect)); count = D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ID3D11DeviceContext_RSGetScissorRects(context, &count, tmp_rect); diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 0baba65..9c84a76 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -510,20 +510,19 @@ float4 main(float4 color : COLOR) : SV_TARGET ok(!tmp_dsv, "Got unexpected depth stencil view %p.\n", tmp_dsv); ID3D10Device_RSGetScissorRects(device, &count, NULL); - todo_wine ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, + ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, "Got unexpected scissor rect count %u.\n", count); memset(tmp_rect, 0x55, sizeof(tmp_rect)); count = D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ID3D10Device_RSGetScissorRects(device, &count, tmp_rect); for (i = 0; i < D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i) { - todo_wine_if(i) - ok(tmp_rect[i].left == i - && tmp_rect[i].top == i * 2 - && tmp_rect[i].right == i + 1 - && tmp_rect[i].bottom == (i + 1) * 2, - "Got unexpected scissor rect %s in slot %u.\n", - wine_dbgstr_rect(&tmp_rect[i]), i); + ok(tmp_rect[i].left == i + && tmp_rect[i].top == i * 2 + && tmp_rect[i].right == i + 1 + && tmp_rect[i].bottom == (i + 1) * 2, + "Got unexpected scissor rect %s in slot %u.\n", + wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D10Device_RSGetViewports(device, &count, NULL); ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE,

1 0

Nikolay Sivov : wined3d: Add support for returning multiple scissor rectangles.
by Alexandre Julliard 26 Apr '18

26 Apr '18

Module: wine Branch: master Commit: 3ee3324c2f019efe014d70da36c6747766b6c2af URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ee3324c2f019efe014d70da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 26 10:58:39 2018 +0300 wined3d: Add support for returning multiple scissor rectangles. 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/d3d11/device.c | 4 ++-- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 13 +++++++++---- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c6a7218..d49f08b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2140,7 +2140,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11De return; wined3d_mutex_lock(); - wined3d_device_get_scissor_rect(device->wined3d_device, rects); + wined3d_device_get_scissor_rects(device->wined3d_device, NULL, rects); wined3d_mutex_unlock(); if (*rect_count > 1) memset(&rects[1], 0, (*rect_count - 1) * sizeof(*rects)); @@ -4943,7 +4943,7 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetScissorRects(ID3D10Device1 *ifac return; wined3d_mutex_lock(); - wined3d_device_get_scissor_rect(device->wined3d_device, rects); + wined3d_device_get_scissor_rects(device->wined3d_device, NULL, rects); wined3d_mutex_unlock(); if (*rect_count > 1) memset(&rects[1], 0, (*rect_count - 1) * sizeof(*rects)); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b73d974..2134257 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2577,7 +2577,7 @@ static HRESULT WINAPI d3d9_device_GetScissorRect(IDirect3DDevice9Ex *iface, RECT TRACE("iface %p, rect %p.\n", iface, rect); wined3d_mutex_lock(); - wined3d_device_get_scissor_rect(device->wined3d_device, rect); + wined3d_device_get_scissor_rects(device->wined3d_device, NULL, rect); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f412cbe..c04bd82 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2157,12 +2157,17 @@ void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsig wined3d_cs_emit_set_scissor_rects(device->cs, rect_count, rects); } -void CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect) +void CDECL wined3d_device_get_scissor_rects(const struct wined3d_device *device, unsigned int *rect_count, RECT *rects) { - TRACE("device %p, rect %p.\n", device, rect); + unsigned int count; + + TRACE("device %p, rect_count %p, rects %p.\n", device, rect_count, rects); - *rect = device->state.scissor_rects[0]; - TRACE("Returning rect %s.\n", wine_dbgstr_rect(rect)); + count = rect_count ? min(*rect_count, device->state.scissor_rect_count) : 1; + if (count && rects) + memcpy(rects, device->state.scissor_rects, count * sizeof(*rects)); + if (rect_count) + *rect_count = device->state.scissor_rect_count; } void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 21b2414..357b76e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -101,7 +101,7 @@ @ cdecl wined3d_device_get_render_state(ptr long) @ cdecl wined3d_device_get_rendertarget_view(ptr long) @ cdecl wined3d_device_get_sampler_state(ptr long long) -@ cdecl wined3d_device_get_scissor_rect(ptr ptr) +@ cdecl wined3d_device_get_scissor_rects(ptr ptr ptr) @ cdecl wined3d_device_get_software_vertex_processing(ptr) @ cdecl wined3d_device_get_stream_output(ptr long ptr) @ cdecl wined3d_device_get_stream_source(ptr long ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6223706..13e83da 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2304,7 +2304,8 @@ struct wined3d_rendertarget_view * __cdecl wined3d_device_get_rendertarget_view( unsigned int view_idx); DWORD __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state); -void __cdecl wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect); +void __cdecl wined3d_device_get_scissor_rects(const struct wined3d_device *device, unsigned int *rect_count, + RECT *rect); BOOL __cdecl wined3d_device_get_software_vertex_processing(const struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_stream_output(struct wined3d_device *device, UINT idx, UINT *offset);

1 0

Nikolay Sivov : d3d11: Add support for setting multiple scissor rectangles.
by Alexandre Julliard 26 Apr '18

26 Apr '18

Module: wine Branch: master Commit: 857756fc688e9478952a2f68b7be6eb34c272bad URL: https://source.winehq.org/git/wine.git/?a=commit;h=857756fc688e9478952a2f68… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 26 10:58:38 2018 +0300 d3d11: Add support for setting multiple scissor rectangles. 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/d3d11/device.c | 14 +++-------- dlls/d3d11/tests/d3d11.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index a8251aa..c6a7218 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -991,14 +991,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11De TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects); - if (rect_count > 1) - FIXME("Multiple scissor rects not implemented.\n"); - - if (!rect_count) + if (rect_count > WINED3D_MAX_VIEWPORTS) return; wined3d_mutex_lock(); - wined3d_device_set_scissor_rects(device->wined3d_device, 1, rects); + wined3d_device_set_scissor_rects(device->wined3d_device, rect_count, rects); wined3d_mutex_unlock(); } @@ -4185,14 +4182,11 @@ static void STDMETHODCALLTYPE d3d10_device_RSSetScissorRects(ID3D10Device1 *ifac TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects); - if (rect_count > 1) - FIXME("Multiple scissor rects not implemented.\n"); - - if (!rect_count) + if (rect_count > WINED3D_MAX_VIEWPORTS) return; wined3d_mutex_lock(); - wined3d_device_set_scissor_rects(device->wined3d_device, 1, rects); + wined3d_device_set_scissor_rects(device->wined3d_device, rect_count, rects); wined3d_mutex_unlock(); } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8279e7b..1a0634f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10563,7 +10563,6 @@ static void test_clear_state(void) ID3D11DeviceContext_RSGetScissorRects(context, &count, tmp_rect); for (i = 0; i < D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i) { - todo_wine_if(!i) ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom, "Got unexpected scissor rect %s in slot %u.\n", wine_dbgstr_rect(&tmp_rect[i]), i); @@ -26130,10 +26129,14 @@ static void test_multiple_viewports(void) }; static const struct vec4 expected_values[] = { - {0.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 2.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, + {0.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 2.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, {0.0f, 4.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, + {0.0f, 5.0f}, {0.5f, 0.5f}, {1.0f, 5.0f}, {0.5f, 0.5f}, }; static const float clear_color[] = {0.5f, 0.5f, 0.0f, 0.0f}; + ID3D11RasterizerState *rasterizer_state; + D3D11_RASTERIZER_DESC rasterizer_desc; unsigned int count, i; + D3D11_RECT rects[2]; RECT rect; int width; @@ -26222,6 +26225,63 @@ static void test_multiple_viewports(void) draw_quad(&test_context); check_texture_sub_resource_vec4(texture, 0, NULL, &expected_values[4], 1); + /* Two viewports, only first scissor rectangle set. */ + memset(&rasterizer_desc, 0, sizeof(rasterizer_desc)); + rasterizer_desc.FillMode = D3D11_FILL_SOLID; + rasterizer_desc.CullMode = D3D11_CULL_BACK; + rasterizer_desc.DepthClipEnable = TRUE; + rasterizer_desc.ScissorEnable = TRUE; + hr = ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rasterizer_state); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D11DeviceContext_RSSetState(context, rasterizer_state); + ID3D11RasterizerState_Release(rasterizer_state); + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, clear_color); + ID3D11DeviceContext_RSSetViewports(context, 2, vp); + + rects[0].left = 0; + rects[0].top = 0; + rects[0].right = width; + rects[0].bottom = texture_desc.Height / 2; + memset(&rects[1], 0, sizeof(*rects)); + ID3D11DeviceContext_RSSetScissorRects(context, 1, rects); + constant.draw_id = 4; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + + SetRect(&rect, 0, 0, width - 1, texture_desc.Height / 2 - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[5], 1); + SetRect(&rect, 0, texture_desc.Height / 2, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[6], 1); + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[7], 1); + + /* Set both rectangles. */ + rects[0].left = 0; + rects[0].top = 0; + rects[0].right = width; + rects[0].bottom = texture_desc.Height / 2; + rects[1].left = width; + rects[1].top = 0; + rects[1].right = width * 2; + rects[1].bottom = texture_desc.Height / 2; + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, clear_color); + ID3D11DeviceContext_RSSetScissorRects(context, 2, rects); + constant.draw_id = 5; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + + SetRect(&rect, 0, 0, width - 1, texture_desc.Height / 2 - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[8], 1); + SetRect(&rect, 0, texture_desc.Height / 2, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[9], 1); + + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height / 2 - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[10], 1); + SetRect(&rect, width, texture_desc.Height / 2, 2 * width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[11], 1); + /* Viewport count exceeding maximum value. */ ID3D11DeviceContext_RSSetViewports(context, 1, vp);

1 0

Zebediah Figura : msi: Execute custom actions in a separate process.
by Alexandre Julliard 26 Apr '18

26 Apr '18

Module: wine Branch: master Commit: 85d1fb62b321e890004bc8d0ded7a0183216c42d URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d1fb62b321e890004bc8d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 25 20:54:40 2018 -0500 msi: Execute custom actions in a separate process. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/Makefile.in | 4 +- dlls/msi/custom.c | 97 +++++++++++++++++++++++++++++++++------------- dlls/msi/database.c | 8 ++-- dlls/msi/handle.c | 2 +- dlls/msi/msi.spec | 2 + dlls/msi/msiquery.c | 10 ++--- dlls/msi/package.c | 42 ++++++++++---------- dlls/msi/tests/custom.c | 2 +- dlls/msi/winemsi.idl | 5 ++- programs/msiexec/msiexec.c | 9 +++-- 10 files changed, 116 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85d1fb62b321e890004b…

1 0

Zebediah Figura : msi: Make remote_GetActionInfo() RPC-compatible.
by Alexandre Julliard 26 Apr '18

26 Apr '18

Module: wine Branch: master Commit: 2635333922f13c0312b3cdae08f7cf870e10f49a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2635333922f13c0312b3cdae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 25 20:54:39 2018 -0500 msi: Make remote_GetActionInfo() RPC-compatible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 74 +++++++++++++++++++--------------------------------- dlls/msi/winemsi.idl | 4 +-- 2 files changed, 29 insertions(+), 49 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 83b1687..f9976a0 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -24,6 +24,7 @@ #define COBJMACROS #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -467,37 +468,21 @@ static msi_custom_action_info *find_action_by_guid( const GUID *guid ) return info; } -static void handle_msi_break( LPCWSTR target ) +static void handle_msi_break(LPCSTR target) { - LPWSTR msg; - WCHAR val[MAX_PATH]; + char format[] = "To debug your custom action, attach your debugger to " + "process %i (0x%X) and press OK"; + char val[MAX_PATH]; + char msg[100]; - static const WCHAR MsiBreak[] = { 'M','s','i','B','r','e','a','k',0 }; - static const WCHAR WindowsInstaller[] = { - 'W','i','n','d','o','w','s',' ','I','n','s','t','a','l','l','e','r',0 - }; - - static const WCHAR format[] = { - 'T','o',' ','d','e','b','u','g',' ','y','o','u','r',' ', - 'c','u','s','t','o','m',' ','a','c','t','i','o','n',',',' ', - 'a','t','t','a','c','h',' ','y','o','u','r',' ','d','e','b','u','g','g','e','r',' ', - 't','o',' ','p','r','o','c','e','s','s',' ','%','i',' ','(','0','x','%','X',')',' ', - 'a','n','d',' ','p','r','e','s','s',' ','O','K',0 - }; - - if( !GetEnvironmentVariableW( MsiBreak, val, MAX_PATH )) + if (!GetEnvironmentVariableA("MsiBreak", val, MAX_PATH)) return; - if( strcmpiW( val, target )) + if (strcasecmp(val, target)) return; - msg = msi_alloc( (lstrlenW(format) + 10) * sizeof(WCHAR) ); - if (!msg) - return; - - wsprintfW( msg, format, GetCurrentProcessId(), GetCurrentProcessId()); - MessageBoxW( NULL, msg, WindowsInstaller, MB_OK); - msi_free(msg); + sprintf(msg, format, GetCurrentProcessId(), GetCurrentProcessId()); + MessageBoxA(NULL, msg, "Windows Installer", MB_OK); DebugBreak(); } @@ -530,14 +515,14 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) MSIHANDLE remote_package = 0; MSIHANDLE hPackage; HANDLE hModule; + LPWSTR dll; LPSTR proc; - UINT r = ERROR_FUNCTION_FAILED; - BSTR dll = NULL, function = NULL; INT type; + UINT r; TRACE("%s\n", debugstr_guid( guid )); - r = remote_GetActionInfo( guid, &type, &dll, &function, &remote_package ); + r = remote_GetActionInfo(guid, &type, &dll, &proc, &remote_package); if (r != ERROR_SUCCESS) return r; @@ -548,16 +533,14 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) return ERROR_SUCCESS; } - proc = strdupWtoA( function ); fn = (MsiCustomActionEntryPoint) GetProcAddress( hModule, proc ); - msi_free( proc ); if (fn) { hPackage = alloc_msi_remote_handle( remote_package ); if (hPackage) { - TRACE("calling %s\n", debugstr_w( function ) ); - handle_msi_break( function ); + TRACE("calling %s\n", debugstr_a(proc)); + handle_msi_break(proc); __TRY { @@ -566,7 +549,7 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) __EXCEPT_PAGE_FAULT { ERR("Custom action (%s:%s) caused a page fault: %08x\n", - debugstr_w(dll), debugstr_w(function), GetExceptionCode()); + debugstr_w(dll), debugstr_a(proc), GetExceptionCode()); r = ERROR_SUCCESS; } __ENDTRY; @@ -577,13 +560,13 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) ERR("failed to create handle for %x\n", remote_package ); } else - ERR("GetProcAddress(%s) failed\n", debugstr_w( function ) ); + ERR("GetProcAddress(%s) failed\n", debugstr_a(proc)); FreeLibrary(hModule); MsiCloseHandle(hPackage); - SysFreeString( dll ); - SysFreeString( function ); + midl_user_free(dll); + midl_user_free(proc); return r; } @@ -1360,22 +1343,19 @@ void ACTION_FinishCustomActions(const MSIPACKAGE* package) LeaveCriticalSection( &msi_custom_action_cs ); } -HRESULT __cdecl remote_GetActionInfo( const GUID *custom_action_guid, - INT *type, BSTR *dll, BSTR *func, MSIHANDLE *remote_package ) +UINT __cdecl remote_GetActionInfo(const GUID *guid, int *type, LPWSTR *dll, LPSTR *func, MSIHANDLE *hinst) { msi_custom_action_info *info; - MSIHANDLE handle; - info = find_action_by_guid( custom_action_guid ); + info = find_action_by_guid(guid); if (!info) - return E_FAIL; + return ERROR_INVALID_DATA; *type = info->type; - handle = alloc_msihandle( &info->package->hdr ); - *dll = SysAllocString( info->source ); - *func = SysAllocString( info->target ); + *hinst = alloc_msihandle(&info->package->hdr); + *dll = strdupW(info->source); + *func = strdupWtoA(info->target); - release_custom_action_data( info ); - *remote_package = handle; - return S_OK; + release_custom_action_data(info); + return ERROR_SUCCESS; } diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 3884500..8af1759 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -94,7 +94,7 @@ interface IWineMsiRemote UINT remote_EnumComponentCosts( [in] MSIHANDLE hinst, [in, string, unique] LPCWSTR component, [in] DWORD index, [in] INSTALLSTATE state, [out, string, size_is(3)] LPWSTR drive, [out] INT *cost, [out] INT *temp ); - HRESULT remote_GetActionInfo( [in] LPCGUID guid, [out] INT *type, [out] BSTR *dllname, - [out] BSTR *function, [out] MSIHANDLE *package ); + UINT remote_GetActionInfo( [in] const GUID *guid, [out] int *type, [out, string] LPWSTR *dllname, + [out, string] LPSTR *function, [out] MSIHANDLE *hinst ); UINT remote_CloseHandle( [in] MSIHANDLE handle ); }

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2018