[PATCH 2/6] d3drm: Implement IDirect3DRM{2-3}::CreateDeviceFromD3D.
Aaryaman Vasishta
jem456.vasishta at gmail.com
Thu Aug 20 09:46:40 CDT 2015
---
dlls/d3drm/d3drm.c | 67 ++++++++++++++++++++++++++++++++++++++++--------
dlls/d3drm/device.c | 15 +++--------
dlls/d3drm/tests/d3drm.c | 46 +++++++++++++++++----------------
3 files changed, 84 insertions(+), 44 deletions(-)
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index 6372cce..6d75605 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -707,20 +707,43 @@ static HRESULT WINAPI d3drm2_CreateDeviceFromSurface(IDirect3DRM2 *iface, GUID *
}
static HRESULT WINAPI d3drm2_CreateDeviceFromD3D(IDirect3DRM2 *iface,
- IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, IDirect3DRMDevice2 **device)
+ IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, IDirect3DRMDevice2 **device)
{
- struct d3drm_device *object;
+ struct d3drm *d3drm = impl_from_IDirect3DRM2(iface);
+ IDirect3D *d3d1;
+ IDirect3DDevice *d3d_device1;
+ IDirect3DRMDevice *device1;
HRESULT hr;
- FIXME("iface %p, d3d %p, d3d_device %p, device %p partial stub.\n",
+ TRACE("iface %p, d3d %p, d3d_device %p, device %p.\n",
iface, d3d, d3d_device, device);
- hr = d3drm_device_create(&object);
+ if (!device)
+ return D3DRMERR_BADVALUE;
+ *device = NULL;
+ if (!d3d || !d3d_device)
+ return D3DRMERR_BADVALUE;
+
+ hr = IDirect3D2_QueryInterface(d3d, &IID_IDirect3D, (void **)&d3d1);
if (FAILED(hr))
return hr;
- *device = IDirect3DRMDevice2_from_impl(object);
+ hr = IDirect3DDevice2_QueryInterface(d3d_device, &IID_IDirect3DDevice, (void **)&d3d_device1);
+ if (FAILED(hr))
+ {
+ IDirect3D_Release(d3d1);
+ return hr;
+ }
- return D3DRM_OK;
+ hr = IDirect3DRM_CreateDeviceFromD3D(&d3drm->IDirect3DRM_iface, d3d1, d3d_device1, &device1);
+ IDirect3D_Release(d3d1);
+ IDirect3DDevice_Release(d3d_device1);
+ if (FAILED(hr))
+ return hr;
+
+ hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)device);
+ IDirect3DRMDevice_Release(device1);
+
+ return hr;
}
static HRESULT WINAPI d3drm2_CreateDeviceFromClipper(IDirect3DRM2 *iface,
@@ -1137,18 +1160,40 @@ static HRESULT WINAPI d3drm3_CreateDeviceFromSurface(IDirect3DRM3 *iface, GUID *
static HRESULT WINAPI d3drm3_CreateDeviceFromD3D(IDirect3DRM3 *iface,
IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, IDirect3DRMDevice3 **device)
{
- struct d3drm_device *object;
+ struct d3drm *d3drm = impl_from_IDirect3DRM3(iface);
+ IDirect3D *d3d1;
+ IDirect3DDevice *d3d_device1;
+ IDirect3DRMDevice *device1;
HRESULT hr;
- FIXME("iface %p, d3d %p, d3d_device %p, device %p partial stub.\n",
+ TRACE("iface %p, d3d %p, d3d_device %p, device %p.\n",
iface, d3d, d3d_device, device);
- hr = d3drm_device_create(&object);
+ if (!device)
+ return D3DRMERR_BADVALUE;
+ *device = NULL;
+ if (!d3d || !d3d_device)
+ return D3DRMERR_BADVALUE;
+
+ hr = IDirect3D2_QueryInterface(d3d, &IID_IDirect3D, (void **)&d3d1);
if (FAILED(hr))
return hr;
+ hr = IDirect3DDevice2_QueryInterface(d3d_device, &IID_IDirect3DDevice, (void **)&d3d_device1);
+ if (FAILED(hr))
+ {
+ IDirect3D_Release(d3d1);
+ return hr;
+ }
- *device = IDirect3DRMDevice3_from_impl(object);
+ hr = IDirect3DRM_CreateDeviceFromD3D(&d3drm->IDirect3DRM_iface, d3d1, d3d_device1, &device1);
+ IDirect3D_Release(d3d1);
+ IDirect3DDevice_Release(d3d_device1);
+ if (FAILED(hr))
+ return hr;
- return D3DRM_OK;
+ hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice3, (void **)device);
+ IDirect3DRMDevice_Release(device1);
+
+ return hr;
}
static HRESULT WINAPI d3drm3_CreateDeviceFromClipper(IDirect3DRM3 *iface,
diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c
index 3cf6791..50d8b72 100644
--- a/dlls/d3drm/device.c
+++ b/dlls/d3drm/device.c
@@ -1302,14 +1302,10 @@ static HRESULT WINAPI d3drm_device3_GetDirect3DDevice(IDirect3DRMDevice3 *iface,
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;
- }
+ *d3d_device = device->device;
+ IDirect3DDevice_AddRef(*d3d_device);
- return E_NOTIMPL;
+ return D3DRM_OK;
}
static HRESULT WINAPI d3drm_device3_InitFromD3D2(IDirect3DRMDevice3 *iface,
@@ -1355,10 +1351,7 @@ static HRESULT WINAPI d3drm_device3_GetDirect3DDevice2(IDirect3DRMDevice3 *iface
TRACE("iface %p, d3d_device %p.\n", iface, d3d_device);
- if (device->device)
- return IDirect3DDevice_QueryInterface(device->device, &IID_IDirect3DDevice2, (void**)d3d_device);
-
- return E_NOTIMPL;
+ return IDirect3DDevice_QueryInterface(device->device, &IID_IDirect3DDevice2, (void**)d3d_device);
}
static HRESULT WINAPI d3drm_device3_FindPreferredTextureFormat(IDirect3DRMDevice3 *iface,
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index b971938..4e5845c 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -3299,7 +3299,7 @@ static void test_create_device_from_d3d2(void)
IDirect3D2 *d3d2 = NULL;
IDirect3DRM *d3drm1 = NULL;
IDirect3DRM2 *d3drm2 = NULL;
- IDirect3DRMDevice2 *device2 = NULL;
+ IDirect3DRMDevice2 *device2 = (IDirect3DRMDevice2 *)0xdeadbeef;
IDirect3DDevice2 *d3ddevice2 = NULL, *d3drm_d3ddevice2 = NULL;
IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_ds = NULL;
DWORD expected_flags;
@@ -3341,14 +3341,22 @@ static void test_create_device_from_d3d2(void)
ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
ref2 = get_refcount((IUnknown *)d3drm2);
+ hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, NULL, d3ddevice2, &device2);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
+ hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, NULL, &device2);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, d3ddevice2, NULL);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+
hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, d3ddevice2, &device2);
ok(hr == DD_OK, "Failed to 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);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- todo_wine ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
@@ -3356,9 +3364,7 @@ static void test_create_device_from_d3d2(void)
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3drm_d3ddevice2);
- todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
- if (FAILED(hr))
- goto cleanup;
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode deivce created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
@@ -3393,13 +3399,8 @@ static void test_create_device_from_d3d2(void)
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
- ds = NULL;
IDirectDrawSurface_Release(surface);
IDirect3DDevice2_Release(d3drm_d3ddevice2);
-cleanup:
- if (ds)
- IDirectDrawSurface_Release(ds);
-
IDirect3DRMDevice2_Release(device2);
ref3 = get_refcount((IUnknown *)d3drm1);
ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
@@ -3424,7 +3425,7 @@ static void test_create_device_from_d3d3(void)
IDirect3D2 *d3d2 = NULL;
IDirect3DRM *d3drm1 = NULL;
IDirect3DRM3 *d3drm3 = NULL;
- IDirect3DRMDevice3 *device3 = NULL;
+ IDirect3DRMDevice3 *device3 = (IDirect3DRMDevice3 *)0xdeadbeef;
IDirect3DDevice2 *d3ddevice2 = NULL, *d3drm_d3ddevice2 = NULL;
IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_ds = NULL;
DWORD expected_flags;
@@ -3466,14 +3467,22 @@ static void test_create_device_from_d3d3(void)
ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
ref2 = get_refcount((IUnknown *)d3drm3);
+ hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, NULL, d3ddevice2, &device3);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
+ hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, NULL, &device3);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, d3ddevice2, NULL);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, d3ddevice2, &device3);
ok(hr == DD_OK, "Failed to 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);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- todo_wine ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
@@ -3481,9 +3490,7 @@ static void test_create_device_from_d3d3(void)
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3drm_d3ddevice2);
- todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
- if (FAILED(hr))
- goto cleanup;
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode deivce created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
@@ -3518,13 +3525,8 @@ static void test_create_device_from_d3d3(void)
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
- ds = NULL;
IDirectDrawSurface_Release(surface);
IDirect3DDevice2_Release(d3drm_d3ddevice2);
-cleanup:
- if (ds)
- IDirectDrawSurface_Release(ds);
-
IDirect3DRMDevice3_Release(device3);
ref3 = get_refcount((IUnknown *)d3drm1);
ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
--
2.3.2 (Apple Git-55)
More information about the wine-patches
mailing list