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

[PATCH v2 2/6] server: Return STATUS_KEY_DELETED when trying to retrieve the full name of a deleted key.

by Zebediah Figura

This fixes a server crash that can be triggered by deleting a key and then trying to retrieve its name. In that case key->parent is NULL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/registry.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/registry.c b/server/registry.c index f36760e6cc1..b7971770728 100644 --- a/server/registry.c +++ b/server/registry.c @@ -413,6 +413,12 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) data_size_t len = sizeof(root_name) - sizeof(WCHAR); char *ret; + if (key->flags & KEY_DELETED) + { + set_error( STATUS_KEY_DELETED ); + return NULL; + } + for (key = (struct key *)obj; key != root_key; key = key->parent) len += key->namelen + sizeof(WCHAR); if (!(ret = malloc( len ))) return NULL; -- 2.30.2

June 30, 2021

[PATCH v2 1/6] server: Retrieve the object name only when requested to.

by Zebediah Figura

A deleted key returns STATUS_KEY_DELETED when ObjectNameInformation is requested, but succeeds when ObjectBasicInformation is requested. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/handle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/handle.c b/server/handle.c index d86f0960ccf..d1288239903 100644 --- a/server/handle.c +++ b/server/handle.c @@ -693,7 +693,7 @@ DECL_HANDLER(get_object_info) reply->access = get_handle_access( current->process, req->handle ); reply->ref_count = obj->refcount; reply->handle_count = obj->handle_count; - if ((name = obj->ops->get_full_name( obj, &reply->total ))) + if (get_reply_max_size() && (name = obj->ops->get_full_name( obj, &reply->total ))) set_reply_data_ptr( name, min( reply->total, get_reply_max_size() )); release_object( obj ); } -- 2.30.2

June 30, 2021

[PATCH 5/5] gdi32: Initialize GdiSharedHandleTable in PEB.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 16 ++++++++++ dlls/gdi32/tests/gdiobj.c | 62 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 77 insertions(+), 1 deletion(-)

June 30, 2021

[PATCH 4/5] gdi32: Use handle layout compatible with GdiSharedHandleTable to store handles.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/gdiobj.c | 110 ++++++++++++++++++--------------------- 2 files changed, 53 insertions(+), 59 deletions(-)

June 30, 2021

[PATCH 3/5] include: Add ntgdi.h file.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This file is not present in WinSDK, but it's provided by mingw. We could move it to include/wine, if that's preffered. include/ntgdi.h | 172 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 include/ntgdi.h

June 30, 2021

[PATCH 2/5] gdi32: Move more fields from gdi_handle_entry to gdi_obj_header.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi_private.h | 10 +++++++ dlls/gdi32/gdiobj.c | 61 ++++++++++++++++++---------------------- 2 files changed, 37 insertions(+), 34 deletions(-)

June 30, 2021

[PATCH 1/5] gdi32: Introduce gdi_obj_header and use it to store gdi_obj_funcs.

by Jacek Caban

June 30, 2021

Re: [PATCH vkd3d 2/5] vkd3d-shader: Track bytecode buffer size in bytes.

by Henri Verbeet

On Tue, 29 Jun 2021 at 20:00, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > @@ -1328,72 +1328,52 @@ static struct hlsl_reg hlsl_reg_from_deref(const struct hlsl_deref *deref, const > struct bytecode_buffer > { > struct hlsl_ctx *ctx; > - uint32_t *data; > - size_t count, size; > + char *data; > + size_t size, capacity; > int status; > }; > "uint8_t *data;" seems preferable.

June 30, 2021

Re: [PATCH vkd3d 2/2] vkd3d-shader: Store a validity flag in struct vkd3d_sm4_data.

by Henri Verbeet

On Wed, 30 Jun 2021 at 05:11, Conor McCarthy <cmccarthy(a)codeweavers.com> wrote: > @@ -571,6 +572,8 @@ static void VKD3D_PRINTF_FUNC(3, 4) shader_read_error(struct vkd3d_sm4_data *pri > va_start(args, format); > vkd3d_shader_verror(priv->message_context, NULL, error, format, args); > va_end(args); > + > + priv->valid = false; > } [...] > @@ -1949,6 +1953,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha > if (opcode_info->read_opcode_func) > { > opcode_info->read_opcode_func(ins, opcode, opcode_token, p, len, priv); > + return priv->valid; > } I think that's a bit too coarse. In particular, if an error is not fatal (like for example the invalid register range one), it's often useful to continue parsing and also report subsequent errors and warnings.

June 30, 2021

Re: [PATCH vkd3d 1/2] vkd3d-shader: Introduce shader_read_error() for reporting via vkd3d_shader_verror().

by Henri Verbeet

On Wed, 30 Jun 2021 at 05:11, Conor McCarthy <cmccarthy(a)codeweavers.com> wrote: > +static void VKD3D_PRINTF_FUNC(3, 4) shader_read_error(struct vkd3d_sm4_data *priv, > + enum vkd3d_shader_error error, const char *format, ...) > +{ > + va_list args; > + > + va_start(args, format); > + vkd3d_shader_verror(priv->message_context, NULL, error, format, args); > + va_end(args); > +} > + That should probably be called shader_sm4_error(). We'd also want to keep track of the source location, although that doesn't need to be in this patch. > static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, > enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param); > static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, > @@ -629,7 +641,11 @@ static void shader_sm4_read_descriptor_register_range(struct vkd3d_sm4_data *pri > range->first = reg->idx[shader_is_sm_5_1(priv) ? 1 : 0].offset; > range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 0].offset; > if (range->last < range->first) > + { > FIXME("Invalid register range [%u:%u].\n", range->first, range->last); > + shader_read_error(priv, VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_RANGE, > + "Last register %u must not be less than first register %u in range.\n", range->last, range->first); > + } > } > VKD3D_SHADER_ERROR_SPV_ errors are for errors specific to SPIR-V generation. This should be a VKD3D_SHADER_ERROR_TPF_ error.

June 30, 2021