d3d9: Add a test for GetContainer (Volumes & Surfaces).

dlls/d3d9/tests/.gitignore

@@ -2,5 +2,7 @@ Makefile
 device.ok
 shader.ok
 stateblock.ok
+surface.ok
 testlist.c
 vertexdeclaration.ok
+volume.ok

dlls/d3d9/tests/Makefile.in

@@ -4,13 +4,15 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = d3d9.dll
 IMPORTS   = user32 kernel32
-EXTRALIBS = -ldxerr9
+EXTRALIBS = -ldxerr9 -luuid -ldxguid
 
 CTESTS = \
 	device.c \
 	shader.c \
 	stateblock.c \
-	vertexdeclaration.c
+	surface.c \
+	vertexdeclaration.c \
+	volume.c
 
 @MAKE_TEST_RULES@
 

dlls/d3d9/tests/surface.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);
+    ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n");
+    if (!d3d9_ptr) 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);
+    ok(SUCCEEDED(hr), "IDirect3D_CreateDevice returned %#lx\n", hr);
+
+    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 %#lx, texture_ptr %p. "
+        "Expected hr %#lx, 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 %#lx, surface_ptr %p. "
+        "Expected hr %#lx, 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 %#lx, container_ptr %p. "
+        "Expected hr %#lx, 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 %#lx, container_ptr %p. "
+        "Expected hr %#lx, 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 %#lx, container_ptr %p. "
+        "Expected hr %#lx, 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 %#lx, container_ptr %p. "
+        "Expected hr %#lx, 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 %#lx, container_ptr %p. "
+        "Expected hr %#lx, 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);
+}
+
+START_TEST(surface)
+{
+    HMODULE d3d9_handle;
+    IDirect3DDevice9 *device_ptr;
+
+    d3d9_handle = LoadLibraryA("d3d9.dll");
+    if (!d3d9_handle)
+    {
+        trace("Could not load d3d9.dll, skipping tests\n");
+        return;
+    }
+
+    device_ptr = init_d3d9(d3d9_handle);
+    if (!device_ptr) return;
+
+    test_surface_get_container(device_ptr);
+}

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);
+    ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n");
+    if (!d3d9_ptr) 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);
+    ok(SUCCEEDED(hr), "IDirect3D_CreateDevice returned %#lx\n", hr);
+
+    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 %#lx, texture_ptr %p. "
+        "Expected hr %#lx, 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 %#lx, volume_ptr %p. "
+        "Expected hr %#lx, 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 %#lx, container_ptr %p. "
+        "Expected hr %#lx, 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 %#lx, container_ptr %p. "
+        "Expected hr %#lx, 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 %#lx, container_ptr %p. "
+        "Expected hr %#lx, 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 %#lx, container_ptr %p. "
+        "Expected hr %#lx, 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 %#lx, container_ptr %p. "
+        "Expected hr %#lx, 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);
+}
+
+START_TEST(volume)
+{
+    HMODULE d3d9_handle;
+    IDirect3DDevice9 *device_ptr;
+
+    d3d9_handle = LoadLibraryA("d3d9.dll");
+    if (!d3d9_handle)
+    {
+        trace("Could not load d3d9.dll, skipping tests\n");
+        return;
+    }
+
+    device_ptr = init_d3d9(d3d9_handle);
+    if (!device_ptr) return;
+
+    test_volume_get_container(device_ptr);
+}