wined3d: direct3d.c variable-names request

[Andrew Talbot]

This request is aimed at the wined3d specialists.

Hi,

I'm looking to fix a couple of write-strings warnings in direct3d.c: lines
323 and 334, the second parameter to Callback(), but I don't know enough to
give suitable names to the intended substitute variables. So I would be
glad of suggestions, please.

Thanks,

-- Andy.

[H. Verbeet]

On 15/08/06, Andrew Talbot  wrote:
> I'm looking to fix a couple of write-strings warnings in direct3d.c: lines
> 323 and 334, the second parameter to Callback(), but I don't know enough to
> give suitable names to the intended substitute variables. So I would be
> glad of suggestions, please.

I assume you're talking about direct3d.c in ddraw then. The second
parameter is the "device description" for the enumerated device. The
first device is the reference device, the second one is our wined3d
implementation.

ddraw: direct3d.c variable-names request

[Andrew Talbot]

H. Verbeet wrote:
> I assume you're talking about direct3d.c in ddraw then.

Sorry, yes.
> The second 
> parameter is the "device description" for the enumerated device. The
> first device is the reference device, the second one is our wined3d
> implementation.

In which case, would you be happy with the suggested names on the lines
marked Var 1 and Var 2 below?

static HRESULT WINAPI
IDirect3DImpl_3_EnumDevices(IDirect3D3 *iface,
                            LPD3DENUMDEVICESCALLBACK Callback,
                            void *Context)
{
    ICOM_THIS_FROM(IDirectDrawImpl, IDirect3D3, iface);
    D3DDEVICEDESC dref, d1, d2;
    D3DDEVICEDESC7 newDesc;
    static CHAR wined3d_and_opengl[] = "Wine D3DDevice using WineD3D and OpenGL"; /*** [Var 1] ***/
    HRESULT hr;

/* [...] */

if(This->d3dversion != 1)
    {
        static CHAR reference_direct3d_id[] = "Reference Direct3D ID";            /*** [Var 2] ***/

/* [...] */
        hr = Callback( (LPIID) &IID_IDirect3DRefDevice, reference_direct3d_id, device_name, &d1, &d2, Context);
        /* [...] */
    }

/* [...] */
    hr = Callback( (LPIID) &IID_D3DDEVICE_WineD3D, wined3d_and_opengl, device_name, &d1, &d2, Context);
    /* [...] */

return D3D_OK;
}

Thanks,

-- Andy.

ddraw: direct3d.c variable-names request

[H. Verbeet]

On 15/08/06, Andrew Talbot  wrote:
> In which case, would you be happy with the suggested names on the lines
> marked Var 1 and Var 2 below?

I could live with that, although perhaps just "reference_description"
and "wined3d_description" would be better.

ddraw: direct3d.c variable-names request

[Andrew Talbot]

H. Verbeet wrote:
> I could live with that, although perhaps just "reference_description"
> and "wined3d_description" would be better.

Then "better" you shall have. :)

-- Andy.