October 2018 - Wine-commits

Józef Kucia : wined3d: Call shader_set_function() separately from shader_init().
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: 137f8f308cae8becf9ad1231026801b0e110ad4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=137f8f308cae8becf9ad1231… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 3 12:32:18 2018 +0200 wined3d: Call shader_set_function() separately from shader_init(). 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 | 96 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 65 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 38377c0..edaa35e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3700,8 +3700,7 @@ static HRESULT shader_copy_signatures_from_shader_desc(struct wined3d_shader *sh } static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device *device, - const struct wined3d_shader_desc *desc, DWORD float_const_count, enum wined3d_shader_type type, - void *parent, const struct wined3d_parent_ops *parent_ops) + const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { size_t byte_code_size; HRESULT hr; @@ -3765,26 +3764,6 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device } memcpy(shader->function, desc->byte_code, byte_code_size); shader->functionLength = byte_code_size; - - if (FAILED(hr = shader_set_function(shader, device, type, float_const_count))) - { - WARN("Failed to set function, hr %#x.\n", hr); - shader_cleanup(shader); - return hr; - } - } - else - { - shader->reg_maps.shader_version.type = type; - shader->reg_maps.shader_version.major = 4; - shader->reg_maps.shader_version.minor = 0; - shader_set_limits(shader); - - if (FAILED(hr = shader_scan_output_signature(shader))) - { - shader_cleanup(shader); - return hr; - } } return hr; @@ -3797,10 +3776,16 @@ static HRESULT vertex_shader_init(struct wined3d_shader *shader, struct wined3d_ unsigned int i; HRESULT hr; - if (FAILED(hr = shader_init(shader, device, desc, device->adapter->d3d_info.limits.vs_uniform_count, - WINED3D_SHADER_TYPE_VERTEX, parent, parent_ops))) + if (FAILED(hr = shader_init(shader, device, desc, parent, parent_ops))) return hr; + if (FAILED(hr = shader_set_function(shader, device, + WINED3D_SHADER_TYPE_VERTEX, device->adapter->d3d_info.limits.vs_uniform_count))) + { + shader_cleanup(shader); + return hr; + } + for (i = 0; i < shader->input_signature.element_count; ++i) { const struct wined3d_shader_signature_element *input = &shader->input_signature.elements[i]; @@ -3845,10 +3830,32 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3 } } - if (FAILED(hr = shader_init(shader, device, &shader_desc, 0, - WINED3D_SHADER_TYPE_GEOMETRY, parent, parent_ops))) + if (FAILED(hr = shader_init(shader, device, &shader_desc, parent, parent_ops))) return hr; + if (shader_desc.byte_code) + { + if (FAILED(hr = shader_set_function(shader, device, WINED3D_SHADER_TYPE_GEOMETRY, 0))) + { + WARN("Failed to set function, hr %#x.\n", hr); + shader_cleanup(shader); + return hr; + } + } + else + { + shader->reg_maps.shader_version.type = WINED3D_SHADER_TYPE_GEOMETRY; + shader->reg_maps.shader_version.major = 4; + shader->reg_maps.shader_version.minor = 0; + shader_set_limits(shader); + + if (FAILED(hr = shader_scan_output_signature(shader))) + { + shader_cleanup(shader); + return hr; + } + } + if (so_desc) { if (!(elements = heap_calloc(so_desc->element_count, sizeof(*elements)))) @@ -4152,10 +4159,16 @@ static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_d unsigned int i, highest_reg_used = 0, num_regs_used = 0; HRESULT hr; - if (FAILED(hr = shader_init(shader, device, desc, device->adapter->d3d_info.limits.ps_uniform_count, - WINED3D_SHADER_TYPE_PIXEL, parent, parent_ops))) + if (FAILED(hr = shader_init(shader, device, desc, parent, parent_ops))) return hr; + if (FAILED(hr = shader_set_function(shader, device, + WINED3D_SHADER_TYPE_PIXEL, device->adapter->d3d_info.limits.ps_uniform_count))) + { + shader_cleanup(shader); + return hr; + } + for (i = 0; i < MAX_REG_INPUT; ++i) { if (shader->u.ps.input_reg_used & (1u << i)) @@ -4246,13 +4259,20 @@ HRESULT CDECL wined3d_shader_create_cs(struct wined3d_device *device, const stru if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = shader_init(object, device, desc, 0, WINED3D_SHADER_TYPE_COMPUTE, parent, parent_ops))) + if (FAILED(hr = shader_init(object, device, desc, parent, parent_ops))) { WARN("Failed to initialize compute shader, hr %#x.\n", hr); heap_free(object); return hr; } + if (FAILED(hr = shader_set_function(object, device, WINED3D_SHADER_TYPE_COMPUTE, 0))) + { + shader_cleanup(object); + heap_free(object); + return hr; + } + wined3d_cs_init_object(device->cs, wined3d_shader_init_object, object); TRACE("Created compute shader %p.\n", object); @@ -4276,13 +4296,20 @@ HRESULT CDECL wined3d_shader_create_ds(struct wined3d_device *device, const stru if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = shader_init(object, device, desc, 0, WINED3D_SHADER_TYPE_DOMAIN, parent, parent_ops))) + if (FAILED(hr = shader_init(object, device, desc, parent, parent_ops))) { WARN("Failed to initialize domain shader, hr %#x.\n", hr); heap_free(object); return hr; } + if (FAILED(hr = shader_set_function(object, device, WINED3D_SHADER_TYPE_DOMAIN, 0))) + { + shader_cleanup(object); + heap_free(object); + return hr; + } + wined3d_cs_init_object(device->cs, wined3d_shader_init_object, object); TRACE("Created domain shader %p.\n", object); @@ -4337,13 +4364,20 @@ HRESULT CDECL wined3d_shader_create_hs(struct wined3d_device *device, const stru if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = shader_init(object, device, desc, 0, WINED3D_SHADER_TYPE_HULL, parent, parent_ops))) + if (FAILED(hr = shader_init(object, device, desc, parent, parent_ops))) { WARN("Failed to initialize hull shader, hr %#x.\n", hr); heap_free(object); return hr; } + if (FAILED(hr = shader_set_function(object, device, WINED3D_SHADER_TYPE_HULL, 0))) + { + shader_cleanup(object); + heap_free(object); + return hr; + } + wined3d_cs_init_object(device->cs, wined3d_shader_init_object, object); TRACE("Created hull shader %p.\n", object);

