d3d9/tests: Merge volume.c into device.c.

dlls/d3d9/tests/Makefile.in

@@ -11,7 +11,6 @@ C_SRCS = \
 	surface.c \
 	texture.c \
 	vertexdeclaration.c \
-	visual.c \
-	volume.c
+	visual.c
 
 @MAKE_TEST_RULES@

dlls/d3d9/tests/device.c

@@ -2,7 +2,8 @@
  * Copyright (C) 2006 Vitaliy Margolen
  * Copyright (C) 2006 Chris Robinson
  * Copyright (C) 2006-2007 Stefan Dösinger(For CodeWeavers)
- * Copyright 2007 Henri Verbeet
+ * Copyright 2006, 2007 Henri Verbeet
+ * Copyright 2013 Henri Verbeet for CodeWeavers
  * Copyright (C) 2008 Rico Schüller
  *
  * This library is free software; you can redistribute it and/or
@@ -3677,6 +3678,148 @@ static void test_set_rt_vp_scissor(void)
     DestroyWindow(window);
 }
 
+static void test_volume_get_container(void)
+{
+    IDirect3DVolumeTexture9 *texture = NULL;
+    IDirect3DVolume9 *volume = NULL;
+    IDirect3DDevice9 *device;
+    IUnknown *container;
+    IDirect3D9 *d3d9;
+    ULONG refcount;
+    D3DCAPS9 caps;
+    HWND window;
+    HRESULT hr;
+
+    if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION)))
+    {
+        skip("Failed to create d3d9 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(d3d9, window, window, TRUE)))
+    {
+        skip("Failed to create a D3D device, skipping tests.\n");
+        IDirect3D9_Release(d3d9);
+        DestroyWindow(window);
+        return;
+    }
+
+    hr = IDirect3DDevice9_GetDeviceCaps(device, &caps);
+    ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr);
+    if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP))
+    {
+        skip("No volume texture support, skipping tests.\n");
+        IDirect3DDevice9_Release(device);
+        IDirect3D9_Release(d3d9);
+        DestroyWindow(window);
+        return;
+    }
+
+    hr = IDirect3DDevice9_CreateVolumeTexture(device, 128, 128, 128, 1, 0,
+            D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture, 0);
+    ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr);
+    ok(!!texture, "Got unexpected texture %p.\n", texture);
+
+    hr = IDirect3DVolumeTexture9_GetVolumeLevel(texture, 0, &volume);
+    ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr);
+    ok(!!volume, "Got unexpected volume %p.\n", volume);
+
+    /* These should work... */
+    container = NULL;
+    hr = IDirect3DVolume9_GetContainer(volume, &IID_IUnknown, (void **)&container);
+    ok(SUCCEEDED(hr), "Failed to get volume container, hr %#x.\n", hr);
+    ok(container == (IUnknown *)texture, "Got unexpected container %p, expected %p.\n", container, texture);
+    IUnknown_Release(container);
+
+    container = NULL;
+    hr = IDirect3DVolume9_GetContainer(volume, &IID_IDirect3DResource9, (void **)&container);
+    ok(SUCCEEDED(hr), "Failed to get volume container, hr %#x.\n", hr);
+    ok(container == (IUnknown *)texture, "Got unexpected container %p, expected %p.\n", container, texture);
+    IUnknown_Release(container);
+
+    container = NULL;
+    hr = IDirect3DVolume9_GetContainer(volume, &IID_IDirect3DBaseTexture9, (void **)&container);
+    ok(SUCCEEDED(hr), "Failed to get volume container, hr %#x.\n", hr);
+    ok(container == (IUnknown *)texture, "Got unexpected container %p, expected %p.\n", container, texture);
+    IUnknown_Release(container);
+
+    container = NULL;
+    hr = IDirect3DVolume9_GetContainer(volume, &IID_IDirect3DVolumeTexture9, (void **)&container);
+    ok(SUCCEEDED(hr), "Failed to get volume 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 = IDirect3DVolume9_GetContainer(volume, &IID_IDirect3DVolume9, (void **)&container);
+    ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr);
+    ok(!container, "Got unexpected container %p.\n", container);
+
+    IDirect3DVolume9_Release(volume);
+    IDirect3DVolumeTexture9_Release(texture);
+    refcount = IDirect3DDevice9_Release(device);
+    ok(!refcount, "Device has %u references left.\n", refcount);
+    IDirect3D9_Release(d3d9);
+    DestroyWindow(window);
+}
+
+static void test_volume_resource(void)
+{
+    IDirect3DVolumeTexture9 *texture;
+    IDirect3DResource9 *resource;
+    IDirect3DVolume9 *volume;
+    IDirect3DDevice9 *device;
+    IDirect3D9 *d3d9;
+    ULONG refcount;
+    D3DCAPS9 caps;
+    HWND window;
+    HRESULT hr;
+
+    if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION)))
+    {
+        skip("Failed to create d3d9 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(d3d9, window, window, TRUE)))
+    {
+        skip("Failed to create a D3D device, skipping tests.\n");
+        IDirect3D9_Release(d3d9);
+        DestroyWindow(window);
+        return;
+    }
+
+    hr = IDirect3DDevice9_GetDeviceCaps(device, &caps);
+    ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr);
+    if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP))
+    {
+        skip("No volume texture support, skipping tests.\n");
+        IDirect3DDevice9_Release(device);
+        IDirect3D9_Release(d3d9);
+        DestroyWindow(window);
+        return;
+    }
+
+    hr = IDirect3DDevice9_CreateVolumeTexture(device, 128, 128, 128, 1, 0,
+            D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture, 0);
+    ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr);
+    hr = IDirect3DVolumeTexture9_GetVolumeLevel(texture, 0, &volume);
+    ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr);
+    IDirect3DVolumeTexture9_Release(texture);
+
+    hr = IDirect3DVolume9_QueryInterface(volume, &IID_IDirect3DResource9, (void **)&resource);
+    ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr);
+
+    IDirect3DVolume9_Release(volume);
+    refcount = IDirect3DDevice9_Release(device);
+    ok(!refcount, "Device has %u references left.\n", refcount);
+    IDirect3D9_Release(d3d9);
+    DestroyWindow(window);
+}
+
 START_TEST(device)
 {
     HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" );
@@ -3735,6 +3878,8 @@ START_TEST(device)
         test_device_window_reset();
         test_reset_resources();
         test_set_rt_vp_scissor();
+        test_volume_get_container();
+        test_volume_resource();
     }
 
 out:

