Re: [PATCH 5/5] d3drm: Implement IDirect3DRM{2-3}::CreateDeviceFromClipper.

[Aaryaman Vasishta]

Please ignore this patchset.
Just realized this patchset was already committed 13 hours ago. Is the bot
on IRC not working?

Cheers,
Jam

On Wed, Aug 19, 2015 at 12:17 AM, Aaryaman Vasishta <
jem456.vasishta(a)gmail.com> wrote:
> ---
>  dlls/d3drm/d3drm.c       | 54
> +++++++++++++++++++++++++++++++++++++++++-------
>  dlls/d3drm/tests/d3drm.c | 36 ++++++++++++++++----------------
>  2 files changed, 64 insertions(+), 26 deletions(-)
>
> diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
> index e4cc4fa..61d0a25 100644
> --- a/dlls/d3drm/d3drm.c
> +++ b/dlls/d3drm/d3drm.c
> @@ -697,18 +697,24 @@ static HRESULT WINAPI
> d3drm2_CreateDeviceFromClipper(IDirect3DRM2 *iface,
>          IDirectDrawClipper *clipper, GUID *guid, int width, int height,
>          IDirect3DRMDevice2 **device)
>  {
> -    struct d3drm_device *object;
> +    struct d3drm *d3drm = impl_from_IDirect3DRM2(iface);
> +    IDirect3DRMDevice3 *device3;
>      HRESULT hr;
> -    FIXME("iface %p, clipper %p, guid %s, width %d, height %d, device
> %p.\n",
> +
> +    TRACE("iface %p, clipper %p, guid %s, width %d, height %d, device
> %p.\n",
>              iface, clipper, debugstr_guid(guid), width, height, device);
>
> -    hr = d3drm_device_create(&object);
> +    if (!device)
> +        return D3DRMERR_BADVALUE;
> +    *device = NULL;
> +    hr = IDirect3DRM3_CreateDeviceFromClipper(&d3drm->IDirect3DRM3_iface,
> clipper, guid, width, height, &device3);
>      if (FAILED(hr))
>          return hr;
>
> -    *device = IDirect3DRMDevice2_from_impl(object);
> +    hr = IDirect3DRMDevice3_QueryInterface(device3,
> &IID_IDirect3DRMDevice2, (void**)device);
> +    IDirect3DRMDevice3_Release(device3);
>
> -    return D3DRM_OK;
> +    return hr;
>  }
>
> static HRESULT WINAPI d3drm2_CreateTextureFromSurface(IDirect3DRM2 *iface,
> @@ -1103,18 +1109,50 @@ static HRESULT WINAPI
> d3drm3_CreateDeviceFromClipper(IDirect3DRM3 *iface,
>          IDirectDrawClipper *clipper, GUID *guid, int width, int height,
>          IDirect3DRMDevice3 **device)
>  {
> +    struct d3drm *d3drm = impl_from_IDirect3DRM3(iface);
>      struct d3drm_device *object;
> +    IDirectDraw *ddraw;
> +    IDirectDrawSurface *render_target;
>      HRESULT hr;
> -    FIXME("iface %p, clipper %p, guid %s, width %d, height %d, device
> %p.\n",
> +
> +    TRACE("iface %p, clipper %p, guid %s, width %d, height %d, device
> %p.\n",
>              iface, clipper, debugstr_guid(guid), width, height, device);
>
> +    if (!device)
> +        return D3DRMERR_BADVALUE;
> +    *device = NULL;
> +
> +    if (!clipper || !width || !height)
> +        return D3DRMERR_BADVALUE;
> +
> +    hr = DirectDrawCreate(NULL, &ddraw, NULL);
> +    if (FAILED(hr))
> +        return hr;
> +
>      hr = d3drm_device_create(&object);
>      if (FAILED(hr))
> +    {
> +        IDirectDraw_Release(ddraw);
>          return hr;
> +    }
>
> -    *device = IDirect3DRMDevice3_from_impl(object);
> +    hr = d3drm_device_create_surfaces_from_clipper(object, ddraw,
> clipper, width, height, &render_target);
> +    if (FAILED(hr))
> +    {
> +        IDirectDraw_Release(ddraw);
> +        d3drm_device_destroy(object);
> +        return hr;
> +    }
>
> -    return D3DRM_OK;
> +    hr = d3drm_device_init(object, 3, &d3drm->IDirect3DRM_iface, ddraw,
> render_target);
> +    IDirectDraw_Release(ddraw);
> +    IDirectDrawSurface_Release(render_target);
> +    if (FAILED(hr))
> +        d3drm_device_destroy(object);
> +    else
> +        *device = IDirect3DRMDevice3_from_impl(object);
> +
> +    return hr;
>  }
>
> static HRESULT WINAPI d3drm3_CreateShadow(IDirect3DRM3 *iface, IUnknown
> *object, IDirect3DRMLight *light,
> diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
> index c797ccd..2d25bf3 100644
> --- a/dlls/d3drm/tests/d3drm.c
> +++ b/dlls/d3drm/tests/d3drm.c
> @@ -2134,7 +2134,7 @@ static void test_create_device_from_clipper2(void)
>      IDirect3DRM2 *d3drm2 = NULL;
>      IDirectDraw *ddraw = NULL;
>      IUnknown *unknown = NULL;
> -    IDirect3DRMDevice2 *device2 = NULL;
> +    IDirect3DRMDevice2 *device2 = (IDirect3DRMDevice2 *)0xdeadbeef;
>      IDirect3DDevice2 *d3ddevice2 = NULL;
>      IDirectDrawClipper *clipper = NULL, *d3drm_clipper = NULL;
>      IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_primary = NULL;
> @@ -2164,24 +2164,24 @@ static void test_create_device_from_clipper2(void)
>      ref2 = get_refcount((IUnknown *)d3drm2);
>
> hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver,
> 0, 0, &device2);
> -    todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr ==
> D3DRMERR_BADVALUE, got %x.\n", hr);
> -    if (SUCCEEDED(hr))
> -        IDirect3DRMDevice2_Release(device2);
> +    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got
> %x.\n", hr);
> +    ok(device2 == NULL, "Expected device returned == NULL, got %p.\n",
> device2);
>
> /* If NULL is passed for clipper, CreateDeviceFromClipper returns
> D3DRMERR_BADVALUE */
>      hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, NULL, &driver, 300,
> 200, &device2);
> -    todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr ==
> D3DRMERR_BADVALUE, got %x.\n", hr);
> -    if (SUCCEEDED(hr))
> -        IDirect3DRMDevice2_Release(device2);
> +    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got
> %x.\n", hr);
> +
> +    hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver,
> 300, 200, NULL);
> +    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got
> %x.\n", hr);
>
> hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver,
> 300, 200, &device2);
>      ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr =
> %x).\n", hr);
>      ref3 = get_refcount((IUnknown *)d3drm1);
> -    todo_wine ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3
> = %u.\n", ref1, ref3);
> +    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n",
> ref1, ref3);
>      ref3 = get_refcount((IUnknown *)d3drm2);
>      ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 =
> %u.\n", ref2, ref3);
>      cref2 = get_refcount((IUnknown *)clipper);
> -    todo_wine ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u ,
> cref2 = %u.\n", cref1, cref2);
> +    ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 =
> %u.\n", cref1, cref2);
>
> /* Fetch immediate mode device in order to access render target */
>      hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
> @@ -2322,7 +2322,7 @@ static void test_create_device_from_clipper3(void)
>      IDirect3DRM3 *d3drm3 = NULL;
>      IDirectDraw *ddraw = NULL;
>      IUnknown *unknown = NULL;
> -    IDirect3DRMDevice3 *device3 = NULL;
> +    IDirect3DRMDevice3 *device3 = (IDirect3DRMDevice3 *)0xdeadbeef;
>      IDirect3DDevice2 *d3ddevice2 = NULL;
>      IDirectDrawClipper *clipper = NULL, *d3drm_clipper = NULL;
>      IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_primary = NULL;
> @@ -2352,24 +2352,24 @@ static void test_create_device_from_clipper3(void)
>      ref2 = get_refcount((IUnknown *)d3drm3);
>
> hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver,
> 0, 0, &device3);
> -    todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr ==
> D3DRMERR_BADVALUE, got %x.\n", hr);
> -    if (SUCCEEDED(hr))
> -        IDirect3DRMDevice3_Release(device3);
> +    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got
> %x.\n", hr);
> +    ok(device3 == NULL, "Expected device returned == NULL, got %p.\n",
> device3);
>
> /* If NULL is passed for clipper, CreateDeviceFromClipper returns
> D3DRMERR_BADVALUE */
>      hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, NULL, &driver, 300,
> 200, &device3);
> -    todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr ==
> D3DRMERR_BADVALUE, got %x.\n", hr);
> -    if (SUCCEEDED(hr))
> -        IDirect3DRMDevice3_Release(device3);
> +    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got
> %x.\n", hr);
> +
> +    hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver,
> 300, 200, NULL);
> +    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got
> %x.\n", hr);
>
> hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver,
> 300, 200, &device3);
>      ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr =
> %x).\n", hr);
>      ref3 = get_refcount((IUnknown *)d3drm1);
> -    todo_wine ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3
> = %u.\n", ref1, ref3);
> +    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n",
> ref1, ref3);
>      ref3 = get_refcount((IUnknown *)d3drm3);
>      ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 =
> %u.\n", ref2, ref3);
>      cref2 = get_refcount((IUnknown *)clipper);
> -    todo_wine ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u ,
> cref2 = %u.\n", cref1, cref2);
> +    ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 =
> %u.\n", cref1, cref2);
>
> /* Fetch immediate mode device in order to access render target */
>      hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
> --
> 2.3.2 (Apple Git-55)

