June 2021 - Wine-commits - list.winehq.org

Rémi Bernon : d2d1: Use D3D11 interfaces to create vertex shader.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 629fa331bb55d5c9a3a565ec664dd63104175cc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=629fa331bb55d5c9a3a565ec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 25 09:34:03 2021 +0200 d2d1: Use D3D11 interfaces to create vertex shader. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 0f4b52f4c3e..565288bc71c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -74,7 +74,7 @@ struct d2d_error_state struct d2d_shape_resources { ID3D11InputLayout *il; - ID3D10VertexShader *vs; + ID3D11VertexShader *vs; }; struct d2d_brush_cb diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 10b555c080f..acb01a35868 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -125,6 +125,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D10Device *device = render_target->d3d_device; ID3D10Buffer *d3d10_ib = NULL, *d3d10_vb = NULL, *d3d10_vs_cb = NULL, *d3d10_ps_cb = NULL; ID3D11Buffer *vs_cb = render_target->vs_cb, *ps_cb = render_target->ps_cb; + ID3D10VertexShader *d3d10_vs = NULL; ID3D10InputLayout *d3d10_il = NULL; D3D10_RECT scissor_rect; unsigned int offset; @@ -168,6 +169,12 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en goto error; } + if (shape_resources->vs && FAILED(hr = ID3D11VertexShader_QueryInterface(shape_resources->vs, &IID_ID3D10VertexShader, (void **)&d3d10_vs))) + { + ERR("Failed to query D3D10 vertex shader, hr %#x.\n", hr); + goto error; + } + if (FAILED(hr = render_target->stateblock->lpVtbl->Capture(render_target->stateblock))) { WARN("Failed to capture stateblock, hr %#x.\n", hr); @@ -182,7 +189,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en offset = 0; ID3D10Device_IASetVertexBuffers(device, 0, 1, &d3d10_vb, &vb_stride, &offset); ID3D10Device_VSSetConstantBuffers(device, 0, 1, &d3d10_vs_cb); - ID3D10Device_VSSetShader(device, shape_resources->vs); + ID3D10Device_VSSetShader(device, d3d10_vs); ID3D10Device_PSSetConstantBuffers(device, 0, 1, &d3d10_ps_cb); ID3D10Device_PSSetShader(device, render_target->ps); ID3D10Device_RSSetViewports(device, 1, &vp); @@ -223,6 +230,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en WARN("Failed to apply stateblock, hr %#x.\n", hr); error: + if (d3d10_vs) ID3D10VertexShader_Release(d3d10_vs); if (d3d10_il) ID3D10InputLayout_Release(d3d10_il); if (d3d10_ib) ID3D10Buffer_Release(d3d10_ib); if (d3d10_vb) ID3D10Buffer_Release(d3d10_vb); @@ -310,7 +318,7 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) ID3D11Buffer_Release(context->vs_cb); for (i = 0; i < D2D_SHAPE_TYPE_COUNT; ++i) { - ID3D10VertexShader_Release(context->shape_resources[i].vs); + ID3D11VertexShader_Release(context->shape_resources[i].vs); ID3D11InputLayout_Release(context->shape_resources[i].il); } for (i = 0; i < D2D_SAMPLER_INTERPOLATION_MODE_COUNT; ++i) @@ -3946,8 +3954,8 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, goto err; } - if (FAILED(hr = ID3D10Device_CreateVertexShader(render_target->d3d_device, si->vs_code, - si->vs_code_size, &render_target->shape_resources[si->shape_type].vs))) + if (FAILED(hr = ID3D11Device1_CreateVertexShader(render_target->d3d11_device, si->vs_code, + si->vs_code_size, NULL, &render_target->shape_resources[si->shape_type].vs))) { WARN("Failed to create vertex shader for shape type %#x, hr %#x.\n", si->shape_type, hr); goto err; @@ -4080,7 +4088,7 @@ err: for (i = 0; i < D2D_SHAPE_TYPE_COUNT; ++i) { if (render_target->shape_resources[i].vs) - ID3D10VertexShader_Release(render_target->shape_resources[i].vs); + ID3D11VertexShader_Release(render_target->shape_resources[i].vs); if (render_target->shape_resources[i].il) ID3D11InputLayout_Release(render_target->shape_resources[i].il); }

1 0

Rémi Bernon : d2d1: Use D3D11 interfaces to create pixel shader.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 5f54ff0b38969f06ba4707abf5e71b64a538b96e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f54ff0b38969f06ba4707ab… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 25 09:34:04 2021 +0200 d2d1: Use D3D11 interfaces to create pixel shader. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 565288bc71c..73259835786 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -167,7 +167,7 @@ struct d2d_device_context ID3D10StateBlock *stateblock; struct d2d_shape_resources shape_resources[D2D_SHAPE_TYPE_COUNT]; ID3D11Buffer *vs_cb; - ID3D10PixelShader *ps; + ID3D11PixelShader *ps; ID3D11Buffer *ps_cb; ID3D11Buffer *ib; unsigned int vb_stride; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index acb01a35868..efeeaf6aa18 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -126,6 +126,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D10Buffer *d3d10_ib = NULL, *d3d10_vb = NULL, *d3d10_vs_cb = NULL, *d3d10_ps_cb = NULL; ID3D11Buffer *vs_cb = render_target->vs_cb, *ps_cb = render_target->ps_cb; ID3D10VertexShader *d3d10_vs = NULL; + ID3D10PixelShader *d3d10_ps = NULL; ID3D10InputLayout *d3d10_il = NULL; D3D10_RECT scissor_rect; unsigned int offset; @@ -175,6 +176,12 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en goto error; } + if (render_target->ps && FAILED(hr = ID3D11PixelShader_QueryInterface(render_target->ps, &IID_ID3D10PixelShader, (void **)&d3d10_ps))) + { + ERR("Failed to query D3D10 pixel shader, hr %#x.\n", hr); + goto error; + } + if (FAILED(hr = render_target->stateblock->lpVtbl->Capture(render_target->stateblock))) { WARN("Failed to capture stateblock, hr %#x.\n", hr); @@ -191,7 +198,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D10Device_VSSetConstantBuffers(device, 0, 1, &d3d10_vs_cb); ID3D10Device_VSSetShader(device, d3d10_vs); ID3D10Device_PSSetConstantBuffers(device, 0, 1, &d3d10_ps_cb); - ID3D10Device_PSSetShader(device, render_target->ps); + ID3D10Device_PSSetShader(device, d3d10_ps); ID3D10Device_RSSetViewports(device, 1, &vp); if (render_target->clip_stack.count) { @@ -230,6 +237,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en WARN("Failed to apply stateblock, hr %#x.\n", hr); error: + if (d3d10_ps) ID3D10PixelShader_Release(d3d10_ps); if (d3d10_vs) ID3D10VertexShader_Release(d3d10_vs); if (d3d10_il) ID3D10InputLayout_Release(d3d10_il); if (d3d10_ib) ID3D10Buffer_Release(d3d10_ib); @@ -314,7 +322,7 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) ID3D11Buffer_Release(context->vb); ID3D11Buffer_Release(context->ib); ID3D11Buffer_Release(context->ps_cb); - ID3D10PixelShader_Release(context->ps); + ID3D11PixelShader_Release(context->ps); ID3D11Buffer_Release(context->vs_cb); for (i = 0; i < D2D_SHAPE_TYPE_COUNT; ++i) { @@ -3976,8 +3984,8 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, goto err; } - if (FAILED(hr = ID3D10Device_CreatePixelShader(render_target->d3d_device, - ps_code, sizeof(ps_code), &render_target->ps))) + if (FAILED(hr = ID3D11Device1_CreatePixelShader(render_target->d3d11_device, + ps_code, sizeof(ps_code), NULL, &render_target->ps))) { WARN("Failed to create pixel shader, hr %#x.\n", hr); goto err; @@ -4082,7 +4090,7 @@ err: if (render_target->ps_cb) ID3D11Buffer_Release(render_target->ps_cb); if (render_target->ps) - ID3D10PixelShader_Release(render_target->ps); + ID3D11PixelShader_Release(render_target->ps); if (render_target->vs_cb) ID3D11Buffer_Release(render_target->vs_cb); for (i = 0; i < D2D_SHAPE_TYPE_COUNT; ++i)

1 0

Zebediah Figura : wined3d: Use a wined3d_resource operation to retrieve the resource dimensions in wined3d_device_context_update_sub_resource().
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: e2755048593c46237f373f2341585becda7fa02c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2755048593c46237f373f23… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 15:29:04 2021 -0500 wined3d: Use a wined3d_resource operation to retrieve the resource dimensions in wined3d_device_context_update_sub_resource(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 23 +++++++++++++++++++++++ dlls/wined3d/device.c | 40 +++++++--------------------------------- dlls/wined3d/texture.c | 9 +++++++++ dlls/wined3d/wined3d_private.h | 8 ++++++++ 4 files changed, 47 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 7b8c8904961..142cce0299f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -840,6 +840,28 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe return &buffer->resource; } +static HRESULT buffer_resource_sub_resource_get_desc(struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc) +{ + if (sub_resource_idx) + { + WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); + return E_INVALIDARG; + } + + desc->format = WINED3DFMT_UNKNOWN; + desc->multisample_type = WINED3D_MULTISAMPLE_NONE; + desc->multisample_quality = 0; + desc->usage = resource->usage; + desc->bind_flags = resource->bind_flags; + desc->access = resource->access; + desc->width = resource->size; + desc->height = 1; + desc->depth = 1; + desc->size = resource->size; + return S_OK; +} + static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, uint32_t flags) { @@ -1105,6 +1127,7 @@ static const struct wined3d_resource_ops buffer_resource_ops = buffer_resource_decref, buffer_resource_preload, buffer_resource_unload, + buffer_resource_sub_resource_get_desc, buffer_resource_sub_resource_map, buffer_resource_sub_resource_unmap, }; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a11f137729f..6d749269c18 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4649,7 +4649,7 @@ void CDECL wined3d_device_context_update_sub_resource(struct wined3d_device_cont struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int depth_pitch, unsigned int flags) { - unsigned int width, height, depth; + struct wined3d_sub_resource_desc desc; struct wined3d_box b; TRACE("context %p, resource %p, sub_resource_idx %u, box %s, data %p, row_pitch %u, depth_pitch %u, flags %#x.\n", @@ -4664,43 +4664,17 @@ void CDECL wined3d_device_context_update_sub_resource(struct wined3d_device_cont return; } - if (resource->type == WINED3D_RTYPE_BUFFER) - { - if (sub_resource_idx > 0) - { - WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); - return; - } - - width = resource->size; - height = 1; - depth = 1; - } - else - { - struct wined3d_texture *texture = texture_from_resource(resource); - unsigned int level; - - if (sub_resource_idx >= texture->level_count * texture->layer_count) - { - WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); - return; - } - - level = sub_resource_idx % texture->level_count; - width = wined3d_texture_get_level_width(texture, level); - height = wined3d_texture_get_level_height(texture, level); - depth = wined3d_texture_get_level_depth(texture, level); - } + if (FAILED(wined3d_resource_get_sub_resource_desc(resource, sub_resource_idx, &desc))) + return; if (!box) { - wined3d_box_set(&b, 0, 0, width, height, 0, depth); + wined3d_box_set(&b, 0, 0, desc.width, desc.height, 0, desc.depth); box = &b; } - else if (box->left >= box->right || box->right > width - || box->top >= box->bottom || box->bottom > height - || box->front >= box->back || box->back > depth) + else if (box->left >= box->right || box->right > desc.width + || box->top >= box->bottom || box->bottom > desc.height + || box->front >= box->back || box->back > desc.depth) { WARN("Invalid box %s specified.\n", debug_box(box)); return; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 165d83eb035..5f02bcfed8f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3506,6 +3506,14 @@ static void texture_resource_unload(struct wined3d_resource *resource) resource_unload(&texture->resource); } +static HRESULT texture_resource_sub_resource_get_desc(struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc) +{ + const struct wined3d_texture *texture = texture_from_resource(resource); + + return wined3d_texture_get_sub_resource_desc(texture, sub_resource_idx, desc); +} + static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { @@ -3692,6 +3700,7 @@ static const struct wined3d_resource_ops texture_resource_ops = texture_resource_decref, texture_resource_preload, texture_resource_unload, + texture_resource_sub_resource_get_desc, texture_resource_sub_resource_map, texture_resource_sub_resource_unmap, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da1cf638606..15b028a00f0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4050,6 +4050,8 @@ struct wined3d_resource_ops ULONG (*resource_decref)(struct wined3d_resource *resource); void (*resource_preload)(struct wined3d_resource *resource); void (*resource_unload)(struct wined3d_resource *resource); + HRESULT (*resource_sub_resource_get_desc)(struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc); HRESULT (*resource_sub_resource_map)(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); HRESULT (*resource_sub_resource_unmap)(struct wined3d_resource *resource, unsigned int sub_resource_idx); @@ -4110,6 +4112,12 @@ static inline void wined3d_resource_release(struct wined3d_resource *resource) InterlockedDecrement(&resource->access_count); } +static inline HRESULT wined3d_resource_get_sub_resource_desc(struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc) +{ + return resource->resource_ops->resource_sub_resource_get_desc(resource, sub_resource_idx, desc); +} + void resource_cleanup(struct wined3d_resource *resource) DECLSPEC_HIDDEN; HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, enum wined3d_resource_type type, const struct wined3d_format *format,

