[reactos] 160/218: [WINESYNC] d3dx9: Fix some spec file entries. - Ros-diffs

4 Feb 2021

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89c23f17a4d5dc06c63d5…

commit 89c23f17a4d5dc06c63d53a2f0f059d051f3ed85
Author:     winesync &lt;ros-dev(a)reactos.org&gt;
AuthorDate: Mon Sep 21 23:03:24 2020 +0200
Commit:     Jérôme Gardou &lt;jerome.gardou(a)reactos.org&gt;
CommitDate: Thu Feb 4 16:37:05 2021 +0100

    [WINESYNC] d3dx9: Fix some spec file entries.
    
    Signed-off-by: André Hentschel &lt;nerv(a)dawncrow.de&gt;
    Signed-off-by: Matteo Bruni &lt;mbruni(a)codeweavers.com&gt;
    Signed-off-by: Alexandre Julliard &lt;julliard(a)winehq.org&gt;
    
    wine commit id 96dab5abeedbb0908ac11915464f71eb74383bd7 by André Hentschel
&lt;nerv(a)dawncrow.de&gt;
---
 dll/directx/wine/d3dx9_24/d3dx9_24.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_25/d3dx9_25.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_26/d3dx9_26.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_27/d3dx9_27.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_28/d3dx9_28.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_29/d3dx9_29.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_30/d3dx9_30.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_31/d3dx9_31.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_32/d3dx9_32.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_33/d3dx9_33.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_34/d3dx9_34.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_35/d3dx9_35.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_36/d3dx9_36.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_37/d3dx9_37.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_38/d3dx9_38.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_39/d3dx9_39.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_40/d3dx9_40.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_41/d3dx9_41.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_42/d3dx9_42.spec | 28 ++++++++++++++--------------
 dll/directx/wine/d3dx9_43/d3dx9_43.spec | 28 ++++++++++++++--------------
 sdk/tools/winesync/d3dx9.cfg            |  2 +-
 21 files changed, 281 insertions(+), 281 deletions(-)

