Piotr Caban : d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromResourceW.
Alexandre Julliard
julliard at winehq.org
Fri Jun 10 16:28:27 CDT 2022
Module: wine
Branch: master
Commit: 3d9c70229e04cf9df40945cdac44f9600f5408a3
URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d9c70229e04cf9df40945cdac44f9600f5408a3
Author: Piotr Caban <piotr at codeweavers.com>
Date: Thu May 26 18:24:30 2022 +0200
d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromResourceW.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
---
dlls/d3dx10_43/texture.c | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c
index 090d480accd..52d1331d30e 100644
--- a/dlls/d3dx10_43/texture.c
+++ b/dlls/d3dx10_43/texture.c
@@ -411,10 +411,32 @@ HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *reso
TRACE("module %p, resource %s, pump %p, info %p, result %p.\n",
module, debugstr_w(resource), pump, info, result);
- if (FAILED((hr = load_resourceW(module, resource, &buffer, &size))))
+ if (pump)
+ {
+ ID3DX10DataProcessor *processor;
+ ID3DX10DataLoader *loader;
+
+ if (FAILED((hr = D3DX10CreateAsyncResourceLoaderW(module, resource, &loader))))
+ return hr;
+ if (FAILED((hr = D3DX10CreateAsyncTextureInfoProcessor(info, &processor))))
+ {
+ ID3DX10DataLoader_Destroy(loader);
+ return hr;
+ }
+ if (FAILED((hr = ID3DX10ThreadPump_AddWorkItem(pump, loader, processor, result, NULL))))
+ {
+ ID3DX10DataLoader_Destroy(loader);
+ ID3DX10DataProcessor_Destroy(processor);
+ }
return hr;
+ }
- return D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result);
+ if (FAILED((hr = load_resourceW(module, resource, &buffer, &size))))
+ return hr;
+ hr = get_image_info(buffer, size, info);
+ if (result)
+ *result = hr;
+ return hr;
}
HRESULT get_image_info(const void *data, SIZE_T size, D3DX10_IMAGE_INFO *img_info)
More information about the wine-cvs
mailing list