1 0

Zebediah Figura : wined3d: Always pass a non-NULL box to context->ops->map().
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 236afee0daab65ccbd8e744569667e128c04a439 URL: https://source.winehq.org/git/wine.git/?a=commit;h=236afee0daab65ccbd8e7445… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 15:29:05 2021 -0500 wined3d: Always pass a non-NULL box to context->ops->map(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 17 ++--------------- dlls/wined3d/device.c | 12 ++++++++++++ dlls/wined3d/texture.c | 39 ++++++++++++++------------------------- 3 files changed, 28 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 142cce0299f..20057b4127f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -875,21 +875,8 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc TRACE("resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", resource, sub_resource_idx, map_desc, debug_box(box), flags); - if (sub_resource_idx) - { - WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); - return E_INVALIDARG; - } - - if (box) - { - offset = box->left; - size = box->right - box->left; - } - else - { - offset = size = 0; - } + offset = box->left; + size = box->right - box->left; map_desc->row_pitch = map_desc->slice_pitch = resource->size; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6d749269c18..55407516446 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4834,6 +4834,9 @@ HRESULT CDECL wined3d_device_context_map(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) { + struct wined3d_sub_resource_desc desc; + struct wined3d_box b; + TRACE("context %p, resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", context, resource, sub_resource_idx, map_desc, debug_box(box), flags); @@ -4857,6 +4860,15 @@ HRESULT CDECL wined3d_device_context_map(struct wined3d_device_context *context, flags = sanitise_map_flags(resource, flags); + if (FAILED(wined3d_resource_get_sub_resource_desc(resource, sub_resource_idx, &desc))) + return E_INVALIDARG; + + if (!box) + { + wined3d_box_set(&b, 0, 0, desc.width, desc.height, 0, desc.depth); + box = &b; + } + return context->ops->map(context, resource, sub_resource_idx, map_desc, box, flags); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5f02bcfed8f..c09a9f619ac 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3532,11 +3532,10 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour resource, sub_resource_idx, map_desc, debug_box(box), flags); texture = texture_from_resource(resource); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) - return E_INVALIDARG; + sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx); texture_level = sub_resource_idx % texture->level_count; - if (box && FAILED(wined3d_texture_check_box_dimensions(texture, texture_level, box))) + if (FAILED(wined3d_texture_check_box_dimensions(texture, texture_level, box))) { WARN("Map box is invalid.\n"); if (((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && !(resource->access & WINED3D_RESOURCE_ACCESS_CPU)) @@ -3605,38 +3604,28 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour wined3d_texture_get_pitch(texture, texture_level, &map_desc->row_pitch, &map_desc->slice_pitch); } - if (!box) + if ((fmt_flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_BLOCKS) { - map_desc->data = base_memory; + /* Compressed textures are block based, so calculate the offset of + * the block that contains the top-left pixel of the mapped box. */ + map_desc->data = base_memory + + (box->front * map_desc->slice_pitch) + + ((box->top / format->block_height) * map_desc->row_pitch) + + ((box->left / format->block_width) * format->block_byte_count); } else { - if ((fmt_flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_BLOCKS) - { - /* Compressed textures are block based, so calculate the offset of - * the block that contains the top-left pixel of the mapped box. */ - map_desc->data = base_memory - + (box->front * map_desc->slice_pitch) - + ((box->top / format->block_height) * map_desc->row_pitch) - + ((box->left / format->block_width) * format->block_byte_count); - } - else - { - map_desc->data = base_memory - + (box->front * map_desc->slice_pitch) - + (box->top * map_desc->row_pitch) - + (box->left * format->byte_count); - } + map_desc->data = base_memory + + (box->front * map_desc->slice_pitch) + + (box->top * map_desc->row_pitch) + + (box->left * format->byte_count); } if (texture->swapchain && texture->swapchain->front_buffer == texture) { RECT *r = &texture->swapchain->front_buffer_update; - if (!box) - SetRect(r, 0, 0, resource->width, resource->height); - else - SetRect(r, box->left, box->top, box->right, box->bottom); + SetRect(r, box->left, box->top, box->right, box->bottom); TRACE("Mapped front buffer %s.\n", wine_dbgstr_rect(r)); }

1 0

Zebediah Figura : wined3d: Return the map pitch in wined3d_device_context_map().
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 61024aa12f7752014924f30657e2adb80148f312 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61024aa12f7752014924f306… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 15:29:06 2021 -0500 wined3d: Return the map pitch in wined3d_device_context_map(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 19 ++++++++++------ dlls/wined3d/cs.c | 18 +++++++-------- dlls/wined3d/device.c | 6 ++++- dlls/wined3d/texture.c | 50 +++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 13 ++++++++--- 5 files changed, 65 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61024aa12f7752014924…

1 0

Brendan McGrath : kernelbase: Don't pass StdHandles with CREATE_NEW_CONSOLE.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 7539dd607b5a9840d13849a0668d9e8982e20c8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7539dd607b5a9840d13849a0… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Fri Jun 25 07:01:56 2021 +1000 kernelbase: Don't pass StdHandles with CREATE_NEW_CONSOLE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51264 Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 924fa733e5b..7296e085382 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -198,7 +198,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename params->hStdOutput = startup->hStdOutput; params->hStdError = startup->hStdError; } - else if (flags & DETACHED_PROCESS) + else if (flags & (DETACHED_PROCESS | CREATE_NEW_CONSOLE)) { params->hStdInput = INVALID_HANDLE_VALUE; params->hStdOutput = INVALID_HANDLE_VALUE;

1 0

Akihiro Sagawa : ntdll: Fix null pointer dereference in RtlDosPathNameToNtPathName_U_WithStatus.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: c94ac2e0619ab31bc3138f17786e7cac00a95bcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c94ac2e0619ab31bc3138f17… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jun 25 18:47:00 2021 +0900 ntdll: Fix null pointer dereference in RtlDosPathNameToNtPathName_U_WithStatus. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index cacb95853ad..58983aca194 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -231,7 +231,7 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U goto out; } - if (*file_part) *file_part = NULL; + if (file_part) *file_part = NULL; sz = LOWORD(dosdev);

