Commit 754c6818 authored by Andrey Gusev's avatar Andrey Gusev Committed by Alexandre Julliard

d3dx11: Add D3DX11GetImageInfoFromMemory stub.

parent d69ae891
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
@ stub D3DX11FilterTexture @ stub D3DX11FilterTexture
@ stub D3DX11GetImageInfoFromFileA @ stub D3DX11GetImageInfoFromFileA
@ stub D3DX11GetImageInfoFromFileW @ stub D3DX11GetImageInfoFromFileW
@ stub D3DX11GetImageInfoFromMemory @ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) d3dx11_43.D3DX11GetImageInfoFromMemory
@ stub D3DX11GetImageInfoFromResourceA @ stub D3DX11GetImageInfoFromResourceA
@ stub D3DX11GetImageInfoFromResourceW @ stub D3DX11GetImageInfoFromResourceW
@ stub D3DX11LoadTextureFromTexture @ stub D3DX11LoadTextureFromTexture
......
...@@ -26,7 +26,14 @@ ...@@ -26,7 +26,14 @@
#include "winbase.h" #include "winbase.h"
#include "winuser.h" #include "winuser.h"
#include "objbase.h" #include "objbase.h"
#include "d3dx11.h" #include "d3dx11.h"
#include "d3dx11core.h"
#include "d3dx11tex.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved)
{ {
...@@ -53,3 +60,12 @@ BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion) ...@@ -53,3 +60,12 @@ BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion)
return FALSE; return FALSE;
} }
HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
D3DX11_IMAGE_INFO *img_info, HRESULT *hresult)
{
FIXME("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p stub!\n",
src_data, src_data_size, pump, img_info, hresult);
return E_NOTIMPL;
}
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
@ stub D3DX11FilterTexture @ stub D3DX11FilterTexture
@ stub D3DX11GetImageInfoFromFileA @ stub D3DX11GetImageInfoFromFileA
@ stub D3DX11GetImageInfoFromFileW @ stub D3DX11GetImageInfoFromFileW
@ stub D3DX11GetImageInfoFromMemory @ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr)
@ stub D3DX11GetImageInfoFromResourceA @ stub D3DX11GetImageInfoFromResourceA
@ stub D3DX11GetImageInfoFromResourceW @ stub D3DX11GetImageInfoFromResourceW
@ stub D3DX11LoadTextureFromTexture @ stub D3DX11LoadTextureFromTexture
......
...@@ -89,6 +89,9 @@ extern "C" { ...@@ -89,6 +89,9 @@ extern "C" {
HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size, HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size,
D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult); D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult);
HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
D3DX11_IMAGE_INFO *img_info, HRESULT *hresult);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
......
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