Skip to content

W
wine-winehq
Commit 19cb2e21 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

d3d8/tests: Merge buffer.c into device.c.

parent 06796a63
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 137 deletions
dlls/d3d8/tests/Makefile.in
View file @ 19cb2e21
......@@ -2,7 +2,6 @@ TESTDLL = d3d8.dll
IMPORTS = user32
C_SRCS = \
buffer.c \
device.c \
stateblock.c \
surface.c \
......
dlls/d3d8/tests/buffer.c deleted 100644 → 0
View file @ 06796a63
/*
* Copyright (C) 2010 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 <d3d8.h>
#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_HARDWARE_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 lock_flag_test(IDirect3DDevice8 *device)
{
HRESULT hr;
IDirect3DVertexBuffer8 *buffer;
unsigned int i;
BYTE *data;
const struct
{
DWORD flags;
const char *debug_string;
HRESULT result;
}
test_data[] =
{
{D3DLOCK_READONLY, "D3DLOCK_READONLY", D3D_OK },
{D3DLOCK_DISCARD, "D3DLOCK_DISCARD", D3D_OK },
{D3DLOCK_NOOVERWRITE, "D3DLOCK_NOOVERWRITE", D3D_OK },
{D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, "D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD", D3D_OK },
{D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY, "D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY", D3D_OK },
{D3DLOCK_READONLY | D3DLOCK_DISCARD, "D3DLOCK_READONLY | D3DLOCK_DISCARD", D3D_OK },
/* Completely bogous flags aren't an error */
{0xdeadbeef, "0xdeadbeef", D3D_OK },
};
hr = IDirect3DDevice8_CreateVertexBuffer(device, 1024, D3DUSAGE_DYNAMIC, 0, D3DPOOL_DEFAULT, &buffer);
ok(hr == D3D_OK, "IDirect3DDevice8_CreateBuffer failed, 0x%08x\n", hr);
for(i = 0; i < (sizeof(test_data) / sizeof(*test_data)); i++)
{
hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, &data, test_data[i].flags);
ok(hr == test_data[i].result, "Lock flags %s returned 0x%08x, expected 0x%08x\n",
test_data[i].debug_string, hr, test_data[i].result);
if(SUCCEEDED(hr))
{
ok(data != NULL, "The data pointer returned by Lock is NULL\n");
hr = IDirect3DVertexBuffer8_Unlock(buffer);
ok(hr == D3D_OK, "IDirect3DVertexBuffer8_Unlock failed, 0x%08x\n", hr);
}
}
IDirect3DVertexBuffer8_Release(buffer);
}
START_TEST(buffer)
{
IDirect3DDevice8 *device_ptr;
ULONG refcount;
HMODULE d3d8_handle = 0;
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;
lock_flag_test(device_ptr);
refcount = IDirect3DDevice8_Release(device_ptr);
ok(!refcount, "Device has %u references left\n", refcount);
}
dlls/d3d8/tests/device.c
View file @ 19cb2e21
......@@ -3,6 +3,7 @@
* Copyright (C) 2006 Chris Robinson
* Copyright (C) 2006 Louis Lenders
* Copyright 2006 Henri Verbeet
* Copyright 2010 Stefan Dösinger for CodeWeavers
* Copyright 2013 Henri Verbeet for CodeWeavers
*
* This library is free software; you can redistribute it and/or
......@@ -3553,6 +3554,73 @@ static void test_volume_get_container(void)
DestroyWindow(window);
}
static void test_vb_lock_flags(void)
{
static const struct
{
DWORD flags;
const char *debug_string;
HRESULT result;
}
test_data[] =
{
{D3DLOCK_READONLY, "D3DLOCK_READONLY", D3D_OK },
{D3DLOCK_DISCARD, "D3DLOCK_DISCARD", D3D_OK },
{D3DLOCK_NOOVERWRITE, "D3DLOCK_NOOVERWRITE", D3D_OK },
{D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, "D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD", D3D_OK },
{D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY, "D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY", D3D_OK },
{D3DLOCK_READONLY | D3DLOCK_DISCARD, "D3DLOCK_READONLY | D3DLOCK_DISCARD", D3D_OK },
/* Completely bogus flags aren't an error. */
{0xdeadbeef, "0xdeadbeef", D3D_OK },
};
IDirect3DVertexBuffer8 *buffer;
IDirect3DDevice8 *device;
IDirect3D8 *d3d8;
unsigned int i;
ULONG refcount;
HWND window;
HRESULT hr;
BYTE *data;
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_CreateVertexBuffer(device, 1024, D3DUSAGE_DYNAMIC, 0, D3DPOOL_DEFAULT, &buffer);
ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr);
for (i = 0; i < (sizeof(test_data) / sizeof(*test_data)); ++i)
{
hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, &data, test_data[i].flags);
ok(hr == test_data[i].result, "Got unexpected hr %#x for %s.\n",
hr, test_data[i].debug_string);
if (SUCCEEDED(hr))
{
ok(!!data, "Got unexpected data %p.\n", data);
hr = IDirect3DVertexBuffer8_Unlock(buffer);
ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr);
}
}
IDirect3DVertexBuffer8_Release(buffer);
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" );
......@@ -3615,6 +3683,7 @@ START_TEST(device)
test_validate_vs();
test_validate_ps();
test_volume_get_container();
test_vb_lock_flags();
}
UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL));
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment