[PATCH] d3dx10: Fix tracing of shader source data.

Matteo Bruni mbruni at codeweavers.com
Thu Nov 9 17:58:43 CST 2017


Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
 dlls/d3dx10_43/async.c        | 7 ++++---
 dlls/d3dx10_43/d3dx10_43.spec | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c
index c910b4a624..feb479b0da 100644
--- a/dlls/d3dx10_43/async.c
+++ b/dlls/d3dx10_43/async.c
@@ -402,9 +402,10 @@ HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_si
         const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text,
         ID3D10Blob **errors, HRESULT *hresult)
 {
-    FIXME("data %s, data_size %lu, filename %s, defines %p, include %p, pump %p, shader_text %p, errors %p, "
-            "hresult %p stub!\n",
-            debugstr_a(data), data_size, debugstr_a(filename), defines, include, pump, shader_text, errors, hresult);
+    FIXME("data %s, data_size %lu, filename %s, defines %p, include %p, pump %p, shader_text %p, "
+            "errors %p, hresult %p stub!\n",
+            debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, pump,
+            shader_text, errors, hresult);
 
     return E_NOTIMPL;
 }
diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec
index a36220f288..cb491241d4 100644
--- a/dlls/d3dx10_43/d3dx10_43.spec
+++ b/dlls/d3dx10_43/d3dx10_43.spec
@@ -2,7 +2,7 @@
 @ stdcall D3DX10CheckVersion(long long)
 @ stub D3DX10CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr)
 @ stub D3DX10CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr)
-@ stdcall D3DX10CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr)
+@ stdcall D3DX10CompileFromMemory(ptr long str ptr ptr str str long long ptr ptr ptr ptr)
 @ stub D3DX10CompileFromResourceA(long str str ptr ptr str str long long ptr ptr ptr ptr)
 @ stub D3DX10CompileFromResourceW(long wstr wstr ptr ptr str str long long ptr ptr ptr ptr)
 @ stub D3DX10ComputeNormalMap(ptr long long long ptr)
@@ -57,7 +57,7 @@
 @ stub D3DX10LoadTextureFromTexture(ptr ptr ptr)
 @ stub D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr)
 @ stub D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr)
-@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr ptr)
+@ stdcall D3DX10PreprocessShaderFromMemory(ptr long str ptr ptr ptr ptr ptr ptr)
 @ stub D3DX10PreprocessShaderFromResourceA(long str str ptr ptr ptr ptr ptr)
 @ stub D3DX10PreprocessShaderFromResourceW(long wstr wstr ptr ptr ptr ptr ptr)
 @ stub D3DX10SHProjectCubeMap(long ptr ptr ptr ptr)
-- 
2.13.6




More information about the wine-patches mailing list