1 0

Hugh McMaster : reg/tests: Modify delete_tree() to support the use of registry views.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: d790c593490bfb363cf34ab2d00dddbaf04ddd15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d790c593490bfb363cf34ab2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 25 22:58:10 2021 +1000 reg/tests: Modify delete_tree() to support the use of registry views. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 17 ++++++++++------- programs/reg/tests/copy.c | 36 ++++++++++++++++++------------------ programs/reg/tests/delete.c | 4 ++-- programs/reg/tests/export.c | 8 ++++---- programs/reg/tests/import.c | 12 ++++++------ programs/reg/tests/query.c | 6 +++--- programs/reg/tests/reg_test.h | 2 +- 7 files changed, 44 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d790c593490bfb363cf3…

1 0

Hugh McMaster : reg/tests: Remove duplicate test from test_registry_view_wow64().
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 8ad9c21b056d9f3119c363e0f7e56198985d5b08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ad9c21b056d9f3119c363e0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 25 22:58:11 2021 +1000 reg/tests: Remove duplicate test from test_registry_view_wow64(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index bb72c4a3737..36fa634796d 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -961,10 +961,6 @@ static void test_registry_view_wow64(void) run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine64 /d Test /f /reg:64", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); - verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); - close_key(hkey); - open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); close_key(hkey);

1 0

Hugh McMaster : reg/tests: Test deletion of keys and values using registry views.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 556121b1cafc2182edaeb7354caf46375205bef7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=556121b1cafc2182edaeb735… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 25 22:58:12 2021 +1000 reg/tests: Test deletion of keys and values using registry views. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/delete.c | 275 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 275 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=556121b1cafc2182edae…

1 0