d3dx10: Fix tracing of shader source data.

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3dx10: Fix tracing of shader source data.
e9e4805d · Matteo Bruni · Alexandre Julliard · e35e3a50 · e9e4805d · e9e4805d
Commit e9e4805d authored Nov 10, 2017 by Matteo Bruni Committed by Alexandre Julliard Nov 10, 2017
12 changed files
--- a/dlls/d3dx10_33/d3dx10_33.spec
+++ b/dlls/d3dx10_33/d3dx10_33.spec
@@ -2,7 +2,7 @@
 @ stdcall D3DX10CheckVersion(long long)
 @ stdcall D3DX10CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileA
 @ stdcall D3DX10CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileW
-@ stdcall D3DX10CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
+@ stdcall D3DX10CompileFromMemory(ptr long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
 @ stdcall D3DX10CompileFromResourceA(long str str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceA
 @ stdcall D3DX10CompileFromResourceW(long wstr wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceW
 @ stdcall D3DX10ComputeNormalMap(ptr long long long ptr) d3dx10_43.D3DX10ComputeNormalMap
@@ -57,7 +57,7 @@
 @ stdcall D3DX10LoadTextureFromTexture(ptr ptr ptr) d3dx10_43.D3DX10LoadTextureFromTexture
 @ stdcall D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileA
 @ stdcall D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileW
-@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
+@ stdcall D3DX10PreprocessShaderFromMemory(ptr long str ptr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
 @ stdcall D3DX10PreprocessShaderFromResourceA(long str str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceA
 @ stdcall D3DX10PreprocessShaderFromResourceW(long wstr wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceW
 @ stdcall D3DX10ReflectShader(ptr long ptr) d3dx10_39.D3DX10ReflectShader

--- a/dlls/d3dx10_34/d3dx10_34.spec
+++ b/dlls/d3dx10_34/d3dx10_34.spec
@@ -2,7 +2,7 @@
 @ stdcall D3DX10CheckVersion(long long)
 @ stdcall D3DX10CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileA
 @ stdcall D3DX10CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileW
-@ stdcall D3DX10CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
+@ stdcall D3DX10CompileFromMemory(ptr long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
 @ stdcall D3DX10CompileFromResourceA(long str str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceA
 @ stdcall D3DX10CompileFromResourceW(long wstr wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceW
 @ stdcall D3DX10ComputeNormalMap(ptr long long long ptr) d3dx10_43.D3DX10ComputeNormalMap
@@ -57,7 +57,7 @@
 @ stdcall D3DX10LoadTextureFromTexture(ptr ptr ptr) d3dx10_43.D3DX10LoadTextureFromTexture
 @ stdcall D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileA
 @ stdcall D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileW
-@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
+@ stdcall D3DX10PreprocessShaderFromMemory(ptr long str ptr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
 @ stdcall D3DX10PreprocessShaderFromResourceA(long str str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceA
 @ stdcall D3DX10PreprocessShaderFromResourceW(long wstr wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceW
 @ stdcall D3DX10ReflectShader(ptr long ptr) d3dx10_39.D3DX10ReflectShader

--- a/dlls/d3dx10_35/d3dx10_35.spec
+++ b/dlls/d3dx10_35/d3dx10_35.spec
@@ -2,7 +2,7 @@
 @ stdcall D3DX10CheckVersion(long long)
 @ stdcall D3DX10CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileA
 @ stdcall D3DX10CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileW
-@ stdcall D3DX10CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
+@ stdcall D3DX10CompileFromMemory(ptr long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
 @ stdcall D3DX10CompileFromResourceA(long str str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceA
 @ stdcall D3DX10CompileFromResourceW(long wstr wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceW
 @ stdcall D3DX10ComputeNormalMap(ptr long long long ptr) d3dx10_43.D3DX10ComputeNormalMap
@@ -60,7 +60,7 @@
 @ stdcall D3DX10LoadTextureFromTexture(ptr ptr ptr) d3dx10_43.D3DX10LoadTextureFromTexture
 @ stdcall D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileA
 @ stdcall D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileW
-@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
+@ stdcall D3DX10PreprocessShaderFromMemory(ptr long str ptr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
 @ stdcall D3DX10PreprocessShaderFromResourceA(long str str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceA
 @ stdcall D3DX10PreprocessShaderFromResourceW(long wstr wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceW
 @ stdcall D3DX10ReflectShader(ptr long ptr) d3dx10_39.D3DX10ReflectShader

--- a/dlls/d3dx10_36/d3dx10_36.spec
+++ b/dlls/d3dx10_36/d3dx10_36.spec
@@ -2,7 +2,7 @@
 @ stdcall D3DX10CheckVersion(long long)
 @ stdcall D3DX10CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileA
 @ stdcall D3DX10CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileW
-@ stdcall D3DX10CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
+@ stdcall D3DX10CompileFromMemory(ptr long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
 @ stdcall D3DX10CompileFromResourceA(long str str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceA
 @ stdcall D3DX10CompileFromResourceW(long wstr wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceW
 @ stdcall D3DX10ComputeNormalMap(ptr long long long ptr) d3dx10_43.D3DX10ComputeNormalMap
@@ -60,7 +60,7 @@
 @ stdcall D3DX10LoadTextureFromTexture(ptr ptr ptr) d3dx10_43.D3DX10LoadTextureFromTexture
 @ stdcall D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileA
 @ stdcall D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileW
-@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
+@ stdcall D3DX10PreprocessShaderFromMemory(ptr long str ptr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
 @ stdcall D3DX10PreprocessShaderFromResourceA(long str str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceA
 @ stdcall D3DX10PreprocessShaderFromResourceW(long wstr wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceW
 @ stdcall D3DX10ReflectShader(ptr long ptr) d3dx10_39.D3DX10ReflectShader

--- a/dlls/d3dx10_37/d3dx10_37.spec
+++ b/dlls/d3dx10_37/d3dx10_37.spec
@@ -4,7 +4,7 @@
 @ stdcall D3DX10CheckVersion(long long)
 @ stdcall D3DX10CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileA
 @ stdcall D3DX10CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileW
-@ stdcall D3DX10CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
+@ stdcall D3DX10CompileFromMemory(ptr long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
 @ stdcall D3DX10CompileFromResourceA(long str str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceA
 @ stdcall D3DX10CompileFromResourceW(long wstr wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceW
 @ stdcall D3DX10ComputeNormalMap(ptr long long long ptr) d3dx10_43.D3DX10ComputeNormalMap
@@ -61,7 +61,7 @@
 @ stdcall D3DX10LoadTextureFromTexture(ptr ptr ptr) d3dx10_43.D3DX10LoadTextureFromTexture
 @ stdcall D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileA
 @ stdcall D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileW
-@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
+@ stdcall D3DX10PreprocessShaderFromMemory(ptr long str ptr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
 @ stdcall D3DX10PreprocessShaderFromResourceA(long str str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceA
 @ stdcall D3DX10PreprocessShaderFromResourceW(long wstr wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceW
 @ stdcall D3DX10ReflectShader(ptr long ptr) d3dx10_39.D3DX10ReflectShader

--- a/dlls/d3dx10_38/d3dx10_38.spec
+++ b/dlls/d3dx10_38/d3dx10_38.spec
@@ -3,7 +3,7 @@
 @ stdcall D3DX10CheckVersion(long long)
 @ stdcall D3DX10CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileA
 @ stdcall D3DX10CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileW
-@ stdcall D3DX10CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
+@ stdcall D3DX10CompileFromMemory(ptr long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
 @ stdcall D3DX10CompileFromResourceA(long str str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceA
 @ stdcall D3DX10CompileFromResourceW(long wstr wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceW
 @ stdcall D3DX10ComputeNormalMap(ptr long long long ptr) d3dx10_43.D3DX10ComputeNormalMap
@@ -60,7 +60,7 @@
 @ stdcall D3DX10LoadTextureFromTexture(ptr ptr ptr) d3dx10_43.D3DX10LoadTextureFromTexture
 @ stdcall D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileA
 @ stdcall D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileW
-@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
+@ stdcall D3DX10PreprocessShaderFromMemory(ptr long str ptr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
 @ stdcall D3DX10PreprocessShaderFromResourceA(long str str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceA
 @ stdcall D3DX10PreprocessShaderFromResourceW(long wstr wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceW
 @ stdcall D3DX10ReflectShader(ptr long ptr) d3dx10_39.D3DX10ReflectShader

--- a/dlls/d3dx10_39/d3dx10_39.spec
+++ b/dlls/d3dx10_39/d3dx10_39.spec
@@ -3,7 +3,7 @@
 @ stdcall D3DX10CheckVersion(long long)
 @ stdcall D3DX10CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileA
 @ stdcall D3DX10CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileW
-@ stdcall D3DX10CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
+@ stdcall D3DX10CompileFromMemory(ptr long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
 @ stdcall D3DX10CompileFromResourceA(long str str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceA
 @ stdcall D3DX10CompileFromResourceW(long wstr wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceW
 @ stdcall D3DX10ComputeNormalMap(ptr long long long ptr) d3dx10_43.D3DX10ComputeNormalMap
@@ -60,7 +60,7 @@
 @ stdcall D3DX10LoadTextureFromTexture(ptr ptr ptr) d3dx10_43.D3DX10LoadTextureFromTexture
 @ stdcall D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileA
 @ stdcall D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileW
-@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
+@ stdcall D3DX10PreprocessShaderFromMemory(ptr long str ptr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
 @ stdcall D3DX10PreprocessShaderFromResourceA(long str str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceA
 @ stdcall D3DX10PreprocessShaderFromResourceW(long wstr wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceW
 @ stub D3DX10ReflectShader(ptr long ptr)

--- a/dlls/d3dx10_40/d3dx10_40.spec
+++ b/dlls/d3dx10_40/d3dx10_40.spec
@@ -2,7 +2,7 @@
 @ stdcall D3DX10CheckVersion(long long)
 @ stdcall D3DX10CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileA
 @ stdcall D3DX10CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileW
-@ stdcall D3DX10CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
+@ stdcall D3DX10CompileFromMemory(ptr long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
 @ stdcall D3DX10CompileFromResourceA(long str str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceA
 @ stdcall D3DX10CompileFromResourceW(long wstr wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceW
 @ stdcall D3DX10ComputeNormalMap(ptr long long long ptr) d3dx10_43.D3DX10ComputeNormalMap
@@ -57,7 +57,7 @@
 @ stdcall D3DX10LoadTextureFromTexture(ptr ptr ptr) d3dx10_43.D3DX10LoadTextureFromTexture
 @ stdcall D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileA
 @ stdcall D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileW
-@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
+@ stdcall D3DX10PreprocessShaderFromMemory(ptr long str ptr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
 @ stdcall D3DX10PreprocessShaderFromResourceA(long str str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceA
 @ stdcall D3DX10PreprocessShaderFromResourceW(long wstr wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceW
 @ stdcall D3DX10SHProjectCubeMap(long ptr ptr ptr ptr) d3dx10_43.D3DX10SHProjectCubeMap

--- a/dlls/d3dx10_41/d3dx10_41.spec
+++ b/dlls/d3dx10_41/d3dx10_41.spec
@@ -2,7 +2,7 @@
 @ stdcall D3DX10CheckVersion(long long)
 @ stdcall D3DX10CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileA
 @ stdcall D3DX10CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileW
-@ stdcall D3DX10CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
+@ stdcall D3DX10CompileFromMemory(ptr long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
 @ stdcall D3DX10CompileFromResourceA(long str str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceA
 @ stdcall D3DX10CompileFromResourceW(long wstr wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceW
 @ stdcall D3DX10ComputeNormalMap(ptr long long long ptr) d3dx10_43.D3DX10ComputeNormalMap
@@ -57,7 +57,7 @@
 @ stdcall D3DX10LoadTextureFromTexture(ptr ptr ptr) d3dx10_43.D3DX10LoadTextureFromTexture
 @ stdcall D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileA
 @ stdcall D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileW
-@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
+@ stdcall D3DX10PreprocessShaderFromMemory(ptr long str ptr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
 @ stdcall D3DX10PreprocessShaderFromResourceA(long str str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceA
 @ stdcall D3DX10PreprocessShaderFromResourceW(long wstr wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceW
 @ stdcall D3DX10SHProjectCubeMap(long ptr ptr ptr ptr) d3dx10_43.D3DX10SHProjectCubeMap

--- a/dlls/d3dx10_42/d3dx10_42.spec
+++ b/dlls/d3dx10_42/d3dx10_42.spec
@@ -2,7 +2,7 @@
 @ stdcall D3DX10CheckVersion(long long)
 @ stdcall D3DX10CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileA
 @ stdcall D3DX10CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromFileW
-@ stdcall D3DX10CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
+@ stdcall D3DX10CompileFromMemory(ptr long str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromMemory
 @ stdcall D3DX10CompileFromResourceA(long str str ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceA
 @ stdcall D3DX10CompileFromResourceW(long wstr wstr ptr ptr str str long long ptr ptr ptr ptr) d3dx10_43.D3DX10CompileFromResourceW
 @ stdcall D3DX10ComputeNormalMap(ptr long long long ptr) d3dx10_43.D3DX10ComputeNormalMap
@@ -57,7 +57,7 @@
 @ stdcall D3DX10LoadTextureFromTexture(ptr ptr ptr) d3dx10_43.D3DX10LoadTextureFromTexture
 @ stdcall D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileA
 @ stdcall D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromFileW
-@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
+@ stdcall D3DX10PreprocessShaderFromMemory(ptr long str ptr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromMemory
 @ stdcall D3DX10PreprocessShaderFromResourceA(long str str ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceA
 @ stdcall D3DX10PreprocessShaderFromResourceW(long wstr wstr ptr ptr ptr ptr ptr) d3dx10_43.D3DX10PreprocessShaderFromResourceW
 @ stdcall D3DX10SHProjectCubeMap(long ptr ptr ptr ptr) d3dx10_43.D3DX10SHProjectCubeMap

--- a/dlls/d3dx10_43/async.c
+++ b/dlls/d3dx10_43/async.c
@@ -401,9 +401,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, "
+    FIXME("data %s, data_size %lu, filename %s, defines %p, include %p, pump %p, shader_text %p, "
-            "hresult %p stub!\n",
+            "errors %p, hresult %p stub!\n",
-            debugstr_a(data), data_size, debugstr_a(filename), defines, include, pump, shader_text, errors, hresult);
+            debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, pump,
+            shader_text, errors, hresult);
    return E_NOTIMPL;
 }
--- 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)