Skip to content

W
wine-winehq
Commit 2b0278c7 authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Alexandre Julliard
Browse files
Options

d3dx9/tests: DDS magic isn't part of the DDS header.

Signed-off-by: 's avatarAlistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: 's avatarMatteo Bruni <mbruni@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 6097695d
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 28 deletions
dlls/d3dx9_36/tests/surface.c
View file @ 2b0278c7
...@@ -200,7 +200,6 @@ struct dds_pixel_format ...@@ -200,7 +200,6 @@ struct dds_pixel_format
struct dds_header struct dds_header
{ {
DWORD magic;
DWORD size; DWORD size;
DWORD flags; DWORD flags;
DWORD height; DWORD height;
...@@ -222,7 +221,6 @@ static void fill_dds_header(struct dds_header *header) ...@@ -222,7 +221,6 @@ static void fill_dds_header(struct dds_header *header)
{ {
memset(header, 0, sizeof(*header)); memset(header, 0, sizeof(*header));
header->magic = MAKEFOURCC('D','D','S',' ');
header->size = sizeof(*header); header->size = sizeof(*header);
header->flags = DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT; header->flags = DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT;
header->height = 4; header->height = 4;
...@@ -250,10 +248,12 @@ static void check_dds_pixel_format_(unsigned int line, ...@@ -250,10 +248,12 @@ static void check_dds_pixel_format_(unsigned int line,
D3DXIMAGE_INFO info; D3DXIMAGE_INFO info;
struct struct
{ {
DWORD magic;
struct dds_header header; struct dds_header header;
BYTE data[256]; BYTE data[256];
} dds; } dds;
dds.magic = MAKEFOURCC('D','D','S',' ');
fill_dds_header(&dds.header); fill_dds_header(&dds.header);
dds.header.pixel_format.flags = flags; dds.header.pixel_format.flags = flags;
dds.header.pixel_format.fourcc = fourcc; dds.header.pixel_format.fourcc = fourcc;
...@@ -281,6 +281,7 @@ static void test_dds_header_handling(void) ...@@ -281,6 +281,7 @@ static void test_dds_header_handling(void)
D3DXIMAGE_INFO info; D3DXIMAGE_INFO info;
struct struct
{ {
DWORD magic;
struct dds_header header; struct dds_header header;
BYTE data[4096 * 1024]; BYTE data[4096 * 1024];
} *dds; } *dds;
...@@ -399,9 +400,10 @@ static void test_dds_header_handling(void) ...@@ -399,9 +400,10 @@ static void test_dds_header_handling(void)
for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++)
{ {
DWORD file_size = sizeof(dds->header) + tests[i].pixel_data_size; DWORD file_size = sizeof(dds->magic) + sizeof(dds->header) + tests[i].pixel_data_size;
assert(file_size <= sizeof(*dds)); assert(file_size <= sizeof(*dds));
dds->magic = MAKEFOURCC('D','D','S',' ');
fill_dds_header(&dds->header); fill_dds_header(&dds->header);
dds->header.flags |= tests[i].flags; dds->header.flags |= tests[i].flags;
dds->header.width = tests[i].width; dds->header.width = tests[i].width;
...@@ -1234,7 +1236,12 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device) ...@@ -1234,7 +1236,12 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device)
RECT rect; RECT rect;
ID3DXBuffer *buffer; ID3DXBuffer *buffer;
IDirect3DSurface9 *surface; IDirect3DSurface9 *surface;
struct dds_header *header; struct
{
DWORD magic;
struct dds_header header;
BYTE *data;
} *dds;
hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL); hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL);
if (FAILED(hr)) { if (FAILED(hr)) {
...@@ -1257,35 +1264,35 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device) ...@@ -1257,35 +1264,35 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device)
todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
header = ID3DXBuffer_GetBufferPointer(buffer); dds = ID3DXBuffer_GetBufferPointer(buffer);
ok(header->magic == MAKEFOURCC('D','D','S',' '), "Invalid DDS signature.\n"); ok(dds->magic == MAKEFOURCC('D','D','S',' '), "Got unexpected DDS signature %#x.\n", dds->magic);
ok(header->size == 124, "Invalid DDS size %u.\n", header->size); ok(dds->header.size == sizeof(dds->header), "Got unexpected DDS size %u.\n", dds->header.size);
ok(!header->height, "Got unexpected height %u.\n", header->height); ok(!dds->header.height, "Got unexpected height %u.\n", dds->header.height);
ok(!header->width, "Got unexpected width %u.\n", header->width); ok(!dds->header.width, "Got unexpected width %u.\n", dds->header.width);
ok(!header->depth, "Got unexpected depth %u.\n", header->depth); ok(!dds->header.depth, "Got unexpected depth %u.\n", dds->header.depth);
ok(!header->miplevels, "Got unexpected miplevels %u.\n", header->miplevels); ok(!dds->header.miplevels, "Got unexpected miplevels %u.\n", dds->header.miplevels);
ok(!header->pitch_or_linear_size, "Got unexpected pitch_or_linear_size %u.\n", header->pitch_or_linear_size); ok(!dds->header.pitch_or_linear_size, "Got unexpected pitch_or_linear_size %u.\n", dds->header.pitch_or_linear_size);
ok(header->caps == (DDS_CAPS_TEXTURE | DDSCAPS_ALPHA), "Got unexpected caps %x.\n", header->caps); ok(dds->header.caps == (DDS_CAPS_TEXTURE | DDSCAPS_ALPHA), "Got unexpected caps %#x.\n", dds->header.caps);
ok(header->flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT), ok(dds->header.flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT),
"Got unexpected flags %x.\n", header->flags); "Got unexpected flags %#x.\n", dds->header.flags);
ID3DXBuffer_Release(buffer); ID3DXBuffer_Release(buffer);
} }
hr = D3DXSaveSurfaceToFileInMemory(&buffer, D3DXIFF_DDS, surface, NULL, NULL); hr = D3DXSaveSurfaceToFileInMemory(&buffer, D3DXIFF_DDS, surface, NULL, NULL);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
header = ID3DXBuffer_GetBufferPointer(buffer);
dds = ID3DXBuffer_GetBufferPointer(buffer);
ok(header->magic == MAKEFOURCC('D','D','S',' '), "Invalid DDS signature.\n"); ok(dds->magic == MAKEFOURCC('D','D','S',' '), "Got unexpected DDS signature %#x.\n", dds->magic);
ok(header->size == 124, "Invalid DDS size %u.\n", header->size); ok(dds->header.size == sizeof(dds->header), "Got unexpected DDS size %u.\n", dds->header.size);
ok(header->height == 4, "Got unexpected height %u.\n", header->height); ok(dds->header.height == 4, "Got unexpected height %u.\n", dds->header.height);
ok(header->width == 4, "Got unexpected width %u.\n", header->width); ok(dds->header.width == 4, "Got unexpected width %u.\n", dds->header.width);
ok(!header->depth, "Got unexpected depth %u.\n", header->depth); ok(!dds->header.depth, "Got unexpected depth %u.\n", dds->header.depth);
ok(!header->miplevels, "Got unexpected miplevels %u.\n", header->miplevels); ok(!dds->header.miplevels, "Got unexpected miplevels %u.\n", dds->header.miplevels);
ok(!header->pitch_or_linear_size, "Got unexpected pitch_or_linear_size %u.\n", header->pitch_or_linear_size); ok(!dds->header.pitch_or_linear_size, "Got unexpected pitch_or_linear_size %u.\n", dds->header.pitch_or_linear_size);
todo_wine ok(header->caps == (DDS_CAPS_TEXTURE | DDSCAPS_ALPHA), "Got unexpected caps %x.\n", header->caps); todo_wine ok(dds->header.caps == (DDS_CAPS_TEXTURE | DDSCAPS_ALPHA), "Got unexpected caps %#x.\n", dds->header.caps);
ok(header->flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT), ok(dds->header.flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT),
"Got unexpected flags %x.\n", header->flags); "Got unexpected flags %#x.\n", dds->header.flags);
ID3DXBuffer_Release(buffer); ID3DXBuffer_Release(buffer);
IDirect3DSurface9_Release(surface); IDirect3DSurface9_Release(surface);
......
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