Piotr Caban : d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromResourceA.

Alexandre Julliard julliard at winehq.org
Fri Jun 10 16:28:27 CDT 2022


Module: wine
Branch: master
Commit: b8b3acbfca8d8ba8a8ac6ebd3c888ad4aa02c6d8
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=b8b3acbfca8d8ba8a8ac6ebd3c888ad4aa02c6d8

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Thu May 26 18:23:06 2022 +0200

d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromResourceA.

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 3ee1eaba624..090d480accd 100644
--- a/dlls/d3dx10_43/texture.c
+++ b/dlls/d3dx10_43/texture.c
@@ -373,10 +373,32 @@ HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resou
     TRACE("module %p, resource %s, pump %p, info %p, result %p.\n",
             module, debugstr_a(resource), pump, info, result);
 
-    if (FAILED((hr = load_resourceA(module, resource, &buffer, &size))))
+    if (pump)
+    {
+        ID3DX10DataProcessor *processor;
+        ID3DX10DataLoader *loader;
+
+        if (FAILED((hr = D3DX10CreateAsyncResourceLoaderA(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_resourceA(module, resource, &buffer, &size))))
+        return hr;
+    hr = get_image_info(buffer, size, info);
+    if (result)
+        *result = hr;
+    return hr;
 }
 
 HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, ID3DX10ThreadPump *pump,




More information about the wine-cvs mailing list