diff --git a/dll/directx/wine/d3dx9_24/d3dx9_24.spec
b/dll/directx/wine/d3dx9_24/d3dx9_24.spec
index d35da61e7c4..570ef6fcaa7 100644
--- a/dll/directx/wine/d3dx9_24/d3dx9_24.spec
+++ b/dll/directx/wine/d3dx9_24/d3dx9_24.spec
@@ -32,12 +32,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -103,12 +103,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -186,9 +186,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -268,12 +268,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_25/d3dx9_25.spec
b/dll/directx/wine/d3dx9_25/d3dx9_25.spec
index 3a5d53d44aa..6b650b2bd8d 100644
--- a/dll/directx/wine/d3dx9_25/d3dx9_25.spec
+++ b/dll/directx/wine/d3dx9_25/d3dx9_25.spec
@@ -32,12 +32,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -103,12 +103,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -186,9 +186,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -268,12 +268,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_26/d3dx9_26.spec
b/dll/directx/wine/d3dx9_26/d3dx9_26.spec
index 3b1020fc161..7c2d8b0919c 100644
--- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec
+++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec
@@ -36,12 +36,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -107,12 +107,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -190,9 +190,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -272,12 +272,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_27/d3dx9_27.spec
b/dll/directx/wine/d3dx9_27/d3dx9_27.spec
index 3b1020fc161..7c2d8b0919c 100644
--- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec
+++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec
@@ -36,12 +36,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -107,12 +107,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -190,9 +190,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -272,12 +272,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_28/d3dx9_28.spec
b/dll/directx/wine/d3dx9_28/d3dx9_28.spec
index 6b8fafcbfaf..7431d7afe66 100644
--- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec
+++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec
@@ -36,12 +36,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -107,12 +107,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -190,9 +190,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -277,12 +277,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_29/d3dx9_29.spec
b/dll/directx/wine/d3dx9_29/d3dx9_29.spec
index 6b8fafcbfaf..7431d7afe66 100644
--- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec
+++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec
@@ -36,12 +36,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -107,12 +107,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -190,9 +190,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -277,12 +277,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_30/d3dx9_30.spec
b/dll/directx/wine/d3dx9_30/d3dx9_30.spec
index fdf5ee43b6c..06ced20df61 100644
--- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec
+++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec
@@ -36,12 +36,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -107,12 +107,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -190,9 +190,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -277,12 +277,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_31/d3dx9_31.spec
b/dll/directx/wine/d3dx9_31/d3dx9_31.spec
index ed842cdaf14..c9aca309a35 100644
--- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec
+++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec
@@ -35,12 +35,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -106,12 +106,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -187,9 +187,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -274,12 +274,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_32/d3dx9_32.spec
b/dll/directx/wine/d3dx9_32/d3dx9_32.spec
index af5624c0592..f541f6f2ef1 100644
--- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec
+++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec
@@ -35,12 +35,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -106,12 +106,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -187,9 +187,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -279,12 +279,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_33/d3dx9_33.spec
b/dll/directx/wine/d3dx9_33/d3dx9_33.spec
index af5624c0592..f541f6f2ef1 100644
--- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec
+++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec
@@ -35,12 +35,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -106,12 +106,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -187,9 +187,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -279,12 +279,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_34/d3dx9_34.spec
b/dll/directx/wine/d3dx9_34/d3dx9_34.spec
index af5624c0592..f541f6f2ef1 100644
--- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec
+++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec
@@ -35,12 +35,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -106,12 +106,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -187,9 +187,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -279,12 +279,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_35/d3dx9_35.spec
b/dll/directx/wine/d3dx9_35/d3dx9_35.spec
index af5624c0592..f541f6f2ef1 100644
--- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec
+++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec
@@ -35,12 +35,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -106,12 +106,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -187,9 +187,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -279,12 +279,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36.spec
b/dll/directx/wine/d3dx9_36/d3dx9_36.spec
index de8b12ce03b..e1f44261610 100644
--- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec
+++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec
@@ -35,12 +35,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -107,12 +107,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -189,9 +189,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -281,12 +281,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_37/d3dx9_37.spec
b/dll/directx/wine/d3dx9_37/d3dx9_37.spec
index de8b12ce03b..e1f44261610 100644
--- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec
+++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec
@@ -35,12 +35,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -107,12 +107,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -189,9 +189,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -281,12 +281,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_38/d3dx9_38.spec
b/dll/directx/wine/d3dx9_38/d3dx9_38.spec
index de8b12ce03b..e1f44261610 100644
--- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec
+++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec
@@ -35,12 +35,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -107,12 +107,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -189,9 +189,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -281,12 +281,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_39/d3dx9_39.spec
b/dll/directx/wine/d3dx9_39/d3dx9_39.spec
index de8b12ce03b..e1f44261610 100644
--- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec
+++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec
@@ -35,12 +35,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -107,12 +107,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -189,9 +189,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -281,12 +281,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_40/d3dx9_40.spec
b/dll/directx/wine/d3dx9_40/d3dx9_40.spec
index de8b12ce03b..e1f44261610 100644
--- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec
+++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec
@@ -35,12 +35,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -107,12 +107,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -189,9 +189,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -281,12 +281,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_41/d3dx9_41.spec
b/dll/directx/wine/d3dx9_41/d3dx9_41.spec
index de8b12ce03b..e1f44261610 100644
--- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec
+++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec
@@ -35,12 +35,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -107,12 +107,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -189,9 +189,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -281,12 +281,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_42/d3dx9_42.spec
b/dll/directx/wine/d3dx9_42/d3dx9_42.spec
index c3bd9d52a2e..0851945d36b 100644
--- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec
+++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec
@@ -35,12 +35,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -105,12 +105,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -182,9 +182,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -274,12 +274,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/dll/directx/wine/d3dx9_43/d3dx9_43.spec
b/dll/directx/wine/d3dx9_43/d3dx9_43.spec
index c3bd9d52a2e..0851945d36b 100644
--- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec
+++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec
@@ -35,12 +35,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long
long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long
long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long
long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long
long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long
long long ptr ptr ptr)
@@ -105,12 +105,12 @@
 @ stdcall D3DXCreateTextureShader(ptr ptr)
 @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
 @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long
long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long
long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long
long long long ptr ptr ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long
long long long long long ptr ptr ptr)
-@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
 @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long
long long long long ptr ptr ptr)
@@ -182,9 +182,9 @@
 @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
-@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
+@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
 @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
 @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@@ -274,12 +274,12 @@
 @ stub D3DXSavePRTBufferToFileW(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
 @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr)
 @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
-@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
+@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
+@ stdcall D3DXSaveTextureToFileA(str long ptr ptr)
 @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
-@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
+@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
 @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
 @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 02beb515ee3..1ac83465926 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h:
sdk/inc
   include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h:
sdk/include/dxsdk/d3dx9of.h,
   include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h:
sdk/include/dxsdk/d3dx9shape.h,
   include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h:
sdk/include/dxsdk/d3dx9xof.h}
-tags: {wine: 4f0212c4fd35ac4b03a082cab27e629130ac1b13}
+tags: {wine: 96dab5abeedbb0908ac11915464f71eb74383bd7}


    