ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx11: Add D3DX11GetImageInfoFromMemory stub. 

Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Andrey Gusev 2016-06-16 16:32:53 +03:00 committed by Alexandre Julliard
parent d69ae891d5
commit 754c681826
4 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3dx11_42/d3dx11_42.spec
View File

@ -29,7 +29,7 @@
@ stub D3DX11FilterTexture
@ stub D3DX11GetImageInfoFromFileA
@ stub D3DX11GetImageInfoFromFileW
@ stub D3DX11GetImageInfoFromMemory
@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) d3dx11_43.D3DX11GetImageInfoFromMemory
@ stub D3DX11GetImageInfoFromResourceA
@ stub D3DX11GetImageInfoFromResourceW
@ stub D3DX11LoadTextureFromTexture

16
dlls/d3dx11_43/d3dx11_43.c
View File

@ -26,7 +26,14 @@
#include "winbase.h"
#include "winuser.h"
#include "objbase.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)
{
@ -53,3 +60,12 @@ BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion)
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;
}

2
dlls/d3dx11_43/d3dx11_43.spec
View File

@ -29,7 +29,7 @@
@ stub D3DX11FilterTexture
@ stub D3DX11GetImageInfoFromFileA
@ stub D3DX11GetImageInfoFromFileW
@ stub D3DX11GetImageInfoFromMemory
@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr)
@ stub D3DX11GetImageInfoFromResourceA
@ stub D3DX11GetImageInfoFromResourceW
@ stub D3DX11LoadTextureFromTexture

3
include/d3dx11tex.h
View File

@ -89,6 +89,9 @@ extern "C" {
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);
HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
D3DX11_IMAGE_INFO *img_info, HRESULT *hresult);
#ifdef __cplusplus
}
#endif