[PATCH] d3dx9_36/tests: Move surface tests into surface.c
Christian Costa
titan.costa at wanadoo.fr
Mon Apr 12 04:21:20 CDT 2010
--
Just rename texture.c file to surface.c. Coming texture tests will go into texture.c.
---
dlls/d3dx9_36/tests/Makefile.in | 2
dlls/d3dx9_36/tests/surface.c | 529 +++++++++++++++++++++++++++++++++++++++
dlls/d3dx9_36/tests/texture.c | 529 ---------------------------------------
3 files changed, 530 insertions(+), 530 deletions(-)
create mode 100644 dlls/d3dx9_36/tests/surface.c
delete mode 100644 dlls/d3dx9_36/tests/texture.c
-------------- next part --------------
diff --git a/dlls/d3dx9_36/tests/Makefile.in b/dlls/d3dx9_36/tests/Makefile.in
index 59ac277..b9ad40d 100644
--- a/dlls/d3dx9_36/tests/Makefile.in
+++ b/dlls/d3dx9_36/tests/Makefile.in
@@ -13,7 +13,7 @@ C_SRCS = \
math.c \
mesh.c \
shader.c \
- texture.c
+ surface.c
RC_SRCS = rsrc.rc
diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c
new file mode 100644
index 0000000..ef04afc
--- /dev/null
+++ b/dlls/d3dx9_36/tests/surface.c
@@ -0,0 +1,529 @@
+/*
+ * Tests for the D3DX9 surface functions
+ *
+ * Copyright 2009 Tony Wasserka
+ *
+ * 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 "wine/test.h"
+#include "d3dx9tex.h"
+#include "resources.h"
+
+static inline int get_ref(IUnknown *obj)
+{
+ IUnknown_AddRef(obj);
+ return IUnknown_Release(obj);
+}
+
+static inline void check_ref(IUnknown *obj, int exp)
+{
+ int ref = get_ref(obj);
+ ok (exp == ref, "Invalid refcount. Expected %d, got %d\n", exp, ref);
+}
+
+static inline void check_release(IUnknown *obj, int exp)
+{
+ int ref = IUnknown_Release(obj);
+ ok (ref == exp, "Invalid refcount. Expected %d, got %d\n", exp, ref);
+}
+
+/* 1x1 bmp (1 bpp) */
+static const unsigned char bmp01[66] = {
+0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00,
+0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00,
+0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00,
+0x00,0x00,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0x00,0x00,
+0x00,0x00
+};
+
+/* 2x2 A8R8G8B8 pixel data */
+static const unsigned char pixdata[] = {
+0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff
+};
+
+/* invalid image file */
+static const unsigned char noimage[4] = {
+0x11,0x22,0x33,0x44
+};
+
+static HRESULT create_file(const char *filename, const unsigned char *data, const unsigned int size)
+{
+ DWORD received;
+ HANDLE hfile;
+
+ hfile = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
+ if(hfile == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError());
+
+ if(WriteFile(hfile, data, size, &received, NULL))
+ {
+ CloseHandle(hfile);
+ return D3D_OK;
+ }
+
+ CloseHandle(hfile);
+ return D3DERR_INVALIDCALL;
+}
+
+static void test_D3DXGetImageInfo(void)
+{
+ HRESULT hr;
+ D3DXIMAGE_INFO info;
+ BOOL testdummy_ok, testbitmap_ok;
+
+ hr = create_file("testdummy.bmp", noimage, sizeof(noimage)); /* invalid image */
+ testdummy_ok = SUCCEEDED(hr);
+
+ hr = create_file("testbitmap.bmp", bmp01, sizeof(bmp01)); /* valid image */
+ testbitmap_ok = SUCCEEDED(hr);
+
+ /* D3DXGetImageInfoFromFile */
+ if(testbitmap_ok) {
+ hr = D3DXGetImageInfoFromFileA("testbitmap.bmp", &info);
+ ok(hr == D3D_OK, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3D_OK);
+
+ hr = D3DXGetImageInfoFromFileA("testbitmap.bmp", NULL); /* valid image, second parameter is NULL */
+ ok(hr == D3D_OK, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3D_OK);
+ } else skip("Couldn't create \"testbitmap.bmp\"\n");
+
+ if(testdummy_ok) {
+ hr = D3DXGetImageInfoFromFileA("testdummy.bmp", NULL); /* invalid image, second parameter is NULL */
+ ok(hr == D3D_OK, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3D_OK);
+
+ hr = D3DXGetImageInfoFromFileA("testdummy.bmp", &info);
+ ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
+ } else skip("Couldn't create \"testdummy.bmp\"\n");
+
+ hr = D3DXGetImageInfoFromFileA("filedoesnotexist.bmp", &info);
+ ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
+
+ hr = D3DXGetImageInfoFromFileA("filedoesnotexist.bmp", NULL);
+ ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
+
+ hr = D3DXGetImageInfoFromFileA("", &info);
+ ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
+
+ hr = D3DXGetImageInfoFromFileA(NULL, &info);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXGetImageInfoFromFileA(NULL, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+
+ /* D3DXGetImageInfoFromResource */
+ todo_wine {
+ hr = D3DXGetImageInfoFromResourceA(NULL, MAKEINTRESOURCEA(IDB_BITMAP_1x1), &info); /* RT_BITMAP */
+ ok(hr == D3D_OK, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3D_OK);
+
+ hr = D3DXGetImageInfoFromResourceA(NULL, MAKEINTRESOURCEA(IDB_BITMAP_1x1), NULL);
+ ok(hr == D3D_OK, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3D_OK);
+ }
+
+ hr = D3DXGetImageInfoFromResourceA(NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), &info); /* RT_RCDATA */
+ ok(hr == D3D_OK, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3D_OK);
+
+ hr = D3DXGetImageInfoFromResourceA(NULL, MAKEINTRESOURCEA(IDS_STRING), &info);
+ ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
+
+ hr = D3DXGetImageInfoFromResourceA(NULL, MAKEINTRESOURCEA(IDS_STRING), NULL);
+ ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
+
+ hr = D3DXGetImageInfoFromResourceA(NULL, "resourcedoesnotexist", &info);
+ ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
+
+ hr = D3DXGetImageInfoFromResourceA(NULL, "resourcedoesnotexist", NULL);
+ ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
+
+ hr = D3DXGetImageInfoFromResourceA(NULL, NULL, NULL);
+ ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
+
+
+ /* D3DXGetImageInfoFromFileInMemory */
+ hr = D3DXGetImageInfoFromFileInMemory(bmp01, sizeof(bmp01), &info);
+ ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK);
+
+ hr = D3DXGetImageInfoFromFileInMemory(bmp01, sizeof(bmp01)+5, &info); /* too large size */
+ ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK);
+
+ hr = D3DXGetImageInfoFromFileInMemory(bmp01, sizeof(bmp01), NULL);
+ ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK);
+
+ hr = D3DXGetImageInfoFromFileInMemory(noimage, sizeof(noimage), NULL);
+ ok(hr == D3D_OK, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3D_OK);
+
+ hr = D3DXGetImageInfoFromFileInMemory(noimage, sizeof(noimage), &info);
+ ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
+
+ todo_wine {
+ hr = D3DXGetImageInfoFromFileInMemory(bmp01, sizeof(bmp01)-1, &info);
+ ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
+ }
+
+ hr = D3DXGetImageInfoFromFileInMemory(bmp01+1, sizeof(bmp01)-1, &info);
+ ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
+
+ hr = D3DXGetImageInfoFromFileInMemory(bmp01, 0, &info);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXGetImageInfoFromFileInMemory(bmp01, 0, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXGetImageInfoFromFileInMemory(noimage, 0, &info);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXGetImageInfoFromFileInMemory(noimage, 0, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXGetImageInfoFromFileInMemory(NULL, 0, &info);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXGetImageInfoFromFileInMemory(NULL, 4, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXGetImageInfoFromFileInMemory(NULL, 4, &info);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXGetImageInfoFromFileInMemory(NULL, 0, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ /* cleanup */
+ if(testdummy_ok) DeleteFileA("testdummy.bmp");
+ if(testbitmap_ok) DeleteFileA("testbitmap.bmp");
+}
+
+#define check_pixel_1bpp(lockrect, x, y, color) \
+ok(((BYTE*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch] == color, "Got color %#x, expected %#x\n", ((BYTE*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch], color)
+
+#define check_pixel_2bpp(lockrect, x, y, color) \
+ok(((WORD*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch / 2] == color, "Got color %#x, expected %#x\n", ((WORD*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch / 2], color)
+
+#define check_pixel_4bpp(lockrect, x, y, color) \
+ok(((DWORD*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch / 4] == color, "Got color %#x, expected %#x\n", ((DWORD*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch / 4], color)
+static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
+{
+ HRESULT hr;
+ BOOL testdummy_ok, testbitmap_ok;
+ IDirect3DSurface9 *surf, *newsurf;
+ RECT rect;
+ D3DLOCKED_RECT lockrect;
+ const WORD pixdata_a8r3g3b2[] = { 0x57df, 0x98fc, 0xacdd, 0xc891 };
+ const WORD pixdata_a1r5g5b5[] = { 0x46b5, 0x99c8, 0x06a2, 0x9431 };
+ const WORD pixdata_r5g6b5[] = { 0x9ef6, 0x658d, 0x0aee, 0x42ee };
+ const DWORD pixdata_g16r16[] = { 0x07d23fbe, 0xdc7f44a4, 0xe4d8976b, 0x9a84fe89 };
+ const DWORD pixdata_a8b8g8r8[] = { 0xc3394cf0, 0x235ae892, 0x09b197fd, 0x8dc32bf6 };
+ const DWORD pixdata_a2r10g10b10[] = { 0x57395aff, 0x5b7668fd, 0xb0d856b5, 0xff2c61d6 };
+
+ hr = create_file("testdummy.bmp", noimage, sizeof(noimage)); /* invalid image */
+ testdummy_ok = SUCCEEDED(hr);
+
+ hr = create_file("testbitmap.bmp", bmp01, sizeof(bmp01)); /* valid image */
+ testbitmap_ok = SUCCEEDED(hr);
+
+ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 256, 256, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf, NULL);
+ if(FAILED(hr)) {
+ skip("Failed to create a surface (%#x)\n", hr);
+ if(testdummy_ok) DeleteFileA("testdummy.bmp");
+ if(testbitmap_ok) DeleteFileA("testbitmap.bmp");
+ return;
+ }
+
+ /* D3DXLoadSurfaceFromFile */
+ if(testbitmap_ok) {
+ todo_wine {
+ hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3D_OK);
+ }
+
+ hr = D3DXLoadSurfaceFromFileA(NULL, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+ } else skip("Couldn't create \"testbitmap.bmp\"\n");
+
+ if(testdummy_ok) {
+ todo_wine {
+ hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "testdummy.bmp", NULL, D3DX_DEFAULT, 0, NULL);
+ ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
+ }
+ } else skip("Couldn't create \"testdummy.bmp\"\n");
+
+ hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, NULL, NULL, D3DX_DEFAULT, 0, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "", NULL, D3DX_DEFAULT, 0, NULL);
+ ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
+
+
+ /* D3DXLoadSurfaceFromResource */
+ todo_wine {
+ hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, MAKEINTRESOURCE(IDB_BITMAP_1x1), NULL, D3DX_DEFAULT, 0, NULL);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3D_OK);
+
+ hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, MAKEINTRESOURCE(IDD_BITMAPDATA_1x1), NULL, D3DX_DEFAULT, 0, NULL);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3D_OK);
+ }
+
+ hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, NULL, NULL, D3DX_DEFAULT, 0, NULL);
+ ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
+
+ hr = D3DXLoadSurfaceFromResourceA(NULL, NULL, NULL, NULL, MAKEINTRESOURCE(IDB_BITMAP_1x1), NULL, D3DX_DEFAULT, 0, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, MAKEINTRESOURCE(IDS_STRING), NULL, D3DX_DEFAULT, 0, NULL);
+ ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
+
+
+ /* D3DXLoadSurfaceFromFileInMemory */
+ todo_wine {
+ hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp01, sizeof(bmp01), NULL, D3DX_DEFAULT, 0, NULL);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK);
+
+ hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, noimage, sizeof(noimage), NULL, D3DX_DEFAULT, 0, NULL);
+ ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
+ }
+
+ hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp01, 0, NULL, D3DX_DEFAULT, 0, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXLoadSurfaceFromFileInMemory(NULL, NULL, NULL, bmp01, sizeof(bmp01), NULL, D3DX_DEFAULT, 0, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, NULL, 8, NULL, D3DX_DEFAULT, 0, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, NULL, 0, NULL, D3DX_DEFAULT, 0, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXLoadSurfaceFromFileInMemory(NULL, NULL, NULL, NULL, 0, NULL, D3DX_DEFAULT, 0, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+
+ /* D3DXLoadSurfaceFromMemory */
+ SetRect(&rect, 0, 0, 2, 2);
+
+ hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
+
+ hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata, D3DFMT_A8R8G8B8, 0, NULL, &rect, D3DX_FILTER_NONE, 0);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
+
+ hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, NULL, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_DEFAULT, 0);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXLoadSurfaceFromMemory(NULL, NULL, NULL, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_DEFAULT, 0);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, NULL, D3DX_DEFAULT, 0);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata, D3DFMT_UNKNOWN, sizeof(pixdata), NULL, &rect, D3DX_DEFAULT, 0);
+ ok(hr == E_FAIL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, E_FAIL);
+
+
+ /* D3DXLoadSurfaceFromSurface */
+ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 256, 256, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &newsurf, NULL);
+ if(SUCCEEDED(hr)) {
+ todo_wine {
+ hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_DEFAULT, 0);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3D_OK);
+ }
+
+ hr = D3DXLoadSurfaceFromSurface(NULL, NULL, NULL, surf, NULL, NULL, D3DX_DEFAULT, 0);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, NULL, NULL, NULL, D3DX_DEFAULT, 0);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+
+ check_release((IUnknown*)newsurf, 0);
+ } else skip("Failed to create a second surface\n");
+
+ check_release((IUnknown*)surf, 0);
+
+
+ /* test color conversion */
+ /* A8R8G8B8 */
+ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf, NULL);
+ if(FAILED(hr)) skip("Failed to create a surface (%#x)\n", hr);
+ else {
+ hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a8r3g3b2, D3DFMT_A8R3G3B2, 4, NULL, &rect, D3DX_FILTER_NONE, 0);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
+ IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
+ check_pixel_4bpp(lockrect, 0, 0, 0x57dbffff);
+ check_pixel_4bpp(lockrect, 1, 0, 0x98ffff00);
+ check_pixel_4bpp(lockrect, 0, 1, 0xacdbff55);
+ check_pixel_4bpp(lockrect, 1, 1, 0xc8929255);
+ IDirect3DSurface9_UnlockRect(surf);
+
+ hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a1r5g5b5, D3DFMT_A1R5G5B5, 4, NULL, &rect, D3DX_FILTER_NONE, 0);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
+ IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
+ check_pixel_4bpp(lockrect, 0, 0, 0x008cadad);
+ check_pixel_4bpp(lockrect, 1, 0, 0xff317342);
+ check_pixel_4bpp(lockrect, 0, 1, 0x0008ad10);
+ check_pixel_4bpp(lockrect, 1, 1, 0xff29088c);
+ IDirect3DSurface9_UnlockRect(surf);
+
+ hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_r5g6b5, D3DFMT_R5G6B5, 4, NULL, &rect, D3DX_FILTER_NONE, 0);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
+ IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
+ check_pixel_4bpp(lockrect, 0, 0, 0xff9cdfb5);
+ check_pixel_4bpp(lockrect, 1, 0, 0xff63b26b);
+ check_pixel_4bpp(lockrect, 0, 1, 0xff085d73);
+ check_pixel_4bpp(lockrect, 1, 1, 0xff425d73);
+ IDirect3DSurface9_UnlockRect(surf);
+
+ hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_g16r16, D3DFMT_G16R16, 8, NULL, &rect, D3DX_FILTER_NONE, 0);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
+ IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
+ todo_wine {
+ check_pixel_4bpp(lockrect, 0, 0, 0xff3f08ff);
+ }
+ check_pixel_4bpp(lockrect, 1, 0, 0xff44dcff);
+ check_pixel_4bpp(lockrect, 0, 1, 0xff97e4ff);
+ check_pixel_4bpp(lockrect, 1, 1, 0xfffe9aff);
+ IDirect3DSurface9_UnlockRect(surf);
+
+ hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a8b8g8r8, D3DFMT_A8B8G8R8, 8, NULL, &rect, D3DX_FILTER_NONE, 0);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
+ IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
+ check_pixel_4bpp(lockrect, 0, 0, 0xc3f04c39);
+ check_pixel_4bpp(lockrect, 1, 0, 0x2392e85a);
+ check_pixel_4bpp(lockrect, 0, 1, 0x09fd97b1);
+ check_pixel_4bpp(lockrect, 1, 1, 0x8df62bc3);
+ IDirect3DSurface9_UnlockRect(surf);
+
+ hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a2r10g10b10, D3DFMT_A2R10G10B10, 8, NULL, &rect, D3DX_FILTER_NONE, 0);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
+ IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
+ check_pixel_4bpp(lockrect, 0, 0, 0x555c95bf);
+ check_pixel_4bpp(lockrect, 1, 0, 0x556d663f);
+ check_pixel_4bpp(lockrect, 0, 1, 0xaac385ad);
+ todo_wine {
+ check_pixel_4bpp(lockrect, 1, 1, 0xfffcc575);
+ }
+ IDirect3DSurface9_UnlockRect(surf);
+
+ check_release((IUnknown*)surf, 0);
+ }
+
+ /* A1R5G5B5 */
+ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_A1R5G5B5, D3DPOOL_DEFAULT, &surf, NULL);
+ if(FAILED(hr)) skip("Failed to create a surface (%#x)\n", hr);
+ else {
+ hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a8r3g3b2, D3DFMT_A8R3G3B2, 4, NULL, &rect, D3DX_FILTER_NONE, 0);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
+ IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
+ check_pixel_2bpp(lockrect, 0, 0, 0x6fff);
+ check_pixel_2bpp(lockrect, 1, 0, 0xffe0);
+ check_pixel_2bpp(lockrect, 0, 1, 0xefea);
+ check_pixel_2bpp(lockrect, 1, 1, 0xca4a);
+ IDirect3DSurface9_UnlockRect(surf);
+
+ hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a1r5g5b5, D3DFMT_A1R5G5B5, 4, NULL, &rect, D3DX_FILTER_NONE, 0);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
+ IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
+ check_pixel_2bpp(lockrect, 0, 0, 0x46b5);
+ check_pixel_2bpp(lockrect, 1, 0, 0x99c8);
+ check_pixel_2bpp(lockrect, 0, 1, 0x06a2);
+ check_pixel_2bpp(lockrect, 1, 1, 0x9431);
+ IDirect3DSurface9_UnlockRect(surf);
+
+ hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_r5g6b5, D3DFMT_R5G6B5, 4, NULL, &rect, D3DX_FILTER_NONE, 0);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
+ IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
+ check_pixel_2bpp(lockrect, 0, 0, 0xcf76);
+ check_pixel_2bpp(lockrect, 1, 0, 0xb2cd);
+ check_pixel_2bpp(lockrect, 0, 1, 0x856e);
+ check_pixel_2bpp(lockrect, 1, 1, 0xa16e);
+ IDirect3DSurface9_UnlockRect(surf);
+
+ hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_g16r16, D3DFMT_G16R16, 8, NULL, &rect, D3DX_FILTER_NONE, 0);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
+ IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
+ todo_wine {
+ check_pixel_2bpp(lockrect, 0, 0, 0xa03f);
+ }
+ check_pixel_2bpp(lockrect, 1, 0, 0xa37f);
+ check_pixel_2bpp(lockrect, 0, 1, 0xcb9f);
+ check_pixel_2bpp(lockrect, 1, 1, 0xfe7f);
+ IDirect3DSurface9_UnlockRect(surf);
+
+ hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a8b8g8r8, D3DFMT_A8B8G8R8, 8, NULL, &rect, D3DX_FILTER_NONE, 0);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
+ IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
+ todo_wine {
+ check_pixel_2bpp(lockrect, 0, 0, 0xf527);
+ check_pixel_2bpp(lockrect, 1, 0, 0x4b8b);
+ }
+ check_pixel_2bpp(lockrect, 0, 1, 0x7e56);
+ check_pixel_2bpp(lockrect, 1, 1, 0xf8b8);
+ IDirect3DSurface9_UnlockRect(surf);
+
+ hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a2r10g10b10, D3DFMT_A2R10G10B10, 8, NULL, &rect, D3DX_FILTER_NONE, 0);
+ ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
+ IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
+ check_pixel_2bpp(lockrect, 0, 0, 0x2e57);
+ todo_wine {
+ check_pixel_2bpp(lockrect, 1, 0, 0x3588);
+ }
+ check_pixel_2bpp(lockrect, 0, 1, 0xe215);
+ check_pixel_2bpp(lockrect, 1, 1, 0xff0e);
+ IDirect3DSurface9_UnlockRect(surf);
+
+ check_release((IUnknown*)surf, 0);
+ }
+
+ /* cleanup */
+ if(testdummy_ok) DeleteFileA("testdummy.bmp");
+ if(testbitmap_ok) DeleteFileA("testbitmap.bmp");
+}
+
+START_TEST(surface)
+{
+ HWND wnd;
+ IDirect3D9 *d3d;
+ IDirect3DDevice9 *device;
+ D3DPRESENT_PARAMETERS d3dpp;
+ HRESULT hr;
+
+ wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL);
+ d3d = Direct3DCreate9(D3D_SDK_VERSION);
+ if (!wnd) {
+ skip("Couldn't create application window\n");
+ return;
+ }
+ if (!d3d) {
+ skip("Couldn't create IDirect3D9 object\n");
+ DestroyWindow(wnd);
+ return;
+ }
+
+ ZeroMemory(&d3dpp, sizeof(d3dpp));
+ d3dpp.Windowed = TRUE;
+ d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
+ hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device);
+ if(FAILED(hr)) {
+ skip("Failed to create IDirect3DDevice9 object %#x\n", hr);
+ IDirect3D9_Release(d3d);
+ DestroyWindow(wnd);
+ return;
+ }
+
+ test_D3DXGetImageInfo();
+ test_D3DXLoadSurface(device);
+
+ check_release((IUnknown*)device, 0);
+ check_release((IUnknown*)d3d, 0);
+ if (wnd) DestroyWindow(wnd);
+}
diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c
deleted file mode 100644
index 2d6f768..0000000
--- a/dlls/d3dx9_36/tests/texture.c
+++ /dev/null
@@ -1,529 +0,0 @@
-/*
- * Tests for the D3DX9 texture functions
- *
- * Copyright 2009 Tony Wasserka
- *
- * 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 "wine/test.h"
-#include "d3dx9tex.h"
-#include "resources.h"
-
-static inline int get_ref(IUnknown *obj)
-{
- IUnknown_AddRef(obj);
- return IUnknown_Release(obj);
-}
-
-static inline void check_ref(IUnknown *obj, int exp)
-{
- int ref = get_ref(obj);
- ok (exp == ref, "Invalid refcount. Expected %d, got %d\n", exp, ref);
-}
-
-static inline void check_release(IUnknown *obj, int exp)
-{
- int ref = IUnknown_Release(obj);
- ok (ref == exp, "Invalid refcount. Expected %d, got %d\n", exp, ref);
-}
-
-/* 1x1 bmp (1 bpp) */
-static const unsigned char bmp01[66] = {
-0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00,
-0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00,
-0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00,
-0x00,0x00,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0x00,0x00,
-0x00,0x00
-};
-
-/* 2x2 A8R8G8B8 pixel data */
-static const unsigned char pixdata[] = {
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff
-};
-
-/* invalid image file */
-static const unsigned char noimage[4] = {
-0x11,0x22,0x33,0x44
-};
-
-static HRESULT create_file(const char *filename, const unsigned char *data, const unsigned int size)
-{
- DWORD received;
- HANDLE hfile;
-
- hfile = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
- if(hfile == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError());
-
- if(WriteFile(hfile, data, size, &received, NULL))
- {
- CloseHandle(hfile);
- return D3D_OK;
- }
-
- CloseHandle(hfile);
- return D3DERR_INVALIDCALL;
-}
-
-static void test_D3DXGetImageInfo(void)
-{
- HRESULT hr;
- D3DXIMAGE_INFO info;
- BOOL testdummy_ok, testbitmap_ok;
-
- hr = create_file("testdummy.bmp", noimage, sizeof(noimage)); /* invalid image */
- testdummy_ok = SUCCEEDED(hr);
-
- hr = create_file("testbitmap.bmp", bmp01, sizeof(bmp01)); /* valid image */
- testbitmap_ok = SUCCEEDED(hr);
-
- /* D3DXGetImageInfoFromFile */
- if(testbitmap_ok) {
- hr = D3DXGetImageInfoFromFileA("testbitmap.bmp", &info);
- ok(hr == D3D_OK, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3D_OK);
-
- hr = D3DXGetImageInfoFromFileA("testbitmap.bmp", NULL); /* valid image, second parameter is NULL */
- ok(hr == D3D_OK, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3D_OK);
- } else skip("Couldn't create \"testbitmap.bmp\"\n");
-
- if(testdummy_ok) {
- hr = D3DXGetImageInfoFromFileA("testdummy.bmp", NULL); /* invalid image, second parameter is NULL */
- ok(hr == D3D_OK, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3D_OK);
-
- hr = D3DXGetImageInfoFromFileA("testdummy.bmp", &info);
- ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
- } else skip("Couldn't create \"testdummy.bmp\"\n");
-
- hr = D3DXGetImageInfoFromFileA("filedoesnotexist.bmp", &info);
- ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
-
- hr = D3DXGetImageInfoFromFileA("filedoesnotexist.bmp", NULL);
- ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
-
- hr = D3DXGetImageInfoFromFileA("", &info);
- ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
-
- hr = D3DXGetImageInfoFromFileA(NULL, &info);
- ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXGetImageInfoFromFileA(NULL, NULL);
- ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFile returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
-
- /* D3DXGetImageInfoFromResource */
- todo_wine {
- hr = D3DXGetImageInfoFromResourceA(NULL, MAKEINTRESOURCEA(IDB_BITMAP_1x1), &info); /* RT_BITMAP */
- ok(hr == D3D_OK, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3D_OK);
-
- hr = D3DXGetImageInfoFromResourceA(NULL, MAKEINTRESOURCEA(IDB_BITMAP_1x1), NULL);
- ok(hr == D3D_OK, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3D_OK);
- }
-
- hr = D3DXGetImageInfoFromResourceA(NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), &info); /* RT_RCDATA */
- ok(hr == D3D_OK, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3D_OK);
-
- hr = D3DXGetImageInfoFromResourceA(NULL, MAKEINTRESOURCEA(IDS_STRING), &info);
- ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
-
- hr = D3DXGetImageInfoFromResourceA(NULL, MAKEINTRESOURCEA(IDS_STRING), NULL);
- ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
-
- hr = D3DXGetImageInfoFromResourceA(NULL, "resourcedoesnotexist", &info);
- ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
-
- hr = D3DXGetImageInfoFromResourceA(NULL, "resourcedoesnotexist", NULL);
- ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
-
- hr = D3DXGetImageInfoFromResourceA(NULL, NULL, NULL);
- ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
-
-
- /* D3DXGetImageInfoFromFileInMemory */
- hr = D3DXGetImageInfoFromFileInMemory(bmp01, sizeof(bmp01), &info);
- ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK);
-
- hr = D3DXGetImageInfoFromFileInMemory(bmp01, sizeof(bmp01)+5, &info); /* too large size */
- ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK);
-
- hr = D3DXGetImageInfoFromFileInMemory(bmp01, sizeof(bmp01), NULL);
- ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK);
-
- hr = D3DXGetImageInfoFromFileInMemory(noimage, sizeof(noimage), NULL);
- ok(hr == D3D_OK, "D3DXGetImageInfoFromResource returned %#x, expected %#x\n", hr, D3D_OK);
-
- hr = D3DXGetImageInfoFromFileInMemory(noimage, sizeof(noimage), &info);
- ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
-
- todo_wine {
- hr = D3DXGetImageInfoFromFileInMemory(bmp01, sizeof(bmp01)-1, &info);
- ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
- }
-
- hr = D3DXGetImageInfoFromFileInMemory(bmp01+1, sizeof(bmp01)-1, &info);
- ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
-
- hr = D3DXGetImageInfoFromFileInMemory(bmp01, 0, &info);
- ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXGetImageInfoFromFileInMemory(bmp01, 0, NULL);
- ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXGetImageInfoFromFileInMemory(noimage, 0, &info);
- ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXGetImageInfoFromFileInMemory(noimage, 0, NULL);
- ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXGetImageInfoFromFileInMemory(NULL, 0, &info);
- ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXGetImageInfoFromFileInMemory(NULL, 4, NULL);
- ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXGetImageInfoFromFileInMemory(NULL, 4, &info);
- ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXGetImageInfoFromFileInMemory(NULL, 0, NULL);
- ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- /* cleanup */
- if(testdummy_ok) DeleteFileA("testdummy.bmp");
- if(testbitmap_ok) DeleteFileA("testbitmap.bmp");
-}
-
-#define check_pixel_1bpp(lockrect, x, y, color) \
-ok(((BYTE*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch] == color, "Got color %#x, expected %#x\n", ((BYTE*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch], color)
-
-#define check_pixel_2bpp(lockrect, x, y, color) \
-ok(((WORD*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch / 2] == color, "Got color %#x, expected %#x\n", ((WORD*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch / 2], color)
-
-#define check_pixel_4bpp(lockrect, x, y, color) \
-ok(((DWORD*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch / 4] == color, "Got color %#x, expected %#x\n", ((DWORD*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch / 4], color)
-static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
-{
- HRESULT hr;
- BOOL testdummy_ok, testbitmap_ok;
- IDirect3DSurface9 *surf, *newsurf;
- RECT rect;
- D3DLOCKED_RECT lockrect;
- const WORD pixdata_a8r3g3b2[] = { 0x57df, 0x98fc, 0xacdd, 0xc891 };
- const WORD pixdata_a1r5g5b5[] = { 0x46b5, 0x99c8, 0x06a2, 0x9431 };
- const WORD pixdata_r5g6b5[] = { 0x9ef6, 0x658d, 0x0aee, 0x42ee };
- const DWORD pixdata_g16r16[] = { 0x07d23fbe, 0xdc7f44a4, 0xe4d8976b, 0x9a84fe89 };
- const DWORD pixdata_a8b8g8r8[] = { 0xc3394cf0, 0x235ae892, 0x09b197fd, 0x8dc32bf6 };
- const DWORD pixdata_a2r10g10b10[] = { 0x57395aff, 0x5b7668fd, 0xb0d856b5, 0xff2c61d6 };
-
- hr = create_file("testdummy.bmp", noimage, sizeof(noimage)); /* invalid image */
- testdummy_ok = SUCCEEDED(hr);
-
- hr = create_file("testbitmap.bmp", bmp01, sizeof(bmp01)); /* valid image */
- testbitmap_ok = SUCCEEDED(hr);
-
- hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 256, 256, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf, NULL);
- if(FAILED(hr)) {
- skip("Failed to create a surface (%#x)\n", hr);
- if(testdummy_ok) DeleteFileA("testdummy.bmp");
- if(testbitmap_ok) DeleteFileA("testbitmap.bmp");
- return;
- }
-
- /* D3DXLoadSurfaceFromFile */
- if(testbitmap_ok) {
- todo_wine {
- hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3D_OK);
- }
-
- hr = D3DXLoadSurfaceFromFileA(NULL, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL);
- ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
- } else skip("Couldn't create \"testbitmap.bmp\"\n");
-
- if(testdummy_ok) {
- todo_wine {
- hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "testdummy.bmp", NULL, D3DX_DEFAULT, 0, NULL);
- ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
- }
- } else skip("Couldn't create \"testdummy.bmp\"\n");
-
- hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, NULL, NULL, D3DX_DEFAULT, 0, NULL);
- ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "", NULL, D3DX_DEFAULT, 0, NULL);
- ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
-
-
- /* D3DXLoadSurfaceFromResource */
- todo_wine {
- hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, MAKEINTRESOURCE(IDB_BITMAP_1x1), NULL, D3DX_DEFAULT, 0, NULL);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3D_OK);
-
- hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, MAKEINTRESOURCE(IDD_BITMAPDATA_1x1), NULL, D3DX_DEFAULT, 0, NULL);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3D_OK);
- }
-
- hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, NULL, NULL, D3DX_DEFAULT, 0, NULL);
- ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
-
- hr = D3DXLoadSurfaceFromResourceA(NULL, NULL, NULL, NULL, MAKEINTRESOURCE(IDB_BITMAP_1x1), NULL, D3DX_DEFAULT, 0, NULL);
- ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, MAKEINTRESOURCE(IDS_STRING), NULL, D3DX_DEFAULT, 0, NULL);
- ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
-
-
- /* D3DXLoadSurfaceFromFileInMemory */
- todo_wine {
- hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp01, sizeof(bmp01), NULL, D3DX_DEFAULT, 0, NULL);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK);
-
- hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, noimage, sizeof(noimage), NULL, D3DX_DEFAULT, 0, NULL);
- ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);
- }
-
- hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp01, 0, NULL, D3DX_DEFAULT, 0, NULL);
- ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXLoadSurfaceFromFileInMemory(NULL, NULL, NULL, bmp01, sizeof(bmp01), NULL, D3DX_DEFAULT, 0, NULL);
- ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, NULL, 8, NULL, D3DX_DEFAULT, 0, NULL);
- ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, NULL, 0, NULL, D3DX_DEFAULT, 0, NULL);
- ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXLoadSurfaceFromFileInMemory(NULL, NULL, NULL, NULL, 0, NULL, D3DX_DEFAULT, 0, NULL);
- ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
-
- /* D3DXLoadSurfaceFromMemory */
- SetRect(&rect, 0, 0, 2, 2);
-
- hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
-
- hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata, D3DFMT_A8R8G8B8, 0, NULL, &rect, D3DX_FILTER_NONE, 0);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
-
- hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, NULL, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_DEFAULT, 0);
- ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXLoadSurfaceFromMemory(NULL, NULL, NULL, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_DEFAULT, 0);
- ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, NULL, D3DX_DEFAULT, 0);
- ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata, D3DFMT_UNKNOWN, sizeof(pixdata), NULL, &rect, D3DX_DEFAULT, 0);
- ok(hr == E_FAIL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, E_FAIL);
-
-
- /* D3DXLoadSurfaceFromSurface */
- hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 256, 256, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &newsurf, NULL);
- if(SUCCEEDED(hr)) {
- todo_wine {
- hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_DEFAULT, 0);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3D_OK);
- }
-
- hr = D3DXLoadSurfaceFromSurface(NULL, NULL, NULL, surf, NULL, NULL, D3DX_DEFAULT, 0);
- ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, NULL, NULL, NULL, D3DX_DEFAULT, 0);
- ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
-
- check_release((IUnknown*)newsurf, 0);
- } else skip("Failed to create a second surface\n");
-
- check_release((IUnknown*)surf, 0);
-
-
- /* test color conversion */
- /* A8R8G8B8 */
- hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf, NULL);
- if(FAILED(hr)) skip("Failed to create a surface (%#x)\n", hr);
- else {
- hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a8r3g3b2, D3DFMT_A8R3G3B2, 4, NULL, &rect, D3DX_FILTER_NONE, 0);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
- IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
- check_pixel_4bpp(lockrect, 0, 0, 0x57dbffff);
- check_pixel_4bpp(lockrect, 1, 0, 0x98ffff00);
- check_pixel_4bpp(lockrect, 0, 1, 0xacdbff55);
- check_pixel_4bpp(lockrect, 1, 1, 0xc8929255);
- IDirect3DSurface9_UnlockRect(surf);
-
- hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a1r5g5b5, D3DFMT_A1R5G5B5, 4, NULL, &rect, D3DX_FILTER_NONE, 0);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
- IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
- check_pixel_4bpp(lockrect, 0, 0, 0x008cadad);
- check_pixel_4bpp(lockrect, 1, 0, 0xff317342);
- check_pixel_4bpp(lockrect, 0, 1, 0x0008ad10);
- check_pixel_4bpp(lockrect, 1, 1, 0xff29088c);
- IDirect3DSurface9_UnlockRect(surf);
-
- hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_r5g6b5, D3DFMT_R5G6B5, 4, NULL, &rect, D3DX_FILTER_NONE, 0);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
- IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
- check_pixel_4bpp(lockrect, 0, 0, 0xff9cdfb5);
- check_pixel_4bpp(lockrect, 1, 0, 0xff63b26b);
- check_pixel_4bpp(lockrect, 0, 1, 0xff085d73);
- check_pixel_4bpp(lockrect, 1, 1, 0xff425d73);
- IDirect3DSurface9_UnlockRect(surf);
-
- hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_g16r16, D3DFMT_G16R16, 8, NULL, &rect, D3DX_FILTER_NONE, 0);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
- IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
- todo_wine {
- check_pixel_4bpp(lockrect, 0, 0, 0xff3f08ff);
- }
- check_pixel_4bpp(lockrect, 1, 0, 0xff44dcff);
- check_pixel_4bpp(lockrect, 0, 1, 0xff97e4ff);
- check_pixel_4bpp(lockrect, 1, 1, 0xfffe9aff);
- IDirect3DSurface9_UnlockRect(surf);
-
- hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a8b8g8r8, D3DFMT_A8B8G8R8, 8, NULL, &rect, D3DX_FILTER_NONE, 0);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
- IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
- check_pixel_4bpp(lockrect, 0, 0, 0xc3f04c39);
- check_pixel_4bpp(lockrect, 1, 0, 0x2392e85a);
- check_pixel_4bpp(lockrect, 0, 1, 0x09fd97b1);
- check_pixel_4bpp(lockrect, 1, 1, 0x8df62bc3);
- IDirect3DSurface9_UnlockRect(surf);
-
- hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a2r10g10b10, D3DFMT_A2R10G10B10, 8, NULL, &rect, D3DX_FILTER_NONE, 0);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
- IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
- check_pixel_4bpp(lockrect, 0, 0, 0x555c95bf);
- check_pixel_4bpp(lockrect, 1, 0, 0x556d663f);
- check_pixel_4bpp(lockrect, 0, 1, 0xaac385ad);
- todo_wine {
- check_pixel_4bpp(lockrect, 1, 1, 0xfffcc575);
- }
- IDirect3DSurface9_UnlockRect(surf);
-
- check_release((IUnknown*)surf, 0);
- }
-
- /* A1R5G5B5 */
- hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_A1R5G5B5, D3DPOOL_DEFAULT, &surf, NULL);
- if(FAILED(hr)) skip("Failed to create a surface (%#x)\n", hr);
- else {
- hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a8r3g3b2, D3DFMT_A8R3G3B2, 4, NULL, &rect, D3DX_FILTER_NONE, 0);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
- IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
- check_pixel_2bpp(lockrect, 0, 0, 0x6fff);
- check_pixel_2bpp(lockrect, 1, 0, 0xffe0);
- check_pixel_2bpp(lockrect, 0, 1, 0xefea);
- check_pixel_2bpp(lockrect, 1, 1, 0xca4a);
- IDirect3DSurface9_UnlockRect(surf);
-
- hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a1r5g5b5, D3DFMT_A1R5G5B5, 4, NULL, &rect, D3DX_FILTER_NONE, 0);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
- IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
- check_pixel_2bpp(lockrect, 0, 0, 0x46b5);
- check_pixel_2bpp(lockrect, 1, 0, 0x99c8);
- check_pixel_2bpp(lockrect, 0, 1, 0x06a2);
- check_pixel_2bpp(lockrect, 1, 1, 0x9431);
- IDirect3DSurface9_UnlockRect(surf);
-
- hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_r5g6b5, D3DFMT_R5G6B5, 4, NULL, &rect, D3DX_FILTER_NONE, 0);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
- IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
- check_pixel_2bpp(lockrect, 0, 0, 0xcf76);
- check_pixel_2bpp(lockrect, 1, 0, 0xb2cd);
- check_pixel_2bpp(lockrect, 0, 1, 0x856e);
- check_pixel_2bpp(lockrect, 1, 1, 0xa16e);
- IDirect3DSurface9_UnlockRect(surf);
-
- hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_g16r16, D3DFMT_G16R16, 8, NULL, &rect, D3DX_FILTER_NONE, 0);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
- IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
- todo_wine {
- check_pixel_2bpp(lockrect, 0, 0, 0xa03f);
- }
- check_pixel_2bpp(lockrect, 1, 0, 0xa37f);
- check_pixel_2bpp(lockrect, 0, 1, 0xcb9f);
- check_pixel_2bpp(lockrect, 1, 1, 0xfe7f);
- IDirect3DSurface9_UnlockRect(surf);
-
- hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a8b8g8r8, D3DFMT_A8B8G8R8, 8, NULL, &rect, D3DX_FILTER_NONE, 0);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
- IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
- todo_wine {
- check_pixel_2bpp(lockrect, 0, 0, 0xf527);
- check_pixel_2bpp(lockrect, 1, 0, 0x4b8b);
- }
- check_pixel_2bpp(lockrect, 0, 1, 0x7e56);
- check_pixel_2bpp(lockrect, 1, 1, 0xf8b8);
- IDirect3DSurface9_UnlockRect(surf);
-
- hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a2r10g10b10, D3DFMT_A2R10G10B10, 8, NULL, &rect, D3DX_FILTER_NONE, 0);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
- IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY);
- check_pixel_2bpp(lockrect, 0, 0, 0x2e57);
- todo_wine {
- check_pixel_2bpp(lockrect, 1, 0, 0x3588);
- }
- check_pixel_2bpp(lockrect, 0, 1, 0xe215);
- check_pixel_2bpp(lockrect, 1, 1, 0xff0e);
- IDirect3DSurface9_UnlockRect(surf);
-
- check_release((IUnknown*)surf, 0);
- }
-
- /* cleanup */
- if(testdummy_ok) DeleteFileA("testdummy.bmp");
- if(testbitmap_ok) DeleteFileA("testbitmap.bmp");
-}
-
-START_TEST(texture)
-{
- HWND wnd;
- IDirect3D9 *d3d;
- IDirect3DDevice9 *device;
- D3DPRESENT_PARAMETERS d3dpp;
- HRESULT hr;
-
- wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL);
- d3d = Direct3DCreate9(D3D_SDK_VERSION);
- if (!wnd) {
- skip("Couldn't create application window\n");
- return;
- }
- if (!d3d) {
- skip("Couldn't create IDirect3D9 object\n");
- DestroyWindow(wnd);
- return;
- }
-
- ZeroMemory(&d3dpp, sizeof(d3dpp));
- d3dpp.Windowed = TRUE;
- d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
- hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device);
- if(FAILED(hr)) {
- skip("Failed to create IDirect3DDevice9 object %#x\n", hr);
- IDirect3D9_Release(d3d);
- DestroyWindow(wnd);
- return;
- }
-
- test_D3DXGetImageInfo();
- test_D3DXLoadSurface(device);
-
- check_release((IUnknown*)device, 0);
- check_release((IUnknown*)d3d, 0);
- if (wnd) DestroyWindow(wnd);
-}
More information about the wine-patches
mailing list