From 1b0003e71b6990951b38c02ae5871413c9608feb Mon Sep 17 00:00:00 2001 From: Aaryaman Vasishta Date: Tue, 21 Jul 2015 16:44:29 +0530 Subject: [PATCH 7/9] d3drm: Implement IDirect3DRMDevice*::GetDirect3DDevice. Reply-To: wine-devel --- dlls/d3drm/device.c | 10 +++++++++- dlls/d3drm/tests/d3drm.c | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 6ddb19f..c94aee5 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1280,7 +1280,15 @@ static D3DRMTEXTUREQUALITY WINAPI d3drm_device3_GetTextureQuality(IDirect3DRMDev static HRESULT WINAPI d3drm_device3_GetDirect3DDevice(IDirect3DRMDevice3 *iface, IDirect3DDevice **d3d_device) { - FIXME("iface %p, d3d_device %p stub!\n", iface, d3d_device); + struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); + TRACE("iface %p, d3d_device %p!\n", iface, d3d_device); + + if (device->device) + { + *d3d_device = device->device; + IDirect3DDevice_AddRef(*d3d_device); + return D3DRM_OK; + } return E_NOTIMPL; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1b9d89c..17a4462 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2008,7 +2008,7 @@ static void test_create_device_from_clipper1(void) /* Fetch immediate mode device in order to access render target */ hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1); - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr); + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr); if (FAILED(hr)) goto cleanup; @@ -2086,7 +2086,7 @@ static void test_create_device_from_clipper1(void) ref2 = get_refcount((IUnknown *)d3drm1); ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2); cref2 = get_refcount((IUnknown *)clipper); - todo_wine ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2); + ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2); /* Test if render target format follows the screen format */ hr = IDirectDraw_GetDisplayMode(ddraw, &desc); @@ -2102,7 +2102,7 @@ static void test_create_device_from_clipper1(void) ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr); hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1); - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr); + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr); if (FAILED(hr)) goto cleanup; -- 2.3.2 (Apple Git-55)