Re: [PATCH 1/4] d3drm: Make it possible to create material objects with CreateObject().

[Henri Verbeet]

On 21 June 2017 at 14:39, Nikolay Sivov <nsivov(a)codeweavers.com> wrote:
> diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
> index fc19b97b8b..6c2903226a 100644
> --- a/dlls/d3drm/tests/d3drm.c
> +++ b/dlls/d3drm/tests/d3drm.c
> @@ -1404,6 +1404,8 @@ static void test_object(void)
>          { &CLSID_CDirect3DRMFrame,         &IID_IDirect3DRMFrame2 },
>          { &CLSID_CDirect3DRMFrame,         &IID_IDirect3DRMFrame3 },
>          { &CLSID_CDirect3DRMLight,         &IID_IDirect3DRMLight },
> +        { &CLSID_CDirect3DRMMaterial,      &IID_IDirect3DRMMaterial },
> +        { &CLSID_CDirect3DRMMaterial,      &IID_IDirect3DRMMaterial2 },
>      };
>      IDirect3DRM *d3drm1;
>      IDirect3DRM2 *d3drm2;
> @@ -1429,7 +1431,8 @@ static void test_object(void)
>      {
>          BOOL takes_ref = IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMeshBuilder) ||
>                  IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMFrame) ||
> -                IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMLight);
> +                IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMLight) ||
> +                IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMaterial);
> If there are going to be more of these, it probably makes sense to
> just include the information as a field in tests[].

[PATCH 1/4] d3drm: Make it possible to create material objects with CreateObject().

[Nikolay Sivov]

On 22.06.2017 13:58, Henri Verbeet wrote:
> On 21 June 2017 at 14:39, Nikolay Sivov <nsivov(a)codeweavers.com> wrote:
> > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
> > index fc19b97b8b..6c2903226a 100644
> > --- a/dlls/d3drm/tests/d3drm.c
> > +++ b/dlls/d3drm/tests/d3drm.c
> > @@ -1404,6 +1404,8 @@ static void test_object(void)
> >          { &CLSID_CDirect3DRMFrame,         &IID_IDirect3DRMFrame2 },
> >          { &CLSID_CDirect3DRMFrame,         &IID_IDirect3DRMFrame3 },
> >          { &CLSID_CDirect3DRMLight,         &IID_IDirect3DRMLight },
> > +        { &CLSID_CDirect3DRMMaterial,      &IID_IDirect3DRMMaterial },
> > +        { &CLSID_CDirect3DRMMaterial,      &IID_IDirect3DRMMaterial2 },
> >      };
> >      IDirect3DRM *d3drm1;
> >      IDirect3DRM2 *d3drm2;
> > @@ -1429,7 +1431,8 @@ static void test_object(void)
> >      {
> >          BOOL takes_ref = IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMeshBuilder) ||
> >                  IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMFrame) ||
> > -                IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMLight);
> > +                IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMLight) ||
> > +                IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMaterial);
> > If there are going to be more of these, it probably makes sense to
> > just include the information as a field in tests[].

Yes, there will be more. I was thinking about inverting it later, since
most objects do take this reference, but test data flag is cleaner I
suppose. I'll also remove 'todo' field, it looks unused.