[PATCH 5/5] d3d9/tests: Merge surface.c into device.c.

Henri Verbeet hverbeet at codeweavers.com
Fri Jan 11 05:07:51 CST 2013


---
 dlls/d3d9/tests/Makefile.in |    1 -
 dlls/d3d9/tests/device.c    |  956 ++++++++++++++++++++++++++++++++++++++++++-
 dlls/d3d9/tests/surface.c   |  841 -------------------------------------
 3 files changed, 955 insertions(+), 843 deletions(-)
 delete mode 100644 dlls/d3d9/tests/surface.c

diff --git a/dlls/d3d9/tests/Makefile.in b/dlls/d3d9/tests/Makefile.in
index fd0b561..380d105 100644
--- a/dlls/d3d9/tests/Makefile.in
+++ b/dlls/d3d9/tests/Makefile.in
@@ -5,7 +5,6 @@ C_SRCS = \
 	d3d9ex.c \
 	device.c \
 	stateblock.c \
-	surface.c \
 	vertexdeclaration.c \
 	visual.c
 
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 9b2858d..c81047a 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006 Vitaliy Margolen
  * Copyright (C) 2006 Chris Robinson
- * Copyright 2006-2007, 2010 Stefan Dösinger for CodeWeavers
+ * Copyright 2006-2007, 2010, 2011 Stefan Dösinger for CodeWeavers
  * Copyright 2005, 2006, 2007 Henri Verbeet
  * Copyright 2013 Henri Verbeet for CodeWeavers
  * Copyright (C) 2008 Rico Schüller
@@ -5024,6 +5024,950 @@ static void test_lod(void)
     DestroyWindow(window);
 }
 
