From: Alistair Leslie-Hughes leslie_alistair@hotmail.com
--- dlls/d3dx11_42/Makefile.in | 3 ++- dlls/d3dx11_43/Makefile.in | 3 ++- dlls/d3dx11_43/main.c | 9 ++++++++- 3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in index 7fcce18a8e1..6dfb2460042 100644 --- a/dlls/d3dx11_42/Makefile.in +++ b/dlls/d3dx11_42/Makefile.in @@ -1,8 +1,9 @@ EXTRADEFS = -DD3DX11_SDK_VERSION=42 MODULE = d3dx11_42.dll IMPORTLIB = d3dx11_42 -IMPORTS = d3dcompiler +IMPORTS = d3dcompiler $(WINED3DX_PE_LIBS) PARENTSRC = ../d3dx11_43 +EXTRAINCL = $(WINED3DX_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native
diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in index ccd4319ace2..d3ad9beee06 100644 --- a/dlls/d3dx11_43/Makefile.in +++ b/dlls/d3dx11_43/Makefile.in @@ -1,7 +1,8 @@ EXTRADEFS = -DD3DX11_SDK_VERSION=43 MODULE = d3dx11_43.dll IMPORTLIB = d3dx11 -IMPORTS = d3dcompiler +IMPORTS = d3dcompiler $(WINED3DX_PE_LIBS) +EXTRAINCL = $(WINED3DX_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native
diff --git a/dlls/d3dx11_43/main.c b/dlls/d3dx11_43/main.c index 5dad027864f..c9b17be200b 100644 --- a/dlls/d3dx11_43/main.c +++ b/dlls/d3dx11_43/main.c @@ -29,6 +29,8 @@ #include "d3dx11core.h" #include "d3dx11tex.h"
+#include "wined3dx.h" + #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -70,8 +72,13 @@ HRESULT WINAPI D3DX11GetImageInfoFromFileW(const WCHAR *filename, ID3DX11ThreadP HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, HRESULT *hresult) { + HRESULT hr; + FIXME("src_data %p, src_data_size %Iu, pump %p, img_info %p, hresult %p stub!\n", src_data, src_data_size, pump, img_info, hresult);
- return E_NOTIMPL; + hr = wined3dx_get_image_info(src_data, src_data_size, img_info); + if (hresult) + *hresult = hr; + return hr; }