dlls/d3d9/tests/volume.c

-/*
- * Copyright (C) 2006 Henri Verbeet
- *
- * 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;
-
-    hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
-            NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr);
-
-    if(FAILED(hr))
-    {
-        trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr);
-        return NULL;
-    }
-
-    return device_ptr;
-}
-
-static void test_volume_get_container(IDirect3DDevice9 *device_ptr)
-{
-    IDirect3DVolumeTexture9 *texture_ptr = 0;
-    IDirect3DVolume9 *volume_ptr = 0;
-    void *container_ptr;
-    HRESULT hr;
-
-    hr = IDirect3DDevice9_CreateVolumeTexture(device_ptr, 128, 128, 128, 1, 0,
-            D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture_ptr, 0);
-    ok(SUCCEEDED(hr) && texture_ptr != NULL, "CreateVolumeTexture 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 = IDirect3DVolumeTexture9_GetVolumeLevel(texture_ptr, 0, &volume_ptr);
-    ok(SUCCEEDED(hr) && volume_ptr != NULL, "GetVolumeLevel returned: hr %#x, volume_ptr %p. "
-        "Expected hr %#x, volume_ptr != %p\n", hr, volume_ptr, D3D_OK, NULL);
-    if (!volume_ptr || FAILED(hr)) goto cleanup;
-
-    /* These should work... */
-    container_ptr = (void *)0x1337c0d3;
-    hr = IDirect3DVolume9_GetContainer(volume_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 = IDirect3DVolume9_GetContainer(volume_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 = IDirect3DVolume9_GetContainer(volume_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 = IDirect3DVolume9_GetContainer(volume_ptr, &IID_IDirect3DVolumeTexture9, &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 = IDirect3DVolume9_GetContainer(volume_ptr, &IID_IDirect3DVolume9, &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) IDirect3DVolumeTexture9_Release(texture_ptr);
-    if (volume_ptr) IDirect3DVolume9_Release(volume_ptr);
-}
-
-static void test_volume_resource(IDirect3DDevice9 *device)
-{
-    IDirect3DVolumeTexture9 *texture;
-    IDirect3DResource9 *resource;
-    IDirect3DVolume9 *volume;
-    HRESULT hr;
-
-    hr = IDirect3DDevice9_CreateVolumeTexture(device, 128, 128, 128, 1, 0,
-            D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture, 0);
-    ok(SUCCEEDED(hr), "CreateVolumeTexture failed, hr %#x.\n", hr);
-
-    hr = IDirect3DVolumeTexture9_GetVolumeLevel(texture, 0, &volume);
-    ok(SUCCEEDED(hr), "GetVolumeLevel failed, hr %#x.\n", hr);
-
-    IDirect3DVolumeTexture9_Release(texture);
-
-    hr = IDirect3DVolume9_QueryInterface(volume, &IID_IDirect3DResource9, (void **)&resource);
-    ok(hr == E_NOINTERFACE, "QueryInterface returned %#x, expected %#x.\n", hr, E_NOINTERFACE);
-
-    IDirect3DVolume9_Release(volume);
-}
-
-
-START_TEST(volume)
-{
-    HMODULE d3d9_handle;
-    IDirect3DDevice9 *device_ptr;
-    ULONG refcount;
-    D3DCAPS9 caps;
-
-    memset(&caps, 0, sizeof(caps));
-    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;
-    IDirect3DDevice9_GetDeviceCaps(device_ptr, &caps);
-
-    if(!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) {
-        skip("No volume texture support\n");
-        return;
-    }
-
-    test_volume_get_container(device_ptr);
-    test_volume_resource(device_ptr);
-
-    refcount = IDirect3DDevice9_Release(device_ptr);
-    ok(!refcount, "Device has %u references left\n", refcount);
-}