[PATCH 2/5] d3d10/effect: Validate shared constant buffer types against the pool.

[Matteo Bruni]

On Fri, Sep 24, 2021 at 7:10 AM Nikolay Sivov <nsivov at codeweavers.com> wrote:
>
> Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
> ---
>  dlls/d3d10/d3d10_private.h |   2 +-
>  dlls/d3d10/effect.c        | 101 +++++++++++++++++++++++++------------
>  dlls/d3d10/tests/effect.c  |  42 ++++++++-------
>  3 files changed, 94 insertions(+), 51 deletions(-)
>
> diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h
> index 7f64e811e9f..3c3c6fa7f58 100644
> --- a/dlls/d3d10/d3d10_private.h
> +++ b/dlls/d3d10/d3d10_private.h
> @@ -269,7 +269,7 @@ struct d3d10_effect
>      DWORD local_buffer_count;
>      DWORD variable_count;
>      DWORD local_variable_count;
> -    DWORD sharedbuffers_count;
> +    DWORD shared_buffer_count;
>      DWORD shared_object_count;
>      DWORD technique_count;
>      DWORD index_offset;
> diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
> index 1913d621ecc..8246f288369 100644
> --- a/dlls/d3d10/effect.c
> +++ b/dlls/d3d10/effect.c
> @@ -2013,7 +2013,7 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size,
>  }
>
>  static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size,
> -        const char **ptr, struct d3d10_effect_variable *v)
> +        const char **ptr, BOOL local, struct d3d10_effect_variable *v)

It's slightly confusing to have a "shared" parameter for
parse_fx10_object_variable() and "local" (its opposite) here. OTOH it
does look a tiny bit nicer not needing to negate it in either
function.

I guess it's fine...