1 0

Józef Kucia : wined3d: Get rid of shader_get_shader_type().
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: 10ede9332a1d3c4076a9a8600a330d0a3ec9bb48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10ede9332a1d3c4076a9a860… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 3 12:32:19 2018 +0200 wined3d: Get rid of shader_get_shader_type(). Use the shader frontend to get the shader 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/wined3d/shader.c | 124 +++++++++++++++++++++-------------------- dlls/wined3d/shader_sm4.c | 2 +- dlls/wined3d/wined3d_private.h | 3 - 3 files changed, 64 insertions(+), 65 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index edaa35e..32261a9 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -419,15 +419,6 @@ static const struct wined3d_shader_frontend *shader_select_frontend(enum wined3d } } -static enum wined3d_shader_type shader_get_shader_type(const struct wined3d_shader_desc *desc) -{ - if (desc->format == WINED3D_SHADER_BYTE_CODE_FORMAT_SM4) - return wined3d_get_sm4_shader_type(desc->byte_code, desc->byte_code_size); - - FIXME("Could not get shader type for byte code format %#x.\n", desc->format); - return WINED3D_SHADER_TYPE_INVALID; -} - void string_buffer_clear(struct wined3d_string_buffer *buffer) { buffer->buffer[0] = '\0'; @@ -3755,16 +3746,13 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device byte_code_size = (ptr - desc->byte_code) * sizeof(*ptr); } - if (desc->byte_code && byte_code_size) + if (!(shader->function = heap_alloc(byte_code_size))) { - if (!(shader->function = heap_alloc(byte_code_size))) - { - shader_cleanup(shader); - return E_OUTOFMEMORY; - } - memcpy(shader->function, desc->byte_code, byte_code_size); - shader->functionLength = byte_code_size; + shader_cleanup(shader); + return E_OUTOFMEMORY; } + memcpy(shader->function, desc->byte_code, byte_code_size); + shader->functionLength = byte_code_size; return hr; } @@ -3804,43 +3792,69 @@ static HRESULT vertex_shader_init(struct wined3d_shader *shader, struct wined3d_ return WINED3D_OK; } -static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, - const struct wined3d_shader_desc *desc, const struct wined3d_stream_output_desc *so_desc, - void *parent, const struct wined3d_parent_ops *parent_ops) +static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, + const struct wined3d_stream_output_desc *so_desc) { - struct wined3d_shader_desc shader_desc = *desc; + const struct wined3d_shader_frontend *fe = shader->frontend; struct wined3d_stream_output_element *elements; - enum wined3d_shader_type shader_type; - HRESULT hr; + struct wined3d_shader_version shader_version; + const DWORD *ptr; + void *fe_data; - if (so_desc) + if (!so_desc) + return WINED3D_OK; + + if (!(fe_data = fe->shader_init(shader->function, shader->functionLength, &shader->output_signature))) { - shader_type = shader_get_shader_type(desc); - switch (shader_type) - { - case WINED3D_SHADER_TYPE_VERTEX: - shader_desc.byte_code = NULL; - shader_desc.byte_code_size = 0; - break; - case WINED3D_SHADER_TYPE_DOMAIN: - FIXME("Stream output not supported for %s.\n", debug_shader_type(shader_type)); - return E_NOTIMPL; - default: - break; - } + WARN("Failed to initialise frontend data.\n"); + return WINED3DERR_INVALIDCALL; + } + fe->shader_read_header(fe_data, &ptr, &shader_version); + fe->shader_free(fe_data); + + switch (shader_version.type) + { + case WINED3D_SHADER_TYPE_VERTEX: + heap_free(shader->function); + shader->function = NULL; + shader->functionLength = 0; + break; + case WINED3D_SHADER_TYPE_DOMAIN: + FIXME("Stream output not supported for %s.\n", debug_shader_type(shader_version.type)); + return E_NOTIMPL; + case WINED3D_SHADER_TYPE_GEOMETRY: + break; + default: + WARN("Wrong shader type %s.\n", debug_shader_type(shader_version.type)); + return E_INVALIDARG; } - if (FAILED(hr = shader_init(shader, device, &shader_desc, parent, parent_ops))) + if (!(elements = heap_calloc(so_desc->element_count, sizeof(*elements)))) + return E_OUTOFMEMORY; + + shader->u.gs.so_desc = *so_desc; + shader->u.gs.so_desc.elements = elements; + memcpy(elements, so_desc->elements, so_desc->element_count * sizeof(*elements)); + + return WINED3D_OK; +} + +static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, + const struct wined3d_shader_desc *desc, const struct wined3d_stream_output_desc *so_desc, + void *parent, const struct wined3d_parent_ops *parent_ops) +{ + HRESULT hr; + + if (FAILED(hr = shader_init(shader, device, desc, parent, parent_ops))) return hr; - if (shader_desc.byte_code) + if (FAILED(hr = geometry_shader_init_stream_output(shader, so_desc))) + goto fail; + + if (shader->function) { if (FAILED(hr = shader_set_function(shader, device, WINED3D_SHADER_TYPE_GEOMETRY, 0))) - { - WARN("Failed to set function, hr %#x.\n", hr); - shader_cleanup(shader); - return hr; - } + goto fail; } else { @@ -3850,26 +3864,14 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3 shader_set_limits(shader); if (FAILED(hr = shader_scan_output_signature(shader))) - { - shader_cleanup(shader); - return hr; - } - } - - if (so_desc) - { - if (!(elements = heap_calloc(so_desc->element_count, sizeof(*elements)))) - { - shader_cleanup(shader); - return E_OUTOFMEMORY; - } - - shader->u.gs.so_desc = *so_desc; - shader->u.gs.so_desc.elements = elements; - memcpy(elements, so_desc->elements, so_desc->element_count * sizeof(*elements)); + goto fail; } return WINED3D_OK; + +fail: + shader_cleanup(shader); + return hr; } void find_ds_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b119e8f..7841686 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1222,7 +1222,7 @@ static enum wined3d_data_type map_data_type(char t) } } -enum wined3d_shader_type wined3d_get_sm4_shader_type(const DWORD *byte_code, size_t byte_code_size) +static enum wined3d_shader_type wined3d_get_sm4_shader_type(const DWORD *byte_code, size_t byte_code_size) { DWORD shader_type; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5f7f6fd..340bfe6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1253,9 +1253,6 @@ struct wined3d_shader_frontend extern const struct wined3d_shader_frontend sm1_shader_frontend DECLSPEC_HIDDEN; extern const struct wined3d_shader_frontend sm4_shader_frontend DECLSPEC_HIDDEN; -enum wined3d_shader_type wined3d_get_sm4_shader_type(const DWORD *byte_code, - size_t byte_code_size) DECLSPEC_HIDDEN; - typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); #define WINED3D_SHADER_CAP_VS_CLIPPING 0x00000001