[PATCH 5/5] d3drm: Implement IDirect3DRM{2-3}::CreateDeviceFromClipper.

[Stefan Dösinger]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am 2015-08-18 um 20:55 schrieb Aaryaman Vasishta:
> Please ignore this patchset. Just realized this patchset was
> already committed 13 hours ago. Is the bot on IRC not working?
> Ya, a the bot seems dead.

A fetch + rebase right before sending is always a good idea, it avoids
this kind of accidental spam and it'll make sure you notice conflicts
introduced by patches from other people.

Also, I don't think the patches hit the repo 13 hours ago. I fetched
this afternoon, and they weren't there yet. I'm not sure how it works
exactly, but I think the commit time is when AJ accepts the patches
into his repo, not when he pushes his repo to the server. Between that
is a lot of automated compiling and testing if I understand it right.

Cheers,
Stefan

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBAgAGBQJV04FIAAoJEN0/YqbEcdMwpZgP/A1Ie7roLAOScMhyUuycrTtP
v0HRclrmQMYmmvoBnlxlmJlWLrX+1+OKAJK5fnN0AMMUVrMquoTOPumStptwI9OK
0FLU1Vx4KC4VH8aOIiPi7w1VdZLumx5vOuJl+kzB0ibAa6xjGDUrtCNu9o7jw0EU
NPso+y/zTp1XjFMN08g8mS/tWpaI1Ti1djggLEvkP7zrFntkAc7zu8pToDCKwmuU
A1AxG/XDyJUR/AeqlHkRAPOdjVjhiucsaCS7bTl4RpG5mAFOsCDBta1dK93oVzRH
bD8Epjy4SaHs1cfA9oOa8KBrBR1LlvDHIppZcX1LbUTLk1ylyujImYUo4JemEcx/
pcl2nnfAWl7fbA2B55RffhuOtBnSjr4Tn1HvwqhpPsyg0YYkKRjU8QCSAcNYNfzc
BN6Q2ToKmgFhTqKRVRXw8IVLYwsQtHf8wkjRrMRRVX5kpZrUOQ04vRDmkCdAboPe
KdSe3o2Zdoa4+qkcTG8Nacgau0G5oqrPNNNyX0n11ajrguPDvJnMpS6sQTm9eYwV
S9YugEuq+IfgSzdDNLchKrT0t7Hv+V+IxVXdNFt1CbIMTwIcCSd/yh82zTWLzZYl
t3W44RYg7lgECUUfRIgs/q8IpsyDspGfQh8ZgyLwh+Vt91G734j8V/eyt5OeBUEQ
X7sJ5xmxzW8ldnFYm21a
=/BSt
-----END PGP SIGNATURE-----

[PATCH 5/5] d3drm: Implement IDirect3DRM{2-3}::CreateDeviceFromClipper.

[Aaryaman Vasishta]

A fetch + rebase right before sending is always a good idea, it avoids
> this kind of accidental spam and it'll make sure you notice conflicts
> introduced by patches from other people.

I'll keep that in mind the next time I send patches, I'll need to stop
relying on the bot for commit reporting.
> Also, I don't think the patches hit the repo 13 hours ago. I fetched
> this afternoon, and they weren't there yet. I'm not sure how it works
> exactly, but I think the commit time is when AJ accepts the patches
> into his repo, not when he pushes his repo to the server. Between that
> is a lot of automated compiling and testing if I understand it right.

So the shortlog reports the accept times, I guess (
https://source.winehq.org/git/wine.git/shortlog).

Cheers,
Jam