+static void test_surface_get_container(void)
+{
+    IDirect3DTexture9 *texture = NULL;
+    IDirect3DSurface9 *surface = NULL;
+    IDirect3DDevice9 *device;
+    IUnknown *container;
+    IDirect3D9 *d3d;
+    ULONG refcount;
+    HWND window;
+    HRESULT hr;
+
+    if (!(d3d = pDirect3DCreate9(D3D_SDK_VERSION)))
+    {
+        skip("Failed to create D3D object, skipping tests.\n");
+        return;
+    }
+
+    window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW,
+            0, 0, 640, 480, 0, 0, 0, 0);
+    if (!(device = create_device(d3d, window, window, TRUE)))
+    {
+        skip("Failed to create a D3D device, skipping tests.\n");
+        IDirect3D9_Release(d3d);
+        DestroyWindow(window);
+        return;
+    }
+
+    hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, 0,
+            D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture, NULL);
+    ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+    ok(!!texture, "Got unexpected texture %p.\n", texture);
+
+    hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface);
+    ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr);
+    ok(!!surface, "Got unexpected surface %p.\n", surface);
+
+    /* These should work... */
+    container = NULL;
+    hr = IDirect3DSurface9_GetContainer(surface, &IID_IUnknown, (void **)&container);
+    ok(SUCCEEDED(hr), "Failed to get surface container, hr %#x.\n", hr);
+    ok(container == (IUnknown *)texture, "Got unexpected container %p, expected %p.\n", container, texture);
+    IUnknown_Release(container);
+
+    container = NULL;
+    hr = IDirect3DSurface9_GetContainer(surface, &IID_IDirect3DResource9, (void **)&container);
+    ok(SUCCEEDED(hr), "Failed to get surface container, hr %#x.\n", hr);
+    ok(container == (IUnknown *)texture, "Got unexpected container %p, expected %p.\n", container, texture);
+    IUnknown_Release(container);
+
+    container = NULL;
+    hr = IDirect3DSurface9_GetContainer(surface, &IID_IDirect3DBaseTexture9, (void **)&container);
+    ok(SUCCEEDED(hr), "Failed to get surface container, hr %#x.\n", hr);
+    ok(container == (IUnknown *)texture, "Got unexpected container %p, expected %p.\n", container, texture);
+    IUnknown_Release(container);
+
+    container = NULL;
+    hr = IDirect3DSurface9_GetContainer(surface, &IID_IDirect3DTexture9, (void **)&container);
+    ok(SUCCEEDED(hr), "Failed to get surface container, hr %#x.\n", hr);
+    ok(container == (IUnknown *)texture, "Got unexpected container %p, expected %p.\n", container, texture);
+    IUnknown_Release(container);
+
+    /* ...and this one shouldn't. This should return E_NOINTERFACE and set container to NULL. */
+    hr = IDirect3DSurface9_GetContainer(surface, &IID_IDirect3DSurface9, (void **)&container);
+    ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr);
+    ok(!container, "Got unexpected container %p.\n", container);
+
+    IDirect3DSurface9_Release(surface);
+    IDirect3DTexture9_Release(texture);
+    refcount = IDirect3DDevice9_Release(device);
+    ok(!refcount, "Device has %u references left.\n", refcount);
+    IDirect3D9_Release(d3d);
+    DestroyWindow(window);
+}
+
+static void test_surface_alignment(void)
+{
+    IDirect3DSurface9 *surface;
+    IDirect3DDevice9 *device;
+    D3DLOCKED_RECT lr;
+    unsigned int i, j;
+    IDirect3D9 *d3d;
+    ULONG refcount;
+    HWND window;
+    HRESULT hr;
+
+    if (!(d3d = pDirect3DCreate9(D3D_SDK_VERSION)))
+    {
+        skip("Failed to create D3D object, skipping tests.\n");
+        return;
+    }
+
+    window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW,
+            0, 0, 640, 480, 0, 0, 0, 0);
+    if (!(device = create_device(d3d, window, window, TRUE)))
+    {
+        skip("Failed to create a D3D device, skipping tests.\n");
+        IDirect3D9_Release(d3d);
+        DestroyWindow(window);
+        return;
+    }
+
+    /* Test a sysmem surface because those aren't affected by the hardware's np2 restrictions. */
+    hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 5, 5,
+            D3DFMT_R5G6B5, D3DPOOL_SYSTEMMEM, &surface, NULL);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+
+    hr = IDirect3DSurface9_LockRect(surface, &lr, NULL, 0);
+    ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr);
+    ok(!(lr.Pitch & 3), "Got misaligned pitch %d.\n", lr.Pitch);
+    /* Some applications also depend on the exact pitch, rather than just the
+     * alignment. */
+    ok(lr.Pitch == 12, "Got unexpected pitch %d.\n", lr.Pitch);
+    hr = IDirect3DSurface9_UnlockRect(surface);
+    ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+    IDirect3DSurface9_Release(surface);
+
+    for (i = 0; i < 5; ++i)
+    {
+        IDirect3DTexture9 *texture;
+        unsigned int level_count;
+        D3DSURFACE_DESC desc;
+        int expected_pitch;
+
+        hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, 0,
+                MAKEFOURCC('D', 'X', 'T', '1' + i), D3DPOOL_MANAGED, &texture, NULL);
+        ok(SUCCEEDED(hr) || hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+        if (FAILED(hr))
+        {
+            skip("DXT%u surfaces are not supported, skipping tests.\n", i + 1);
+            continue;
+        }
+
+        level_count = IDirect3DBaseTexture9_GetLevelCount(texture);
+        for (j = 0; j < level_count; ++j)
+        {
+            IDirect3DTexture9_GetLevelDesc(texture, j, &desc);
+            hr = IDirect3DTexture9_LockRect(texture, j, &lr, NULL, 0);
+            ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr);
+            hr = IDirect3DTexture9_UnlockRect(texture, j);
+            ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr);
+
+            expected_pitch = ((desc.Width + 3) >> 2) << 3;
+            if (i > 0)
+                expected_pitch <<= 1;
+            ok(lr.Pitch == expected_pitch, "Got unexpected pitch %d for DXT%u level %u (%ux%u), expected %d.\n",
+                    lr.Pitch, i + 1, j, desc.Width, desc.Height, expected_pitch);
+        }
+        IDirect3DTexture9_Release(texture);
+    }
+
+    refcount = IDirect3DDevice9_Release(device);
+    ok(!refcount, "Device has %u references left.\n", refcount);
+    IDirect3D9_Release(d3d);
+    DestroyWindow(window);
+}
+
+/* Since the DXT formats are based on 4x4 blocks, locking works slightly
+ * different from regular formats. This test verifies we return the correct
+ * memory offsets. */
+static void test_lockrect_offset(void)
+{
+    static const struct
+    {
+        D3DFORMAT format;
+        const char *name;
+        unsigned int block_width;
+        unsigned int block_height;
+        unsigned int block_size;
+    }
+    dxt_formats[] =
+    {
+        {D3DFMT_DXT1,                 "D3DFMT_DXT1", 4, 4, 8},
+        {D3DFMT_DXT2,                 "D3DFMT_DXT2", 4, 4, 16},
+        {D3DFMT_DXT3,                 "D3DFMT_DXT3", 4, 4, 16},
+        {D3DFMT_DXT4,                 "D3DFMT_DXT4", 4, 4, 16},
+        {D3DFMT_DXT5,                 "D3DFMT_DXT5", 4, 4, 16},
+        {MAKEFOURCC('A','T','I','2'), "ATI2N",       1, 1,  1},
+    };
+    unsigned int expected_offset, offset, i;
+    const RECT rect = {60, 60, 68, 68};
+    IDirect3DSurface9 *surface;
+    D3DLOCKED_RECT locked_rect;
+    IDirect3DDevice9 *device;
+    int expected_pitch;
+    IDirect3D9 *d3d;
+    ULONG refcount;
+    HWND window;
+    BYTE *base;
+    HRESULT hr;
+
+    if (!(d3d = pDirect3DCreate9(D3D_SDK_VERSION)))
+    {
+        skip("Failed to create D3D object, skipping tests.\n");
+        return;
+    }
+
+    window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW,
+            0, 0, 640, 480, 0, 0, 0, 0);
+    if (!(device = create_device(d3d, window, window, TRUE)))
+    {
+        skip("Failed to create a D3D device, skipping tests.\n");
+        IDirect3D9_Release(d3d);
+        DestroyWindow(window);
+        return;
+    }
+
+    for (i = 0; i < (sizeof(dxt_formats) / sizeof(*dxt_formats)); ++i)
+    {
+        if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8,
+                0, D3DRTYPE_TEXTURE, dxt_formats[i].format)))
+        {
+            skip("Format %s not supported, skipping lockrect offset tests.\n", dxt_formats[i].name);
+            continue;
+        }
+
+        hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128,
+                dxt_formats[i].format, D3DPOOL_SCRATCH, &surface, NULL);
+        ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+
+        hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0);
+        ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr);
+
+        base = locked_rect.pBits;
+        expected_pitch = (128 + dxt_formats[i].block_height - 1) / dxt_formats[i].block_width
+                * dxt_formats[i].block_size;
+        ok(locked_rect.Pitch == expected_pitch, "Got unexpected pitch %d for format %s, expected %d.\n",
+                locked_rect.Pitch, dxt_formats[i].name, expected_pitch);
+
+        hr = IDirect3DSurface9_UnlockRect(surface);
+        ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+
+        hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0);
+        ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr);
+
+        offset = (BYTE *)locked_rect.pBits - base;
+        expected_offset = (rect.top / dxt_formats[i].block_height) * expected_pitch
+                + (rect.left / dxt_formats[i].block_width) * dxt_formats[i].block_size;
+        ok(offset == expected_offset, "Got unexpected offset %u for format %s, expected %u.\n",
+                offset, dxt_formats[i].name, expected_offset);
+
+        hr = IDirect3DSurface9_UnlockRect(surface);
+        ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+
+        IDirect3DSurface9_Release(surface);
+    }
+
+    refcount = IDirect3DDevice9_Release(device);
+    ok(!refcount, "Device has %u references left.\n", refcount);
+    IDirect3D9_Release(d3d);
+    DestroyWindow(window);
+}
+
+static void test_lockrect_invalid(void)
+{
+    static const struct
+    {
+        RECT rect;
+        HRESULT win7_result;
+    }
+    test_data[] =
+    {
+        {{60, 60, 68, 68},      D3D_OK},                /* Valid */
+        {{60, 60, 60, 68},      D3DERR_INVALIDCALL},    /* 0 height */
+        {{60, 60, 68, 60},      D3DERR_INVALIDCALL},    /* 0 width */
+        {{68, 60, 60, 68},      D3DERR_INVALIDCALL},    /* left > right */
+        {{60, 68, 68, 60},      D3DERR_INVALIDCALL},    /* top > bottom */
+        {{-8, 60,  0, 68},      D3DERR_INVALIDCALL},    /* left < surface */
+        {{60, -8, 68,  0},      D3DERR_INVALIDCALL},    /* top < surface */
+        {{-16, 60, -8, 68},     D3DERR_INVALIDCALL},    /* right < surface */
+        {{60, -16, 68, -8},     D3DERR_INVALIDCALL},    /* bottom < surface */
+        {{60, 60, 136, 68},     D3DERR_INVALIDCALL},    /* right > surface */
+        {{60, 60, 68, 136},     D3DERR_INVALIDCALL},    /* bottom > surface */
+        {{136, 60, 144, 68},    D3DERR_INVALIDCALL},    /* left > surface */
+        {{60, 136, 68, 144},    D3DERR_INVALIDCALL},    /* top > surface */
+    };
+    static const RECT test_rect_2 = {0, 0, 8, 8};
+    IDirect3DSurface9 *surface = NULL;
+    D3DLOCKED_RECT locked_rect;
+    IDirect3DDevice9 *device;
+    IDirect3D9 *d3d;
+    unsigned int i;
+    ULONG refcount;
+    HWND window;
+    BYTE *base;
+    HRESULT hr;
+
+    if (!(d3d = pDirect3DCreate9(D3D_SDK_VERSION)))
+    {
+        skip("Failed to create D3D object, skipping tests.\n");
+        return;
+    }
+
+    window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW,
+            0, 0, 640, 480, 0, 0, 0, 0);
+    if (!(device = create_device(d3d, window, window, TRUE)))
+    {
+        skip("Failed to create a D3D device, skipping tests.\n");
+        IDirect3D9_Release(d3d);
+        DestroyWindow(window);
+        return;
+    }
+
+    hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128,
+            D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+    hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0);
+    ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr);
+    base = locked_rect.pBits;
+    hr = IDirect3DSurface9_UnlockRect(surface);
+    ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+
+    for (i = 0; i < (sizeof(test_data) / sizeof(*test_data)); ++i)
+    {
+        unsigned int offset, expected_offset;
+        const RECT *rect = &test_data[i].rect;
+
+        locked_rect.pBits = (BYTE *)0xdeadbeef;
+        locked_rect.Pitch = 0xdeadbeef;
+
+        hr = IDirect3DSurface9_LockRect(surface, &locked_rect, rect, 0);
+        /* Windows XP accepts invalid locking rectangles, windows 7 rejects
+         * them. Some games (C&C3) depend on the XP behavior, mark the Win 7
+         * one broken. */
+        ok(SUCCEEDED(hr) || broken(hr == test_data[i].win7_result),
+                "Failed to lock surface with rect [%d, %d]->[%d, %d], hr %#x.\n",
+                rect->left, rect->top, rect->right, rect->bottom, hr);
+        if (FAILED(hr))
+            continue;
+
+        offset = (BYTE *)locked_rect.pBits - base;
+        expected_offset = rect->top * locked_rect.Pitch + rect->left * 4;
+        ok(offset == expected_offset,
+                "Got unexpected offset %u (expected %u) for rect [%d, %d]->[%d, %d].\n",
+                offset, expected_offset, rect->left, rect->top, rect->right, rect->bottom);
+
+        hr = IDirect3DSurface9_UnlockRect(surface);
+        ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+    }
+
+    hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0);
+    ok(SUCCEEDED(hr), "Failed to lock surface with rect NULL, hr %#x.\n", hr);
+    hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0);
+    ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+    hr = IDirect3DSurface9_UnlockRect(surface);
+    ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+
+    hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_data[0].rect, 0);
+    ok(hr == D3D_OK, "Got unexpected hr %#x for rect [%d, %d]->[%d, %d].\n",
+            hr, test_data[0].rect.left, test_data[0].rect.top, test_data[0].rect.right, test_data[0].rect.bottom);
+    hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_data[0].rect, 0);
+    ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x for rect [%d, %d]->[%d, %d].\n",
+            hr, test_data[0].rect.left, test_data[0].rect.top, test_data[0].rect.right, test_data[0].rect.bottom);
+    hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_rect_2, 0);
+    ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x for rect [%d, %d]->[%d, %d].\n",
+            hr, test_rect_2.left, test_rect_2.top, test_rect_2.right, test_rect_2.bottom);
+    hr = IDirect3DSurface9_UnlockRect(surface);
+    ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+
+    IDirect3DSurface9_Release(surface);
+    refcount = IDirect3DDevice9_Release(device);
+    ok(!refcount, "Device has %u references left.\n", refcount);
+    IDirect3D9_Release(d3d);
+    DestroyWindow(window);
+}
+
+static void test_private_data(void)
+{
+    ULONG refcount, expected_refcount;
+    IDirect3DSurface9 *surface;
+    IDirect3DDevice9 *device;
+    IDirect3D9 *d3d;
+    IUnknown *ptr;
+    HWND window;
+    HRESULT hr;
+    DWORD size;
+
+    if (!(d3d = pDirect3DCreate9(D3D_SDK_VERSION)))
+    {
+        skip("Failed to create D3D object, skipping tests.\n");
+        return;
+    }
+
+    window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW,
+            0, 0, 640, 480, 0, 0, 0, 0);
+    if (!(device = create_device(d3d, window, window, TRUE)))
+    {
+        skip("Failed to create a D3D device, skipping tests.\n");
+        IDirect3D9_Release(d3d);
+        DestroyWindow(window);
+        return;
+    }
+
+    hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4,
+            D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+
+    hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */,
+            device, 0, D3DSPD_IUNKNOWN);
+    ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+    hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */,
+            device, 5, D3DSPD_IUNKNOWN);
+    ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+    hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */,
+            device, sizeof(IUnknown *) * 2, D3DSPD_IUNKNOWN);
+    ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+
+    refcount = get_refcount((IUnknown *)device);
+    hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */,
+            device, sizeof(IUnknown *), D3DSPD_IUNKNOWN);
+    ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+    expected_refcount = refcount + 1;
+    refcount = get_refcount((IUnknown *)device);
+    ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
+    hr = IDirect3DSurface9_FreePrivateData(surface, &IID_IDirect3DSurface9);
+    ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+    expected_refcount = refcount - 1;
+    refcount = get_refcount((IUnknown *)device);
+    ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
+
+    hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9,
+            device, sizeof(IUnknown *), D3DSPD_IUNKNOWN);
+    ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+    hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9,
+            surface, sizeof(IUnknown *), D3DSPD_IUNKNOWN);
+    ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+    refcount = get_refcount((IUnknown *)device);
+    ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
+
+    hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9,
+            device, sizeof(IUnknown *), D3DSPD_IUNKNOWN);
+    ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+    size = sizeof(ptr);
+    hr = IDirect3DSurface9_GetPrivateData(surface, &IID_IDirect3DSurface9, &ptr, &size);
+    ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+    expected_refcount = refcount + 2;
+    refcount = get_refcount((IUnknown *)device);
+    ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
+    ok(ptr == (IUnknown *)device, "Got unexpected ptr %p, expected %p.\n", ptr, device);
+    IUnknown_Release(ptr);
+
+    /* Destroying the surface frees the held reference. */
+    IDirect3DSurface9_Release(surface);
+    expected_refcount = refcount - 3;
+    refcount = get_refcount((IUnknown *)device);
+    ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
+
+    refcount = IDirect3DDevice9_Release(device);
+    ok(!refcount, "Device has %u references left.\n", refcount);
+    IDirect3D9_Release(d3d);
+    DestroyWindow(window);
+}
+
+static void test_getdc(void)
+{
+    static const struct
+    {
+        const char *name;
+        D3DFORMAT format;
+        BOOL getdc_supported;
+    }
+    testdata[] =
+    {
+        {"D3DFMT_A8R8G8B8",    D3DFMT_A8R8G8B8,    TRUE },
+        {"D3DFMT_X8R8G8B8",    D3DFMT_X8R8G8B8,    TRUE },
+        {"D3DFMT_R5G6B5",      D3DFMT_R5G6B5,      TRUE },
+        {"D3DFMT_X1R5G5B5",    D3DFMT_X1R5G5B5,    TRUE },
+        {"D3DFMT_A1R5G5B5",    D3DFMT_A1R5G5B5,    TRUE },
+        {"D3DFMT_R8G8B8",      D3DFMT_R8G8B8,      TRUE },
+        {"D3DFMT_A2R10G10B10", D3DFMT_A2R10G10B10, FALSE}, /* Untested, card on windows didn't support it. */
+        {"D3DFMT_V8U8",        D3DFMT_V8U8,        FALSE},
+        {"D3DFMT_Q8W8V8U8",    D3DFMT_Q8W8V8U8,    FALSE},
+        {"D3DFMT_A8B8G8R8",    D3DFMT_A8B8G8R8,    FALSE},
+        {"D3DFMT_X8B8G8R8",    D3DFMT_A8B8G8R8,    FALSE},
+        {"D3DFMT_R3G3B2",      D3DFMT_R3G3B2,      FALSE},
+        {"D3DFMT_P8",          D3DFMT_P8,          FALSE},
+        {"D3DFMT_L8",          D3DFMT_L8,          FALSE},
+        {"D3DFMT_A8L8",        D3DFMT_A8L8,        FALSE},
+        {"D3DFMT_DXT1",        D3DFMT_DXT1,        FALSE},
+        {"D3DFMT_DXT2",        D3DFMT_DXT2,        FALSE},
+        {"D3DFMT_DXT3",        D3DFMT_DXT3,        FALSE},
+        {"D3DFMT_DXT4",        D3DFMT_DXT4,        FALSE},
+        {"D3DFMT_DXT5",        D3DFMT_DXT5,        FALSE},
+    };
+    IDirect3DTexture9 *texture;
+    IDirect3DSurface9 *surface;
+    IDirect3DDevice9 *device;
+    IDirect3D9 *d3d;
+    unsigned int i;
+    ULONG refcount;
+    HWND window;
+    HRESULT hr;
+    HDC dc;
+
+    if (!(d3d = pDirect3DCreate9(D3D_SDK_VERSION)))
+    {
+        skip("Failed to create D3D object, skipping tests.\n");
+        return;
+    }
+
+    window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW,
+            0, 0, 640, 480, 0, 0, 0, 0);
+    if (!(device = create_device(d3d, window, window, TRUE)))
+    {
+        skip("Failed to create a D3D device, skipping tests.\n");
+        IDirect3D9_Release(d3d);
+        DestroyWindow(window);
+        return;
+    }
+
+    for (i = 0; i < (sizeof(testdata) / sizeof(*testdata)); ++i)
+    {
+        texture = NULL;
+        hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 64, 64,
+                testdata[i].format, D3DPOOL_SYSTEMMEM, &surface, NULL);
+        if (FAILED(hr))
+        {
+            hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 1, 0,
+                    testdata[i].format, D3DPOOL_MANAGED, &texture, NULL);
+            if (FAILED(hr))
+            {
+                skip("Failed to create surface for format %s (hr %#x), skipping tests.\n", testdata[i].name, hr);
+                continue;
+            }
+            hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface);
+            ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr);
+        }
+
+        dc = (void *)0x1234;
+        hr = IDirect3DSurface9_GetDC(surface, &dc);
+        if (testdata[i].getdc_supported)
+            ok(SUCCEEDED(hr), "Got unexpected hr %#x for format %s.\n", hr, testdata[i].name);
+        else
+            ok(FAILED(hr), "Got unexpected hr %#x for format %s.\n", hr, testdata[i].name);
+
+        if (SUCCEEDED(hr))
+        {
+            hr = IDirect3DSurface9_ReleaseDC(surface, dc);
+            ok(hr == D3D_OK, "Failed to release DC, hr %#x.\n", hr);
+        }
+        else
+        {
+            ok(dc == (void *)0x1234, "Got unexpected dc %p.\n", dc);
+        }
+
+        IDirect3DSurface9_Release(surface);
+        if (texture)
+            IDirect3DTexture9_Release(texture);
+    }
+
+    refcount = IDirect3DDevice9_Release(device);
+    ok(!refcount, "Device has %u references left.\n", refcount);
+    IDirect3D9_Release(d3d);
+    DestroyWindow(window);
+}
+
+static void test_surface_dimensions(void)
+{
+    IDirect3DSurface9 *surface;
+    IDirect3DDevice9 *device;
+    IDirect3D9 *d3d;
+    ULONG refcount;
+    HWND window;
+    HRESULT hr;
+
+    if (!(d3d = pDirect3DCreate9(D3D_SDK_VERSION)))
+    {
+        skip("Failed to create D3D object, skipping tests.\n");
+        return;
+    }
+
+    window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW,
+            0, 0, 640, 480, 0, 0, 0, 0);
+    if (!(device = create_device(d3d, window, window, TRUE)))
+    {
+        skip("Failed to create a D3D device, skipping tests.\n");
+        IDirect3D9_Release(d3d);
+        DestroyWindow(window);
+        return;
+    }
+
+    hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 0, 1,
+            D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL);
+    ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+    hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 1, 0,
+            D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL);
+    ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+
+    refcount = IDirect3DDevice9_Release(device);
+    ok(!refcount, "Device has %u references left.\n", refcount);
+    IDirect3D9_Release(d3d);
+    DestroyWindow(window);
+}
+
+static void test_surface_format_null(void)
+{
+    static const D3DFORMAT D3DFMT_NULL = MAKEFOURCC('N','U','L','L');
+    IDirect3DTexture9 *texture;
+    IDirect3DSurface9 *surface;
+    IDirect3DSurface9 *rt, *ds;
+    D3DLOCKED_RECT locked_rect;
+    IDirect3DDevice9 *device;
+    D3DSURFACE_DESC desc;
+    IDirect3D9 *d3d;
+    ULONG refcount;
+    HWND window;
+    HRESULT hr;
+
+    if (!(d3d = pDirect3DCreate9(D3D_SDK_VERSION)))
+    {
+        skip("Failed to create D3D object, skipping tests.\n");
+        return;
+    }
+
+    hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8,
+            D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, D3DFMT_NULL);
+    if (hr != D3D_OK)
+    {
+        skip("No D3DFMT_NULL support, skipping test.\n");
+        IDirect3D9_Release(d3d);
+        return;
+    }
+
+    window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW,
+            0, 0, 640, 480, 0, 0, 0, 0);
+    if (!(device = create_device(d3d, window, window, TRUE)))
+    {
+        skip("Failed to create a D3D device, skipping tests.\n");
+        IDirect3D9_Release(d3d);
+        DestroyWindow(window);
+        return;
+    }
+
+    hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8,
+            D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, D3DFMT_NULL);
+    ok(hr == D3D_OK, "D3DFMT_NULL should be supported for render target textures, hr %#x.\n", hr);
+
+    hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8,
+            D3DFMT_NULL, D3DFMT_D24S8);
+    ok(SUCCEEDED(hr), "Depth stencil match failed for D3DFMT_NULL, hr %#x.\n", hr);
+
+    hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, D3DFMT_NULL,
+            D3DMULTISAMPLE_NONE, 0, TRUE, &surface, NULL);
+    ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+
+    hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt);
+    ok(SUCCEEDED(hr), "Failed to get original render target, hr %#x.\n", hr);
+
+    hr = IDirect3DDevice9_GetDepthStencilSurface(device, &ds);
+    ok(SUCCEEDED(hr), "Failed to get original depth/stencil, hr %#x.\n", hr);
+
+    hr = IDirect3DDevice9_SetRenderTarget(device, 0, NULL);
+    ok(FAILED(hr), "Succeeded in setting render target 0 to NULL, should fail.\n");
+
+    hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface);
+    ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr);
+
+    hr = IDirect3DDevice9_SetDepthStencilSurface(device, NULL);
+    ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr);
+
+    hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00000000, 0.0f, 0);
+    ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr);
+
+    hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt);
+    ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr);
+
+    hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds);
+    ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr);
+
+    IDirect3DSurface9_Release(rt);
+    IDirect3DSurface9_Release(ds);
+
+    hr = IDirect3DSurface9_GetDesc(surface, &desc);
+    ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr);
+    ok(desc.Width == 128, "Expected width 128, got %u.\n", desc.Width);
+    ok(desc.Height == 128, "Expected height 128, got %u.\n", desc.Height);
+
+    hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0);
+    ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr);
+    ok(locked_rect.Pitch, "Expected non-zero pitch, got %u.\n", locked_rect.Pitch);
+    ok(!!locked_rect.pBits, "Expected non-NULL pBits, got %p.\n", locked_rect.pBits);
+
+    hr = IDirect3DSurface9_UnlockRect(surface);
+    ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+
+    IDirect3DSurface9_Release(surface);
+
+    hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 0, D3DUSAGE_RENDERTARGET,
+            D3DFMT_NULL, D3DPOOL_DEFAULT, &texture, NULL);
+    ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+    IDirect3DTexture9_Release(texture);
+
+    refcount = IDirect3DDevice9_Release(device);
+    ok(!refcount, "Device has %u references left.\n", refcount);
+    IDirect3D9_Release(d3d);
+    DestroyWindow(window);
+}
+
+static void test_surface_double_unlock(void)
+{
+    static const D3DPOOL pools[] =
+    {
+        D3DPOOL_DEFAULT,
+        D3DPOOL_SCRATCH,
+        D3DPOOL_SYSTEMMEM,
+    };
+    IDirect3DSurface9 *surface;
+    IDirect3DDevice9 *device;
+    D3DLOCKED_RECT lr;
+    IDirect3D9 *d3d;
+    unsigned int i;
+    ULONG refcount;
+    HWND window;
+    HRESULT hr;
+
+    if (!(d3d = pDirect3DCreate9(D3D_SDK_VERSION)))
+    {
+        skip("Failed to create D3D object, skipping tests.\n");
+        return;
+    }
+
+    window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW,
+            0, 0, 640, 480, 0, 0, 0, 0);
+    if (!(device = create_device(d3d, window, window, TRUE)))
+    {
+        skip("Failed to create a D3D device, skipping tests.\n");
+        IDirect3D9_Release(d3d);
+        DestroyWindow(window);
+        return;
+    }
+
+    for (i = 0; i < (sizeof(pools) / sizeof(*pools)); ++i)
+    {
+        hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 64, 64,
+                D3DFMT_X8R8G8B8, pools[i], &surface, NULL);
+        ok(SUCCEEDED(hr), "Failed to create surface in pool %#x, hr %#x.\n", pools[i], hr);
+
+        hr = IDirect3DSurface9_UnlockRect(surface);
+        ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, for surface in pool %#x.\n", hr, pools[i]);
+        hr = IDirect3DSurface9_LockRect(surface, &lr, NULL, 0);
+        ok(SUCCEEDED(hr), "Failed to lock surface in pool %#x, hr %#x.\n", pools[i], hr);
+        hr = IDirect3DSurface9_UnlockRect(surface);
+        ok(SUCCEEDED(hr), "Failed to unlock surface in pool %#x, hr %#x.\n", pools[i], hr);
+        hr = IDirect3DSurface9_UnlockRect(surface);
+        ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, for surface in pool %#x.\n", hr, pools[i]);
+
+        IDirect3DSurface9_Release(surface);
+    }
+
+    refcount = IDirect3DDevice9_Release(device);
+    ok(!refcount, "Device has %u references left.\n", refcount);
+    IDirect3D9_Release(d3d);
+    DestroyWindow(window);
+}
+
+static void test_surface_lockrect_blocks(void)
+{
+    static const struct
+    {
+        D3DFORMAT fmt;
+        const char *name;
+        unsigned int block_width;
+        unsigned int block_height;
+        BOOL broken;
+    }
+    formats[] =
+    {
+        {D3DFMT_DXT1,                 "D3DFMT_DXT1", 4, 4, FALSE},
+        {D3DFMT_DXT2,                 "D3DFMT_DXT2", 4, 4, FALSE},
+        {D3DFMT_DXT3,                 "D3DFMT_DXT3", 4, 4, FALSE},
+        {D3DFMT_DXT4,                 "D3DFMT_DXT4", 4, 4, FALSE},
+        {D3DFMT_DXT5,                 "D3DFMT_DXT5", 4, 4, FALSE},
+        /* ATI2N has 2x2 blocks on all AMD cards and Geforce 7 cards,
+         * which doesn't match the format spec. On newer Nvidia cards
+         * it has the correct 4x4 block size */
+        {MAKEFOURCC('A','T','I','2'), "ATI2N",       4, 4, TRUE},
+        {D3DFMT_YUY2,                 "D3DFMT_YUY2", 2, 1, FALSE},
+        {D3DFMT_UYVY,                 "D3DFMT_UYVY", 2, 1, FALSE},
+    };
+    static const struct
+    {
+        D3DPOOL pool;
+        const char *name;
+        /* Don't check the return value, Nvidia returns D3DERR_INVALIDCALL for some formats
+         * and E_INVALIDARG/DDERR_INVALIDPARAMS for others. */
+        BOOL success;
+    }
+    pools[] =
+    {
+        {D3DPOOL_DEFAULT,       "D3DPOOL_DEFAULT",  FALSE},
+        {D3DPOOL_SCRATCH,       "D3DPOOL_SCRATCH",  TRUE},
+        {D3DPOOL_SYSTEMMEM,     "D3DPOOL_SYSTEMMEM",TRUE},
+        {D3DPOOL_MANAGED,       "D3DPOOL_MANAGED",  TRUE},
+    };
+    IDirect3DTexture9 *texture;
+    IDirect3DSurface9 *surface;
+    D3DLOCKED_RECT locked_rect;
+    IDirect3DDevice9 *device;
+    unsigned int i, j;
+    BOOL surface_only;
+    IDirect3D9 *d3d;
+    ULONG refcount;
+    HWND window;
+    HRESULT hr;
+    RECT rect;
+
+    if (!(d3d = pDirect3DCreate9(D3D_SDK_VERSION)))
+    {
+        skip("Failed to create D3D object, skipping tests.\n");
+        return;
+    }
+
+    window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW,
+            0, 0, 640, 480, 0, 0, 0, 0);
+    if (!(device = create_device(d3d, window, window, TRUE)))
+    {
+        skip("Failed to create a D3D device, skipping tests.\n");
+        IDirect3D9_Release(d3d);
+        DestroyWindow(window);
+        return;
+    }
+
+    for (i = 0; i < (sizeof(formats) / sizeof(*formats)); ++i)
+    {
+        surface_only = FALSE;
+        if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8,
+                D3DUSAGE_DYNAMIC, D3DRTYPE_TEXTURE, formats[i].fmt)))
+        {
+            if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8,
+                    0, D3DRTYPE_SURFACE, formats[i].fmt)))
+            {
+                skip("Format %s not supported, skipping lockrect offset tests.\n", formats[i].name);
+                continue;
+            }
+            surface_only = TRUE;
+        }
+
+        for (j = 0; j < (sizeof(pools) / sizeof(*pools)); ++j)
+        {
+            switch (pools[j].pool)
+            {
+                case D3DPOOL_SYSTEMMEM:
+                case D3DPOOL_MANAGED:
+                    if (surface_only)
+                        continue;
+                    /* Fall through */
+                case D3DPOOL_DEFAULT:
+                    if (surface_only)
+                    {
+                        hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128,
+                                formats[i].fmt, pools[j].pool, &surface, NULL);
+                        ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+                    }
+                    else
+                    {
+                        hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1,
+                                pools[j].pool == D3DPOOL_DEFAULT ? D3DUSAGE_DYNAMIC : 0,
+                                formats[i].fmt, pools[j].pool, &texture, NULL);
+                        ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+                        hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface);
+                        ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr);
+                        IDirect3DTexture9_Release(texture);
+                    }
+                    break;
+
+                case D3DPOOL_SCRATCH:
+                    hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128,
+                            formats[i].fmt, pools[j].pool, &surface, NULL);
+                    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+                    break;
+
+                default:
+                    break;
+            }
+
+            if (formats[i].block_width > 1)
+            {
+                SetRect(&rect, formats[i].block_width >> 1, 0, formats[i].block_width, formats[i].block_height);
+                hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0);
+                ok(FAILED(hr) == !pools[j].success || broken(formats[i].broken),
+                        "Partial block lock %s, expected %s, format %s, pool %s.\n",
+                        SUCCEEDED(hr) ? "succeeded" : "failed",
+                        pools[j].success ? "success" : "failure", formats[i].name, pools[j].name);
+                if (SUCCEEDED(hr))
+                {
+                    hr = IDirect3DSurface9_UnlockRect(surface);
+                    ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+                }
+
+                SetRect(&rect, 0, 0, formats[i].block_width >> 1, formats[i].block_height);
+                hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0);
+                ok(FAILED(hr) == !pools[j].success || broken(formats[i].broken),
+                        "Partial block lock %s, expected %s, format %s, pool %s.\n",
+                        SUCCEEDED(hr) ? "succeeded" : "failed",
+                        pools[j].success ? "success" : "failure", formats[i].name, pools[j].name);
+                if (SUCCEEDED(hr))
+                {
+                    hr = IDirect3DSurface9_UnlockRect(surface);
+                    ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+                }
+            }
+
+            if (formats[i].block_height > 1)
+            {
+                SetRect(&rect, 0, formats[i].block_height >> 1, formats[i].block_width, formats[i].block_height);
+                hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0);
+                ok(FAILED(hr) == !pools[j].success || broken(formats[i].broken),
+                        "Partial block lock %s, expected %s, format %s, pool %s.\n",
+                        SUCCEEDED(hr) ? "succeeded" : "failed",
+                        pools[j].success ? "success" : "failure", formats[i].name, pools[j].name);
+                if (SUCCEEDED(hr))
+                {
+                    hr = IDirect3DSurface9_UnlockRect(surface);
+                    ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+                }
+
+                SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height >> 1);
+                hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0);
+                ok(FAILED(hr) == !pools[j].success || broken(formats[i].broken),
+                        "Partial block lock %s, expected %s, format %s, pool %s.\n",
+                        SUCCEEDED(hr) ? "succeeded" : "failed",
+                        pools[j].success ? "success" : "failure", formats[i].name, pools[j].name);
+                if (SUCCEEDED(hr))
+                {
+                    hr = IDirect3DSurface9_UnlockRect(surface);
+                    ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+                }
+            }
+
+            SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height);
+            hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0);
+            ok(SUCCEEDED(hr), "Got unexpected hr %#x for format %s, pool %s.\n", hr, formats[i].name, pools[j].name);
+            hr = IDirect3DSurface9_UnlockRect(surface);
+            ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+
+            IDirect3DSurface9_Release(surface);
+        }
+    }
+
+    refcount = IDirect3DDevice9_Release(device);
+    ok(!refcount, "Device has %u references left.\n", refcount);
+    IDirect3D9_Release(d3d);
+    DestroyWindow(window);
+}
+
 START_TEST(device)
 {
     HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" );
@@ -5099,6 +6043,16 @@ START_TEST(device)
         test_filter();
         test_get_texture();
         test_lod();
+        test_surface_get_container();
+        test_surface_alignment();
+        test_lockrect_offset();
+        test_lockrect_invalid();
+        test_private_data();
+        test_getdc();
+        test_surface_dimensions();
+        test_surface_format_null();
+        test_surface_double_unlock();
+        test_surface_lockrect_blocks();
     }
 
 out:
diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c
deleted file mode 100644
index 36d2dac..0000000
--- a/dlls/d3d9/tests/surface.c
+++ /dev/null
@@ -1,841 +0,0 @@
-/*
- * Copyright 2006-2007 Henri Verbeet
- * Copyright 2011 Stefan Dösinger for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-#define COBJMACROS
-#include <d3d9.h>
-#include "wine/test.h"
-
-static HWND create_window(void)
-{
-    WNDCLASS wc = {0};
-    wc.lpfnWndProc = DefWindowProc;
-    wc.lpszClassName = "d3d9_test_wc";
-    RegisterClass(&wc);
-
-    return CreateWindow("d3d9_test_wc", "d3d9_test",
-            0, 0, 0, 0, 0, 0, 0, 0, 0);
-}
-
-static IDirect3DDevice9 *init_d3d9(HMODULE d3d9_handle)
-{
-    IDirect3D9 * (__stdcall * d3d9_create)(UINT SDKVersion) = 0;
-    IDirect3D9 *d3d9_ptr = 0;
-    IDirect3DDevice9 *device_ptr = 0;
-    D3DPRESENT_PARAMETERS present_parameters;
-    HRESULT hr;
-
-    d3d9_create = (void *)GetProcAddress(d3d9_handle, "Direct3DCreate9");
-    ok(d3d9_create != NULL, "Failed to get address of Direct3DCreate9\n");
-    if (!d3d9_create) return NULL;
-
-    d3d9_ptr = d3d9_create(D3D_SDK_VERSION);
-    if (!d3d9_ptr)
-    {
-        skip("could not create D3D9\n");
-        return NULL;
-    }
-
-    ZeroMemory(&present_parameters, sizeof(present_parameters));
-    present_parameters.Windowed = TRUE;
-    present_parameters.hDeviceWindow = create_window();
-    present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD;
-    present_parameters.EnableAutoDepthStencil = TRUE;
-    present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8;
-
-    hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
-            NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr);
-
-    if(FAILED(hr))
-    {
-        skip("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr);
-        return NULL;
-    }
-
-    return device_ptr;
-}
-
-static void test_surface_get_container(IDirect3DDevice9 *device_ptr)
-{
-    IDirect3DTexture9 *texture_ptr = 0;
-    IDirect3DSurface9 *surface_ptr = 0;
-    void *container_ptr;
-    HRESULT hr;
-
-    hr = IDirect3DDevice9_CreateTexture(device_ptr, 128, 128, 1, 0,
-            D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture_ptr, 0);
-    ok(SUCCEEDED(hr) && texture_ptr != NULL, "CreateTexture returned: hr %#x, texture_ptr %p. "
-        "Expected hr %#x, texture_ptr != %p\n", hr, texture_ptr, D3D_OK, NULL);
-    if (!texture_ptr || FAILED(hr)) goto cleanup;
-
-    hr = IDirect3DTexture9_GetSurfaceLevel(texture_ptr, 0, &surface_ptr);
-    ok(SUCCEEDED(hr) && surface_ptr != NULL, "GetSurfaceLevel returned: hr %#x, surface_ptr %p. "
-        "Expected hr %#x, surface_ptr != %p\n", hr, surface_ptr, D3D_OK, NULL);
-    if (!surface_ptr || FAILED(hr)) goto cleanup;
-
-    /* These should work... */
-    container_ptr = (void *)0x1337c0d3;
-    hr = IDirect3DSurface9_GetContainer(surface_ptr, &IID_IUnknown, &container_ptr);
-    ok(SUCCEEDED(hr) && container_ptr == texture_ptr, "GetContainer returned: hr %#x, container_ptr %p. "
-        "Expected hr %#x, container_ptr %p\n", hr, container_ptr, S_OK, texture_ptr);
-    if (container_ptr && container_ptr != (void *)0x1337c0d3) IUnknown_Release((IUnknown *)container_ptr);
-
-    container_ptr = (void *)0x1337c0d3;
-    hr = IDirect3DSurface9_GetContainer(surface_ptr, &IID_IDirect3DResource9, &container_ptr);
-    ok(SUCCEEDED(hr) && container_ptr == texture_ptr, "GetContainer returned: hr %#x, container_ptr %p. "
-        "Expected hr %#x, container_ptr %p\n", hr, container_ptr, S_OK, texture_ptr);
-    if (container_ptr && container_ptr != (void *)0x1337c0d3) IUnknown_Release((IUnknown *)container_ptr);
-
-    container_ptr = (void *)0x1337c0d3;
-    hr = IDirect3DSurface9_GetContainer(surface_ptr, &IID_IDirect3DBaseTexture9, &container_ptr);
-    ok(SUCCEEDED(hr) && container_ptr == texture_ptr, "GetContainer returned: hr %#x, container_ptr %p. "
-        "Expected hr %#x, container_ptr %p\n", hr, container_ptr, S_OK, texture_ptr);
-    if (container_ptr && container_ptr != (void *)0x1337c0d3) IUnknown_Release((IUnknown *)container_ptr);
-
-    container_ptr = (void *)0x1337c0d3;
-    hr = IDirect3DSurface9_GetContainer(surface_ptr, &IID_IDirect3DTexture9, &container_ptr);
-    ok(SUCCEEDED(hr) && container_ptr == texture_ptr, "GetContainer returned: hr %#x, container_ptr %p. "
-        "Expected hr %#x, container_ptr %p\n", hr, container_ptr, S_OK, texture_ptr);
-    if (container_ptr && container_ptr != (void *)0x1337c0d3) IUnknown_Release((IUnknown *)container_ptr);
-
-    /* ...and this one shouldn't. This should return E_NOINTERFACE and set container_ptr to NULL */
-    container_ptr = (void *)0x1337c0d3;
-    hr = IDirect3DSurface9_GetContainer(surface_ptr, &IID_IDirect3DSurface9, &container_ptr);
-    ok(hr == E_NOINTERFACE && container_ptr == NULL, "GetContainer returned: hr %#x, container_ptr %p. "
-        "Expected hr %#x, container_ptr %p\n", hr, container_ptr, E_NOINTERFACE, NULL);
-    if (container_ptr && container_ptr != (void *)0x1337c0d3) IUnknown_Release((IUnknown *)container_ptr);
-
-cleanup:
-    if (texture_ptr) IDirect3DTexture9_Release(texture_ptr);
-    if (surface_ptr) IDirect3DSurface9_Release(surface_ptr);
-}
-
-static void test_surface_alignment(IDirect3DDevice9 *device_ptr)
-{
-    IDirect3DSurface9 *surface_ptr = 0;
-    HRESULT hr;
-    int i;
-
-    /* Test a sysmem surface as those aren't affected by the hardware's np2 restrictions */
-    hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device_ptr, 5, 5, D3DFMT_R5G6B5, D3DPOOL_SYSTEMMEM, &surface_ptr, 0);
-    ok(hr == D3D_OK, "IDirect3DDevice9_CreateOffscreenPlainSurface returned %08x\n", hr);
-
-    if(surface_ptr)
-    {
-        D3DLOCKED_RECT lockedRect;
-        hr = IDirect3DSurface9_LockRect(surface_ptr, &lockedRect, NULL, 0);
-        ok(hr == D3D_OK, "IDirect3DSurface9_LockRect returned %08x\n", hr);
-        ok(!(lockedRect.Pitch & 3), "Surface pitch %d is not 32-bit aligned\n", lockedRect.Pitch);
-        /* Some applications also depend on the exact pitch, rather than just
-         * the alignment.
-         */
-        ok(lockedRect.Pitch == 12, "Got pitch %d, expected 12\n", lockedRect.Pitch);
-        hr = IDirect3DSurface9_UnlockRect(surface_ptr);
-        ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect returned %#x.\n", hr);
-        IDirect3DSurface9_Release(surface_ptr);
-    }
-
-    for (i = 0; i < 5; i++)
-    {
-        IDirect3DTexture9 *pTexture;
-        int j, pitch;
-
-        hr = IDirect3DDevice9_CreateTexture(device_ptr, 64, 64, 0, 0, MAKEFOURCC('D', 'X', 'T', '1'+i),
-                                            D3DPOOL_MANAGED, &pTexture, NULL);
-        ok(SUCCEEDED(hr) || hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_CreateTexture: %08x\n", hr);
-        if (FAILED(hr)) {
-            skip("DXT%d surfaces are not supported\n", i + 1);
-            continue;
-        }
-
-        for (j = IDirect3DBaseTexture9_GetLevelCount(pTexture) - 1; j >= 0; j--)
-        {
-            D3DLOCKED_RECT rc;
-            D3DSURFACE_DESC descr;
-
-            IDirect3DTexture9_GetLevelDesc(pTexture, j, &descr);
-            hr = IDirect3DTexture9_LockRect(pTexture, j, &rc, NULL, 0);
-            ok(SUCCEEDED(hr), "IDirect3DTexture9_LockRect: %08x\n", hr);
-            hr = IDirect3DTexture9_UnlockRect(pTexture, j);
-            ok(SUCCEEDED(hr), "IDirect3DTexture9_UnLockRect: %08x\n", hr);
-            /* Windows XP returns D3D_OK when calling UnlockRect on an unlocked surface,
-             * windows 7 returns an error.
-             */
-
-            pitch = ((descr.Width + 3) >> 2) << 3;
-            if (i > 0) pitch <<= 1;
-            ok(rc.Pitch == pitch, "Wrong pitch for DXT%d lvl[%d (%dx%d)]: expected %d got %d\n",
-               i + 1, j, descr.Width, descr.Height, pitch, rc.Pitch);
-        }
-        IDirect3DTexture9_Release( pTexture );
-    }
-}
-
-/* Since the DXT formats are based on 4x4 blocks, locking works slightly
- * different than with regular formats. This patch verifies we return the
- * correct memory offsets */
-static void test_lockrect_offset(IDirect3DDevice9 *device)
-{
-    IDirect3DSurface9 *surface = 0;
-    IDirect3D9 *d3d;
-    const RECT rect = {60, 60, 68, 68};
-    D3DLOCKED_RECT locked_rect;
-    int expected_pitch;
-    unsigned int expected_offset;
-    unsigned int offset;
-    unsigned int i;
-    BYTE *base;
-    HRESULT hr;
-
-    const struct {
-        D3DFORMAT fmt;
-        const char *name;
-        unsigned int block_width;
-        unsigned int block_height;
-        unsigned int block_size;
-    } dxt_formats[] = {
-        {D3DFMT_DXT1,                 "D3DFMT_DXT1", 4, 4, 8},
-        {D3DFMT_DXT2,                 "D3DFMT_DXT2", 4, 4, 16},
-        {D3DFMT_DXT3,                 "D3DFMT_DXT3", 4, 4, 16},
-        {D3DFMT_DXT4,                 "D3DFMT_DXT4", 4, 4, 16},
-        {D3DFMT_DXT5,                 "D3DFMT_DXT5", 4, 4, 16},
-        {MAKEFOURCC('A','T','I','2'), "ATI2N",       1, 1,  1},
-    };
-    hr = IDirect3DDevice9_GetDirect3D(device, &d3d);
-    ok(SUCCEEDED(hr), "IDirect3DDevice9_GetDirect3D failed (%08x)\n", hr);
-
-    for (i = 0; i < (sizeof(dxt_formats) / sizeof(*dxt_formats)); ++i) {
-        hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, dxt_formats[i].fmt);
-        if(FAILED(hr))
-        {
-            skip("Format %s not supported, skipping lockrect offset test\n", dxt_formats[i].name);
-            continue;
-        }
-
-        hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, dxt_formats[i].fmt, D3DPOOL_SCRATCH, &surface, 0);
-        ok(SUCCEEDED(hr), "CreateOffscreenPlainSurface failed (%08x)\n", hr);
-
-        hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0);
-        ok(SUCCEEDED(hr), "LockRect failed (%08x)\n", hr);
-
-        base = locked_rect.pBits;
-        expected_pitch = (128 + dxt_formats[i].block_height - 1) / dxt_formats[i].block_width
-                         * dxt_formats[i].block_size;
-        ok(locked_rect.Pitch == expected_pitch, "Got pitch %d, expected pitch %d for format %s\n", locked_rect.Pitch, expected_pitch, dxt_formats[i].name);
-
-        hr = IDirect3DSurface9_UnlockRect(surface);
-        ok(SUCCEEDED(hr), "UnlockRect failed (%08x)\n", hr);
-
-        hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0);
-        ok(SUCCEEDED(hr), "LockRect failed (%08x)\n", hr);
-
-        offset = (BYTE *)locked_rect.pBits - base;
-        expected_offset = (rect.top / dxt_formats[i].block_height) * expected_pitch
-                        + (rect.left / dxt_formats[i].block_width) * dxt_formats[i].block_size;
-        ok(offset == expected_offset, "Got offset %u, expected offset %u for format %s\n", offset, expected_offset, dxt_formats[i].name);
-
-        hr = IDirect3DSurface9_UnlockRect(surface);
-        ok(SUCCEEDED(hr), "UnlockRect failed (%08x)\n", hr);
-
-        IDirect3DSurface9_Release(surface);
-    }
-    IDirect3D9_Release(d3d);
-}
-
-struct rect_test
-{
-    RECT rect;
-    HRESULT win7_result;
-};
-
-static void test_lockrect_invalid(IDirect3DDevice9 *device)
-{
-    IDirect3DSurface9 *surface = 0;
-    D3DLOCKED_RECT locked_rect;
-    unsigned int i;
-    BYTE *base;
-    HRESULT hr;
-
-    const RECT test_rect_2 = { 0, 0, 8, 8 };
-    const struct rect_test test_data[] = {
-        {{60, 60, 68, 68},      D3D_OK},                /* Valid */
-        {{60, 60, 60, 68},      D3DERR_INVALIDCALL},    /* 0 height */
-        {{60, 60, 68, 60},      D3DERR_INVALIDCALL},    /* 0 width */
-        {{68, 60, 60, 68},      D3DERR_INVALIDCALL},    /* left > right */
-        {{60, 68, 68, 60},      D3DERR_INVALIDCALL},    /* top > bottom */
-        {{-8, 60,  0, 68},      D3DERR_INVALIDCALL},    /* left < surface */
-        {{60, -8, 68,  0},      D3DERR_INVALIDCALL},    /* top < surface */
-        {{-16, 60, -8, 68},     D3DERR_INVALIDCALL},    /* right < surface */
-        {{60, -16, 68, -8},     D3DERR_INVALIDCALL},    /* bottom < surface */
-        {{60, 60, 136, 68},     D3DERR_INVALIDCALL},    /* right > surface */
-        {{60, 60, 68, 136},     D3DERR_INVALIDCALL},    /* bottom > surface */
-        {{136, 60, 144, 68},    D3DERR_INVALIDCALL},    /* left > surface */
-        {{60, 136, 68, 144},    D3DERR_INVALIDCALL},    /* top > surface */
-    };
-
-    hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, 0);
-    ok(SUCCEEDED(hr), "CreateOffscreenPlainSurface failed (0x%08x)\n", hr);
-
-    hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0);
-    ok(SUCCEEDED(hr), "LockRect failed (0x%08x)\n", hr);
-
-    base = locked_rect.pBits;
-
-    hr = IDirect3DSurface9_UnlockRect(surface);
-    ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr);
-
-    for (i = 0; i < (sizeof(test_data) / sizeof(*test_data)); ++i)
-    {
-        unsigned int offset, expected_offset;
-        const RECT *rect = &test_data[i].rect;
-
-        locked_rect.pBits = (BYTE *)0xdeadbeef;
-        locked_rect.Pitch = 0xdeadbeef;
-
-        hr = IDirect3DSurface9_LockRect(surface, &locked_rect, rect, 0);
-        /* Windows XP accepts invalid locking rectangles, windows 7 rejects them.
-         * Some games(C&C3) depend on the XP behavior, mark the Win7 one broken */
-        ok(SUCCEEDED(hr) || broken(hr == test_data[i].win7_result),
-                "LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]\n",
-                hr, rect->left, rect->top, rect->right, rect->bottom);
-        if(FAILED(hr)) continue;
-
-        offset = (BYTE *)locked_rect.pBits - base;
-        expected_offset = rect->top * locked_rect.Pitch + rect->left * 4;
-        ok(offset == expected_offset, "Got offset %u, expected offset %u for rect [%d, %d]->[%d, %d]\n",
-                offset, expected_offset, rect->left, rect->top, rect->right, rect->bottom);
-
-        hr = IDirect3DSurface9_UnlockRect(surface);
-        ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr);
-    }
-
-    hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0);
-    ok(SUCCEEDED(hr), "LockRect failed (0x%08x) for rect NULL\n", hr);
-    hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0);
-    ok(hr == D3DERR_INVALIDCALL, "Double LockRect for rect NULL returned 0x%08x\n", hr);
-    hr = IDirect3DSurface9_UnlockRect(surface);
-    ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr);
-
-    hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_data[0].rect, 0);
-    ok(hr == D3D_OK, "LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]"
-            ", expected D3D_OK (0x%08x)\n", hr, test_data[0].rect.left, test_data[0].rect.top,
-            test_data[0].rect.right, test_data[0].rect.bottom, D3D_OK);
-    hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_data[0].rect, 0);
-    ok(hr == D3DERR_INVALIDCALL, "Double LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]"
-            ", expected D3DERR_INVALIDCALL (0x%08x)\n", hr, test_data[0].rect.left, test_data[0].rect.top,
-            test_data[0].rect.right, test_data[0].rect.bottom, D3DERR_INVALIDCALL);
-    hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_rect_2, 0);
-    ok(hr == D3DERR_INVALIDCALL, "Double LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]"
-            ", expected D3DERR_INVALIDCALL (0x%08x)\n", hr, test_rect_2.left, test_rect_2.top,
-            test_rect_2.right, test_rect_2.bottom, D3DERR_INVALIDCALL);
-    hr = IDirect3DSurface9_UnlockRect(surface);
-    ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr);
-
-    IDirect3DSurface9_Release(surface);
-}
-
-static ULONG getref(IUnknown *iface)
-{
-    IUnknown_AddRef(iface);
-    return IUnknown_Release(iface);
-}
-
-static void test_private_data(IDirect3DDevice9 *device)
-{
-    HRESULT hr;
-    IDirect3DSurface9 *surface;
-    ULONG ref, ref2;
-    IUnknown *ptr;
-    DWORD size = sizeof(IUnknown *);
-
-    hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, 0);
-    ok(SUCCEEDED(hr), "CreateImageSurface failed (0x%08x)\n", hr);
-    if(!surface)
-    {
-        return;
-    }
-
-    /* This fails */
-    hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */, device, 0, D3DSPD_IUNKNOWN);
-    ok(hr == D3DERR_INVALIDCALL, "IDirect3DSurface9_SetPrivateData failed with %08x\n", hr);
-    hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */, device, 5, D3DSPD_IUNKNOWN);
-    ok(hr == D3DERR_INVALIDCALL, "IDirect3DSurface9_SetPrivateData failed with %08x\n", hr);
-    hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */, device, sizeof(IUnknown *) * 2, D3DSPD_IUNKNOWN);
-    ok(hr == D3DERR_INVALIDCALL, "IDirect3DSurface9_SetPrivateData failed with %08x\n", hr);
-
-    ref = getref((IUnknown *) device);
-    hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN);
-    ok(hr == D3D_OK, "IDirect3DSurface9_SetPrivateData failed with %08x\n", hr);
-    ref2 = getref((IUnknown *) device);
-    ok(ref2 == ref + 1, "Object reference is %d, expected %d\n", ref2, ref + 1);
-    hr = IDirect3DSurface9_FreePrivateData(surface, &IID_IDirect3DSurface9);
-    ok(hr == D3D_OK, "IDirect3DSurface9_FreePrivateData returned %08x\n", hr);
-    ref2 = getref((IUnknown *) device);
-    ok(ref2 == ref, "Object reference is %d, expected %d\n", ref2, ref);
-
-    hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN);
-    ok(hr == D3D_OK, "IDirect3DSurface9_SetPrivateData failed with %08x\n", hr);
-    hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9, surface, sizeof(IUnknown *), D3DSPD_IUNKNOWN);
-    ok(hr == D3D_OK, "IDirect3DSurface9_SetPrivateData failed with %08x\n", hr);
-    ref2 = getref((IUnknown *) device);
-    ok(ref2 == ref, "Object reference is %d, expected %d\n", ref2, ref);
-
-    hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN);
-    ok(hr == D3D_OK, "IDirect3DSurface9_SetPrivateData failed with %08x\n", hr);
-    hr = IDirect3DSurface9_GetPrivateData(surface, &IID_IDirect3DSurface9, &ptr, &size);
-    ok(hr == D3D_OK, "IDirect3DSurface9_GetPrivateData failed with %08x\n", hr);
-    ref2 = getref((IUnknown *) device);
-    /* Object is addrefed */
-    ok(ptr == (IUnknown *) device, "Returned interface pointer is %p, expected %p\n", ptr, device);
-    ok(ref2 == ref + 2, "Object reference is %d, expected %d. ptr at %p, orig at %p\n", ref2, ref + 2, ptr, device);
-    IUnknown_Release(ptr);
-
-    IDirect3DSurface9_Release(surface);
-
-    /* Destroying the surface frees the held reference */
-    ref2 = getref((IUnknown *) device);
-    /* -1 because the surface was released and held a reference before */
-    ok(ref2 == (ref - 1), "Object reference is %d, expected %d\n", ref2, (ref - 1));
-}
-
-static void test_getdc(IDirect3DDevice9 *device)
-{
-    IDirect3DSurface9 *surface;
-    IDirect3DTexture9 *texture;
-    HRESULT hr;
-    unsigned int i;
-    HDC dc;
-
-    struct
-    {
-        const char *name;
-        D3DFORMAT fmt;
-        BOOL getdc_supported;
-    } testdata[] = {
-        { "D3DFMT_A8R8G8B8",    D3DFMT_A8R8G8B8,    TRUE    },
-        { "D3DFMT_X8R8G8B8",    D3DFMT_X8R8G8B8,    TRUE    },
-        { "D3DFMT_R5G6B5",      D3DFMT_R5G6B5,      TRUE    },
-        { "D3DFMT_X1R5G5B5",    D3DFMT_X1R5G5B5,    TRUE    },
-        { "D3DFMT_A1R5G5B5",    D3DFMT_A1R5G5B5,    TRUE    },
-        { "D3DFMT_R8G8B8",      D3DFMT_R8G8B8,      TRUE    },
-        { "D3DFMT_A2R10G10B10", D3DFMT_A2R10G10B10, FALSE   }, /* Untested, card on windows didn't support it */
-        { "D3DFMT_V8U8",        D3DFMT_V8U8,        FALSE   },
-        { "D3DFMT_Q8W8V8U8",    D3DFMT_Q8W8V8U8,    FALSE   },
-        { "D3DFMT_A8B8G8R8",    D3DFMT_A8B8G8R8,    FALSE   },
-        { "D3DFMT_X8B8G8R8",    D3DFMT_A8B8G8R8,    FALSE   },
-        { "D3DFMT_R3G3B2",      D3DFMT_R3G3B2,      FALSE   },
-        { "D3DFMT_P8",          D3DFMT_P8,          FALSE   },
-        { "D3DFMT_L8",          D3DFMT_L8,          FALSE   },
-        { "D3DFMT_A8L8",        D3DFMT_A8L8,        FALSE   },
-        { "D3DFMT_DXT1",        D3DFMT_DXT1,        FALSE   },
-        { "D3DFMT_DXT2",        D3DFMT_DXT2,        FALSE   },
-        { "D3DFMT_DXT3",        D3DFMT_DXT3,        FALSE   },
-        { "D3DFMT_DXT4",        D3DFMT_DXT4,        FALSE   },
-        { "D3DFMT_DXT5",        D3DFMT_DXT5,        FALSE   },
-    };
-
-    for(i = 0; i < (sizeof(testdata) / sizeof(testdata[0])); i++)
-    {
-        texture = NULL;
-        hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 64, 64, testdata[i].fmt, D3DPOOL_SYSTEMMEM, &surface, NULL);
-        if(FAILED(hr))
-        {
-            hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 1, 0, testdata[i].fmt, D3DPOOL_MANAGED, &texture, NULL);
-            if(FAILED(hr))
-            {
-                skip("IDirect3DDevice9_CreateOffscreenPlainSurface failed, hr = 0x%08x, fmt %s\n", hr, testdata[i].name);
-                continue;
-            }
-            IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface);
-        }
-
-        dc = (void *) 0x1234;
-        hr = IDirect3DSurface9_GetDC(surface, &dc);
-
-        if(testdata[i].getdc_supported)
-        {
-            ok(SUCCEEDED(hr), "GetDC on format %s failed(hr=0x%08x), but was expected to work\n",
-               testdata[i].name, hr);
-        }
-        else
-        {
-            ok(FAILED(hr), "GetDC on format %s worked(hr=0x%08x), but was expected to fail\n",
-               testdata[i].name, hr);
-        }
-
-        if(SUCCEEDED(hr))
-        {
-            hr = IDirect3DSurface9_ReleaseDC(surface, dc);
-            ok(hr == D3D_OK, "IDirect3DSurface9_ReleaseDC failed, hr = 0x%08x\n", hr);
-        }
-        else
-        {
-            ok(dc == (void *) 0x1234, "After failed getDC dc is %p\n", dc);
-        }
-
-        IDirect3DSurface9_Release(surface);
-        if(texture) IDirect3DTexture9_Release(texture);
-    }
-}
-
-static void test_surface_dimensions(IDirect3DDevice9 *device)
-{
-    IDirect3DSurface9 *surface;
-    HRESULT hr;
-
-    hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 0, 1, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL);
-    ok(hr == D3DERR_INVALIDCALL, "CreateOffscreenPlainSurface returned %#x, expected D3DERR_INVALIDCALL.\n", hr);
-    if (SUCCEEDED(hr)) IDirect3DSurface9_Release(surface);
-
-    hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL);
-    ok(hr == D3DERR_INVALIDCALL, "CreateOffscreenPlainSurface returned %#x, expected D3DERR_INVALIDCALL.\n", hr);
-    if (SUCCEEDED(hr)) IDirect3DSurface9_Release(surface);
-}
-
-static void test_surface_format_null(IDirect3DDevice9 *device)
-{
-    static const D3DFORMAT D3DFMT_NULL = MAKEFOURCC('N','U','L','L');
-    IDirect3DTexture9 *texture;
-    IDirect3DSurface9 *surface;
-    IDirect3DSurface9 *rt, *ds;
-    D3DLOCKED_RECT locked_rect;
-    D3DSURFACE_DESC desc;
-    IDirect3D9 *d3d;
-    HRESULT hr;
-
-    IDirect3DDevice9_GetDirect3D(device, &d3d);
-
-    hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8,
-            D3DUSAGE_RENDERTARGET,  D3DRTYPE_SURFACE, D3DFMT_NULL);
-    if (hr != D3D_OK)
-    {
-        skip("No D3DFMT_NULL support, skipping test.\n");
-        IDirect3D9_Release(d3d);
-        return;
-    }
-
-    hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8,
-            D3DUSAGE_RENDERTARGET,  D3DRTYPE_TEXTURE, D3DFMT_NULL);
-    ok(hr == D3D_OK, "D3DFMT_NULL should be supported for render target textures, hr %#x.\n", hr);
-
-    hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8,
-            D3DFMT_NULL, D3DFMT_D24S8);
-    ok(SUCCEEDED(hr), "Depth stencil match failed for D3DFMT_NULL, hr %#x.\n", hr);
-
-    IDirect3D9_Release(d3d);
-
-    hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, D3DFMT_NULL, 0, 0, TRUE, &surface, NULL);
-    ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
-
-    hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt);
-    ok(SUCCEEDED(hr), "Failed to get original render target, hr %#x.\n", hr);
-
-    hr = IDirect3DDevice9_GetDepthStencilSurface(device, &ds);
-    ok(SUCCEEDED(hr), "Failed to get original depth/stencil, hr %#x.\n", hr);
-
-    hr = IDirect3DDevice9_SetRenderTarget(device, 0, NULL);
-    ok(FAILED(hr), "Succeeded in setting render target 0 to NULL, should fail.\n");
-
-    hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface);
-    ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr);
-
-    hr = IDirect3DDevice9_SetDepthStencilSurface(device, NULL);
-    ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr);
-
-    hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00000000, 0.0f, 0);
-    ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr);
-
-    hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt);
-    ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr);
-
-    hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds);
-    ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr);
-
-    IDirect3DSurface9_Release(rt);
-    IDirect3DSurface9_Release(ds);
-
-    hr = IDirect3DSurface9_GetDesc(surface, &desc);
-    ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr);
-    ok(desc.Width == 128, "Expected width 128, got %u.\n", desc.Width);
-    ok(desc.Height == 128, "Expected height 128, got %u.\n", desc.Height);
-
-    hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0);
-    ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr);
-    ok(locked_rect.Pitch, "Expected non-zero pitch, got %u.\n", locked_rect.Pitch);
-    ok(!!locked_rect.pBits, "Expected non-NULL pBits, got %p.\n", locked_rect.pBits);
-
-    hr = IDirect3DSurface9_UnlockRect(surface);
-    ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
-
-    IDirect3DSurface9_Release(surface);
-
-    hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 0, D3DUSAGE_RENDERTARGET,
-            D3DFMT_NULL, D3DPOOL_DEFAULT, &texture, NULL);
-    ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
-    IDirect3DTexture9_Release(texture);
-}
-
-static void test_surface_double_unlock(IDirect3DDevice9 *device)
-{
-    static const struct
-    {
-        D3DPOOL pool;
-        const char *name;
-    }
-    pools[] =
-    {
-        { D3DPOOL_DEFAULT,      "D3DPOOL_DEFAULT"   },
-        { D3DPOOL_SCRATCH,      "D3DPOOL_SCRATCH"   },
-        { D3DPOOL_SYSTEMMEM,    "D3DPOOL_SYSTEMMEM" },
-        /* There are no standalone MANAGED pool surfaces */
-    };
-    IDirect3DSurface9 *surface;
-    unsigned int i;
-    HRESULT hr;
-    D3DLOCKED_RECT lr;
-
-    for (i = 0; i < (sizeof(pools) / sizeof(*pools)); i++)
-    {
-        hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 64, 64, D3DFMT_X8R8G8B8,
-                pools[i].pool, &surface, NULL);
-        ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateOffscreenPlainSurface failed, hr = 0x%08x, pool %s\n",
-                hr, pools[i].name);
-        hr = IDirect3DSurface9_UnlockRect(surface);
-        ok(hr == D3DERR_INVALIDCALL, "Unlock without lock returned 0x%08x, expected 0x%08x, pool %s\n",
-                hr, D3DERR_INVALIDCALL, pools[i].name);
-
-        hr = IDirect3DSurface9_LockRect(surface, &lr, NULL, 0);
-        ok(SUCCEEDED(hr), "IDirect3DSurface9_LockRect failed, hr = 0x%08x, pool %s\n",
-                hr, pools[i].name);
-        hr = IDirect3DSurface9_UnlockRect(surface);
-        ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed, hr = 0x%08x, pool %s\n",
-                hr, pools[i].name);
-
-        hr = IDirect3DSurface9_UnlockRect(surface);
-        ok(hr == D3DERR_INVALIDCALL, "Double unlock returned 0x%08x, expected 0x%08x, pool %s\n",
-                hr, D3DERR_INVALIDCALL, pools[i].name);
-
-        IDirect3DSurface9_Release(surface);
-    }
-}
-
-static void test_surface_lockrect_blocks(IDirect3DDevice9 *device)
-{
-    IDirect3DTexture9 *texture;
-    IDirect3DSurface9 *surface;
-    IDirect3D9 *d3d;
-    D3DLOCKED_RECT locked_rect;
-    unsigned int i, j;
-    HRESULT hr;
-    RECT rect;
-    BOOL surface_only;
-
-    const struct
-    {
-        D3DFORMAT fmt;
-        const char *name;
-        unsigned int block_width;
-        unsigned int block_height;
-        BOOL broken;
-    }
-    formats[] =
-    {
-        {D3DFMT_DXT1,                 "D3DFMT_DXT1", 4, 4, FALSE},
-        {D3DFMT_DXT2,                 "D3DFMT_DXT2", 4, 4, FALSE},
-        {D3DFMT_DXT3,                 "D3DFMT_DXT3", 4, 4, FALSE},
-        {D3DFMT_DXT4,                 "D3DFMT_DXT4", 4, 4, FALSE},
-        {D3DFMT_DXT5,                 "D3DFMT_DXT5", 4, 4, FALSE},
-        /* ATI2N has 2x2 blocks on all AMD cards and Geforce 7 cards,
-         * which doesn't match the format spec. On newer Nvidia cards
-         * it has the correct 4x4 block size */
-        {MAKEFOURCC('A','T','I','2'), "ATI2N",       4, 4, TRUE},
-        {D3DFMT_YUY2,                 "D3DFMT_YUY2", 2, 1, FALSE},
-        {D3DFMT_UYVY,                 "D3DFMT_UYVY", 2, 1, FALSE},
-    };
-    static const struct
-    {
-        D3DPOOL pool;
-        const char *name;
-        /* Don't check the return value, Nvidia returns D3DERR_INVALIDCALL for some formats
-         * and E_INVALIDARG/DDERR_INVALIDPARAMS for others. */
-        BOOL success;
-    }
-    pools[] =
-    {
-        {D3DPOOL_DEFAULT,       "D3DPOOL_DEFAULT",  FALSE},
-        {D3DPOOL_SCRATCH,       "D3DPOOL_SCRATCH",  TRUE},
-        {D3DPOOL_SYSTEMMEM,     "D3DPOOL_SYSTEMMEM",TRUE},
-        {D3DPOOL_MANAGED,       "D3DPOOL_MANAGED",  TRUE},
-    };
-
-    hr = IDirect3DDevice9_GetDirect3D(device, &d3d);
-    ok(SUCCEEDED(hr), "IDirect3DDevice9_GetDirect3D failed (%08x)\n", hr);
-
-    for (i = 0; i < (sizeof(formats) / sizeof(*formats)); ++i) {
-        surface_only = FALSE;
-        hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_DYNAMIC,
-                D3DRTYPE_TEXTURE, formats[i].fmt);
-        if (FAILED(hr))
-        {
-            hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_SURFACE, formats[i].fmt);
-            if (FAILED(hr))
-            {
-                skip("Format %s not supported, skipping lockrect offset test\n", formats[i].name);
-                continue;
-            }
-            surface_only = TRUE;
-        }
-
-        for (j = 0; j < (sizeof(pools) / sizeof(*pools)); j++)
-        {
-            switch (pools[j].pool)
-            {
-                case D3DPOOL_SYSTEMMEM:
-                case D3DPOOL_MANAGED:
-                    if (surface_only) continue;
-                    /* Fall through */
-                case D3DPOOL_DEFAULT:
-                    if (surface_only)
-                    {
-                        hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, formats[i].fmt,
-                                pools[j].pool, &surface, 0);
-                        ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateOffscreenPlainSurface failed (%08x)\n", hr);
-                    }
-                    else
-                    {
-                        hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1,
-                                pools[j].pool == D3DPOOL_DEFAULT ? D3DUSAGE_DYNAMIC : 0,
-                                formats[i].fmt, pools[j].pool, &texture, NULL);
-                        ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateTexture failed (%08x)\n", hr);
-                        hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface);
-                        ok(SUCCEEDED(hr), "IDirect3DTexture9_GetSurfaceLevel failed (%08x)\n", hr);
-                        IDirect3DTexture9_Release(texture);
-                    }
-                    if (FAILED(hr)) continue;
-                    break;
-
-                case D3DPOOL_SCRATCH:
-                    hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, formats[i].fmt,
-                            pools[j].pool, &surface, 0);
-                    ok(SUCCEEDED(hr), "CreateOffscreenPlainSurface failed (%08x)\n", hr);
-                    if (FAILED(hr)) continue;
-                    break;
-
-                default:
-                    break;
-            }
-
-            if (formats[i].block_width > 1)
-            {
-                SetRect(&rect, formats[i].block_width >> 1, 0, formats[i].block_width, formats[i].block_height);
-                hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0);
-                ok(!SUCCEEDED(hr) == !pools[j].success || broken(formats[i].broken),
-                        "Partial block lock %s, expected %s, format %s, pool %s.\n",
-                        SUCCEEDED(hr) ? "succeeded" : "failed",
-                        pools[j].success ? "success" : "failure", formats[i].name, pools[j].name);
-                if (SUCCEEDED(hr))
-                {
-                    hr = IDirect3DSurface9_UnlockRect(surface);
-                    ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed (%08x)\n", hr);
-                }
-
-                SetRect(&rect, 0, 0, formats[i].block_width >> 1, formats[i].block_height);
-                hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0);
-                ok(!SUCCEEDED(hr) == !pools[j].success || broken(formats[i].broken),
-                        "Partial block lock %s, expected %s, format %s, pool %s.\n",
-                        SUCCEEDED(hr) ? "succeeded" : "failed",
-                        pools[j].success ? "success" : "failure", formats[i].name, pools[j].name);
-                if (SUCCEEDED(hr))
-                {
-                    hr = IDirect3DSurface9_UnlockRect(surface);
-                    ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed (%08x)\n", hr);
-                }
-            }
-
-            if (formats[i].block_height > 1)
-            {
-                SetRect(&rect, 0, formats[i].block_height >> 1, formats[i].block_width, formats[i].block_height);
-                hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0);
-                ok(!SUCCEEDED(hr) == !pools[j].success || broken(formats[i].broken),
-                        "Partial block lock %s, expected %s, format %s, pool %s.\n",
-                        SUCCEEDED(hr) ? "succeeded" : "failed",
-                        pools[j].success ? "success" : "failure", formats[i].name, pools[j].name);
-                if (SUCCEEDED(hr))
-                {
-                    hr = IDirect3DSurface9_UnlockRect(surface);
-                    ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed (%08x)\n", hr);
-                }
-
-                SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height >> 1);
-                hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0);
-                ok(!SUCCEEDED(hr) == !pools[j].success || broken(formats[i].broken),
-                        "Partial block lock %s, expected %s, format %s, pool %s.\n",
-                        SUCCEEDED(hr) ? "succeeded" : "failed",
-                        pools[j].success ? "success" : "failure", formats[i].name, pools[j].name);
-                if (SUCCEEDED(hr))
-                {
-                    hr = IDirect3DSurface9_UnlockRect(surface);
-                    ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed (%08x)\n", hr);
-                }
-            }
-
-            SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height);
-            hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0);
-            ok(SUCCEEDED(hr), "Full block lock returned %08x, expected %08x, format %s, pool %s\n",
-                    hr, D3D_OK, formats[i].name, pools[j].name);
-            if (SUCCEEDED(hr))
-            {
-                hr = IDirect3DSurface9_UnlockRect(surface);
-                ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed (%08x)\n", hr);
-            }
-
-            IDirect3DSurface9_Release(surface);
-        }
-    }
-    IDirect3D9_Release(d3d);
-}
-
-START_TEST(surface)
-{
-    HMODULE d3d9_handle;
-    IDirect3DDevice9 *device_ptr;
-    ULONG refcount;
-
-    d3d9_handle = LoadLibraryA("d3d9.dll");
-    if (!d3d9_handle)
-    {
-        skip("Could not load d3d9.dll\n");
-        return;
-    }
-
-    device_ptr = init_d3d9(d3d9_handle);
-    if (!device_ptr) return;
-
-    test_surface_get_container(device_ptr);
-    test_surface_alignment(device_ptr);
-    test_lockrect_offset(device_ptr);
-    test_lockrect_invalid(device_ptr);
-    test_private_data(device_ptr);
-    test_getdc(device_ptr);
-    test_surface_dimensions(device_ptr);
-    test_surface_format_null(device_ptr);
-    test_surface_double_unlock(device_ptr);
-    test_surface_lockrect_blocks(device_ptr);
-
-    refcount = IDirect3DDevice9_Release(device_ptr);
-    ok(!refcount, "Device has %u references left\n", refcount);
-}
-- 
1.7.8.6




More information about the wine-patches mailing list