1 0

Józef Kucia : wined3d: Allow stream output with domain shaders.
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: 272414177f3b60528c92a39d7278af37f71c250a URL: https://source.winehq.org/git/wine.git/?a=commit;h=272414177f3b60528c92a39d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 3 12:32:20 2018 +0200 wined3d: Allow stream output with domain shaders. 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 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 32261a9..8e857b5 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3815,13 +3815,11 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, switch (shader_version.type) { case WINED3D_SHADER_TYPE_VERTEX: + case WINED3D_SHADER_TYPE_DOMAIN: heap_free(shader->function); shader->function = NULL; shader->functionLength = 0; break; - case WINED3D_SHADER_TYPE_DOMAIN: - FIXME("Stream output not supported for %s.\n", debug_shader_type(shader_version.type)); - return E_NOTIMPL; case WINED3D_SHADER_TYPE_GEOMETRY: break; default:

1 0

Józef Kucia : wined3d: Use version from byte code for pass-through geometry shaders.
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: 7c9036183356e98decdbc6708d0820d603980fd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c9036183356e98decdbc670… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 3 12:32:21 2018 +0200 wined3d: Use version from byte code for pass-through geometry shaders. 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 | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8e857b5..438af50 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3800,6 +3800,7 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, struct wined3d_shader_version shader_version; const DWORD *ptr; void *fe_data; + HRESULT hr; if (!so_desc) return WINED3D_OK; @@ -3827,6 +3828,15 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, return E_INVALIDARG; } + if (!shader->function) + { + shader->reg_maps.shader_version = shader_version; + shader->reg_maps.shader_version.type = WINED3D_SHADER_TYPE_GEOMETRY; + shader_set_limits(shader); + if (FAILED(hr = shader_scan_output_signature(shader))) + return hr; + } + if (!(elements = heap_calloc(so_desc->element_count, sizeof(*elements)))) return E_OUTOFMEMORY; @@ -3849,21 +3859,9 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3 if (FAILED(hr = geometry_shader_init_stream_output(shader, so_desc))) goto fail; - if (shader->function) - { - if (FAILED(hr = shader_set_function(shader, device, WINED3D_SHADER_TYPE_GEOMETRY, 0))) - goto fail; - } - else - { - shader->reg_maps.shader_version.type = WINED3D_SHADER_TYPE_GEOMETRY; - shader->reg_maps.shader_version.major = 4; - shader->reg_maps.shader_version.minor = 0; - shader_set_limits(shader); - - if (FAILED(hr = shader_scan_output_signature(shader))) - goto fail; - } + if (shader->function + && FAILED(hr = shader_set_function(shader, device, WINED3D_SHADER_TYPE_GEOMETRY, 0))) + goto fail; return WINED3D_OK;

