[PATCH 3/7] d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage. (v6 resend)

[Henri Verbeet]

On 19 May 2016 at 12:55, Aaryaman Vasishta <jem456.vasishta at gmail.com> wrote:
> diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
> index 583dbec..1f57058 100644
> --- a/dlls/d3drm/tests/d3drm.c
> +++ b/dlls/d3drm/tests/d3drm.c
> @@ -1705,6 +1705,11 @@ static void test_Texture(void)
>          TRUE, 2 * sizeof(DWORD), NULL, NULL,
>          0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, 0, NULL
>      }, *d3drm_img = NULL;
> +    D3DRMIMAGE testimg = {
Formatting. (Yeah, the existing test is like that as well.)

> +        0, 0, 0, 0, 0,
> +        TRUE, 0, (void *)0xcafebabe, NULL,
> +        0x000000ff, 0x0000ff00, 0x00ff0000, 0, 0, NULL
> +    };
>      DWORD pixel[4] = { 20000, 30000, 10000, 0 };
>      DWORD size;
>      CHAR cname[64] = {0};
> @@ -1853,22 +1858,95 @@ static void test_Texture(void)
>      ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
>
>      /* InitFromImage tests */
> -    d3drm_img = NULL;
> +
> +    /* Tests for validation of D3DRMIMAGE struct */
> +    hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)&texture2);
Line length.

> +    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %x).\n", hr);
It's not a huge issue, but %#x, please.