marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx10_43: Add D3DX10GetImageInfoFromMemory stub. 

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Alistair Leslie-Hughes 2016-05-25 11:03:11 +00:00 committed by Alexandre Julliard
parent dca016d7dc
commit 62ede82a72
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3dx10_43/d3dx10_43.spec
View File

@ -51,7 +51,7 @@
@ stdcall D3DX10GetFeatureLevel1(ptr ptr)
@ stub D3DX10GetImageInfoFromFileA(str ptr ptr ptr)
@ stub D3DX10GetImageInfoFromFileW(wstr ptr ptr ptr)
@ stub D3DX10GetImageInfoFromMemory(ptr long ptr ptr ptr)
@ stdcall D3DX10GetImageInfoFromMemory(ptr long ptr ptr ptr)
@ stub D3DX10GetImageInfoFromResourceA(long str ptr ptr ptr)
@ stub D3DX10GetImageInfoFromResourceW(long wstr ptr ptr ptr)
@ stub D3DX10LoadTextureFromTexture(ptr ptr ptr)

10
dlls/d3dx10_43/d3dx10_43_main.c
View File

@ -35,6 +35,7 @@
#include "d3d10_1.h"
#include "d3dx10core.h"
#include "d3dx10tex.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
@ -193,3 +194,12 @@ HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **devi
return ID3D10Device_QueryInterface(device, &IID_ID3D10Device1, (void **)device1);
}
HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump,
D3DX10_IMAGE_INFO *img_info, HRESULT *hresult)
{
FIXME("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p.\n",
src_data, src_data_size, pump, img_info, hresult);
return E_NOTIMPL;
}

2
include/d3dx10tex.h
View File

@ -87,6 +87,8 @@ extern "C" {
HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, SIZE_T src_data_size,
D3DX10_IMAGE_LOAD_INFO *loadinfo, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult);
HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump,
D3DX10_IMAGE_INFO *img_info, HRESULT *hresult);
#ifdef __cplusplus
}