1 0

Józef Kucia : wined3d: Validate byte code pointer in shader_init().
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: 0e35782fe86f08dc2852abee6e25caf9de9470b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e35782fe86f08dc2852abee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 3 12:32:22 2018 +0200 wined3d: Validate byte code pointer in shader_init(). 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 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 438af50..9524757 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3699,6 +3699,9 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device TRACE("byte_code %p, byte_code_size %#lx, format %#x.\n", desc->byte_code, (long)desc->byte_code_size, desc->format); + if (!desc->byte_code) + return WINED3DERR_INVALIDCALL; + if (!(shader->frontend = shader_select_frontend(desc->format))) { FIXME("Unable to find frontend for shader.\n"); @@ -4251,9 +4254,6 @@ HRESULT CDECL wined3d_shader_create_cs(struct wined3d_device *device, const stru TRACE("device %p, desc %p, parent %p, parent_ops %p, shader %p.\n", device, desc, parent, parent_ops, shader); - if (!desc->byte_code) - return WINED3DERR_INVALIDCALL; - if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -4288,9 +4288,6 @@ HRESULT CDECL wined3d_shader_create_ds(struct wined3d_device *device, const stru TRACE("device %p, desc %p, parent %p, parent_ops %p, shader %p.\n", device, desc, parent, parent_ops, shader); - if (!desc->byte_code) - return WINED3DERR_INVALIDCALL; - if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -4326,9 +4323,6 @@ HRESULT CDECL wined3d_shader_create_gs(struct wined3d_device *device, const stru TRACE("device %p, desc %p, so_desc %p, parent %p, parent_ops %p, shader %p.\n", device, desc, so_desc, parent, parent_ops, shader); - if (!desc->byte_code) - return WINED3DERR_INVALIDCALL; - if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -4356,9 +4350,6 @@ HRESULT CDECL wined3d_shader_create_hs(struct wined3d_device *device, const stru TRACE("device %p, desc %p, parent %p, parent_ops %p, shader %p.\n", device, desc, parent, parent_ops, shader); - if (!desc->byte_code) - return WINED3DERR_INVALIDCALL; - if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -4393,9 +4384,6 @@ HRESULT CDECL wined3d_shader_create_ps(struct wined3d_device *device, const stru TRACE("device %p, desc %p, parent %p, parent_ops %p, shader %p.\n", device, desc, parent, parent_ops, shader); - if (!desc->byte_code) - return WINED3DERR_INVALIDCALL; - if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -4423,9 +4411,6 @@ HRESULT CDECL wined3d_shader_create_vs(struct wined3d_device *device, const stru TRACE("device %p, desc %p, parent %p, parent_ops %p, shader %p.\n", device, desc, parent, parent_ops, shader); - if (!desc->byte_code) - return WINED3DERR_INVALIDCALL; - if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY;

1 0

Huw Davies : wineps: Use a tri-state to describe the passthrough state.
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: f7c15b9fcfc1ed5068f0c40f37087476894de61f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7c15b9fcfc1ed5068f0c40f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 3 11:39:19 2018 +0100 wineps: Use a tri-state to describe the passthrough state. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/escape.c | 12 ++++++------ dlls/wineps.drv/graphics.c | 14 ++++++++------ dlls/wineps.drv/ps.c | 4 ++-- dlls/wineps.drv/psdrv.h | 10 ++++++++-- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 636ad2a..f9616bc 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -269,11 +269,12 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, * length of the string, rather than 2 more. So we'll use the WORD at * in_data[0] instead. */ - if(!physDev->job.in_passthrough) { - write_spool(dev, psbegindocument, sizeof(psbegindocument)-1); - physDev->job.in_passthrough = TRUE; + if (physDev->job.passthrough_state == passthrough_none) + { + write_spool(dev, psbegindocument, sizeof(psbegindocument) - 1); + physDev->job.passthrough_state = passthrough_active; } - return write_spool(dev,((char*)in_data)+2,*(const WORD*)in_data); + return write_spool(dev, ((char*)in_data) + 2, *(const WORD*)in_data); } case POSTSCRIPT_IGNORE: @@ -451,8 +452,7 @@ INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) physDev->job.OutOfPage = TRUE; physDev->job.PageNo = 0; physDev->job.quiet = FALSE; - physDev->job.in_passthrough = FALSE; - physDev->job.had_passthrough_rect = FALSE; + physDev->job.passthrough_state = passthrough_none; physDev->job.doc_name = strdupW( doc->lpszDocName ); return physDev->job.id; diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 4887bd0..66108d1 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -113,12 +113,14 @@ BOOL PSDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) /* Windows does something truly hacky here. If we're in passthrough mode and our rop is R2_NOP, then we output the string below. This is used in Office 2k when inserting eps files */ - if(physDev->job.in_passthrough && !physDev->job.had_passthrough_rect && GetROP2(dev->hdc) == R2_NOP) { - char buf[256]; - sprintf(buf, "N %d %d %d %d B\n", rect.right - rect.left, rect.bottom - rect.top, rect.left, rect.top); - write_spool(dev, buf, strlen(buf)); - physDev->job.had_passthrough_rect = TRUE; - return TRUE; + if (physDev->job.passthrough_state == passthrough_active && GetROP2(dev->hdc) == R2_NOP) + { + char buf[256]; + + sprintf(buf, "N %d %d %d %d B\n", rect.right - rect.left, rect.bottom - rect.top, rect.left, rect.top); + write_spool(dev, buf, strlen(buf)); + physDev->job.passthrough_state = passthrough_had_rect; + return TRUE; } PSDRV_SetPen(dev); diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 972609d..663cc23 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -226,9 +226,9 @@ DWORD PSDRV_WriteSpool(PHYSDEV dev, LPCSTR lpData, DWORD cch) return 0; } - if(physDev->job.in_passthrough) { /* Was in PASSTHROUGH mode */ + if(physDev->job.passthrough_state != passthrough_none) { /* Was in PASSTHROUGH mode */ write_spool( dev, psenddocument, sizeof(psenddocument)-1 ); - physDev->job.in_passthrough = physDev->job.had_passthrough_rect = FALSE; + physDev->job.passthrough_state = passthrough_none; } if(physDev->job.OutOfPage) { /* Will get here after NEWFRAME Escape */ diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 79f23ea..d92fbb3 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -343,6 +343,13 @@ typedef struct { BOOL set; } PSPEN; +enum passthrough +{ + passthrough_none, + passthrough_active, + passthrough_had_rect, /* See the comment in PSDRV_Rectangle */ +}; + typedef struct { DWORD id; /* Job id */ HANDLE hprinter; /* Printer handle */ @@ -352,8 +359,7 @@ typedef struct { BOOL OutOfPage; /* Page header not sent yet */ INT PageNo; BOOL quiet; /* Don't actually output anything */ - BOOL in_passthrough; /* In PASSTHROUGH mode */ - BOOL had_passthrough_rect; /* See the comment in PSDRV_Rectangle */ + enum passthrough passthrough_state; } JOB; typedef struct

1 0

Huw Davies : wineps: Add helpers to enter and leave passthrough.
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: 187f90d89912959cefdfb55c015d81704d26b31a URL: https://source.winehq.org/git/wine.git/?a=commit;h=187f90d89912959cefdfb55c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 3 11:39:20 2018 +0100 wineps: Add helpers to enter and leave passthrough. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/escape.c | 10 +--------- dlls/wineps.drv/ps.c | 27 +++++++++++++++++++++++---- dlls/wineps.drv/psdrv.h | 3 +++ 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index f9616bc..7b90116 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -44,10 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); -static const char psbegindocument[] = -"%%BeginDocument: Wine passthrough\n"; - - DWORD write_spool( PHYSDEV dev, const void *data, DWORD num ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); @@ -269,11 +265,7 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, * length of the string, rather than 2 more. So we'll use the WORD at * in_data[0] instead. */ - if (physDev->job.passthrough_state == passthrough_none) - { - write_spool(dev, psbegindocument, sizeof(psbegindocument) - 1); - physDev->job.passthrough_state = passthrough_active; - } + passthrough_enter(dev); return write_spool(dev, ((char*)in_data) + 2, *(const WORD*)in_data); } diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 663cc23..4fd3c76 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -213,9 +213,31 @@ static const char psarrayput[] = static const char psarraydef[] = "/%s %d array def\n"; +static const char psbegindocument[] = +"%%BeginDocument: Wine passthrough\n"; static const char psenddocument[] = "\n%%EndDocument\n"; +void passthrough_enter(PHYSDEV dev) +{ + PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + + if (physDev->job.passthrough_state != passthrough_none) return; + + write_spool(dev, psbegindocument, sizeof(psbegindocument) - 1); + physDev->job.passthrough_state = passthrough_active; +} + +void passthrough_leave(PHYSDEV dev) +{ + PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + + if (physDev->job.passthrough_state == passthrough_none) return; + + write_spool(dev, psenddocument, sizeof(psenddocument) - 1); + physDev->job.passthrough_state = passthrough_none; +} + DWORD PSDRV_WriteSpool(PHYSDEV dev, LPCSTR lpData, DWORD cch) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); @@ -226,10 +248,7 @@ DWORD PSDRV_WriteSpool(PHYSDEV dev, LPCSTR lpData, DWORD cch) return 0; } - if(physDev->job.passthrough_state != passthrough_none) { /* Was in PASSTHROUGH mode */ - write_spool( dev, psenddocument, sizeof(psenddocument)-1 ); - physDev->job.passthrough_state = passthrough_none; - } + passthrough_leave(dev); if(physDev->job.OutOfPage) { /* Will get here after NEWFRAME Escape */ if( !PSDRV_StartPage(dev) ) diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index d92fbb3..9cbee65 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -578,6 +578,9 @@ extern void T42_free(TYPE42 *t42) DECLSPEC_HIDDEN; extern DWORD RLE_encode(BYTE *in_buf, DWORD len, BYTE *out_buf) DECLSPEC_HIDDEN; extern DWORD ASCII85_encode(BYTE *in_buf, DWORD len, BYTE *out_buf) DECLSPEC_HIDDEN; +extern void passthrough_enter(PHYSDEV dev) DECLSPEC_HIDDEN; +extern void passthrough_leave(PHYSDEV dev) DECLSPEC_HIDDEN; + #define push_lc_numeric(x) do { \ const char *tmplocale = setlocale(LC_NUMERIC,NULL); \ setlocale(LC_NUMERIC,x);

1 0

Huw Davies : wineps: Leave passthrough mode at the end of the page.
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: cd9e63f7581c459b385cd20aa8d9b004de498d0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd9e63f7581c459b385cd20a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 3 11:39:21 2018 +0100 wineps: Leave passthrough mode at the end of the page. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/escape.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 7b90116..43bbe18 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -384,6 +384,8 @@ INT PSDRV_EndPage( PHYSDEV dev ) FIXME("Already ended a page?\n"); return 1; } + + passthrough_leave(dev); if(!PSDRV_WriteEndPage( dev )) return 0; PSDRV_EmptyDownloadList(dev, FALSE);

1 0

Piotr Caban : msvcr100: Added _Scoped_lock::_NonReentrantPPLLock class.
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: c3445197b2575556e0bb789198b8abf45f3573cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3445197b2575556e0bb7891… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 3 17:23:50 2018 +0200 msvcr100: Added _Scoped_lock::_NonReentrantPPLLock class. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 8 ++++---- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcr120/msvcr120.spec | 12 ++++++------ dlls/msvcr120_app/msvcr120_app.spec | 12 ++++++------ dlls/msvcrt/lock.c | 35 +++++++++++++++++++++++++++++++++++ 6 files changed, 61 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c3445197b2575556e0bb…

1 0

Piotr Caban : msvcp140: Added _Winerror_message implementation.
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: c69eba9278597935a3a3eb75071a40e7a63fd7aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c69eba9278597935a3a3eb75… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 3 18:49:43 2018 +0200 msvcp140: Added _Winerror_message implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp140/tests/msvcp140.c | 23 +++++++++++++++++++++++ dlls/msvcp90/misc.c | 12 ++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 29d0e19..296d06c 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1670,8 +1670,8 @@ @ stub -arch=i386 ?_W_Gettnames(a)_Locinfo@std@@QBE?AV_Timevec(a)2@XZ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ @ stub ?_Winerror_map(a)std@@YAHH(a)Z -@ stub -arch=win32 ?_Winerror_message(a)std@@YAKKPADK(a)Z -@ stub -arch=win64 ?_Winerror_message(a)std@@YAKKPEADK(a)Z +@ cdecl -arch=win32 ?_Winerror_message(a)std@@YAKKPADK(a)Z(long ptr long) _Winerror_message +@ cdecl -arch=win64 ?_Winerror_message(a)std@@YAKKPEADK(a)Z(long ptr long) _Winerror_message @ stub ?_XGetLastError(a)std@@YAXXZ @ stub ?_XLgamma(a)std@@YAMM(a)Z @ stub ?_XLgamma(a)std@@YANN(a)Z diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 03350d3..a3f9211 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -191,6 +191,7 @@ static WCHAR* (__cdecl *p_Temp_get)(WCHAR *); static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static int (__cdecl *p_Unlink)(WCHAR const*); +static ULONG (__cdecl *p__Winerror_message)(ULONG, char*, ULONG); static BOOLEAN (WINAPI *pCreateSymbolicLinkW)(const WCHAR *, const WCHAR *, DWORD); @@ -227,6 +228,7 @@ static BOOL init(void) SET(p__Schedule_chore, "?_Schedule_chore(a)details@Concurrency@@YAHPEAU_Threadpool_chore(a)12@@Z"); SET(p__Reschedule_chore, "?_Reschedule_chore(a)details@Concurrency@@YAHPEBU_Threadpool_chore(a)12@@Z"); SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPEAU_Threadpool_chore(a)12@@Z"); + SET(p__Winerror_message, "?_Winerror_message(a)std@@YAKKPEADK(a)Z"); } else { #ifdef __arm__ SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AAA(a)XZ"); @@ -256,6 +258,7 @@ static BOOL init(void) SET(p__Schedule_chore, "?_Schedule_chore(a)details@Concurrency@@YAHPAU_Threadpool_chore(a)12@@Z"); SET(p__Reschedule_chore, "?_Reschedule_chore(a)details@Concurrency@@YAHPBU_Threadpool_chore(a)12@@Z"); SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPAU_Threadpool_chore(a)12@@Z"); + SET(p__Winerror_message, "?_Winerror_message(a)std@@YAKKPADK(a)Z"); } SET(p_Close_dir, "_Close_dir"); @@ -1281,6 +1284,25 @@ static void test_Last_write_time(void) ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); } +static void test__Winerror_message(void) +{ + char buf[256], buf_fm[256]; + ULONG ret, ret_fm; + + ret_fm = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, 0, 0, buf_fm, sizeof(buf_fm), NULL); + + memset(buf, 'a', sizeof(buf)); + ret = p__Winerror_message(0, buf, sizeof(buf)); + ok(ret == ret_fm, "ret = %u, expected %u\n", ret, ret_fm); + ok(!strcmp(buf, buf_fm), "buf = %s, expected %s\n", buf, buf_fm); + + memset(buf, 'a', sizeof(buf)); + ret = p__Winerror_message(0, buf, 2); + ok(!ret, "ret = %u\n", ret); + ok(buf[0] == 'a', "buf = %s\n", buf); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1302,5 +1324,6 @@ START_TEST(msvcp140) test_Temp_get(); test_Rename(); test_Last_write_time(); + test__Winerror_message(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index ef02129..ae7a129 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2790,3 +2790,15 @@ const char* __cdecl _Syserror_map(int err) return NULL; } #endif + +#if _MSVCP_VER >= 140 +/* ?_Winerror_message(a)std@@YAKKPADK(a)Z */ +/* ?_Winerror_message(a)std@@YAKKPEADK(a)Z */ +ULONG __cdecl _Winerror_message(ULONG err, char *buf, ULONG size) +{ + TRACE("(%u %p %u)\n", err, buf, size); + + return FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, err, 0, buf, size, NULL); +} +#endif

1 0