https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6760065ef255ff86d6392…
commit 6760065ef255ff86d63920ad1e9051b9a397f97e
Author: Jérôme Gardou <jerome.gardou(a)reactos.org>
AuthorDate: Mon Sep 21 22:40:02 2020 +0200
Commit: Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Thu Feb 4 16:37:01 2021 +0100
[D3DX9_xx] Reduce diff to wine
---
dll/directx/wine/d3dx9_24/d3dx9_24.spec | 130 ++++++++++++++--------------
dll/directx/wine/d3dx9_25/d3dx9_25.spec | 136 ++++++++++++++---------------
dll/directx/wine/d3dx9_26/d3dx9_26.spec | 144 +++++++++++++++----------------
dll/directx/wine/d3dx9_27/d3dx9_27.spec | 144 +++++++++++++++----------------
dll/directx/wine/d3dx9_28/d3dx9_28.spec | 144 +++++++++++++++----------------
dll/directx/wine/d3dx9_29/d3dx9_29.spec | 144 +++++++++++++++----------------
dll/directx/wine/d3dx9_30/d3dx9_30.spec | 144 +++++++++++++++----------------
dll/directx/wine/d3dx9_31/d3dx9_31.spec | 144 +++++++++++++++----------------
dll/directx/wine/d3dx9_32/d3dx9_32.spec | 148 ++++++++++++++++----------------
dll/directx/wine/d3dx9_33/d3dx9_33.spec | 148 ++++++++++++++++----------------
dll/directx/wine/d3dx9_34/d3dx9_34.spec | 148 ++++++++++++++++----------------
dll/directx/wine/d3dx9_35/d3dx9_35.spec | 148 ++++++++++++++++----------------
dll/directx/wine/d3dx9_36/d3dx9_36.spec | 148 ++++++++++++++++----------------
dll/directx/wine/d3dx9_37/d3dx9_37.spec | 148 ++++++++++++++++----------------
dll/directx/wine/d3dx9_38/d3dx9_38.spec | 148 ++++++++++++++++----------------
dll/directx/wine/d3dx9_39/d3dx9_39.spec | 148 ++++++++++++++++----------------
dll/directx/wine/d3dx9_40/d3dx9_40.spec | 148 ++++++++++++++++----------------
dll/directx/wine/d3dx9_41/d3dx9_41.spec | 148 ++++++++++++++++----------------
dll/directx/wine/d3dx9_42/d3dx9_42.spec | 138 ++++++++++++++---------------
dll/directx/wine/d3dx9_43/d3dx9_43.spec | 138 ++++++++++++++---------------
20 files changed, 1443 insertions(+), 1443 deletions(-)
diff --git a/dll/directx/wine/d3dx9_24/d3dx9_24.spec
b/dll/directx/wine/d3dx9_24/d3dx9_24.spec
index d4e741884b9..d35da61e7c4 100644
--- a/dll/directx/wine/d3dx9_24/d3dx9_24.spec
+++ b/dll/directx/wine/d3dx9_24/d3dx9_24.spec
@@ -20,17 +20,17 @@
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -38,10 +38,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -69,20 +69,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -99,7 +99,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -109,10 +109,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -129,20 +129,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -163,21 +163,21 @@
@ stub D3DXGetTargetDescByVersion
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -190,8 +190,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -226,7 +226,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -246,7 +246,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -254,38 +254,38 @@
@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr)
@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr)
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_25/d3dx9_25.spec
b/dll/directx/wine/d3dx9_25/d3dx9_25.spec
index 5375c07690a..3a5d53d44aa 100644
--- a/dll/directx/wine/d3dx9_25/d3dx9_25.spec
+++ b/dll/directx/wine/d3dx9_25/d3dx9_25.spec
@@ -20,17 +20,17 @@
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -38,10 +38,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -69,20 +69,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -99,7 +99,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -109,10 +109,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -129,20 +129,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -163,21 +163,21 @@
@ stub D3DXGetTargetDescByVersion
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -190,8 +190,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -226,7 +226,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -246,7 +246,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -254,41 +254,41 @@
@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr)
@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr)
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_26/d3dx9_26.spec
b/dll/directx/wine/d3dx9_26/d3dx9_26.spec
index c17f97f04a9..3b1020fc161 100644
--- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec
+++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec
@@ -18,23 +18,23 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
+@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -42,10 +42,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -73,20 +73,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -103,7 +103,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -113,10 +113,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -133,20 +133,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -167,21 +167,21 @@
@ stub D3DXGetTargetDescByVersion
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -194,8 +194,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -230,7 +230,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -250,7 +250,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -258,41 +258,41 @@
@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr)
@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr)
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_27/d3dx9_27.spec
b/dll/directx/wine/d3dx9_27/d3dx9_27.spec
index c17f97f04a9..3b1020fc161 100644
--- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec
+++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec
@@ -18,23 +18,23 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
+@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -42,10 +42,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -73,20 +73,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -103,7 +103,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -113,10 +113,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -133,20 +133,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -167,21 +167,21 @@
@ stub D3DXGetTargetDescByVersion
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -194,8 +194,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -230,7 +230,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -250,7 +250,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -258,41 +258,41 @@
@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr)
@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr)
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_28/d3dx9_28.spec
b/dll/directx/wine/d3dx9_28/d3dx9_28.spec
index 5b267c14599..6b8fafcbfaf 100644
--- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec
+++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec
@@ -18,23 +18,23 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
+@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -42,10 +42,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -73,20 +73,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -103,7 +103,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -113,10 +113,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -133,20 +133,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -167,21 +167,21 @@
@ stub D3DXGetTargetDescByVersion
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -194,8 +194,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -230,7 +230,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -255,7 +255,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -263,41 +263,41 @@
@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr)
@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr)
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_29/d3dx9_29.spec
b/dll/directx/wine/d3dx9_29/d3dx9_29.spec
index 5b267c14599..6b8fafcbfaf 100644
--- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec
+++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec
@@ -18,23 +18,23 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
+@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -42,10 +42,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -73,20 +73,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -103,7 +103,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -113,10 +113,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -133,20 +133,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -167,21 +167,21 @@
@ stub D3DXGetTargetDescByVersion
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -194,8 +194,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -230,7 +230,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -255,7 +255,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -263,41 +263,41 @@
@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr)
@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr)
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_30/d3dx9_30.spec
b/dll/directx/wine/d3dx9_30/d3dx9_30.spec
index dc9ea939416..fdf5ee43b6c 100644
--- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec
+++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec
@@ -18,23 +18,23 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
+@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCpuOptimizations(long)
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -42,10 +42,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -73,20 +73,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -103,7 +103,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -113,10 +113,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -133,20 +133,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -167,21 +167,21 @@
@ stub D3DXGetTargetDescByVersion
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -194,8 +194,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -230,7 +230,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -255,7 +255,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -263,41 +263,41 @@
@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr)
@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr)
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_31/d3dx9_31.spec
b/dll/directx/wine/d3dx9_31/d3dx9_31.spec
index 4dec8f58d0d..ed842cdaf14 100644
--- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec
+++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec
@@ -18,22 +18,22 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
+@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -41,10 +41,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -72,20 +72,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -102,7 +102,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -112,10 +112,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -132,20 +132,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -164,21 +164,21 @@
@ stdcall D3DXGetShaderVersion(ptr)
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -191,8 +191,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -227,7 +227,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -252,7 +252,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -260,41 +260,41 @@
@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr)
@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr)
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_32/d3dx9_32.spec
b/dll/directx/wine/d3dx9_32/d3dx9_32.spec
index 7b6d62df3e7..af5624c0592 100644
--- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec
+++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec
@@ -18,22 +18,22 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
+@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -41,10 +41,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -72,20 +72,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -102,7 +102,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -112,10 +112,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -132,20 +132,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -164,21 +164,21 @@
@ stdcall D3DXGetShaderVersion(ptr)
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -191,8 +191,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -227,7 +227,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -252,7 +252,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -263,43 +263,43 @@
@ stdcall D3DXSHMultiply2(ptr ptr ptr)
@ stdcall D3DXSHMultiply3(ptr ptr ptr)
@ stdcall D3DXSHMultiply4(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHMultiply5(ptr ptr ptr)
+@ stub D3DXSHMultiply6(ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_33/d3dx9_33.spec
b/dll/directx/wine/d3dx9_33/d3dx9_33.spec
index 7b6d62df3e7..af5624c0592 100644
--- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec
+++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec
@@ -18,22 +18,22 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
+@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -41,10 +41,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -72,20 +72,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -102,7 +102,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -112,10 +112,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -132,20 +132,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -164,21 +164,21 @@
@ stdcall D3DXGetShaderVersion(ptr)
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -191,8 +191,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -227,7 +227,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -252,7 +252,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -263,43 +263,43 @@
@ stdcall D3DXSHMultiply2(ptr ptr ptr)
@ stdcall D3DXSHMultiply3(ptr ptr ptr)
@ stdcall D3DXSHMultiply4(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHMultiply5(ptr ptr ptr)
+@ stub D3DXSHMultiply6(ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_34/d3dx9_34.spec
b/dll/directx/wine/d3dx9_34/d3dx9_34.spec
index 7b6d62df3e7..af5624c0592 100644
--- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec
+++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec
@@ -18,22 +18,22 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
+@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -41,10 +41,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -72,20 +72,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -102,7 +102,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -112,10 +112,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -132,20 +132,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -164,21 +164,21 @@
@ stdcall D3DXGetShaderVersion(ptr)
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -191,8 +191,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -227,7 +227,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -252,7 +252,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -263,43 +263,43 @@
@ stdcall D3DXSHMultiply2(ptr ptr ptr)
@ stdcall D3DXSHMultiply3(ptr ptr ptr)
@ stdcall D3DXSHMultiply4(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHMultiply5(ptr ptr ptr)
+@ stub D3DXSHMultiply6(ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_35/d3dx9_35.spec
b/dll/directx/wine/d3dx9_35/d3dx9_35.spec
index 7b6d62df3e7..af5624c0592 100644
--- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec
+++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec
@@ -18,22 +18,22 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
+@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -41,10 +41,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -72,20 +72,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -102,7 +102,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -112,10 +112,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -132,20 +132,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -164,21 +164,21 @@
@ stdcall D3DXGetShaderVersion(ptr)
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -191,8 +191,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -227,7 +227,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -252,7 +252,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -263,43 +263,43 @@
@ stdcall D3DXSHMultiply2(ptr ptr ptr)
@ stdcall D3DXSHMultiply3(ptr ptr ptr)
@ stdcall D3DXSHMultiply4(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHMultiply5(ptr ptr ptr)
+@ stub D3DXSHMultiply6(ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36.spec
b/dll/directx/wine/d3dx9_36/d3dx9_36.spec
index 692321d9065..de8b12ce03b 100644
--- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec
+++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec
@@ -18,22 +18,22 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
+@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -41,10 +41,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -73,20 +73,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -103,7 +103,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -113,10 +113,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -133,20 +133,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -166,21 +166,21 @@
@ stdcall D3DXGetShaderVersion(ptr)
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -193,8 +193,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -229,7 +229,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -254,7 +254,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -265,43 +265,43 @@
@ stdcall D3DXSHMultiply2(ptr ptr ptr)
@ stdcall D3DXSHMultiply3(ptr ptr ptr)
@ stdcall D3DXSHMultiply4(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHMultiply5(ptr ptr ptr)
+@ stub D3DXSHMultiply6(ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_37/d3dx9_37.spec
b/dll/directx/wine/d3dx9_37/d3dx9_37.spec
index 692321d9065..de8b12ce03b 100644
--- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec
+++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec
@@ -18,22 +18,22 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
+@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -41,10 +41,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -73,20 +73,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -103,7 +103,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -113,10 +113,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -133,20 +133,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -166,21 +166,21 @@
@ stdcall D3DXGetShaderVersion(ptr)
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -193,8 +193,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -229,7 +229,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -254,7 +254,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -265,43 +265,43 @@
@ stdcall D3DXSHMultiply2(ptr ptr ptr)
@ stdcall D3DXSHMultiply3(ptr ptr ptr)
@ stdcall D3DXSHMultiply4(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHMultiply5(ptr ptr ptr)
+@ stub D3DXSHMultiply6(ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_38/d3dx9_38.spec
b/dll/directx/wine/d3dx9_38/d3dx9_38.spec
index 692321d9065..de8b12ce03b 100644
--- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec
+++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec
@@ -18,22 +18,22 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
+@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -41,10 +41,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -73,20 +73,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -103,7 +103,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -113,10 +113,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -133,20 +133,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -166,21 +166,21 @@
@ stdcall D3DXGetShaderVersion(ptr)
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -193,8 +193,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -229,7 +229,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -254,7 +254,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -265,43 +265,43 @@
@ stdcall D3DXSHMultiply2(ptr ptr ptr)
@ stdcall D3DXSHMultiply3(ptr ptr ptr)
@ stdcall D3DXSHMultiply4(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHMultiply5(ptr ptr ptr)
+@ stub D3DXSHMultiply6(ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_39/d3dx9_39.spec
b/dll/directx/wine/d3dx9_39/d3dx9_39.spec
index 692321d9065..de8b12ce03b 100644
--- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec
+++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec
@@ -18,22 +18,22 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
+@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -41,10 +41,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -73,20 +73,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -103,7 +103,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -113,10 +113,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -133,20 +133,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -166,21 +166,21 @@
@ stdcall D3DXGetShaderVersion(ptr)
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -193,8 +193,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -229,7 +229,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -254,7 +254,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -265,43 +265,43 @@
@ stdcall D3DXSHMultiply2(ptr ptr ptr)
@ stdcall D3DXSHMultiply3(ptr ptr ptr)
@ stdcall D3DXSHMultiply4(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHMultiply5(ptr ptr ptr)
+@ stub D3DXSHMultiply6(ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_40/d3dx9_40.spec
b/dll/directx/wine/d3dx9_40/d3dx9_40.spec
index 692321d9065..de8b12ce03b 100644
--- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec
+++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec
@@ -18,22 +18,22 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
+@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -41,10 +41,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -73,20 +73,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -103,7 +103,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -113,10 +113,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -133,20 +133,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -166,21 +166,21 @@
@ stdcall D3DXGetShaderVersion(ptr)
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -193,8 +193,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -229,7 +229,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -254,7 +254,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -265,43 +265,43 @@
@ stdcall D3DXSHMultiply2(ptr ptr ptr)
@ stdcall D3DXSHMultiply3(ptr ptr ptr)
@ stdcall D3DXSHMultiply4(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHMultiply5(ptr ptr ptr)
+@ stub D3DXSHMultiply6(ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_41/d3dx9_41.spec
b/dll/directx/wine/d3dx9_41/d3dx9_41.spec
index 692321d9065..de8b12ce03b 100644
--- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec
+++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec
@@ -18,22 +18,22 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
+@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -41,10 +41,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -73,20 +73,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -103,7 +103,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -113,10 +113,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -133,20 +133,20 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -166,21 +166,21 @@
@ stdcall D3DXGetShaderVersion(ptr)
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -193,8 +193,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -229,7 +229,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -254,7 +254,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -265,43 +265,43 @@
@ stdcall D3DXSHMultiply2(ptr ptr ptr)
@ stdcall D3DXSHMultiply3(ptr ptr ptr)
@ stdcall D3DXSHMultiply4(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHMultiply5(ptr ptr ptr)
+@ stub D3DXSHMultiply6(ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_42/d3dx9_42.spec
b/dll/directx/wine/d3dx9_42/d3dx9_42.spec
index 936ae902dea..c3bd9d52a2e 100644
--- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec
+++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec
@@ -18,22 +18,22 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
+@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
@ stdcall D3DXComputeNormals(ptr ptr)
-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr)
-@ stdcall -stub D3DXComputeTangentFrame(ptr long)
+@ stub D3DXComputeTangent(ptr long long long long ptr)
+@ stub D3DXComputeTangentFrame(ptr long)
@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr
float float float ptr ptr)
-@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
-@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
@ stdcall D3DXCreateAnimationController(long long long long ptr)
@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
@ stdcall D3DXCreateBuffer(long ptr)
-@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr 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)
@@ -41,10 +41,10 @@
@ 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 -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long
long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr)
@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr)
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr)
@@ -71,20 +71,20 @@
@ stdcall D3DXCreateMatrixStack(long ptr)
@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr)
-@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr)
-@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr)
-@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr)
-@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
-@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
-@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
+@ stub D3DXCreateNPatchMesh(ptr ptr)
+@ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr)
+@ stub D3DXCreatePRTBuffer(long long long ptr)
+@ stub D3DXCreatePRTBufferTex(long long long long ptr)
+@ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr)
+@ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr)
+@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr)
@ stdcall D3DXCreatePolygon(ptr float long ptr ptr)
@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr)
@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr)
-@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
+@ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr)
@ stdcall D3DXCreateSkinInfo(long ptr long ptr)
@ stdcall D3DXCreateSkinInfoFVF(long long long ptr)
-@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
+@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr)
@ stdcall D3DXCreateSphere(ptr float long long ptr ptr)
@ stdcall D3DXCreateSprite(ptr ptr)
@ stdcall D3DXCreateTeapot(ptr ptr ptr)
@@ -101,7 +101,7 @@
@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long
long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long
long long long ptr ptr ptr)
@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr)
-@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
+@ stub D3DXCreateTextureGutterHelper(long long ptr long ptr)
@ stdcall D3DXCreateTextureShader(ptr ptr)
@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr)
@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
@@ -111,10 +111,10 @@
@ 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 -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long
long long long long long long ptr ptr ptr)
-@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr 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)
+@ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr)
@ stdcall D3DXDebugMute(long)
@ stdcall D3DXDeclaratorFromFVF(long ptr)
@ stdcall D3DXDisassembleEffect(ptr long ptr)
@@ -131,15 +131,15 @@
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stdcall D3DXFloat16To32Array(ptr ptr long)
@ stdcall D3DXFloat32To16Array(ptr ptr long)
-@ stdcall -stub D3DXFrameAppendChild(ptr ptr)
-@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
+@ stub D3DXFrameAppendChild(ptr ptr)
+@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameFind(ptr str)
-@ stdcall -stub D3DXFrameNumNamedMatrices(ptr)
-@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr)
+@ stub D3DXFrameNumNamedMatrices(ptr)
+@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
@ stdcall D3DXFresnelTerm(float float)
-@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr)
-@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXGenerateOutputDecl(ptr ptr)
+@ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXGetDeclLength(ptr)
@ stdcall D3DXGetDeclVertexSize(ptr long)
@ stdcall D3DXGetDriverLevel(ptr)
@@ -159,21 +159,21 @@
@ stdcall D3DXGetShaderVersion(ptr)
@ stdcall D3DXGetVertexShaderProfile(ptr)
@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
+@ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
-@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
-@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
+@ stub D3DXLoadPRTBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr)
+@ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr)
+@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr)
@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr)
@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@@ -186,8 +186,8 @@
@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
-@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
-@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
+@ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long)
@ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr)
@ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr)
@@ -222,7 +222,7 @@
@ stdcall D3DXMatrixTranslation(ptr float float float)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stdcall D3DXOptimizeFaces(ptr long long long ptr)
-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr)
+@ stub D3DXOptimizeVertices(ptr long long long ptr)
@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
@@ -247,7 +247,7 @@
@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float)
@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr)
-@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr)
+@ stub D3DXRectPatchSize(ptr ptr ptr)
@ stdcall D3DXSHAdd(ptr long ptr ptr)
@ stdcall D3DXSHDot(long ptr ptr)
@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)
@@ -258,43 +258,43 @@
@ stdcall D3DXSHMultiply2(ptr ptr ptr)
@ stdcall D3DXSHMultiply3(ptr ptr ptr)
@ stdcall D3DXSHMultiply4(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply5(ptr ptr ptr)
-@ stdcall -stub D3DXSHMultiply6(ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr
long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stub D3DXSHMultiply5(ptr ptr ptr)
+@ stub D3DXSHMultiply6(ptr ptr ptr)
+@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr
ptr ptr ptr)
+@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
-@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr)
-@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long)
+@ stub D3DXSavePRTBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTBufferToFileW(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileA(ptr ptr)
+@ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
@ stdcall D3DXSaveSurfaceToFileA(ptr 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 D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
-@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
+@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
+@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
+@ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
@ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
-@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
-@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long
ptr long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
-@ stdcall -stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr
ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
+@ stub D3DXTriPatchSize(ptr ptr ptr)
+@ stub D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long
ptr ptr ptr ptr ptr)
+@ stub D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr)
+@ stub D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr
ptr ptr ptr)
@ stdcall D3DXValidMesh(ptr ptr ptr)
-@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr)
+@ stub D3DXValidPatchMesh(ptr ptr ptr ptr)
@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr float float)
@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr float)
@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr float)
diff --git a/dll/directx/wine/d3dx9_43/d3dx9_43.spec
b/dll/directx/wine/d3dx9_43/d3dx9_43.spec
index 936ae902dea..c3bd9d52a2e 100644
--- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec
+++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec
@@ -18,22 +18,22 @@
@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr)
@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr)
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long
ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
-@ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr
ptr)
+@ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr)
+@ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
... 239 lines suppressed ...