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

d3dx10: Add D3DX10GetImageInfoFromResource{A, W}() stub implementation. 

Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Ziqing Hui 2020-09-04 09:31:16 +08:00 committed by Alexandre Julliard
parent 4d0f38b86c
commit 94edc0b3f1
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/d3dx10_43/d3dx10_43.spec
View File

@ -52,8 +52,8 @@
@ stdcall D3DX10GetImageInfoFromFileA(str ptr ptr ptr) @ stdcall D3DX10GetImageInfoFromFileA(str ptr ptr ptr)
@ stdcall D3DX10GetImageInfoFromFileW(wstr ptr ptr ptr) @ stdcall D3DX10GetImageInfoFromFileW(wstr ptr ptr ptr)
@ stdcall D3DX10GetImageInfoFromMemory(ptr long ptr ptr ptr) @ stdcall D3DX10GetImageInfoFromMemory(ptr long ptr ptr ptr)
@ stub D3DX10GetImageInfoFromResourceA(long str ptr ptr ptr) @ stdcall D3DX10GetImageInfoFromResourceA(long str ptr ptr ptr)
@ stub D3DX10GetImageInfoFromResourceW(long wstr ptr ptr ptr) @ stdcall D3DX10GetImageInfoFromResourceW(long wstr ptr ptr ptr)
@ stdcall D3DX10LoadTextureFromTexture(ptr ptr ptr) @ stdcall D3DX10LoadTextureFromTexture(ptr ptr ptr)
@ stub D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr) @ stub D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr)
@ stub D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr) @ stub D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr)

18
dlls/d3dx10_43/d3dx10_43_main.c
View File

@ -313,6 +313,24 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadP
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resource, ID3DX10ThreadPump *pump,
D3DX10_IMAGE_INFO *info, HRESULT *result)
{
FIXME("module %p, resource %s, pump %p, info %p, result %p\n",
module, debugstr_a(resource), pump, info, result);
return E_NOTIMPL;
}
HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, ID3DX10ThreadPump *pump,
D3DX10_IMAGE_INFO *info, HRESULT *result)
{
FIXME("module %p, resource %s, pump %p, info %p, result %p\n",
module, debugstr_w(resource), pump, info, result);
return E_NOTIMPL;
}
HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump,
D3DX10_IMAGE_INFO *img_info, HRESULT *hresult) D3DX10_IMAGE_INFO *img_info, HRESULT *hresult)
{ {

6
include/d3dx10tex.h
View File

@ -147,6 +147,12 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadP
HRESULT *result); HRESULT *result);
#define D3DX10GetImageInfoFromFile WINELIB_NAME_AW(D3DX10GetImageInfoFromFile) #define D3DX10GetImageInfoFromFile WINELIB_NAME_AW(D3DX10GetImageInfoFromFile)
HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resource, ID3DX10ThreadPump *pump,
D3DX10_IMAGE_INFO *info, HRESULT *result);
HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, ID3DX10ThreadPump *pump,
D3DX10_IMAGE_INFO *info, HRESULT *result);
#define D3DX10GetImageInfoFromResource WINELIB_NAME_AW(D3DX10GetImageInfoFromResource)
HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump,
D3DX10_IMAGE_INFO *img_info, HRESULT *hresult); D3DX10_IMAGE_INFO *img_info, HRESULT *hresult);