[PATCH v2 4/4] d3dx11: Implement async data loader interfaces.
Matteo Bruni
mbruni at codeweavers.com
Sun Nov 13 17:26:42 CST 2016
From: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
configure.ac | 1 +
dlls/d3dx11_43/async.c | 329 +++++++++++++++++++++++++++++++++++++++
dlls/d3dx11_43/d3dx11_43.spec | 10 +-
dlls/d3dx11_43/tests/Makefile.in | 5 +
dlls/d3dx11_43/tests/d3dx11.c | 213 +++++++++++++++++++++++++
include/d3dx11async.h | 6 +
6 files changed, 559 insertions(+), 5 deletions(-)
create mode 100644 dlls/d3dx11_43/tests/Makefile.in
create mode 100644 dlls/d3dx11_43/tests/d3dx11.c
diff --git a/configure.ac b/configure.ac
index 8fb0de1..2489ac0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2910,6 +2910,7 @@ WINE_CONFIG_DLL(d3dx10_43,,[implib],[d3dx10])
WINE_CONFIG_TEST(dlls/d3dx10_43/tests)
WINE_CONFIG_DLL(d3dx11_42)
WINE_CONFIG_DLL(d3dx11_43,,[implib],[d3dx11])
+WINE_CONFIG_TEST(dlls/d3dx11_43/tests)
WINE_CONFIG_DLL(d3dx9_24)
WINE_CONFIG_DLL(d3dx9_25)
WINE_CONFIG_DLL(d3dx9_26)
diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c
index b33c235..ea7072a 100644
--- a/dlls/d3dx11_43/async.c
+++ b/dlls/d3dx11_43/async.c
@@ -22,9 +22,201 @@
#include "d3dcompiler.h"
#include "wine/debug.h"
+#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
+struct asyncdataloader
+{
+ ID3DX11DataLoader ID3DX11DataLoader_iface;
+
+ union
+ {
+ struct
+ {
+ WCHAR *path;
+ } file;
+ struct
+ {
+ HMODULE module;
+ HRSRC rsrc;
+ } resource;
+ } u;
+ void *data;
+ SIZE_T size;
+};
+
+static inline struct asyncdataloader *impl_from_ID3DX11DataLoader(ID3DX11DataLoader *iface)
+{
+ return CONTAINING_RECORD(iface, struct asyncdataloader, ID3DX11DataLoader_iface);
+}
+
+static HRESULT WINAPI memorydataloader_Load(ID3DX11DataLoader *iface)
+{
+ TRACE("iface %p.\n", iface);
+ return S_OK;
+}
+
+static HRESULT WINAPI memorydataloader_Decompress(ID3DX11DataLoader *iface, void **data, SIZE_T *size)
+{
+ struct asyncdataloader *loader = impl_from_ID3DX11DataLoader(iface);
+
+ TRACE("iface %p, data %p, size %p.\n", iface, data, size);
+
+ *data = loader->data;
+ *size = loader->size;
+
+ return S_OK;
+}
+
+static HRESULT WINAPI memorydataloader_Destroy(ID3DX11DataLoader *iface)
+{
+ struct asyncdataloader *loader = impl_from_ID3DX11DataLoader(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ HeapFree(GetProcessHeap(), 0, loader);
+ return S_OK;
+}
+
+static const ID3DX11DataLoaderVtbl memorydataloadervtbl =
+{
+ memorydataloader_Load,
+ memorydataloader_Decompress,
+ memorydataloader_Destroy
+};
+
+static HRESULT WINAPI filedataloader_Load(ID3DX11DataLoader *iface)
+{
+ struct asyncdataloader *loader = impl_from_ID3DX11DataLoader(iface);
+ DWORD size, read_len;
+ HANDLE file;
+ void *data;
+ BOOL ret;
+
+ TRACE("iface %p.\n", iface);
+
+ /* Always buffer file contents, even if Load() was already called. */
+ file = CreateFileW(loader->u.file.path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
+ NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+ if (file == INVALID_HANDLE_VALUE)
+ return D3D11_ERROR_FILE_NOT_FOUND;
+
+ size = GetFileSize(file, NULL);
+ data = HeapAlloc(GetProcessHeap(), 0, size);
+ if (!data)
+ {
+ CloseHandle(file);
+ return E_OUTOFMEMORY;
+ }
+
+ ret = ReadFile(file, data, size, &read_len, NULL);
+ CloseHandle(file);
+ if (!ret)
+ {
+ ERR("Failed to read file contents.\n");
+ HeapFree(GetProcessHeap(), 0, data);
+ return E_FAIL;
+ }
+
+ HeapFree(GetProcessHeap(), 0, loader->data);
+ loader->data = data;
+ loader->size = size;
+
+ return S_OK;
+}
+
+static HRESULT WINAPI filedataloader_Decompress(ID3DX11DataLoader *iface, void **data, SIZE_T *size)
+{
+ struct asyncdataloader *loader = impl_from_ID3DX11DataLoader(iface);
+
+ TRACE("iface %p, data %p, size %p.\n", iface, data, size);
+
+ if (!loader->data)
+ return E_FAIL;
+
+ *data = loader->data;
+ *size = loader->size;
+
+ return S_OK;
+}
+
+static HRESULT WINAPI filedataloader_Destroy(ID3DX11DataLoader *iface)
+{
+ struct asyncdataloader *loader = impl_from_ID3DX11DataLoader(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ HeapFree(GetProcessHeap(), 0, loader->u.file.path);
+ HeapFree(GetProcessHeap(), 0, loader->data);
+ HeapFree(GetProcessHeap(), 0, loader);
+
+ return S_OK;
+}
+
+static const ID3DX11DataLoaderVtbl filedataloadervtbl =
+{
+ filedataloader_Load,
+ filedataloader_Decompress,
+ filedataloader_Destroy
+};
+
+static HRESULT WINAPI resourcedataloader_Load(ID3DX11DataLoader *iface)
+{
+ struct asyncdataloader *loader = impl_from_ID3DX11DataLoader(iface);
+ HGLOBAL hglobal;
+
+ TRACE("iface %p.\n", iface);
+
+ if (loader->data)
+ return S_OK;
+
+ hglobal = LoadResource(loader->u.resource.module, loader->u.resource.rsrc);
+ if (!hglobal)
+ {
+ ERR("Failed to load resource.\n");
+ return E_FAIL;
+ }
+
+ loader->data = LockResource(hglobal);
+ loader->size = SizeofResource(loader->u.resource.module, loader->u.resource.rsrc);
+
+ return S_OK;
+}
+
+static HRESULT WINAPI resourcedataloader_Decompress(ID3DX11DataLoader *iface, void **data, SIZE_T *size)
+{
+ struct asyncdataloader *loader = impl_from_ID3DX11DataLoader(iface);
+
+ TRACE("iface %p, data %p, size %p.\n", iface, data, size);
+
+ if (!loader->data)
+ return E_FAIL;
+
+ *data = loader->data;
+ *size = loader->size;
+
+ return S_OK;
+}
+
+static HRESULT WINAPI resourcedataloader_Destroy(ID3DX11DataLoader *iface)
+{
+ struct asyncdataloader *loader = impl_from_ID3DX11DataLoader(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ HeapFree(GetProcessHeap(), 0, loader);
+
+ return S_OK;
+}
+
+static const ID3DX11DataLoaderVtbl resourcedataloadervtbl =
+{
+ resourcedataloader_Load,
+ resourcedataloader_Decompress,
+ resourcedataloader_Destroy
+};
+
HRESULT WINAPI D3DX11CompileFromMemory(const char *data, SIZE_T data_size, const char *filename,
const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entry_point,
const char *target, UINT sflags, UINT eflags, ID3DX11ThreadPump *pump, ID3D10Blob **shader,
@@ -65,3 +257,140 @@ HRESULT WINAPI D3DX11CompileFromFileW(const WCHAR *filename, const D3D10_SHADER_
return E_NOTIMPL;
}
+
+HRESULT WINAPI D3DX11CreateAsyncMemoryLoader(const void *data, SIZE_T data_size, ID3DX11DataLoader **loader)
+{
+ struct asyncdataloader *object;
+
+ TRACE("data %p, data_size %lu, loader %p.\n", data, data_size, loader);
+
+ if (!data || !loader)
+ return E_FAIL;
+
+ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
+ if (!object)
+ return E_OUTOFMEMORY;
+
+ object->ID3DX11DataLoader_iface.lpVtbl = &memorydataloadervtbl;
+ object->data = (void *)data;
+ object->size = data_size;
+
+ *loader = &object->ID3DX11DataLoader_iface;
+
+ return S_OK;
+}
+
+HRESULT WINAPI D3DX11CreateAsyncFileLoaderA(const char *filename, ID3DX11DataLoader **loader)
+{
+ WCHAR *filename_w;
+ HRESULT hr;
+ int len;
+
+ TRACE("filename %s, loader %p.\n", debugstr_a(filename), loader);
+
+ if (!filename || !loader)
+ return E_FAIL;
+
+ len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0);
+ filename_w = HeapAlloc(GetProcessHeap(), 0, len * sizeof(*filename_w));
+ MultiByteToWideChar(CP_ACP, 0, filename, -1, filename_w, len);
+
+ hr = D3DX11CreateAsyncFileLoaderW(filename_w, loader);
+
+ HeapFree(GetProcessHeap(), 0, filename_w);
+
+ return hr;
+}
+
+HRESULT WINAPI D3DX11CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX11DataLoader **loader)
+{
+ struct asyncdataloader *object;
+
+ TRACE("filename %s, loader %p.\n", debugstr_w(filename), loader);
+
+ if (!filename || !loader)
+ return E_FAIL;
+
+ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
+ if (!object)
+ return E_OUTOFMEMORY;
+
+ object->ID3DX11DataLoader_iface.lpVtbl = &filedataloadervtbl;
+ object->u.file.path = HeapAlloc(GetProcessHeap(), 0, (strlenW(filename) + 1) * sizeof(WCHAR));
+ if (!object->u.file.path)
+ {
+ HeapFree(GetProcessHeap(), 0, object);
+ return E_OUTOFMEMORY;
+ }
+ strcpyW(object->u.file.path, filename);
+ object->data = NULL;
+ object->size = 0;
+
+ *loader = &object->ID3DX11DataLoader_iface;
+
+ return S_OK;
+}
+
+HRESULT WINAPI D3DX11CreateAsyncResourceLoaderA(HMODULE module, const char *resource, ID3DX11DataLoader **loader)
+{
+ struct asyncdataloader *object;
+ HRSRC rsrc;
+
+ TRACE("module %p, resource %s, loader %p.\n", module, debugstr_a(resource), loader);
+
+ if (!loader)
+ return E_FAIL;
+
+ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
+ if (!object)
+ return E_OUTOFMEMORY;
+
+ if (!(rsrc = FindResourceA(module, resource, (const char *)RT_RCDATA)))
+ {
+ ERR("Failed to find resource.\n");
+ HeapFree(GetProcessHeap(), 0, object);
+ return D3DX11_ERR_INVALID_DATA;
+ }
+
+ object->ID3DX11DataLoader_iface.lpVtbl = &resourcedataloadervtbl;
+ object->u.resource.module = module;
+ object->u.resource.rsrc = rsrc;
+ object->data = NULL;
+ object->size = 0;
+
+ *loader = &object->ID3DX11DataLoader_iface;
+
+ return S_OK;
+}
+
+HRESULT WINAPI D3DX11CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *resource, ID3DX11DataLoader **loader)
+{
+ struct asyncdataloader *object;
+ HRSRC rsrc;
+
+ TRACE("module %p, resource %s, loader %p.\n", module, debugstr_w(resource), loader);
+
+ if (!loader)
+ return E_FAIL;
+
+ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
+ if (!object)
+ return E_OUTOFMEMORY;
+
+ if (!(rsrc = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA)))
+ {
+ ERR("Failed to find resource.\n");
+ HeapFree(GetProcessHeap(), 0, object);
+ return D3DX11_ERR_INVALID_DATA;
+ }
+
+ object->ID3DX11DataLoader_iface.lpVtbl = &resourcedataloadervtbl;
+ object->u.resource.module = module;
+ object->u.resource.rsrc = rsrc;
+ object->data = NULL;
+ object->size = 0;
+
+ *loader = &object->ID3DX11DataLoader_iface;
+
+ return S_OK;
+}
diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec
index 0a6350c..217cad1 100644
--- a/dlls/d3dx11_43/d3dx11_43.spec
+++ b/dlls/d3dx11_43/d3dx11_43.spec
@@ -6,11 +6,11 @@
@ stub D3DX11CompileFromResourceW
@ stub D3DX11ComputeNormalMap
@ stub D3DX11CreateAsyncCompilerProcessor
-@ stub D3DX11CreateAsyncFileLoaderA
-@ stub D3DX11CreateAsyncFileLoaderW
-@ stub D3DX11CreateAsyncMemoryLoader
-@ stub D3DX11CreateAsyncResourceLoaderA
-@ stub D3DX11CreateAsyncResourceLoaderW
+@ stdcall D3DX11CreateAsyncFileLoaderA(str ptr)
+@ stdcall D3DX11CreateAsyncFileLoaderW(wstr ptr)
+@ stdcall D3DX11CreateAsyncMemoryLoader(ptr long ptr)
+@ stdcall D3DX11CreateAsyncResourceLoaderA(long str ptr)
+@ stdcall D3DX11CreateAsyncResourceLoaderW(long wstr ptr)
@ stub D3DX11CreateAsyncShaderPreprocessProcessor
@ stub D3DX11CreateAsyncShaderResourceViewProcessor
@ stub D3DX11CreateAsyncTextureInfoProcessor
diff --git a/dlls/d3dx11_43/tests/Makefile.in b/dlls/d3dx11_43/tests/Makefile.in
new file mode 100644
index 0000000..6e522df
--- /dev/null
+++ b/dlls/d3dx11_43/tests/Makefile.in
@@ -0,0 +1,5 @@
+TESTDLL = d3dx11_43.dll
+IMPORTS = d3dx11
+
+C_SRCS = \
+ d3dx11.c
diff --git a/dlls/d3dx11_43/tests/d3dx11.c b/dlls/d3dx11_43/tests/d3dx11.c
new file mode 100644
index 0000000..f7ced89
--- /dev/null
+++ b/dlls/d3dx11_43/tests/d3dx11.c
@@ -0,0 +1,213 @@
+/*
+ * Copyright 2016 Nikolay Sivov 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 "initguid.h"
+#include "d3d11.h"
+#include "d3dx11.h"
+#include "wine/test.h"
+
+static void test_D3DX11CreateAsyncMemoryLoader(void)
+{
+ ID3DX11DataLoader *loader;
+ SIZE_T size;
+ DWORD data;
+ HRESULT hr;
+ void *ptr;
+
+ hr = D3DX11CreateAsyncMemoryLoader(NULL, 0, NULL);
+ ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3DX11CreateAsyncMemoryLoader(NULL, 0, &loader);
+ ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3DX11CreateAsyncMemoryLoader(&data, 0, &loader);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ size = 100;
+ hr = ID3DX11DataLoader_Decompress(loader, &ptr, &size);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(ptr == &data, "Got data pointer %p, original %p.\n", ptr, &data);
+ ok(!size, "Got unexpected data size.\n");
+
+ /* Load() is no-op. */
+ hr = ID3DX11DataLoader_Load(loader);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3DX11DataLoader_Destroy(loader);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ data = 0;
+ hr = D3DX11CreateAsyncMemoryLoader(&data, sizeof(data), &loader);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ /* Load() is no-op. */
+ hr = ID3DX11DataLoader_Load(loader);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3DX11DataLoader_Decompress(loader, &ptr, &size);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(ptr == &data, "Got data pointer %p, original %p.\n", ptr, &data);
+ ok(size == sizeof(data), "Got unexpected data size.\n");
+
+ hr = ID3DX11DataLoader_Destroy(loader);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+}
+
+static void create_testfile(WCHAR *path, const void *data, int data_len)
+{
+ static const WCHAR test_filename[] = {'a','s','y','n','c','l','o','a','d','e','r','.','d','a','t','a',0};
+ DWORD written;
+ HANDLE file;
+ BOOL ret;
+
+ GetTempPathW(MAX_PATH, path);
+ lstrcatW(path, test_filename);
+
+ file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);
+ ok(file != INVALID_HANDLE_VALUE, "Test file creation failed, at %s, error %d.\n",
+ wine_dbgstr_w(path), GetLastError());
+
+ ret = WriteFile(file, data, data_len, &written, NULL);
+ ok(ret, "Write to test file failed.\n");
+
+ CloseHandle(file);
+}
+
+static void test_D3DX11CreateAsyncFileLoader(void)
+{
+ static const char test_data1[] = "test data";
+ static const char test_data2[] = "more test data";
+ ID3DX11DataLoader *loader;
+ WCHAR path[MAX_PATH];
+ SIZE_T size;
+ HRESULT hr;
+ void *ptr;
+ BOOL ret;
+
+ hr = D3DX11CreateAsyncFileLoaderA(NULL, NULL);
+ ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3DX11CreateAsyncFileLoaderA(NULL, &loader);
+ ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3DX11CreateAsyncFileLoaderA("nonexistentfilename", &loader);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3DX11DataLoader_Decompress(loader, &ptr, &size);
+ ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3DX11DataLoader_Load(loader);
+ ok(hr == D3D11_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3DX11DataLoader_Decompress(loader, &ptr, &size);
+ ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+
+ hr = ID3DX11DataLoader_Destroy(loader);
+ ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+
+ /* Test file sharing using dummy empty file. */
+ create_testfile(path, test_data1, sizeof(test_data1));
+
+ hr = D3DX11CreateAsyncFileLoaderW(path, &loader);
+ ok(SUCCEEDED(hr), "Failed to create file loader, hr %#x.\n", hr);
+
+ ret = DeleteFileW(path);
+ ok(ret, "DeleteFile() failed, ret %d, error %d.\n", ret, GetLastError());
+
+ /* File was removed before Load(). */
+ hr = ID3DX11DataLoader_Load(loader);
+ ok(hr == D3D11_ERROR_FILE_NOT_FOUND, "Load() returned unexpected result, hr %#x.\n", hr);
+
+ /* Create it again. */
+ create_testfile(path, test_data1, sizeof(test_data1));
+ hr = ID3DX11DataLoader_Load(loader);
+ ok(SUCCEEDED(hr), "Load() failed, hr %#x.\n", hr);
+
+ /* Already loaded. */
+ hr = ID3DX11DataLoader_Load(loader);
+ ok(SUCCEEDED(hr), "Load() failed, hr %#x.\n", hr);
+
+ ret = DeleteFileW(path);
+ ok(ret, "DeleteFile() failed, ret %d, error %d.\n", ret, GetLastError());
+
+ /* Already loaded, file removed. */
+ hr = ID3DX11DataLoader_Load(loader);
+ ok(hr == D3D11_ERROR_FILE_NOT_FOUND, "Load() returned unexpected result, hr %#x.\n", hr);
+
+ /* Decompress still works. */
+ ptr = NULL;
+ hr = ID3DX11DataLoader_Decompress(loader, &ptr, &size);
+ ok(SUCCEEDED(hr), "Decompress() failed, hr %#x.\n", hr);
+ ok(ptr != NULL, "Got unexpected ptr %p.\n", ptr);
+ ok(size == sizeof(test_data1), "Got unexpected decompressed size.\n");
+ if (size == sizeof(test_data1))
+ ok(!memcmp(ptr, test_data1, size), "Got unexpected file data.\n");
+
+ /* Create it again, with different data. */
+ create_testfile(path, test_data2, sizeof(test_data2));
+
+ hr = ID3DX11DataLoader_Load(loader);
+ ok(SUCCEEDED(hr), "Load() failed, hr %#x.\n", hr);
+
+ ptr = NULL;
+ hr = ID3DX11DataLoader_Decompress(loader, &ptr, &size);
+ ok(SUCCEEDED(hr), "Decompress() failed, hr %#x.\n", hr);
+ ok(ptr != NULL, "Got unexpected ptr %p.\n", ptr);
+ ok(size == sizeof(test_data2), "Got unexpected decompressed size.\n");
+ if (size == sizeof(test_data2))
+ ok(!memcmp(ptr, test_data2, size), "Got unexpected file data.\n");
+
+ hr = ID3DX11DataLoader_Destroy(loader);
+ ok(SUCCEEDED(hr), "Destroy() failed, hr %#x.\n", hr);
+
+ ret = DeleteFileW(path);
+ ok(ret, "DeleteFile() failed, ret %d, error %d.\n", ret, GetLastError());
+}
+
+static void test_D3DX11CreateAsyncResourceLoader(void)
+{
+ static const WCHAR resource_name[] = {'n','o','n','a','m','e',0};
+ ID3DX11DataLoader *loader;
+ HRESULT hr;
+
+ hr = D3DX11CreateAsyncResourceLoaderA(NULL, NULL, NULL);
+ ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3DX11CreateAsyncResourceLoaderA(NULL, NULL, &loader);
+ ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3DX11CreateAsyncResourceLoaderA(NULL, "noname", &loader);
+ ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3DX11CreateAsyncResourceLoaderW(NULL, NULL, NULL);
+ ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3DX11CreateAsyncResourceLoaderW(NULL, NULL, &loader);
+ ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3DX11CreateAsyncResourceLoaderW(NULL, resource_name, &loader);
+ ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr);
+}
+
+START_TEST(d3dx11)
+{
+ test_D3DX11CreateAsyncMemoryLoader();
+ test_D3DX11CreateAsyncFileLoader();
+ test_D3DX11CreateAsyncResourceLoader();
+}
diff --git a/include/d3dx11async.h b/include/d3dx11async.h
index ab4b507..2d85e4a 100644
--- a/include/d3dx11async.h
+++ b/include/d3dx11async.h
@@ -25,6 +25,12 @@
extern "C" {
#endif
+HRESULT WINAPI D3DX11CreateAsyncFileLoaderA(const char *file_name, ID3DX11DataLoader **loader);
+HRESULT WINAPI D3DX11CreateAsyncFileLoaderW(const WCHAR *file_name, ID3DX11DataLoader **loader);
+HRESULT WINAPI D3DX11CreateAsyncResourceLoaderA(HMODULE module, const char *resource, ID3DX11DataLoader **loader);
+HRESULT WINAPI D3DX11CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *resource, ID3DX11DataLoader **loader);
+HRESULT WINAPI D3DX11CreateAsyncMemoryLoader(const void *data, SIZE_T data_size, ID3DX11DataLoader **loader);
+
HRESULT WINAPI D3DX11CompileFromMemory(const char *data, SIZE_T data_size, const char *filename,
const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entry_point,
const char *target, UINT sflags, UINT eflags, ID3DX11ThreadPump *pump, ID3D10Blob **shader,
--
2.7.3
More information about the wine-patches
mailing list