[PATCH 3/9] d3drm: Implement IDirect3DRMDevice{2-3}::InitFromD3D2. (v2)
Aaryaman Vasishta
jem456.vasishta at gmail.com
Fri Jul 15 05:32:08 CDT 2016
Signed-off-by: Aaryaman Vasishta <jem456.vasishta at gmail.com>
---
dlls/d3drm/d3drm.c | 54 +++-------
dlls/d3drm/device.c | 24 ++++-
dlls/d3drm/tests/d3drm.c | 268 +++++++++++++++++++++++++++++++++++++++++++++--
3 files changed, 293 insertions(+), 53 deletions(-)
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index e98a4b1..9e8630e 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -801,38 +801,22 @@ static HRESULT WINAPI d3drm2_CreateDeviceFromD3D(IDirect3DRM2 *iface,
IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, IDirect3DRMDevice2 **device)
{
struct d3drm *d3drm = impl_from_IDirect3DRM2(iface);
- IDirect3D *d3d1;
- IDirect3DDevice *d3d_device1;
- IDirect3DRMDevice *device1;
+ IDirect3DRMDevice3 *device3;
HRESULT hr;
+
TRACE("iface %p, d3d %p, d3d_device %p, device %p.\n",
iface, d3d, d3d_device, device);
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;
- }
- hr = IDirect3DRM_CreateDeviceFromD3D(&d3drm->IDirect3DRM_iface, d3d1, d3d_device1, &device1);
- IDirect3D_Release(d3d1);
- IDirect3DDevice_Release(d3d_device1);
+ hr = IDirect3DRM3_CreateDeviceFromD3D(&d3drm->IDirect3DRM3_iface, d3d, d3d_device, &device3);
if (FAILED(hr))
return hr;
- hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)device);
- IDirect3DRMDevice_Release(device1);
+ hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IDirect3DRMDevice2, (void **)device);
+ IDirect3DRMDevice3_Release(device3);
return hr;
}
@@ -1361,39 +1345,27 @@ static HRESULT WINAPI d3drm3_CreateDeviceFromD3D(IDirect3DRM3 *iface,
IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, IDirect3DRMDevice3 **device)
{
struct d3drm *d3drm = impl_from_IDirect3DRM3(iface);
- IDirect3D *d3d1;
- IDirect3DDevice *d3d_device1;
- IDirect3DRMDevice *device1;
+ struct d3drm_device *object;
HRESULT hr;
+
TRACE("iface %p, d3d %p, d3d_device %p, device %p.\n",
iface, d3d, d3d_device, device);
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))
+ if (FAILED(hr = d3drm_device_create(&object, &d3drm->IDirect3DRM_iface)))
return hr;
- hr = IDirect3DDevice2_QueryInterface(d3d_device, &IID_IDirect3DDevice, (void **)&d3d_device1);
- if (FAILED(hr))
+
+ if (FAILED(hr = IDirect3DRMDevice3_InitFromD3D2(&object->IDirect3DRMDevice3_iface, d3d, d3d_device)))
{
- IDirect3D_Release(d3d1);
+ d3drm_device_destroy(object);
return hr;
}
+ *device = &object->IDirect3DRMDevice3_iface;
- 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_IDirect3DRMDevice3, (void **)device);
- IDirect3DRMDevice_Release(device1);
-
- return hr;
+ return D3DRM_OK;
}
static HRESULT WINAPI d3drm3_CreateDeviceFromClipper(IDirect3DRM3 *iface,
diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c
index 9d4aafd..449135a 100644
--- a/dlls/d3drm/device.c
+++ b/dlls/d3drm/device.c
@@ -1200,9 +1200,29 @@ static HRESULT WINAPI d3drm_device1_GetDirect3DDevice(IDirect3DRMDevice *iface,
static HRESULT WINAPI d3drm_device3_InitFromD3D2(IDirect3DRMDevice3 *iface,
IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device)
{
- FIXME("iface %p, d3d %p, d3d_device %p stub!\n", iface, d3d, d3d_device);
+ struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface);
+ IDirect3D *d3d1;
+ IDirect3DDevice *d3d_device1;
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("iface %p, d3d %p, d3d_device %p.\n", iface, d3d, d3d_device);
+
+ if (!d3d || !d3d_device)
+ return D3DRMERR_BADVALUE;
+
+ if (FAILED(hr = IDirect3D2_QueryInterface(d3d, &IID_IDirect3D, (void **)&d3d1)))
+ return hr;
+ if (FAILED(hr = IDirect3DDevice2_QueryInterface(d3d_device, &IID_IDirect3DDevice, (void **)&d3d_device1)))
+ {
+ IDirect3D_Release(d3d1);
+ return hr;
+ }
+
+ hr = d3drm_device_set_ddraw_device_d3d(device, d3d1, d3d_device1);
+ IDirect3D_Release(d3d1);
+ IDirect3DDevice_Release(d3d_device1);
+
+ return hr;
}
static HRESULT WINAPI d3drm_device2_InitFromD3D2(IDirect3DRMDevice2 *iface,
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index 63640a1..76e8298 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -4261,22 +4261,23 @@ static IDirect3DDevice2 *create_device2(IDirectDraw2 *ddraw, HWND window, IDirec
static void test_create_device_from_d3d2(void)
{
- IDirectDraw *ddraw1 = NULL;
- IDirectDraw2 *ddraw2 = NULL;
+ IDirectDraw *ddraw1 = NULL, *temp_ddraw1;
+ IDirectDraw2 *ddraw2 = NULL, *temp_ddraw2;
IDirect3D* d3d1;
- IDirect3D2 *d3d2 = NULL;
+ IDirect3D2 *d3d2 = NULL, *temp_d3d2;
IDirect3DRM *d3drm1 = NULL;
IDirect3DRM2 *d3drm2 = NULL;
+ IDirect3DRMDevice *device1;
IDirect3DRMDevice2 *device2 = (IDirect3DRMDevice2 *)0xdeadbeef;
IDirect3DDevice *d3ddevice1;
- IDirect3DDevice2 *d3ddevice2 = NULL, *d3drm_d3ddevice2 = NULL;
+ IDirect3DDevice2 *d3ddevice2 = NULL, *d3drm_d3ddevice2 = NULL, *temp_d3ddevice2;
IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_ds = NULL;
DWORD expected_flags, ret_val;
DDSCAPS caps = { DDSCAPS_ZBUFFER };
DDSURFACEDESC desc;
RECT rc;
HWND window;
- ULONG ref1, ref2, ref3, device_ref1, device_ref2, d3d_ref1, d3d_ref2;
+ ULONG ref1, ref2, ref3, ref4, ref5, device_ref1, device_ref2, d3d_ref1, d3d_ref2;
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
@@ -4401,10 +4402,133 @@ static void test_create_device_from_d3d2(void)
ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
hr = IDirect3DRMDevice2_InitFromD3D(device2, d3d1, NULL);
ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ hr = IDirect3DRMDevice2_QueryInterface(device2, &IID_IDirect3DRMDevice, (void **)&device1);
+ ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
+ todo_wine ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ IDirect3DRMDevice_Release(device1);
+ if (SUCCEEDED(hr))
+ {
+ IDirect3DRMDevice_Release(device1);
+ hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice2,
+ (void **)&device2);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface (hr = %#x).\n", hr);
+ }
}
IDirect3D_Release(d3d1);
IDirect3DDevice_Release(d3ddevice1);
+ hr = IDirect3DRMDevice2_InitFromD3D2(device2, NULL, d3ddevice2);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, NULL);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+
+ hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, d3ddevice2);
+ ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface (hr = %#x)\n", hr);
+ ref4 = get_refcount((IUnknown *)d3drm1);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ device_ref2 = get_refcount((IUnknown *)d3ddevice2);
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ d3d_ref2 = get_refcount((IUnknown *)d3d2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ret_val = IDirect3DRMDevice2_GetWidth(device2);
+ ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ret_val = IDirect3DRMDevice2_GetHeight(device2);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+
+ hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, d3ddevice2);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ref3 = get_refcount((IUnknown *)d3drm1);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ref3 = get_refcount((IUnknown *)d3ddevice2);
+ ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ref3 = get_refcount((IUnknown *)d3d2);
+ ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ /* Release leaked references */
+ while (IDirect3DRM_Release(d3drm1) > ref4);
+ while (IDirect3DDevice2_Release(d3ddevice2) > device_ref2);
+ while (IDirect3D2_Release(d3d2) > d3d_ref2);
+
+ hr = DirectDrawCreate(NULL, &temp_ddraw1, NULL);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface (hr = %#x).\n", hr);
+ hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirect3D2, (void **)&temp_d3d2);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %#x).\n", hr);
+ ref5 = get_refcount((IUnknown *)temp_d3d2);
+
+ hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirectDraw2, (void **)&temp_ddraw2);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface (hr = %#x).\n", hr);
+
+ temp_d3ddevice2 = create_device2(temp_ddraw2, window, &surface);
+ hr = IDirect3DRMDevice2_InitFromD3D2(device2, temp_d3d2, temp_d3ddevice2);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ref3 = get_refcount((IUnknown *)d3drm1);
+ ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %u , ref4 = %u.\n", ref3, ref4);
+ ref3 = get_refcount((IUnknown *)temp_d3ddevice2);
+ ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ref3 = get_refcount((IUnknown *)temp_d3d2);
+ ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ /* Release leaked references */
+ while (IDirect3DRM_Release(d3drm1) > ref4);
+ while (IDirect3DDevice2_Release(temp_d3ddevice2) > 0);
+ while (IDirect3D2_Release(temp_d3d2) > ref5);
+ IDirectDrawSurface_Release(surface);
+ IDirectDraw2_Release(temp_ddraw2);
+ IDirectDraw_Release(temp_ddraw1);
+
+ surface = NULL;
+ hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
+ NULL, &surface, surface_callback);
+ ok(SUCCEEDED(hr), "Failed to enumerate surfaces (hr = %#x).\n", hr);
+ ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
+
+ hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3drm_d3ddevice2);
+ ok(SUCCEEDED(hr), "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 */
+ hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+
+ memset(&desc, 0, sizeof(desc));
+ desc.dwSize = sizeof(desc);
+ hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
+ ok(SUCCEEDED(hr), "Cannot get surface desc structure (hr = %#x).\n", hr);
+
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
+ ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
+ "Expected caps containing %#x, got %#x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
+ ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+
+ hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
+
+ desc.dwSize = sizeof(desc);
+ hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
+ ok(SUCCEEDED(hr), "Cannot get z surface desc structure (hr = %x).\n", hr);
+
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %#x, got %#x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
+ ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+
+ IDirectDrawSurface_Release(d3drm_ds);
+ IDirectDrawSurface_Release(ds);
+ IDirectDrawSurface_Release(surface);
+ IDirect3DDevice2_Release(d3drm_d3ddevice2);
+ IDirect3DRMDevice2_Release(device2);
+ ref3 = get_refcount((IUnknown *)d3drm1);
+ ok(ref1 == ref3, "Expected ref1 == ref3, 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);
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ d3d_ref2 = get_refcount((IUnknown *)d3d2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+
IDirect3DRM2_Release(d3drm2);
IDirect3DRM_Release(d3drm1);
IDirect3DDevice2_Release(d3ddevice2);
@@ -4416,22 +4540,23 @@ static void test_create_device_from_d3d2(void)
static void test_create_device_from_d3d3(void)
{
- IDirectDraw *ddraw1 = NULL;
- IDirectDraw2 *ddraw2 = NULL;
+ IDirectDraw *ddraw1 = NULL, *temp_ddraw1;
+ IDirectDraw2 *ddraw2 = NULL, *temp_ddraw2;
IDirect3D *d3d1;
- IDirect3D2 *d3d2 = NULL;
+ IDirect3D2 *d3d2 = NULL, *temp_d3d2;
IDirect3DRM *d3drm1 = NULL;
IDirect3DRM3 *d3drm3 = NULL;
+ IDirect3DRMDevice *device1;
IDirect3DRMDevice3 *device3 = (IDirect3DRMDevice3 *)0xdeadbeef;
IDirect3DDevice *d3ddevice1;
- IDirect3DDevice2 *d3ddevice2 = NULL, *d3drm_d3ddevice2 = NULL;
+ IDirect3DDevice2 *d3ddevice2 = NULL, *d3drm_d3ddevice2 = NULL, *temp_d3ddevice2;
IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_ds = NULL;
DWORD expected_flags, ret_val;
DDSCAPS caps = { DDSCAPS_ZBUFFER };
DDSURFACEDESC desc;
RECT rc;
HWND window;
- ULONG ref1, ref2, ref3, device_ref1, device_ref2, d3d_ref1, d3d_ref2;
+ ULONG ref1, ref2, ref3, ref4, ref5, device_ref1, device_ref2, d3d_ref1, d3d_ref2;
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
@@ -4554,10 +4679,133 @@ static void test_create_device_from_d3d3(void)
ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
hr = IDirect3DRMDevice3_InitFromD3D(device3, d3d1, NULL);
ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IDirect3DRMDevice, (void **)&device1);
+ ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
+ todo_wine ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ IDirect3DRMDevice_Release(device1);
+ if (SUCCEEDED(hr))
+ {
+ IDirect3DRMDevice_Release(device1);
+ hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice3,
+ (void **)&device3);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %#x).\n", hr);
+ }
}
IDirect3D_Release(d3d1);
IDirect3DDevice_Release(d3ddevice1);
+ hr = IDirect3DRMDevice3_InitFromD3D2(device3, NULL, d3ddevice2);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, NULL);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+
+ hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, d3ddevice2);
+ ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface (hr = %#x)\n", hr);
+ ref4 = get_refcount((IUnknown *)d3drm1);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ device_ref2 = get_refcount((IUnknown *)d3ddevice2);
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ d3d_ref2 = get_refcount((IUnknown *)d3d2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ret_val = IDirect3DRMDevice3_GetWidth(device3);
+ ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ret_val = IDirect3DRMDevice3_GetHeight(device3);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+
+ hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, d3ddevice2);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ref3 = get_refcount((IUnknown *)d3drm1);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ref3 = get_refcount((IUnknown *)d3ddevice2);
+ ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ref3 = get_refcount((IUnknown *)d3d2);
+ ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ /* Release leaked references */
+ while (IDirect3DRM_Release(d3drm1) > ref4);
+ while (IDirect3DDevice2_Release(d3ddevice2) > device_ref2);
+ while (IDirect3D2_Release(d3d2) > d3d_ref2);
+
+ hr = DirectDrawCreate(NULL, &temp_ddraw1, NULL);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface (hr = %#x).\n", hr);
+ hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirect3D2, (void **)&temp_d3d2);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %#x).\n", hr);
+ ref5 = get_refcount((IUnknown *)temp_d3d2);
+
+ hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirectDraw2, (void **)&temp_ddraw2);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface (hr = %#x).\n", hr);
+
+ temp_d3ddevice2 = create_device2(temp_ddraw2, window, &surface);
+ hr = IDirect3DRMDevice3_InitFromD3D2(device3, temp_d3d2, temp_d3ddevice2);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ref3 = get_refcount((IUnknown *)d3drm1);
+ ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %u , ref4 = %u.\n", ref3, ref4);
+ ref3 = get_refcount((IUnknown *)temp_d3ddevice2);
+ ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ref3 = get_refcount((IUnknown *)temp_d3d2);
+ ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ /* Release leaked references */
+ while (IDirect3DRM_Release(d3drm1) > ref4);
+ while (IDirect3DDevice2_Release(temp_d3ddevice2) > 0);
+ while (IDirect3D2_Release(temp_d3d2) > ref5);
+ IDirectDrawSurface_Release(surface);
+ IDirectDraw2_Release(temp_ddraw2);
+ IDirectDraw_Release(temp_ddraw1);
+
+ surface = NULL;
+ hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
+ NULL, &surface, surface_callback);
+ ok(SUCCEEDED(hr), "Failed to enumerate surfaces (hr = %#x).\n", hr);
+ ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
+
+ hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3drm_d3ddevice2);
+ ok(SUCCEEDED(hr), "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 */
+ hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+
+ memset(&desc, 0, sizeof(desc));
+ desc.dwSize = sizeof(desc);
+ hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
+ ok(SUCCEEDED(hr), "Cannot get surface desc structure (hr = %x).\n", hr);
+
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
+ ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
+ "Expected caps containing %#x, got %#x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
+ ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+
+ hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
+
+ desc.dwSize = sizeof(desc);
+ hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
+ ok(SUCCEEDED(hr), "Cannot get z surface desc structure (hr = %x).\n", hr);
+
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %#x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
+ ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+
+ IDirectDrawSurface_Release(d3drm_ds);
+ IDirectDrawSurface_Release(ds);
+ IDirectDrawSurface_Release(surface);
+ IDirect3DDevice2_Release(d3drm_d3ddevice2);
+ IDirect3DRMDevice3_Release(device3);
+ ref3 = get_refcount((IUnknown *)d3drm1);
+ ok(ref1 == ref3, "expected ref1 == ref3, 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);
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ d3d_ref2 = get_refcount((IUnknown *)d3d2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+
IDirect3DRM3_Release(d3drm3);
IDirect3DRM_Release(d3drm1);
IDirect3DDevice2_Release(d3ddevice2);
--
2.3.2 (Apple Git-55)
More information about the wine-patches
mailing list