Ziqing Hui : d3dx10: Add stubs for D3DX10CreateTextureFromResource{A, W}.
Alexandre Julliard
julliard at winehq.org
Thu Oct 7 16:21:23 CDT 2021
Module: wine
Branch: master
Commit: 5636088871714f2a2de9e543eb66f944ce188edc
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5636088871714f2a2de9e543eb66f944ce188edc
Author: Ziqing Hui <zhui at codeweavers.com>
Date: Tue Oct 5 16:31:56 2021 +0800
d3dx10: Add stubs for D3DX10CreateTextureFromResource{A, W}.
Signed-off-by: Ziqing Hui <zhui at codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dx10_43/d3dx10_43.spec | 4 ++--
dlls/d3dx10_43/texture.c | 16 ++++++++++++++++
include/d3dx10tex.h | 6 ++++++
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec
index af349afae02..82b71b5fa5c 100644
--- a/dlls/d3dx10_43/d3dx10_43.spec
+++ b/dlls/d3dx10_43/d3dx10_43.spec
@@ -45,8 +45,8 @@
@ stdcall D3DX10CreateTextureFromFileA(ptr str ptr ptr ptr ptr)
@ stdcall D3DX10CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr)
@ stdcall D3DX10CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr)
-@ stub D3DX10CreateTextureFromResourceA(ptr long str ptr ptr ptr ptr)
-@ stub D3DX10CreateTextureFromResourceW(ptr long wstr ptr ptr ptr ptr)
+@ stdcall D3DX10CreateTextureFromResourceA(ptr long str ptr ptr ptr ptr)
+@ stdcall D3DX10CreateTextureFromResourceW(ptr long wstr ptr ptr ptr ptr)
@ stdcall D3DX10FilterTexture(ptr long long)
@ stdcall D3DX10GetFeatureLevel1(ptr ptr)
@ stdcall D3DX10GetImageInfoFromFileA(str ptr ptr ptr)
diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c
index 5aca98610a9..0568bc2316c 100644
--- a/dlls/d3dx10_43/texture.c
+++ b/dlls/d3dx10_43/texture.c
@@ -589,6 +589,22 @@ HRESULT WINAPI D3DX10CreateTextureFromFileW(ID3D10Device *device, const WCHAR *s
return E_NOTIMPL;
}
+HRESULT WINAPI D3DX10CreateTextureFromResourceA(ID3D10Device *device, HMODULE module, const char *resource,
+ D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult)
+{
+ FIXME("device %p, module %p, resource %s, load_info %p, pump %p, texture %p, hresult %p stub!\n",
+ device, module, debugstr_a(resource), load_info, pump, texture, hresult);
+ return E_NOTIMPL;
+}
+
+HRESULT WINAPI D3DX10CreateTextureFromResourceW(ID3D10Device *device, HMODULE module, const WCHAR *resource,
+ D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult)
+{
+ FIXME("device %p, module %p, resource %s, load_info %p, pump %p, texture %p, hresult %p stub!\n",
+ device, module, debugstr_w(resource), load_info, pump, texture, hresult);
+ return E_NOTIMPL;
+}
+
HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, SIZE_T src_data_size,
D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult)
{
diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h
index 022afdd51d9..33e41e577b4 100644
--- a/include/d3dx10tex.h
+++ b/include/d3dx10tex.h
@@ -162,6 +162,12 @@ HRESULT WINAPI D3DX10CreateTextureFromFileW(ID3D10Device *device, const WCHAR *s
D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult);
#define D3DX10CreateTextureFromFile WINELIB_NAME_AW(D3DX10CreateTextureFromFile)
+HRESULT WINAPI D3DX10CreateTextureFromResourceA(ID3D10Device *device, HMODULE module, const char *resource,
+ D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult);
+HRESULT WINAPI D3DX10CreateTextureFromResourceW(ID3D10Device *device, HMODULE module, const WCHAR *resource,
+ D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult);
+#define D3DX10CreateTextureFromResource WINELIB_NAME_AW(D3DX10CreateTextureFromResource)
+
HRESULT WINAPI D3DX10LoadTextureFromTexture(ID3D10Resource *src_texture, D3DX10_TEXTURE_LOAD_INFO *load_info,
ID3D10Resource *dst_texture);
More information about the wine-cvs
mailing list