From 00ef7a52850126fcf83066078c2766706e44c947 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 8 Jan 2013 09:53:19 +0100 Subject: [PATCH] d3d8/tests: Merge volume.c into device.c. --- dlls/d3d8/tests/Makefile.in | 3 +- dlls/d3d8/tests/device.c | 89 +++++++++++++++++++++ dlls/d3d8/tests/volume.c | 154 ------------------------------------ 3 files changed, 90 insertions(+), 156 deletions(-) delete mode 100644 dlls/d3d8/tests/volume.c diff --git a/dlls/d3d8/tests/Makefile.in b/dlls/d3d8/tests/Makefile.in index ab1e92b2a56..def2c04f644 100644 --- a/dlls/d3d8/tests/Makefile.in +++ b/dlls/d3d8/tests/Makefile.in @@ -7,7 +7,6 @@ C_SRCS = \ stateblock.c \ surface.c \ texture.c \ - visual.c \ - volume.c + visual.c @MAKE_TEST_RULES@ diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index d8e8a562207..e20c883e69e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2,6 +2,8 @@ * Copyright (C) 2006 Vitaliy Margolen * Copyright (C) 2006 Chris Robinson * Copyright (C) 2006 Louis Lenders + * Copyright 2006 Henri Verbeet + * Copyright 2013 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -3465,6 +3467,92 @@ static void test_validate_ps(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } +static void test_volume_get_container(void) +{ + IDirect3DVolumeTexture8 *texture = NULL; + IDirect3DVolume8 *volume = NULL; + IDirect3DDevice8 *device; + IUnknown *container; + IDirect3D8 *d3d8; + ULONG refcount; + D3DCAPS8 caps; + HWND window; + HRESULT hr; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create d3d8 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_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"); + IDirect3DDevice8_Release(device); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVolumeTexture(device, 128, 128, 128, 1, 0, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + ok(!!texture, "Got unexpected texture %p.\n", texture); + + hr = IDirect3DVolumeTexture8_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 = IDirect3DVolume8_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 = IDirect3DVolume8_GetContainer(volume, &IID_IDirect3DResource8, (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 = IDirect3DVolume8_GetContainer(volume, &IID_IDirect3DBaseTexture8, (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 = IDirect3DVolume8_GetContainer(volume, &IID_IDirect3DVolumeTexture8, (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 = IDirect3DVolume8_GetContainer(volume, &IID_IDirect3DVolume8, (void **)&container); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(!container, "Got unexpected container %p.\n", container); + + IDirect3DVolume8_Release(volume); + IDirect3DVolumeTexture8_Release(texture); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -3526,6 +3614,7 @@ START_TEST(device) test_set_rt_vp_scissor(); test_validate_vs(); test_validate_ps(); + test_volume_get_container(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); } diff --git a/dlls/d3d8/tests/volume.c b/dlls/d3d8/tests/volume.c deleted file mode 100644 index f2948921bc4..00000000000 --- a/dlls/d3d8/tests/volume.c +++ /dev/null @@ -1,154 +0,0 @@ -/* - * 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 -#include "wine/test.h" - -static HWND create_window(void) -{ - WNDCLASS wc = {0}; - wc.lpfnWndProc = DefWindowProc; - wc.lpszClassName = "d3d8_test_wc"; - RegisterClass(&wc); - - return CreateWindow("d3d8_test_wc", "d3d8_test", - 0, 0, 0, 0, 0, 0, 0, 0, 0); -} - -static IDirect3DDevice8 *init_d3d8(HMODULE d3d8_handle) -{ - IDirect3D8 * (__stdcall * d3d8_create)(UINT SDKVersion) = 0; - IDirect3D8 *d3d8_ptr = 0; - IDirect3DDevice8 *device_ptr = 0; - D3DPRESENT_PARAMETERS present_parameters; - D3DDISPLAYMODE d3ddm; - HRESULT hr; - - d3d8_create = (void *)GetProcAddress(d3d8_handle, "Direct3DCreate8"); - ok(d3d8_create != NULL, "Failed to get address of Direct3DCreate8\n"); - if (!d3d8_create) return NULL; - - d3d8_ptr = d3d8_create(D3D_SDK_VERSION); - if (!d3d8_ptr) - { - skip("could not create D3D8\n"); - return NULL; - } - - IDirect3D8_GetAdapterDisplayMode(d3d8_ptr, D3DADAPTER_DEFAULT, &d3ddm ); - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = create_window(); - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferFormat = d3ddm.Format; - - hr = IDirect3D8_CreateDevice(d3d8_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - - if(FAILED(hr)) - { - skip("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); - return NULL; - } - - return device_ptr; -} - -static void test_volume_get_container(IDirect3DDevice8 *device_ptr) -{ - IDirect3DVolumeTexture8 *texture_ptr = 0; - IDirect3DVolume8 *volume_ptr = 0; - void *container_ptr; - HRESULT hr; - - hr = IDirect3DDevice8_CreateVolumeTexture(device_ptr, 128, 128, 128, 1, 0, - D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture_ptr); - 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 = IDirect3DVolumeTexture8_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 = IDirect3DVolume8_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 = IDirect3DVolume8_GetContainer(volume_ptr, &IID_IDirect3DResource8, &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 = IDirect3DVolume8_GetContainer(volume_ptr, &IID_IDirect3DBaseTexture8, &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 = IDirect3DVolume8_GetContainer(volume_ptr, &IID_IDirect3DVolumeTexture8, &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 = IDirect3DVolume8_GetContainer(volume_ptr, &IID_IDirect3DVolume8, &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) IDirect3DVolumeTexture8_Release(texture_ptr); - if (volume_ptr) IDirect3DVolume8_Release(volume_ptr); -} - -START_TEST(volume) -{ - HMODULE d3d8_handle; - IDirect3DDevice8 *device_ptr; - ULONG refcount; - D3DCAPS8 caps; - - d3d8_handle = LoadLibraryA("d3d8.dll"); - if (!d3d8_handle) - { - skip("Could not load d3d8.dll\n"); - return; - } - - device_ptr = init_d3d8(d3d8_handle); - if (!device_ptr) return; - - IDirect3DDevice8_GetDeviceCaps(device_ptr, &caps); - if(!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) { - skip("Volume textures not supported\n"); - return; - } - - test_volume_get_container(device_ptr); - - refcount = IDirect3DDevice8_Release(device_ptr); - ok(!refcount, "Device has %u references left\n", refcount); -}