Skip to content

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

d3dx11_43/tests: Add a trailing '\n' to ok() calls.

parent e195aafe
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
dlls/d3dx11_43/tests/d3dx11.c
View file @ f8aca527
...@@ -770,50 +770,50 @@ static void test_D3DX11GetImageInfoFromMemory(void) ...@@ -770,50 +770,50 @@ static void test_D3DX11GetImageInfoFromMemory(void)
} }
hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp), NULL, &info, NULL); hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp), NULL, &info, NULL);
ok(hr == S_OK, "Got unexpected hr %#lx.", hr); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp) + 5, NULL, &info, NULL); /* too large size */ hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp) + 5, NULL, &info, NULL); /* too large size */
ok(hr == S_OK, "Got unexpected hr %#lx.", hr); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11GetImageInfoFromMemory(noimage, sizeof(noimage), NULL, NULL, NULL); hr = D3DX11GetImageInfoFromMemory(noimage, sizeof(noimage), NULL, NULL, NULL);
ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11GetImageInfoFromMemory(noimage, sizeof(noimage), NULL, &info, NULL); hr = D3DX11GetImageInfoFromMemory(noimage, sizeof(noimage), NULL, &info, NULL);
ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp) - 1, NULL, &info, NULL); hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp) - 1, NULL, &info, NULL);
ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11GetImageInfoFromMemory(bmp_1bpp + 1, sizeof(bmp_1bpp) - 1, NULL, &info, NULL); hr = D3DX11GetImageInfoFromMemory(bmp_1bpp + 1, sizeof(bmp_1bpp) - 1, NULL, &info, NULL);
ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, 0, NULL, &info, NULL); hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, 0, NULL, &info, NULL);
ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, 0, NULL, NULL, NULL); hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, 0, NULL, NULL, NULL);
ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, &info, NULL); hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, &info, NULL);
ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, NULL, NULL); hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, NULL, NULL);
ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, &info, NULL); hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, &info, NULL);
ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11GetImageInfoFromMemory(NULL, 4, NULL, NULL, NULL); hr = D3DX11GetImageInfoFromMemory(NULL, 4, NULL, NULL, NULL);
ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11GetImageInfoFromMemory(NULL, 4, NULL, &info, NULL); hr = D3DX11GetImageInfoFromMemory(NULL, 4, NULL, &info, NULL);
ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11GetImageInfoFromMemory(NULL, 0, NULL, NULL, NULL); hr = D3DX11GetImageInfoFromMemory(NULL, 0, NULL, NULL, NULL);
ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
/* test BMP support */ /* test BMP support */
hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp), NULL, &info, NULL); hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp), NULL, &info, NULL);
ok(hr == S_OK, "Got unexpected hr %#lx.", hr); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(info.Width == 1, "Unexpected width %u.\n", info.Width); ok(info.Width == 1, "Unexpected width %u.\n", info.Width);
ok(info.Height == 1, "Unexpected height %u.\n", info.Height); ok(info.Height == 1, "Unexpected height %u.\n", info.Height);
ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth);
...@@ -825,7 +825,7 @@ static void test_D3DX11GetImageInfoFromMemory(void) ...@@ -825,7 +825,7 @@ static void test_D3DX11GetImageInfoFromMemory(void)
ok(info.ImageFileFormat == D3DX11_IFF_BMP, "Unexpected image file format %#x.\n", info.ImageFileFormat); ok(info.ImageFileFormat == D3DX11_IFF_BMP, "Unexpected image file format %#x.\n", info.ImageFileFormat);
hr = D3DX11GetImageInfoFromMemory(bmp_2bpp, sizeof(bmp_2bpp), NULL, &info, NULL); hr = D3DX11GetImageInfoFromMemory(bmp_2bpp, sizeof(bmp_2bpp), NULL, &info, NULL);
ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11GetImageInfoFromMemory(bmp_4bpp, sizeof(bmp_4bpp), NULL, &info, NULL); hr = D3DX11GetImageInfoFromMemory(bmp_4bpp, sizeof(bmp_4bpp), NULL, &info, NULL);
ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
......
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