Updated imported headers to current Wine version

git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@4160 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/direct-x/include/d3dx9.h b/mingw-w64-headers/direct-x/include/d3dx9.h
index 09ae553..97d4234 100644
--- a/mingw-w64-headers/direct-x/include/d3dx9.h
+++ b/mingw-w64-headers/direct-x/include/d3dx9.h
@@ -30,10 +30,12 @@
 #include "d3d9.h"
 #include "d3dx9math.h"
 #include "d3dx9core.h"
+#include "d3dx9xof.h"
 #include "d3dx9mesh.h"
 #include "d3dx9shader.h"
 #include "d3dx9effect.h"
 #include "d3dx9shape.h"
+#include "d3dx9anim.h"
 #include "d3dx9tex.h"
 
 #define _FACDD 0x876
diff --git a/mingw-w64-headers/direct-x/include/d3dx9anim.h b/mingw-w64-headers/direct-x/include/d3dx9anim.h
new file mode 100644
index 0000000..2dc9028
--- /dev/null
+++ b/mingw-w64-headers/direct-x/include/d3dx9anim.h
@@ -0,0 +1,393 @@
+#include <_mingw_unicode.h>
+#undef INTERFACE
+/*
+ * Copyright 2011 Dylan Smith
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_D3DX9ANIM_H
+#define __WINE_D3DX9ANIM_H
+
+DEFINE_GUID(IID_ID3DXAnimationSet,           0x698cfb3f, 0x9289, 0x4d95, 0x9a, 0x57, 0x33, 0xa9, 0x4b, 0x5a, 0x65, 0xf9);
+DEFINE_GUID(IID_ID3DXKeyframedAnimationSet,  0xfa4e8e3a, 0x9786, 0x407d, 0x8b, 0x4c, 0x59, 0x95, 0x89, 0x37, 0x64, 0xaf);
+DEFINE_GUID(IID_ID3DXCompressedAnimationSet, 0x6cc2480d, 0x3808, 0x4739, 0x9f, 0x88, 0xde, 0x49, 0xfa, 0xcd, 0x8d, 0x4c);
+DEFINE_GUID(IID_ID3DXAnimationController,    0xac8948ec, 0xf86d, 0x43e2, 0x96, 0xde, 0x31, 0xfc, 0x35, 0xf9, 0x6d, 0x9e);
+
+typedef enum _D3DXMESHDATATYPE
+{
+    D3DXMESHTYPE_MESH        = 1,
+    D3DXMESHTYPE_PMESH       = 2,
+    D3DXMESHTYPE_PATCHMESH   = 3,
+    D3DXMESHTYPE_FORCE_DWORD = 0x7fffffff,
+} D3DXMESHDATATYPE;
+
+typedef enum _D3DXCALLBACK_SEARCH_FLAGS
+{
+    D3DXCALLBACK_SEARCH_EXCLUDING_INITIAL_POSITION = 0x00000001,
+    D3DXCALLBACK_SEARCH_BEHIND_INITIAL_POSITION    = 0x00000002,
+    D3DXCALLBACK_SEARCH_FORCE_DWORD                = 0x7fffffff,
+} D3DXCALLBACK_SEARCH_FLAGS;
+
+typedef enum _D3DXPLAYBACK_TYPE
+{
+    D3DXPLAY_LOOP        = 0,
+    D3DXPLAY_ONCE        = 1,
+    D3DXPLAY_PINGPONG    = 2,
+    D3DXPLAY_FORCE_DWORD = 0x7fffffff,
+} D3DXPLAYBACK_TYPE;
+
+typedef enum _D3DXCOMPRESSION_FLAGS
+{
+    D3DXCOMPRESSION_DEFAULT     = 0x00000000,
+    D3DXCOMPRESSION_FORCE_DWORD = 0x7fffffff,
+} D3DXCOMPRESSION_FLAGS;
+
+typedef enum _D3DXPRIORITY_TYPE
+{
+    D3DXPRIORITY_LOW         = 0,
+    D3DXPRIORITY_HIGH        = 1,
+    D3DXPRIORITY_FORCE_DWORD = 0x7fffffff,
+} D3DXPRIORITY_TYPE;
+
+typedef enum _D3DXEVENT_TYPE
+{
+    D3DXEVENT_TRACKSPEED    = 0,
+    D3DXEVENT_TRACKWEIGHT   = 1,
+    D3DXEVENT_TRACKPOSITION = 2,
+    D3DXEVENT_TRACKENABLE   = 3,
+    D3DXEVENT_PRIORITYBLEND = 4,
+    D3DXEVENT_FORCE_DWORD   = 0x7fffffff,
+} D3DXEVENT_TYPE;
+
+typedef enum _D3DXTRANSITION_TYPE
+{
+    D3DXTRANSITION_LINEAR        = 0,
+    D3DXTRANSITION_EASEINEASEOUT = 1,
+    D3DXTRANSITION_FORCE_DWORD   = 0x7fffffff,
+} D3DXTRANSITION_TYPE;
+
+
+typedef struct _D3DXMESHDATA
+{
+    D3DXMESHDATATYPE Type;
+
+    union
+    {
+        LPD3DXMESH pMesh;
+        LPD3DXPMESH pPMesh;
+        LPD3DXPATCHMESH pPatchMesh;
+    } DUMMYUNIONNAME;
+} D3DXMESHDATA, *LPD3DXMESHDATA;
+
+typedef struct _D3DXMESHCONTAINER
+{
+    LPSTR Name;
+    D3DXMESHDATA MeshData;
+    LPD3DXMATERIAL pMaterials;
+    LPD3DXEFFECTINSTANCE pEffects;
+    DWORD NumMaterials;
+    DWORD *pAdjacency;
+    LPD3DXSKININFO pSkinInfo;
+    struct _D3DXMESHCONTAINER *pNextMeshContainer;
+} D3DXMESHCONTAINER, *LPD3DXMESHCONTAINER;
+
+typedef struct _D3DXFRAME
+{
+    LPSTR Name;
+    D3DXMATRIX TransformationMatrix;
+    LPD3DXMESHCONTAINER pMeshContainer;
+    struct _D3DXFRAME *pFrameSibling;
+    struct _D3DXFRAME *pFrameFirstChild;
+} D3DXFRAME, *LPD3DXFRAME;
+
+typedef struct _D3DXKEY_VECTOR3
+{
+    FLOAT Time;
+    D3DXVECTOR3 Value;
+} D3DXKEY_VECTOR3, *LPD3DXKEY_VECTOR3;
+
+typedef struct _D3DXKEY_QUATERNION
+{
+    FLOAT Time;
+    D3DXQUATERNION Value;
+} D3DXKEY_QUATERNION, *LPD3DXKEY_QUATERNION;
+
+typedef struct _D3DXKEY_CALLBACK
+{
+    FLOAT Time;
+    LPVOID pCallbackData;
+} D3DXKEY_CALLBACK, *LPD3DXKEY_CALLBACK;
+
+typedef struct _D3DXTRACK_DESC
+{
+    D3DXPRIORITY_TYPE Priority;
+    FLOAT Weight;
+    FLOAT Speed;
+    DOUBLE Position;
+    WINBOOL Enable;
+} D3DXTRACK_DESC, *LPD3DXTRACK_DESC;
+
+typedef struct _D3DXEVENT_DESC
+{
+    D3DXEVENT_TYPE Type;
+    UINT Track;
+    DOUBLE StartTime;
+    DOUBLE Duration;
+    D3DXTRANSITION_TYPE Transition;
+    union
+    {
+        FLOAT Weight;
+        FLOAT Speed;
+        DOUBLE Position;
+        WINBOOL Enable;
+    } DUMMYUNIONNAME;
+} D3DXEVENT_DESC, *LPD3DXEVENT_DESC;
+
+typedef DWORD D3DXEVENTHANDLE, *LPD3DXEVENTHANDLE;
+
+typedef interface ID3DXAllocateHierarchy *LPD3DXALLOCATEHIERARCHY;
+typedef interface ID3DXLoadUserData *LPD3DXLOADUSERDATA;
+typedef interface ID3DXSaveUserData *LPD3DXSAVEUSERDATA;
+typedef interface ID3DXAnimationSet *LPD3DXANIMATIONSET;
+typedef interface ID3DXKeyframedAnimationSet *LPD3DXKEYFRAMEDANIMATIONSET;
+typedef interface ID3DXCompressedAnimationSet *LPD3DXCOMPRESSEDANIMATIONSET;
+typedef interface ID3DXAnimationCallbackHandler *LPD3DXANIMATIONCALLBACKHANDLER;
+typedef interface ID3DXAnimationController *LPD3DXANIMATIONCONTROLLER;
+
+#undef INTERFACE
+
+#define INTERFACE ID3DXAllocateHierarchy
+DECLARE_INTERFACE(ID3DXAllocateHierarchy)
+{
+    STDMETHOD(CreateFrame)(THIS_ LPCSTR Name, LPD3DXFRAME *new_frame) PURE;
+    STDMETHOD(CreateMeshContainer)(THIS_ LPCSTR Name, CONST D3DXMESHDATA *mesh_data,
+            CONST D3DXMATERIAL *materials, CONST D3DXEFFECTINSTANCE *effect_instances,
+            DWORD num_materials, CONST DWORD *adjacency, LPD3DXSKININFO skin_info,
+            LPD3DXMESHCONTAINER *new_mesh_container) PURE;
+    STDMETHOD(DestroyFrame)(THIS_ LPD3DXFRAME frame) PURE;
+    STDMETHOD(DestroyMeshContainer)(THIS_ LPD3DXMESHCONTAINER mesh_container) PURE;
+};
+#undef INTERFACE
+
+#define INTERFACE ID3DXLoadUserData
+DECLARE_INTERFACE(ID3DXLoadUserData)
+{
+    STDMETHOD(LoadTopLevelData)(LPD3DXFILEDATA child_data) PURE;
+    STDMETHOD(LoadFrameChildData)(LPD3DXFRAME frame, LPD3DXFILEDATA child_data) PURE;
+    STDMETHOD(LoadMeshChildData)(LPD3DXMESHCONTAINER mesh_container, LPD3DXFILEDATA child_data) PURE;
+};
+#undef INTERFACE
+
+#define INTERFACE ID3DXSaveUserData
+DECLARE_INTERFACE(ID3DXSaveUserData)
+{
+    STDMETHOD(AddFrameChildData)(CONST LPD3DXFRAME *frame, LPD3DXFILESAVEOBJECT save_obj,
+            LPD3DXFILESAVEDATA frame_data) PURE;
+    STDMETHOD(AddMeshChildData)(CONST LPD3DXMESHCONTAINER *mesh_container,
+            LPD3DXFILESAVEOBJECT save_obj, LPD3DXFILESAVEDATA mesh_data) PURE;
+    STDMETHOD(AddTopLevelDataObjectsPre)(LPD3DXFILESAVEOBJECT save_obj) PURE;
+    STDMETHOD(AddTopLevelDataObjectsPost)(LPD3DXFILESAVEOBJECT save_obj) PURE;
+    STDMETHOD(RegisterTemplates)(LPD3DXFILE xfile) PURE;
+    STDMETHOD(SaveTemplates)(LPD3DXFILESAVEOBJECT save_obj) PURE;
+};
+#undef INTERFACE
+
+#define INTERFACE ID3DXAnimationSet
+DECLARE_INTERFACE_(ID3DXAnimationSet, IUnknown)
+{
+    /*** IUnknown methods ***/
+    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+    /*** ID3DXAnimationSet methods ***/
+    STDMETHOD_(LPCSTR, GetName)(THIS) PURE;
+    STDMETHOD_(DOUBLE, GetPeriod)(THIS) PURE;
+    STDMETHOD_(DOUBLE, GetPeriodicPosition)(THIS_ DOUBLE position) PURE;
+    STDMETHOD_(UINT, GetNumAnimations)(THIS) PURE;
+    STDMETHOD(GetAnimationNameByIndex)(THIS_ UINT index, LPCSTR *name) PURE;
+    STDMETHOD(GetAnimationIndexByName)(THIS_ LPCSTR name, UINT *index) PURE;
+    STDMETHOD(GetSRT)(THIS_ DOUBLE periodic_position, UINT animation, D3DXVECTOR3 *scale,
+            D3DXQUATERNION *rotation, D3DXVECTOR3 *translation) PURE;
+    STDMETHOD(GetCallback)(THIS_ DOUBLE position, DWORD flags, DOUBLE *callback_position,
+            LPVOID *callback_data) PURE;
+};
+#undef INTERFACE
+
+#define INTERFACE ID3DXKeyframedAnimationSet
+DECLARE_INTERFACE_(ID3DXKeyframedAnimationSet, ID3DXAnimationSet)
+{
+    /*** IUnknown methods ***/
+    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+    /*** ID3DXAnimationSet methods ***/
+    STDMETHOD_(LPCSTR, GetName)(THIS) PURE;
+    STDMETHOD_(DOUBLE, GetPeriod)(THIS) PURE;
+    STDMETHOD_(DOUBLE, GetPeriodicPosition)(THIS_ DOUBLE position) PURE;
+    STDMETHOD_(UINT, GetNumAnimations)(THIS) PURE;
+    STDMETHOD(GetAnimationNameByIndex)(THIS_ UINT index, LPCSTR *name) PURE;
+    STDMETHOD(GetAnimationIndexByName)(THIS_ LPCSTR name, UINT *index) PURE;
+    STDMETHOD(GetSRT)(THIS_ DOUBLE periodic_position, UINT animation, D3DXVECTOR3 *scale,
+            D3DXQUATERNION *rotation, D3DXVECTOR3 *translation) PURE;
+    STDMETHOD(GetCallback)(THIS_ DOUBLE position, DWORD flags, DOUBLE *callback_position,
+            LPVOID *callback_data) PURE;
+    /*** ID3DXKeyframedAnimationSet methods ***/
+    STDMETHOD_(D3DXPLAYBACK_TYPE, GetPlaybackType)(THIS) PURE;
+    STDMETHOD_(DOUBLE, GetSourceTicksPerSecond)(THIS) PURE;
+    STDMETHOD_(UINT, GetNumScaleKeys)(THIS_ UINT animation) PURE;
+    STDMETHOD(GetScaleKeys)(THIS_ UINT animation, LPD3DXKEY_VECTOR3 scale_keys) PURE;
+    STDMETHOD(GetScaleKey)(THIS_ UINT animation, UINT key, LPD3DXKEY_VECTOR3 scale_key) PURE;
+    STDMETHOD(SetScaleKey)(THIS_ UINT animation, UINT key, LPD3DXKEY_VECTOR3 scale_key) PURE;
+    STDMETHOD_(UINT, GetNumRotationKeys)(THIS_ UINT animation) PURE;
+    STDMETHOD(GetRotationKeys)(THIS_ UINT animation, LPD3DXKEY_QUATERNION rotation_keys) PURE;
+    STDMETHOD(GetRotationKey)(THIS_ UINT animation, UINT key, LPD3DXKEY_QUATERNION rotation_key) PURE;
+    STDMETHOD(SetRotationKey)(THIS_ UINT animation, UINT key, LPD3DXKEY_QUATERNION rotation_key) PURE;
+    STDMETHOD_(UINT, GetNumTranslationKeys)(THIS_ UINT animation) PURE;
+    STDMETHOD(GetTranslationKeys)(THIS_ UINT animation, LPD3DXKEY_VECTOR3 translation_keys) PURE;
+    STDMETHOD(GetTranslationKey)(THIS_ UINT animation, UINT key, LPD3DXKEY_VECTOR3 translation_key) PURE;
+    STDMETHOD(SetTranslationKey)(THIS_ UINT animation, UINT key, LPD3DXKEY_VECTOR3 translation_key) PURE;
+    STDMETHOD_(UINT, GetNumCallbackKeys)(THIS) PURE;
+    STDMETHOD(GetCallbackKeys)(THIS_ LPD3DXKEY_CALLBACK callback_keys) PURE;
+    STDMETHOD(GetCallbackKey)(THIS_ UINT key, LPD3DXKEY_CALLBACK callback_key) PURE;
+    STDMETHOD(SetCallbackKey)(THIS_ UINT key, LPD3DXKEY_CALLBACK callback_key) PURE;
+    STDMETHOD(UnregisterScaleKey)(THIS_ UINT animation, UINT key) PURE;
+    STDMETHOD(UnregisterRotationKey)(THIS_ UINT animation, UINT key) PURE;
+    STDMETHOD(UnregisterTranslationKey)(THIS_ UINT animation, UINT key) PURE;
+    STDMETHOD(RegisterAnimationSRTKeys)(THIS_ LPCSTR name, UINT num_scale_keys,
+            UINT num_rotation_keys, UINT num_translation_keys, CONST D3DXKEY_VECTOR3 *scale_keys,
+            CONST D3DXKEY_QUATERNION *rotation_keys, CONST D3DXKEY_VECTOR3 *translation_keys,
+            DWORD *animation_index) PURE;
+    STDMETHOD(Compress)(THIS_ DWORD flags, FLOAT lossiness, LPD3DXFRAME hierarchy,
+            LPD3DXBUFFER *compressed_data) PURE;
+    STDMETHOD(UnregisterAnimation)(THIS_ UINT index) PURE;
+};
+#undef INTERFACE
+
+#define INTERFACE ID3DXCompressedAnimationSet
+DECLARE_INTERFACE_(ID3DXCompressedAnimationSet, ID3DXAnimationSet)
+{
+    /*** IUnknown methods ***/
+    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+    /*** ID3DXAnimationSet methods ***/
+    STDMETHOD_(LPCSTR, GetName)(THIS) PURE;
+    STDMETHOD_(DOUBLE, GetPeriod)(THIS) PURE;
+    STDMETHOD_(DOUBLE, GetPeriodicPosition)(THIS_ DOUBLE position) PURE;
+    STDMETHOD_(UINT, GetNumAnimations)(THIS) PURE;
+    STDMETHOD(GetAnimationNameByIndex)(THIS_ UINT index, LPCSTR *name) PURE;
+    STDMETHOD(GetAnimationIndexByName)(THIS_ LPCSTR name, UINT *index) PURE;
+    STDMETHOD(GetSRT)(THIS_ DOUBLE periodic_position, UINT animation, D3DXVECTOR3 *scale,
+            D3DXQUATERNION *rotation, D3DXVECTOR3 *translation) PURE;
+    STDMETHOD(GetCallback)(THIS_ DOUBLE position, DWORD flags, DOUBLE *callback_position,
+            LPVOID *callback_data) PURE;
+    /*** ID3DXCompressedAnimationSet methods ***/
+    STDMETHOD_(D3DXPLAYBACK_TYPE, GetPlaybackType)(THIS) PURE;
+    STDMETHOD_(DOUBLE, GetSourceTicksPerSecond)(THIS) PURE;
+    STDMETHOD(GetCompressedData)(THIS_ LPD3DXBUFFER *compressed_data) PURE;
+    STDMETHOD_(UINT, GetNumCallbackKeys)(THIS) PURE;
+    STDMETHOD(GetCallbackKeys)(THIS_ LPD3DXKEY_CALLBACK callback_keys) PURE;
+};
+#undef INTERFACE
+
+#define INTERFACE ID3DXAnimationCallbackHandler
+DECLARE_INTERFACE(ID3DXAnimationCallbackHandler)
+{
+    STDMETHOD(HandleCallback)(THIS_ UINT track, LPVOID callback_data) PURE;
+};
+#undef INTERFACE
+
+#define INTERFACE ID3DXAnimationController
+DECLARE_INTERFACE_(ID3DXAnimationController, IUnknown)
+{
+    /*** IUnknown methods ***/
+    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+    /*** ID3DXAnimationController methods ***/
+    STDMETHOD_(UINT, GetMaxNumAnimationOutputs)(THIS) PURE;
+    STDMETHOD_(UINT, GetMaxNumAnimationSets)(THIS) PURE;
+    STDMETHOD_(UINT, GetMaxNumTracks)(THIS) PURE;
+    STDMETHOD_(UINT, GetMaxNumEvents)(THIS) PURE;
+    STDMETHOD(RegisterAnimationOutput)(THIS_ LPCSTR name, D3DXMATRIX *matrix,
+            D3DXVECTOR3 *scale, D3DXQUATERNION *rotation, D3DXVECTOR3 *translation) PURE;
+    STDMETHOD(RegisterAnimationSet)(THIS_ LPD3DXANIMATIONSET anim_set) PURE;
+    STDMETHOD(UnregisterAnimationSet)(THIS_ LPD3DXANIMATIONSET anim_set) PURE;
+    STDMETHOD_(UINT, GetNumAnimationSets)(THIS) PURE;
+    STDMETHOD(GetAnimationSet)(THIS_ UINT index, LPD3DXANIMATIONSET *anim_set) PURE;
+    STDMETHOD(GetAnimationSetByName)(THIS_ LPCSTR name, LPD3DXANIMATIONSET *anim_set) PURE;
+    STDMETHOD(AdvanceTime)(THIS_ DOUBLE time_delta, LPD3DXANIMATIONCALLBACKHANDLER *callback_handler) PURE;
+    STDMETHOD(ResetTime)(THIS) PURE;
+    STDMETHOD_(DOUBLE, GetTime)(THIS) PURE;
+    STDMETHOD(SetTrackAnimationSet)(THIS_ UINT track, LPD3DXANIMATIONSET anim_set) PURE;
+    STDMETHOD(GetTrackAnimationSet)(THIS_ UINT track, LPD3DXANIMATIONSET *anim_set) PURE;
+    STDMETHOD(GetTrackPriority)(THIS_ UINT track, D3DXPRIORITY_TYPE *priority) PURE;
+    STDMETHOD(SetTrackSpeed)(THIS_ UINT track, FLOAT speed) PURE;
+    STDMETHOD(SetTrackWeight)(THIS_ UINT track, FLOAT weight) PURE;
+    STDMETHOD(SetTrackPosition)(THIS_ UINT track, DOUBLE position) PURE;
+    STDMETHOD(SetTrackEnable)(THIS_ UINT track, WINBOOL enable) PURE;
+    STDMETHOD(SetTrackDesc)(THIS_ UINT track, LPD3DXTRACK_DESC desc) PURE;
+    STDMETHOD(GetTrackDesc)(THIS_ UINT track, LPD3DXTRACK_DESC desc) PURE;
+    STDMETHOD(SetPriorityBlend)(THIS_ FLOAT blend_weight) PURE;
+    STDMETHOD_(FLOAT, GetPriorityBlend)(THIS) PURE;
+    STDMETHOD_(D3DXEVENTHANDLE, KeyTrackSpeed)(THIS_ UINT track, FLOAT new_speed,
+            DOUBLE start_time, DOUBLE duration, D3DXTRANSITION_TYPE transition) PURE;
+    STDMETHOD_(D3DXEVENTHANDLE, KeyTrackWeight)(THIS_ UINT track, FLOAT new_weight,
+            DOUBLE start_time, DOUBLE duration, D3DXTRANSITION_TYPE transition) PURE;
+    STDMETHOD_(D3DXEVENTHANDLE, KeyTrackPosition)(THIS_ UINT track, DOUBLE new_position, DOUBLE start_time) PURE;
+    STDMETHOD_(D3DXEVENTHANDLE, KeyTrackEnable)(THIS_ UINT track, WINBOOL new_enable, DOUBLE start_time) PURE;
+    STDMETHOD_(D3DXEVENTHANDLE, KeyPriorityBlend)(THIS_ FLOAT new_blend_weight,
+            DOUBLE start_time, DOUBLE duration, D3DXTRANSITION_TYPE transition) PURE;
+    STDMETHOD(UnkeyEvent)(THIS, D3DXEVENTHANDLE event) PURE;
+    STDMETHOD(UnkeyAllTrackEvents)(THIS_ UINT track) PURE;
+    STDMETHOD(UnkeyAllPriorityBlends)(THIS) PURE;
+    STDMETHOD_(D3DXEVENTHANDLE, GetCurrentTrackEvent)(THIS_ UINT track, D3DXEVENT_TYPE event_type) PURE;
+    STDMETHOD_(D3DXEVENTHANDLE, GetCurrentPriorityBlend)(THIS) PURE;
+    STDMETHOD_(D3DXEVENTHANDLE, GetUpcomingTrackEvent)(THIS_ UINT track, D3DXEVENTHANDLE event) PURE;
+    STDMETHOD_(D3DXEVENTHANDLE, GetUpcomingPriorityBlend)(THIS_ D3DXEVENTHANDLE handle) PURE;
+    STDMETHOD(ValidateEvent)(THIS_ D3DXEVENTHANDLE event) PURE;
+    STDMETHOD(GetEventDesc)(THIS_ D3DXEVENTHANDLE event, LPD3DXEVENT_DESC desc) PURE;
+    STDMETHOD(CloneAnimationController)(THIS_ UINT max_num_anim_outputs, UINT max_num_anim_sets,
+            UINT max_num_tracks, UINT max_num_events, LPD3DXANIMATIONCONTROLLER *anim_controller) PURE;
+};
+#undef INTERFACE
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+HRESULT WINAPI D3DXLoadMeshHierarchyFromXA(LPCSTR, DWORD, LPDIRECT3DDEVICE9, LPD3DXALLOCATEHIERARCHY, LPD3DXLOADUSERDATA, LPD3DXFRAME*, LPD3DXANIMATIONCONTROLLER*);
+HRESULT WINAPI D3DXLoadMeshHierarchyFromXW(LPCWSTR, DWORD, LPDIRECT3DDEVICE9, LPD3DXALLOCATEHIERARCHY, LPD3DXLOADUSERDATA, LPD3DXFRAME*, LPD3DXANIMATIONCONTROLLER*);
+#define D3DXLoadMeshHierarchyFromX __MINGW_NAME_AW(D3DXLoadMeshHierarchyFromX)
+HRESULT WINAPI D3DXLoadMeshHierarchyFromXInMemory(LPCVOID, DWORD, DWORD, LPDIRECT3DDEVICE9, LPD3DXALLOCATEHIERARCHY, LPD3DXLOADUSERDATA, LPD3DXFRAME*, LPD3DXANIMATIONCONTROLLER*);
+HRESULT WINAPI D3DXSaveMeshHierarchyToFileA(LPCSTR, DWORD, CONST D3DXFRAME*, LPD3DXANIMATIONCONTROLLER, LPD3DXSAVEUSERDATA);
+HRESULT WINAPI D3DXSaveMeshHierarchyToFileW(LPCWSTR, DWORD, CONST D3DXFRAME*, LPD3DXANIMATIONCONTROLLER, LPD3DXSAVEUSERDATA);
+#define D3DXSaveMeshHierarchyToFile __MINGW_NAME_AW(D3DXSaveMeshHierarchyToFile)
+HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME, LPD3DXALLOCATEHIERARCHY);
+HRESULT WINAPI D3DXFrameAppendChild(LPD3DXFRAME, CONST D3DXFRAME*);
+LPD3DXFRAME WINAPI D3DXFrameFind(CONST D3DXFRAME*, LPCSTR);
+HRESULT WINAPI D3DXFrameRegisterNamedMatrices(LPD3DXFRAME, LPD3DXANIMATIONCONTROLLER);
+UINT WINAPI D3DXFrameNumNamedMatrices(CONST D3DXFRAME *frame_root);
+HRESULT WINAPI D3DXFrameCalculateBoundingSphere(CONST D3DXFRAME*, LPD3DXVECTOR3, FLOAT*);
+HRESULT WINAPI D3DXCreateKeyframedAnimationSet(LPCSTR, DOUBLE, D3DXPLAYBACK_TYPE, UINT, UINT, CONST D3DXKEY_CALLBACK*, LPD3DXKEYFRAMEDANIMATIONSET*);
+HRESULT WINAPI D3DXCreateCompressedAnimationSet(LPCSTR, DOUBLE, D3DXPLAYBACK_TYPE, LPD3DXBUFFER, UINT, CONST D3DXKEY_CALLBACK*, LPD3DXCOMPRESSEDANIMATIONSET*);
+HRESULT WINAPI D3DXCreateAnimationController(UINT, UINT, UINT, UINT, LPD3DXANIMATIONCONTROLLER*);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __WINE_D3DX9ANIM_H */
diff --git a/mingw-w64-headers/direct-x/include/d3dx9mesh.h b/mingw-w64-headers/direct-x/include/d3dx9mesh.h
index cf3860f..73c92e0 100644
--- a/mingw-w64-headers/direct-x/include/d3dx9mesh.h
+++ b/mingw-w64-headers/direct-x/include/d3dx9mesh.h
@@ -1,3 +1,4 @@
+#include <_mingw_unicode.h>
 #undef INTERFACE
 /*
  * Copyright (C) 2009 David Adam
@@ -25,6 +26,17 @@
 
 DEFINE_GUID(IID_ID3DXBaseMesh, 0x7ed943dd, 0x52e8, 0x40b5, 0xa8, 0xd8, 0x76, 0x68, 0x5c, 0x40, 0x63, 0x30);
 DEFINE_GUID(IID_ID3DXMesh,     0x4020e5c2, 0x1403, 0x4929, 0x88, 0x3f, 0xe2, 0xe8, 0x49, 0xfa, 0xc1, 0x95);
+DEFINE_GUID(IID_ID3DXPMesh,    0x8875769a, 0xd579, 0x4088, 0xaa, 0xeb, 0x53, 0x4d, 0x1a, 0xd8, 0x4e, 0x96);
+DEFINE_GUID(IID_ID3DXSPMesh,   0x667ea4c7, 0xf1cd, 0x4386, 0xb5, 0x23, 0x7c, 0x02, 0x90, 0xb8, 0x3c, 0xc5);
+DEFINE_GUID(IID_ID3DXSkinInfo, 0x11eaa540, 0xf9a6, 0x4d49, 0xae, 0x6a, 0xe1, 0x92, 0x21, 0xf7, 0x0c, 0xc4);
+DEFINE_GUID(IID_ID3DXPatchMesh,0x3ce6cc22, 0xdbf2, 0x44f4, 0x89, 0x4d, 0xf9, 0xc3, 0x4a, 0x33, 0x71, 0x39);
+DEFINE_GUID(IID_ID3DXPRTBuffer,           0xf1827e47, 0x00a8, 0x49cd, 0x90, 0x8c, 0x9d, 0x11, 0x95, 0x5f, 0x87, 0x28);
+DEFINE_GUID(IID_ID3DXPRTCompBuffer,       0xa758d465, 0xfe8d, 0x45ad, 0x9c, 0xf0, 0xd0, 0x1e, 0x56, 0x26, 0x6a, 0x07);
+DEFINE_GUID(IID_ID3DXTextureGutterHelper, 0x838f01ec, 0x9729, 0x4527, 0xaa, 0xdb, 0xdf, 0x70, 0xad, 0xe7, 0xfe, 0xa9);
+DEFINE_GUID(IID_ID3DXPRTEngine,           0x683a4278, 0xcd5f, 0x4d24, 0x90, 0xad, 0xc4, 0xe1, 0xb6, 0x85, 0x5d, 0x53);
+
+#define UNUSED16 (0xffff)
+#define UNUSED32 (0xffffffff)
 
 enum _MAX_FVF_DECL_SIZE
 {
@@ -57,8 +69,118 @@
     D3DXMESH_SOFTWAREPROCESSING    = 0x18000
 };
 
+enum _D3DXMESHOPT
+{
+    D3DXMESHOPT_DEVICEINDEPENDENT = 0x00400000,
+    D3DXMESHOPT_COMPACT           = 0x01000000,
+    D3DXMESHOPT_ATTRSORT          = 0x02000000,
+    D3DXMESHOPT_VERTEXCACHE       = 0x04000000,
+    D3DXMESHOPT_STRIPREORDER      = 0x08000000,
+    D3DXMESHOPT_IGNOREVERTS       = 0x10000000,
+    D3DXMESHOPT_DONOTSPLIT        = 0x20000000,
+};
+
+typedef enum _D3DXPATCHMESHTYPE
+{
+    D3DXPATCHMESH_RECT        = 1,
+    D3DXPATCHMESH_TRI         = 2,
+    D3DXPATCHMESH_NPATCH      = 3,
+    D3DXPATCHMESH_FORCE_DWORD = 0x7fffffff,
+} D3DXPATCHMESHTYPE;
+
+enum _D3DXPATCHMESH
+{
+    D3DXPATCHMESH_DEFAULT = 0,
+};
+
+enum _D3DXMESHSIMP
+{
+    D3DXMESHSIMP_VERTEX = 0x1,
+    D3DXMESHSIMP_FACE   = 0x2,
+};
+
+typedef enum D3DXCLEANTYPE {
+    D3DXCLEAN_BACKFACING     = 0x00000001,
+    D3DXCLEAN_BOWTIES        = 0x00000002,
+
+    D3DXCLEAN_SKINNING       = D3DXCLEAN_BACKFACING,
+    D3DXCLEAN_OPTIMIZATION   = D3DXCLEAN_BACKFACING,
+    D3DXCLEAN_SIMPLIFICATION = D3DXCLEAN_BACKFACING | D3DXCLEAN_BOWTIES,
+} D3DXCLEANTYPE;
+
+typedef enum _D3DXTANGENT
+{
+    D3DXTANGENT_WRAP_U =                  0x0001,
+    D3DXTANGENT_WRAP_V =                  0x0002,
+    D3DXTANGENT_WRAP_UV =                 0x0003,
+    D3DXTANGENT_DONT_NORMALIZE_PARTIALS = 0x0004,
+    D3DXTANGENT_DONT_ORTHOGONALIZE =      0x0008,
+    D3DXTANGENT_ORTHOGANALIZE_FROM_V =    0x0010,
+    D3DXTANGENT_ORTHOGANALIZE_FROM_U =    0x0020,
+    D3DXTANGENT_WEIGHT_BY_AREA =          0x0040,
+    D3DXTANGENT_WEIGHT_EQUAL =            0x0080,
+    D3DXTANGENT_WIND_CW =                 0x0100,
+    D3DXTANGENT_CALCULATE_NORMALS =       0x0200,
+    D3DXTANGENT_GENERATE_IN_PLACE =       0x0400,
+} D3DXTANGENT;
+
+typedef enum _D3DXIMT
+{
+    D3DXIMT_WRAP_U   = 0x01,
+    D3DXIMT_WRAP_V   = 0x02,
+    D3DXIMT_WRAP_UV  = 0x03,
+} D3DXIMT;
+
+typedef enum _D3DXUVATLAS
+{
+    D3DXUVATLAS_DEFAULT          = 0x00,
+    D3DXUVATLAS_GEODESIC_FAST    = 0x01,
+    D3DXUVATLAS_GEODESIC_QUALITY = 0x02,
+} D3DXUVATLAS;
+
+typedef enum _D3DXEFFECTDEFAULTTYPE
+{
+    D3DXEDT_STRING     = 1,
+    D3DXEDT_FLOATS     = 2,
+    D3DXEDT_DWORD      = 3,
+    D3DXEDT_FORCEDWORD = 0x7fffffff,
+} D3DXEFFECTDEFAULTTYPE;
+
+enum _D3DXWELDEPSILONSFLAGS
+{
+    D3DXWELDEPSILONS_WELDALL             = 0x1,
+    D3DXWELDEPSILONS_WELDPARTIALMATCHES  = 0x2,
+    D3DXWELDEPSILONS_DONOTREMOVEVERTICES = 0x4,
+    D3DXWELDEPSILONS_DONOTSPLIT          = 0x8,
+};
+
+typedef enum _D3DXSHCOMPRESSQUALITYTYPE
+{
+    D3DXSHCQUAL_FASTLOWQUALITY  = 1,
+    D3DXSHCQUAL_SLOWHIGHQUALITY = 2,
+    D3DXSHCQUAL_FORCE_DWORD     = 0x7fffffff,
+} D3DXSHCOMPRESSQUALITYTYPE;
+
+typedef enum _D3DXSHGPUSIMOPT
+{
+    D3DXSHGPUSIMOPT_SHADOWRES256   = 1,
+    D3DXSHGPUSIMOPT_SHADOWRES512   = 0,
+    D3DXSHGPUSIMOPT_SHADOWRES1024  = 2,
+    D3DXSHGPUSIMOPT_SHADOWRES2048  = 3,
+    D3DXSHGPUSIMOPT_HIGHQUALITY    = 4,
+    D3DXSHGPUSIMOPT_FORCE_DWORD    = 0x7fffffff,
+} D3DXSHGPUSIMOPT;
+
 typedef struct ID3DXBaseMesh* LPD3DXBASEMESH;
 typedef struct ID3DXMesh* LPD3DXMESH;
+typedef struct ID3DXPMesh *LPD3DXPMESH;
+typedef struct ID3DXSPMesh *LPD3DXSPMESH;
+typedef struct ID3DXSkinInfo *LPD3DXSKININFO;
+typedef struct ID3DXPatchMesh *LPD3DXPATCHMESH;
+typedef struct ID3DXPRTBuffer *LPD3DXPRTBUFFER;
+typedef struct ID3DXPRTCompBuffer *LPD3DXPRTCOMPBUFFER;
+typedef struct ID3DXPRTEngine *LPD3DXPRTENGINE;
+typedef struct ID3DXTextureGutterHelper *LPD3DXTEXTUREGUTTERHELPER;
 
 typedef struct _D3DXATTRIBUTERANGE {
     DWORD AttribId;
@@ -70,6 +192,117 @@
 
 typedef D3DXATTRIBUTERANGE* LPD3DXATTRIBUTERANGE;
 
+typedef struct _D3DXMATERIAL
+{
+    D3DMATERIAL9 MatD3D;
+    LPSTR pTextureFilename;
+} D3DXMATERIAL, *LPD3DXMATERIAL;
+
+typedef struct _D3DXEFFECTDEFAULT
+{
+    LPSTR pParamName;
+    D3DXEFFECTDEFAULTTYPE Type;
+    DWORD NumBytes;
+    LPVOID pValue;
+} D3DXEFFECTDEFAULT, *LPD3DXEFFECTDEFAULT;
+
+typedef struct _D3DXEFFECTINSTANCE
+{
+    LPSTR pEffectFilename;
+    DWORD NumDefaults;
+    LPD3DXEFFECTDEFAULT pDefaults;
+} D3DXEFFECTINSTANCE, *LPD3DXEFFECTINSTANCE;
+
+typedef struct _D3DXATTRIBUTEWEIGHTS
+{
+    FLOAT Position;
+    FLOAT Boundary;
+    FLOAT Normal;
+    FLOAT Diffuse;
+    FLOAT Specular;
+    FLOAT Texcoords[8];
+    FLOAT Tangent;
+    FLOAT Binormal;
+} D3DXATTRIBUTEWEIGHTS, *LPD3DXATTRIBUTEWEIGHTS;
+
+typedef struct _D3DXWELDEPSILONS
+{
+    FLOAT Position;
+    FLOAT BlendWeights;
+    FLOAT Normals;
+    FLOAT PSize;
+    FLOAT Specular;
+    FLOAT Diffuse;
+    FLOAT Texcoords[8];
+    FLOAT Tangent;
+    FLOAT Binormal;
+    FLOAT TessFactor;
+} D3DXWELDEPSILONS, *LPD3DXWELDEPSILONS;
+
+typedef struct _D3DXBONECOMBINATION
+{
+    DWORD AttribId;
+    DWORD FaceStart;
+    DWORD FaceCount;
+    DWORD VertexStart;
+    DWORD VertexCout;
+    DWORD *BoneId;
+} D3DXBONECOMBINATION, *LPD3DXBONECOMBINATION;
+
+typedef struct _D3DXPATCHINFO
+{
+    D3DXPATCHMESHTYPE PatchType;
+    D3DDEGREETYPE Degree;
+    D3DBASISTYPE Basis;
+} D3DXPATCHINFO, *LPD3DXPATCHINFO;
+
+typedef struct _D3DXINTERSECTINFO
+{
+    DWORD FaceIndex;
+    FLOAT U;
+    FLOAT V;
+    FLOAT Dist;
+} D3DXINTERSECTINFO, *LPD3DXINTERSECTINFO;
+
+typedef struct _D3DXSHMATERIAL
+{
+    D3DCOLORVALUE Diffuse;
+    WINBOOL bMirror;
+    WINBOOL bSubSurf;
+    FLOAT RelativeIndexOfRefraction;
+    D3DCOLORVALUE Absorption;
+    D3DCOLORVALUE ReducedScattering;
+} D3DXSHMATERIAL;
+
+typedef struct _D3DXSHPRTSPLITMESHVERTDATA
+{
+    UINT uVertRemap;
+    UINT uSubCluster;
+    UCHAR ucVertStatus;
+} D3DXSHPRTSPLITMESHVERTDATA;
+
+typedef struct _D3DXSHPRTSPLITMESHCLUSTERDATA
+{
+    UINT uVertStart;
+    UINT uVertLength;
+    UINT uFaceStart;
+    UINT uFaceLength;
+    UINT uClusterStart;
+    UINT uClusterLength;
+} D3DXSHPRTSPLITMESHCLUSTERDATA;
+
+typedef struct _XFILECOMPRESSEDANIMATIONSET
+{
+    DWORD CompressedBlockSize;
+    FLOAT TicksPerSec;
+    DWORD PlaybackType;
+    DWORD BufferLength;
+} XFILECOMPRESSEDANIMATIONSET;
+
+typedef HRESULT (WINAPI *LPD3DXUVATLASCB)(FLOAT, LPVOID);
+typedef HRESULT (WINAPI *LPD3DXIMTSIGNALCALLBACK)(CONST D3DXVECTOR2 *, UINT, UINT, VOID *, FLOAT *);
+typedef HRESULT (WINAPI *LPD3DXSHPRTSIMCB)(float, LPVOID);
+
 #undef INTERFACE
 #define INTERFACE ID3DXBaseMesh
 
@@ -146,6 +379,305 @@
                      DWORD* face_remap, LPD3DXBUFFER* vertex_remap) PURE;
     STDMETHOD(SetAttributeTable)(THIS_ CONST D3DXATTRIBUTERANGE* attrib_table, DWORD attrib_table_size) PURE;
 };
+#undef INTERFACE
+
+#define INTERFACE ID3DXPMesh
+DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
+{
+    /*** IUnknown methods ***/
+    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+    /*** ID3DXBaseMesh ***/
+    STDMETHOD(DrawSubset)(THIS_ DWORD attrib_id) PURE;
+    STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE;
+    STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE;
+    STDMETHOD_(DWORD, GetFVF)(THIS) PURE;
+    STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE;
+    STDMETHOD_(DWORD, GetNumBytesPerVertex)(THIS) PURE;
+    STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
+    STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* device) PURE;
+    STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE;
+    STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device,
+        LPD3DXMESH* clone_mesh) PURE;
+    STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE;
+    STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* index_buffer) PURE;
+    STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE;
+    STDMETHOD(UnlockVertexBuffer)(THIS) PURE;
+    STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE;
+    STDMETHOD(UnlockIndexBuffer)(THIS) PURE;
+    STDMETHOD(GetAttributeTable)(THIS_ D3DXATTRIBUTERANGE* attrib_table, DWORD* attrib_table_size) PURE;
+    STDMETHOD(ConvertPointRepsToAdjacency)(THIS_ CONST DWORD* point_reps, DWORD* adjacency) PURE;
+    STDMETHOD(ConvertAdjacencyToPointReps)(THIS_ CONST DWORD* adjacency, DWORD* point_reps) PURE;
+    STDMETHOD(GenerateAdjacency)(THIS_ FLOAT epsilon, DWORD* adjacency) PURE;
+    STDMETHOD(UpdateSemantics)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE;
+    /*** ID3DXPMesh ***/
+    STDMETHOD(ClonePMeshFVF)(THIS_ DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, LPD3DXPMESH* clone_mesh) PURE;
+    STDMETHOD(ClonePMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device,
+        LPD3DXPMESH* clone_mesh) PURE;
+    STDMETHOD(SetNumFaces)(THIS_ DWORD faces) PURE;
+    STDMETHOD(SetNumVertices)(THIS_ DWORD vertices) PURE;
+    STDMETHOD_(DWORD, GetMaxFaces)(THIS) PURE;
+    STDMETHOD_(DWORD, GetMinFaces)(THIS) PURE;
+    STDMETHOD_(DWORD, GetMaxVertices)(THIS) PURE;
+    STDMETHOD_(DWORD, GetMinVertices)(THIS) PURE;
+    STDMETHOD(Save)(THIS_ IStream *stream, CONST D3DXMATERIAL* material, CONST D3DXEFFECTINSTANCE* effect_instance, DWORD num_materials) PURE;
+    STDMETHOD(Optimize)(THIS_ DWORD flags, DWORD* adjacency_out, DWORD* face_remap,
+        LPD3DXBUFFER* vertex_remap, LPD3DXMESH* opt_mesh) PURE;
+    STDMETHOD(OptimizeBaseLOD)(THIS_ DWORD flags, DWORD* face_remap) PURE;
+    STDMETHOD(TrimByFaces)(THIS_ DWORD new_faces_min, DWORD new_faces_max, DWORD* face_remap, DWORD* vertex_remap) PURE;
+    STDMETHOD(TrimByVertices)(THIS_ DWORD new_vertices_min, DWORD new_vertices_max, DWORD* face_remap, DWORD* vertex_remap) PURE;
+    STDMETHOD(GetAdjacency)(THIS_ DWORD* adjacency) PURE;
+    STDMETHOD(GenerateVertexHistory)(THIS, DWORD* vertex_history) PURE;
+};
+#undef INTERFACE
+
+#define INTERFACE ID3DXSPMesh
+DECLARE_INTERFACE_(ID3DXSPMesh, IUnknown)
+{
+    /*** IUnknown methods ***/
+    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+    /*** ID3DXSPMesh ***/
+    STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE;
+    STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE;
+    STDMETHOD_(DWORD, GetNumFVF)(THIS) PURE;
+    STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE;
+    STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
+    STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* device) PURE;
+    STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, DWORD* adjacency_out,
+        DWORD* vertex_remap_out, LPD3DXMESH* clone_mesh) PURE;
+    STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device,
+        DWORD* adjacency_out, DWORD* vertex_remap_out, LPD3DXMESH* clone_mesh) PURE;
+    STDMETHOD(ClonePMeshFVF)(THIS_ DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, DWORD* vertex_remap_out,
+        FLOAT* errors_by_face, LPD3DXPMESH* clone_mesh) PURE;
+    STDMETHOD(ClonePMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device,
+        DWORD* vertex_remap_out, FLOAT* errors_by_face, LPD3DXPMESH* clone_mesh) PURE;
+    STDMETHOD(ReduceFaces)(THIS_ DWORD faces) PURE;
+    STDMETHOD(ReduceVertices)(THIS_ DWORD vertices) PURE;
+    STDMETHOD_(DWORD, GetMaxFaces)(THIS) PURE;
+    STDMETHOD_(DWORD, GetMaxVertices)(THIS) PURE;
+    STDMETHOD(GetVertexAttributeWeights)(THIS_ LPD3DXATTRIBUTEWEIGHTS vertex_attribute_weights) PURE;
+    STDMETHOD(GetVertexWeights)(THIS_ FLOAT* vertex_weights) PURE;
+};
+#undef INTERFACE
+
+#define INTERFACE ID3DXPatchMesh
+DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown)
+{
+    /*** IUnknown methods ***/
+    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+    /*** ID3DXPatchMesh ***/
+    STDMETHOD_(DWORD, GetNumPatches)(THIS) PURE;
+    STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE;
+    STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE;
+    STDMETHOD_(DWORD, GetControlVerticesPerPatch)(THIS) PURE;
+    STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
+    STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* device) PURE;
+    STDMETHOD(GetPatchInfo)(THIS_ LPD3DXPATCHINFO patch_info) PURE;
+    STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE;
+    STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* index_buffer) PURE;
+    STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE;
+    STDMETHOD(UnlockVertexBuffer)(THIS) PURE;
+    STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE;
+    STDMETHOD(UnlockIndexBuffer)(THIS) PURE;
+    STDMETHOD(LockAttributeBuffer)(THIS_ DWORD flags, DWORD** data) PURE;
+    STDMETHOD(UnlockAttributeBuffer)(THIS) PURE;
+    STDMETHOD(GetTessSize)(THIS_ FLOAT tess_level, DWORD adaptive, DWORD* num_triangles, DWORD* num_vertices) PURE;
+    STDMETHOD(GenerateAdjacency)(THIS_ FLOAT tolerance) PURE;
+    STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPD3DXPATCHMESH *clone_mesh) PURE;
+    STDMETHOD(Optimize)(THIS_ DWORD flags) PURE;
+    STDMETHOD(SetDisplaceParam)(THIS_ LPDIRECT3DBASETEXTURE9 texture, D3DTEXTUREFILTERTYPE min_filter,
+        D3DTEXTUREFILTERTYPE mag_filter, D3DTEXTUREFILTERTYPE mip_filter, D3DTEXTUREADDRESS wrap, DWORD lod_bias) PURE;
+    STDMETHOD(GetDisplaceParam)(THIS_ LPDIRECT3DBASETEXTURE9* texture, D3DTEXTUREFILTERTYPE* min_filter,
+        D3DTEXTUREFILTERTYPE* mag_filter, D3DTEXTUREFILTERTYPE* mip_filter, D3DTEXTUREADDRESS* wrap, DWORD* lod_bias) PURE;
+    STDMETHOD(Tessellate)(THIS_ FLOAT tess_level, LPD3DXMESH mesh) PURE;
+    STDMETHOD(TessellateAdaptive)(THIS_ CONST D3DXVECTOR4* trans, DWORD max_tess_level, DWORD min_tess_level, LPD3DXMESH mesh) PURE;
+};
+#undef INTERFACE
+
+#define INTERFACE ID3DXSkinInfo
+DECLARE_INTERFACE_(ID3DXSkinInfo, IUnknown)
+{
+    /*** IUnknown methods ***/
+    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+    /*** ID3DXSkinInfo ***/
+    STDMETHOD(SetBoneInfluence)(THIS_ DWORD bone, DWORD num_influences, CONST DWORD* vertices, CONST FLOAT* weights) PURE;
+    STDMETHOD(SetBoneVertexInfluence)(THIS_ DWORD bone_num, DWORD influence_num, float weight) PURE;
+    STDMETHOD_(DWORD, GetNumBoneInfluences)(THIS_ DWORD bone) PURE;
+    STDMETHOD(GetBoneInfluence)(THIS_ DWORD bone, DWORD* vertices, FLOAT* weights) PURE;
+    STDMETHOD(GetBoneVertexInfluence)(THIS_ DWORD bone_num, DWORD influence_num, float *weight, DWORD* vertex_num) PURE;
+    STDMETHOD(GetMaxVertexInfluences)(THIS_ DWORD* max_vertex_influences) PURE;
+    STDMETHOD_(DWORD, GetNumBones)(THIS) PURE;
+    STDMETHOD(FindBoneVertexInfluenceIndex)(THIS_ DWORD bone_num, DWORD vertex_num, DWORD* influence_index) PURE;
+    STDMETHOD(GetMaxFaceInfluences)(THIS_ LPDIRECT3DINDEXBUFFER9 index_buffer, DWORD num_faces, DWORD* max_face_influences) PURE;
+    STDMETHOD(SetMinBoneInfluence)(THIS_ FLOAT min_influence) PURE;
+    STDMETHOD_(DWORD, GetMinBoneInfluence)(THIS) PURE;
+    STDMETHOD(SetBoneName)(THIS_ DWORD bone, LPCSTR name) PURE;
+    STDMETHOD_(LPCSTR, GetBoneName)(THIS_ DWORD bone) PURE;
+    STDMETHOD(SetBoneOffsetMatrix)(THIS_ DWORD bone, CONST D3DXMATRIX* bone_transform) PURE;
+    STDMETHOD_(LPD3DXMATRIX, GetBoneOffsetMatrix)(THIS_ DWORD bone) PURE;
+    STDMETHOD(Clone)(THIS_ LPD3DXSKININFO* skin_info) PURE;
+    STDMETHOD(Remap)(THIS_ DWORD num_vertices, DWORD* vertex_remap) PURE;
+    STDMETHOD(SetFVF)(THIS_ DWORD FVF) PURE;
+    STDMETHOD(SetDeclaration)(THIS_ CONST D3DVERTEXELEMENT9* declaration) PURE;
+    STDMETHOD_(DWORD, GetFVF)(THIS) PURE;
+    STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE;
+    STDMETHOD(UpdateSkinnedMesh)(THIS_ CONST D3DXMATRIX* bone_transforms,
+        CONST D3DXMATRIX* bone_inv_transpose_transforms, LPCVOID vertices_src, PVOID vertices_dest) PURE;
+    STDMETHOD(ConvertToBlendedMesh)(THIS_ LPD3DXMESH mesh_in, DWORD options, CONST DWORD *adjacency_in,
+        LPDWORD adjacency_out, DWORD* face_remap, LPD3DXBUFFER* vertex_remap, DWORD* max_face_infl,
+        DWORD* num_bone_combinations, LPD3DXBUFFER* bone_combination_table, LPD3DXMESH* mesh_out) PURE;
+    STDMETHOD(ConvertToIndexedBlendedMesh)(THIS_ LPD3DXMESH mesh_in, DWORD options, CONST DWORD *adjacency_in,
+        LPDWORD adjacency_out, DWORD* face_remap, LPD3DXBUFFER* vertex_remap, DWORD* max_face_infl,
+        DWORD* num_bone_combinations, LPD3DXBUFFER* bone_combination_table, LPD3DXMESH* mesh_out) PURE;
+};
+#undef INTERFACE
+
+#define INTERFACE ID3DXPRTBuffer
+DECLARE_INTERFACE_(ID3DXPRTBuffer, IUnknown)
+{
+    /*** IUnknown methods ***/
+    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+    /*** ID3DXPRTBuffer methods ***/
+    STDMETHOD_(UINT, GetNumSamples)(THIS) PURE;
+    STDMETHOD_(UINT, GetNumCoeffs)(THIS) PURE;
+    STDMETHOD_(UINT, GetNumChannels)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsTexture)(THIS) PURE;
+    STDMETHOD_(WINBOOL, GetWidth)(THIS) PURE;
+    STDMETHOD_(WINBOOL, GetHeight)(THIS) PURE;
+    STDMETHOD(Resize)(THIS_ UINT new_size) PURE;
+    STDMETHOD(LockBuffer)(THIS_ UINT start, UINT num_samples, FLOAT **data) PURE;
+    STDMETHOD(UnlockBuffer)(THIS) PURE;
+    STDMETHOD(ScaleBuffer)(THIS_ FLOAT scale) PURE;
+    STDMETHOD(AddBuffer)(THIS_ LPD3DXPRTBUFFER buffer) PURE;
+    STDMETHOD(AttachGH)(THIS_ LPD3DXTEXTUREGUTTERHELPER) PURE;
+    STDMETHOD(ReleaseGH)(THIS) PURE;
+    STDMETHOD(EvalGH)(THIS) PURE;
+    STDMETHOD(ExtractTexture)(THIS_ UINT channel, UINT start_coefficient,
+        UINT num_coefficients, LPDIRECT3DTEXTURE9 texture) PURE;
+    STDMETHOD(ExtractToMesh)(THIS_ UINT num_coefficients, D3DDECLUSAGE usage,
+        UINT usage_index_start, LPD3DXMESH scene) PURE;
+};
+#undef INTERFACE
+
+#define INTERFACE ID3DXPRTCompBuffer
+DECLARE_INTERFACE_(ID3DXPRTCompBuffer, IUnknown)
+{
+    /*** IUnknown methods ***/
+    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+    /*** ID3DXPRTCompBuffer methods ***/
+    STDMETHOD_(UINT, GetNumSamples)(THIS) PURE;
+    STDMETHOD_(UINT, GetNumCoeffs)(THIS) PURE;
+    STDMETHOD_(UINT, GetNumChannels)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsTexture)(THIS) PURE;
+    STDMETHOD_(UINT, GetWidth)(THIS) PURE;
+    STDMETHOD_(UINT, GetHeight)(THIS) PURE;
+    STDMETHOD_(UINT, GetNumClusters)(THIS) PURE;
+    STDMETHOD_(UINT, GetNumPCA)(THIS) PURE;
+    STDMETHOD(NormalizeData)(THIS) PURE;
+    STDMETHOD(ExtractBasis)(THIS_ UINT cluster, FLOAT *cluster_basis) PURE;
+    STDMETHOD(ExtractClusterIDs)(THIS_ UINT *cluster_ids) PURE;
+    STDMETHOD(ExtractPCA)(THIS_ UINT start_pca, UINT num_extract, FLOAT *pca_coefficients) PURE;
+    STDMETHOD(ExtractTexture)(THIS_ UINT start_pca, UINT num_pca, LPDIRECT3DTEXTURE9 texture) PURE;
+    STDMETHOD(ExtractToMesh)(THIS_ UINT num_pca, D3DDECLUSAGE usage, UINT usage_index_start, LPD3DXMESH scene) PURE;
+};
+#undef INTERFACE
+
+#define INTERFACE ID3DXTextureGutterHelper
+DECLARE_INTERFACE_(ID3DXTextureGutterHelper, IUnknown)
+{
+    /*** IUnknown methods ***/
+    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+    /*** ID3DXTextureGutterHelper methods ***/
+    STDMETHOD_(UINT, GetWidth)(THIS) PURE;
+    STDMETHOD_(UINT, GetHeight)(THIS) PURE;
+
+    STDMETHOD(ApplyGuttersFloat)(THIS_ FLOAT *data_in, UINT num_coeffs, UINT width, UINT height) PURE;
+    STDMETHOD(ApplyGuttersTex)(THIS_ LPDIRECT3DTEXTURE9 texture) PURE;
+    STDMETHOD(ApplyGuttersPRT)(THIS_ LPD3DXPRTBUFFER buffer) PURE;
+    STDMETHOD(ResampleTex)(THIS_ LPDIRECT3DTEXTURE9 texture_in, LPD3DXMESH mesh_in,
+        D3DDECLUSAGE usage, UINT usage_index, LPDIRECT3DTEXTURE9 texture_out) PURE;
+    STDMETHOD(GetFaceMap)(THIS_ UINT *face_data) PURE;
+    STDMETHOD(GetBaryMap)(THIS_ D3DXVECTOR2 *bary_data) PURE;
+    STDMETHOD(GetTexelMap)(THIS_ D3DXVECTOR2 *texel_data) PURE;
+    STDMETHOD(GetGutterMap)(THIS_ BYTE *gutter_data) PURE;
+    STDMETHOD(SetFaceMap)(THIS_ UINT *face_data) PURE;
+    STDMETHOD(SetBaryMap)(THIS_ D3DXVECTOR2 *bary_data) PURE;
+    STDMETHOD(SetTexelMap)(THIS_ D3DXVECTOR2 *texel_data) PURE;
+    STDMETHOD(SetGutterMap)(THIS_ BYTE *gutter_data) PURE;
+};
+#undef INTERFACE
+
+#define INTERFACE ID3DXPRTEngine
+DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
+{
+    /*** IUnknown methods ***/
+    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+    /*** ID3DXPRTEngine methods ***/
+    STDMETHOD(SetMeshMaterials)(THIS_ CONST D3DXSHMATERIAL **materials, UINT num_meshes,
+        UINT num_channels, WINBOOL set_albedo, FLOAT length_scale) PURE;
+    STDMETHOD(SetPerVertexAlbedo)(THIS_ CONST VOID *data_in, UINT num_channels, UINT stride) PURE;
+    STDMETHOD(SetPerTexelAlbedo)(THIS_ LPDIRECT3DTEXTURE9 albedo_texture, UINT num_channels,
+        LPD3DXTEXTUREGUTTERHELPER gh) PURE;
+    STDMETHOD(GetVertexAlbedo)(THIS_ D3DXCOLOR *vert_colors, UINT num_verts) PURE;
+    STDMETHOD(SetPerTexelNormals)(THIS_ LPDIRECT3DTEXTURE9 normal_texture) PURE;
+    STDMETHOD(ExtractPerVertexAlbedo)(THIS_ LPD3DXMESH mesh, D3DDECLUSAGE usage, UINT num_channels) PURE;
+    STDMETHOD(ResampleBuffer)(THIS_ LPD3DXPRTBUFFER buffer_in, LPD3DXPRTBUFFER buffer_out) PURE;
+    STDMETHOD(GetAdaptedMesh)(THIS_ LPDIRECT3DDEVICE9 device, UINT *face_remap,
+        UINT *vert_remap, FLOAT *vert_weights, LPD3DXMESH *mesh) PURE;
+    STDMETHOD_(UINT, GetNumVerts)(THIS) PURE;
+    STDMETHOD_(UINT, GetNumFaces)(THIS) PURE;
+    STDMETHOD(SetMinMaxIntersection)(THIS_ FLOAT min, FLOAT max) PURE;
+    STDMETHOD(RobustMeshRefine)(THIS_ FLOAT min_edge_length, UINT max_subdiv) PURE;
+    STDMETHOD(SetSamplingInfo)(THIS_ UINT num_rays, WINBOOL use_sphere,
+        WINBOOL use_cosine, WINBOOL adaptive, FLOAT adpative_thresh) PURE;
+    STDMETHOD(ComputeDirectLightingSH)(THIS_ UINT sh_order, LPD3DXPRTBUFFER data_out) PURE;
+    STDMETHOD(ComputeDirectLightingSHAdaptive)(THIS_ UINT sh_order, FLOAT adaptive_thresh,
+        FLOAT min_edge_length, UINT max_subdiv, LPD3DXPRTBUFFER data_out) PURE;
+    STDMETHOD(ComputeDirectLightingSHGPU)(THIS_ LPDIRECT3DDEVICE9 device, UINT flags,
+        UINT sh_order, FLOAT zbias, FLOAT zangle_bias, LPD3DXPRTBUFFER data_out) PURE;
+    STDMETHOD(ComputeSS)(THIS_ LPD3DXPRTBUFFER data_in, LPD3DXPRTBUFFER data_out,
+        LPD3DXPRTBUFFER data_total) PURE;
+    STDMETHOD(ComputeSSAdaptive)(THIS_ LPD3DXPRTBUFFER data_in, FLOAT adaptive_thres,
+        FLOAT min_edge_length, UINT max_subdiv, LPD3DXPRTBUFFER data_out, LPD3DXPRTBUFFER data_total) PURE;
+    STDMETHOD(ComputeBounce)(THIS_ LPD3DXPRTBUFFER data_in, LPD3DXPRTBUFFER data_out,
+        LPD3DXPRTBUFFER data_total) PURE;
+    STDMETHOD(ComputeBounceAdaptive)(THIS_ LPD3DXPRTBUFFER data_in, FLOAT adaptive_thres,
+        FLOAT min_edge_length, UINT max_subdiv, LPD3DXPRTBUFFER data_out, LPD3DXPRTBUFFER data_total) PURE;
+    STDMETHOD(ComputeVolumeSamplesDirectSH)(THIS_ UINT sh_order_in, UINT sh_order_out,
+        UINT num_vol_samples, CONST D3DXVECTOR3 *sample_locs, LPD3DXPRTBUFFER data_out) PURE;
+    STDMETHOD(ComputeVolumeSamples)(THIS_ LPD3DXPRTBUFFER surf_data_in, UINT sh_order,
+        UINT num_vol_samples, CONST D3DXVECTOR3 *sample_locs, LPD3DXPRTBUFFER data_out) PURE;
+    STDMETHOD(ComputeSurfSamplesDirectSH)(THIS_ UINT sh_order, UINT num_samples,
+        CONST D3DXVECTOR3 *sample_locs, CONST D3DXVECTOR3 *sample_norms, LPD3DXPRTBUFFER data_out) PURE;
+    STDMETHOD(ComputeSurfSamplesBounce)(THIS_ LPD3DXPRTBUFFER surf_data_in, UINT num_samples,
+        CONST D3DXVECTOR3 *sample_locs, CONST D3DXVECTOR3 *sample_norms, LPD3DXPRTBUFFER data_out,
+        LPD3DXPRTBUFFER data_total) PURE;
+    STDMETHOD(FreeSSData)(THIS) PURE;
+    STDMETHOD(FreeBounceData)(THIS) PURE;
+    STDMETHOD(ComputeLDPRTCoeffs)(THIS_ LPD3DXPRTBUFFER data_in, UINT sh_order, D3DXVECTOR3 *norm_out,
+        LPD3DXPRTBUFFER data_out) PURE;
+    STDMETHOD(ScaleMeshChunk)(THIS_ UINT mesh_chunk, FLOAT scale, LPD3DXPRTBUFFER data_out) PURE;
+    STDMETHOD(MultiplyAlbedo)(THIS_ LPD3DXPRTBUFFER data_out) PURE;
+    STDMETHOD(SetCallback)(THIS_ LPD3DXSHPRTSIMCB cb, FLOAT frequency, LPVOID user_context) PURE;
+    STDMETHOD_(WINBOOL, ShadowRayIntersects)(THIS_ CONST D3DXVECTOR3 *ray_pos, CONST D3DXVECTOR3 *ray_dir) PURE;
+    STDMETHOD_(WINBOOL, ClosestRayIntersects)(THIS_ CONST D3DXVECTOR3 *ray_pos, CONST D3DXVECTOR3 *ray_dir,
+        DWORD *face_index, FLOAT *u, FLOAT *v, FLOAT *dist) PURE;
+};
 
 #ifdef __cplusplus
 extern "C" {
@@ -154,19 +686,274 @@
 HRESULT WINAPI D3DXCreateMesh(DWORD, DWORD, DWORD, CONST D3DVERTEXELEMENT9 *, LPDIRECT3DDEVICE9, LPD3DXMESH *);
 HRESULT WINAPI D3DXCreateMeshFVF(DWORD, DWORD, DWORD, DWORD, LPDIRECT3DDEVICE9, LPD3DXMESH *);
 HRESULT WINAPI D3DXCreateBuffer(DWORD, LPD3DXBUFFER*);
+HRESULT WINAPI D3DXCreateSPMesh(LPD3DXMESH, CONST DWORD *, CONST D3DXATTRIBUTEWEIGHTS, CONST FLOAT *, LPD3DXSPMESH *);
+HRESULT WINAPI D3DXCreatePMeshFromStream(IStream *, DWORD, LPDIRECT3DDEVICE9, LPD3DXBUFFER *, LPD3DXBUFFER *, DWORD *, LPD3DXPMESH *);
+HRESULT WINAPI D3DXCreateSkinInfo(DWORD, CONST D3DVERTEXELEMENT9 *, DWORD, LPD3DXSKININFO *);
+HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD, DWORD, DWORD, LPD3DXSKININFO *);
+HRESULT WINAPI D3DXCreateSkinInfoFromBlendedMesh(LPD3DXBASEMESH, DWORD, CONST D3DXBONECOMBINATION *, LPD3DXSKININFO *);
+HRESULT WINAPI D3DXCreatePatchMesh(CONST D3DXPATCHINFO *, DWORD, DWORD, DWORD, CONST D3DVERTEXELEMENT9 *, LPDIRECT3DDEVICE9, LPD3DXPATCHMESH *);
+HRESULT WINAPI D3DXCreatePRTBuffer(UINT, UINT, UINT, LPD3DXPRTBUFFER *);
+HRESULT WINAPI D3DXCreatePRTBufferTex(UINT, UINT, UINT, UINT, LPD3DXPRTBUFFER *);
+HRESULT WINAPI D3DXCreatePRTCompBuffer(D3DXSHCOMPRESSQUALITYTYPE, UINT, UINT, LPD3DXSHPRTSIMCB, LPVOID, LPD3DXPRTBUFFER, LPD3DXPRTCOMPBUFFER *);
+HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT, UINT, LPD3DXMESH, FLOAT, LPD3DXTEXTUREGUTTERHELPER *);
+HRESULT WINAPI D3DXCreatePRTEngine(LPD3DXMESH, DWORD *, WINBOOL, LPD3DXMESH, LPD3DXPRTENGINE *);
+HRESULT WINAPI D3DXLoadMeshFromXA(LPCSTR, DWORD, LPDIRECT3DDEVICE9, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, DWORD *, LPD3DXMESH *);
+HRESULT WINAPI D3DXLoadMeshFromXW(LPCWSTR, DWORD, LPDIRECT3DDEVICE9, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, DWORD *, LPD3DXMESH *);
+#define D3DXLoadMeshFromX __MINGW_NAME_AW(D3DXLoadMeshFromX)
+HRESULT WINAPI D3DXLoadMeshFromXInMemory(LPCVOID, DWORD, DWORD, LPDIRECT3DDEVICE9, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, DWORD *, LPD3DXMESH *);
+HRESULT WINAPI D3DXLoadMeshFromXResource(HMODULE, LPCSTR, LPCSTR, DWORD, LPDIRECT3DDEVICE9, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, DWORD *, LPD3DXMESH *);
+HRESULT WINAPI D3DXLoadMeshFromXof(LPD3DXFILEDATA, DWORD, LPDIRECT3DDEVICE9, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, DWORD *, LPD3DXMESH *);
+HRESULT WINAPI D3DXLoadPatchMeshFromXof(LPD3DXFILEDATA, DWORD, LPDIRECT3DDEVICE9, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, DWORD *, LPD3DXPATCHMESH *);
+HRESULT WINAPI D3DXLoadSkinMeshFromXof(LPD3DXFILEDATA, DWORD, LPDIRECT3DDEVICE9, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, DWORD *, LPD3DXSKININFO *, LPD3DXMESH *);
+HRESULT WINAPI D3DXLoadPRTBufferFromFileA(LPCSTR, LPD3DXPRTBUFFER *);
+HRESULT WINAPI D3DXLoadPRTBufferFromFileW(LPCWSTR, LPD3DXPRTBUFFER *);
+#define D3DXLoadPRTBufferFromFile __MINGW_NAME_AW(D3DXLoadPRTBufferFromFile)
+HRESULT WINAPI D3DXLoadPRTCompBufferFromFileA(LPCSTR, LPD3DXPRTCOMPBUFFER *);
+HRESULT WINAPI D3DXLoadPRTCompBufferFromFileW(LPCWSTR, LPD3DXPRTCOMPBUFFER *);
+#define D3DXLoadPRTCompBufferFromFile __MINGW_NAME_AW(D3DXLoadPRTCompBufferFromFile)
+HRESULT WINAPI D3DXSaveMeshToXA(LPCSTR, LPD3DXMESH, CONST DWORD *, CONST D3DXMATERIAL *, CONST D3DXEFFECTINSTANCE *, DWORD, DWORD);
+HRESULT WINAPI D3DXSaveMeshToXW(LPCWSTR, LPD3DXMESH, CONST DWORD *, CONST D3DXMATERIAL *, CONST D3DXEFFECTINSTANCE *, DWORD, DWORD);
+#define D3DXSaveMeshToX __MINGW_NAME_AW(D3DXSaveMeshToX)
+HRESULT WINAPI D3DXSavePRTBufferToFileA(LPCSTR, LPD3DXPRTBUFFER);
+HRESULT WINAPI D3DXSavePRTBufferToFileW(LPCWSTR, LPD3DXPRTBUFFER);
+#define D3DXSavePRTBufferToFile __MINGW_NAME_AW(D3DXSavePRTBufferToFile)
+HRESULT WINAPI D3DXSavePRTCompBufferToFileA(LPCSTR, LPD3DXPRTCOMPBUFFER);
+HRESULT WINAPI D3DXSavePRTCompBufferToFileW(LPCWSTR, LPD3DXPRTCOMPBUFFER);
+#define D3DXSavePRTCompBufferToFile __MINGW_NAME_AW(D3DXSavePRTCompBufferToFile)
 UINT    WINAPI D3DXGetDeclLength(const D3DVERTEXELEMENT9 *decl);
 UINT    WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_idx);
 UINT    WINAPI D3DXGetFVFVertexSize(DWORD);
 WINBOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *);
 WINBOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *,FLOAT,CONST D3DXVECTOR3 *,CONST D3DXVECTOR3 *);
+HRESULT WINAPI D3DXCleanMesh(D3DXCLEANTYPE, LPD3DXMESH, CONST DWORD *, LPD3DXMESH *, DWORD *, LPD3DXBUFFER *);
+HRESULT WINAPI D3DXConcatenateMeshes(LPD3DXMESH *, UINT, DWORD, CONST D3DXMATRIX *, CONST D3DXMATRIX *, CONST D3DVERTEXELEMENT9 *, LPDIRECT3DDEVICE9, LPD3DXMESH *);
 HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, D3DXVECTOR3 *);
 HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, FLOAT *);
+HRESULT WINAPI D3DXComputeIMTFromPerTexelSignal(LPD3DXMESH, DWORD, FLOAT *, UINT, UINT, UINT, UINT, DWORD, LPD3DXUVATLASCB, LPVOID, LPD3DXBUFFER *);
+HRESULT WINAPI D3DXComputeIMTFromPerVertexSignal(LPD3DXMESH, CONST FLOAT *, UINT, UINT, DWORD, LPD3DXUVATLASCB, LPVOID, LPD3DXBUFFER *);
+HRESULT WINAPI D3DXComputeIMTFromSignal(LPD3DXMESH, DWORD, UINT, FLOAT, DWORD, LPD3DXIMTSIGNALCALLBACK, VOID *, LPD3DXUVATLASCB, LPVOID, LPD3DXBUFFER *);
+HRESULT WINAPI D3DXComputeIMTFromTexture(LPD3DXMESH, LPDIRECT3DTEXTURE9, DWORD, DWORD, LPD3DXUVATLASCB, LPVOID, LPD3DXBUFFER *);
+HRESULT WINAPI D3DXComputeNormals(LPD3DXBASEMESH, CONST DWORD *);
+HRESULT WINAPI D3DXComputeTangentFrameEx(LPD3DXMESH, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, CONST DWORD *, FLOAT, FLOAT, FLOAT, LPD3DXMESH *, LPD3DXBUFFER *);
+HRESULT WINAPI D3DXComputeTangent(LPD3DXMESH, DWORD, DWORD, DWORD, DWORD, CONST DWORD *);
+HRESULT WINAPI D3DXConvertMeshSubsetToSingleStrip(LPD3DXBASEMESH, DWORD, DWORD, LPDIRECT3DINDEXBUFFER9 *, DWORD *);
+HRESULT WINAPI D3DXConvertMeshSubsetToStrips(LPD3DXBASEMESH, DWORD, DWORD, LPDIRECT3DINDEXBUFFER9, DWORD *, LPD3DXBUFFER *, DWORD *);
 HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD, D3DVERTEXELEMENT9[MAX_FVF_DECL_SIZE]);
 HRESULT WINAPI D3DXFVFFromDeclarator(const D3DVERTEXELEMENT9 *decl, DWORD *fvf);
+HRESULT WINAPI D3DXGenerateOutputDecl(D3DVERTEXELEMENT9 *, CONST D3DVERTEXELEMENT9 *);
+HRESULT WINAPI D3DXGeneratePMesh(LPD3DXMESH, CONST DWORD *, CONST D3DXATTRIBUTEWEIGHTS *, CONST FLOAT *, DWORD, DWORD, LPD3DXPMESH *);
+HRESULT WINAPI D3DXIntersect(LPD3DXBASEMESH, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, WINBOOL *, DWORD *, FLOAT *, FLOAT *, FLOAT *, LPD3DXBUFFER *, DWORD *);
+HRESULT WINAPI D3DXIntersectSubset(LPD3DXBASEMESH, DWORD, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, WINBOOL *, DWORD *, FLOAT *, FLOAT *, FLOAT *, LPD3DXBUFFER *, DWORD *);
 WINBOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *);
+HRESULT WINAPI D3DXOptimizeFaces(LPCVOID, UINT, UINT, WINBOOL, DWORD *);
+HRESULT WINAPI D3DXOptimizeVertices(LPCVOID, UINT, UINT, WINBOOL, DWORD *);
+HRESULT WINAPI D3DXRectPatchSize(CONST FLOAT *, DWORD *, DWORD *);
+HRESULT WINAPI D3DXSHPRTCompSuperCluster(UINT *, LPD3DXMESH, UINT, UINT, UINT *, UINT *);
+HRESULT WINAPI D3DXSHPRTCompSplitMeshSC(UINT *, UINT, UINT, UINT *, UINT, LPVOID, WINBOOL, UINT, LPD3DXBUFFER *, UINT *, WINBOOL, LPD3DXBUFFER *, LPD3DXBUFFER *, UINT *, UINT *, D3DXSHPRTSPLITMESHCLUSTERDATA *);
+HRESULT WINAPI D3DXSimplifyMesh(LPD3DXMESH, CONST DWORD *, CONST D3DXATTRIBUTEWEIGHTS, CONST FLOAT *, DWORD, DWORD, LPD3DXMESH *);
+HRESULT WINAPI D3DXSplitMesh(LPD3DXMESH, CONST DWORD *, CONST DWORD, CONST DWORD, DWORD *, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *);
+HRESULT WINAPI D3DXTesselateNPatches(LPD3DXMESH, CONST DWORD *, FLOAT, WINBOOL, LPD3DXMESH *, LPD3DXBUFFER *);
+HRESULT WINAPI D3DXTesselateRectPatch(LPDIRECT3DVERTEXBUFFER9, CONST FLOAT *, CONST D3DVERTEXELEMENT9 *, CONST D3DRECTPATCH_INFO *, LPD3DXMESH);
+HRESULT WINAPI D3DXTesselateTriPatch(LPDIRECT3DVERTEXBUFFER9, CONST FLOAT *, CONST D3DVERTEXELEMENT9 *, CONST D3DTRIPATCH_INFO *, LPD3DXMESH);
+HRESULT WINAPI D3DXTriPatchSize(CONST FLOAT *, DWORD *, DWORD *);
+HRESULT WINAPI D3DXUVAtlasCreate(LPD3DXMESH, UINT, FLOAT, UINT, UINT, FLOAT, DWORD, CONST DWORD *, CONST FLOAT *, LPD3DXUVATLASCB, FLOAT, LPVOID, DWORD, LPD3DXMESH *, LPD3DXBUFFER *, LPD3DXBUFFER *, FLOAT *, UINT *);
+HRESULT WINAPI D3DXUVAtlasPack(ID3DXMesh *, UINT, UINT, FLOAT, DWORD, CONST DWORD *, LPD3DXUVATLASCB, FLOAT, LPVOID, DWORD, LPD3DXBUFFER);
+HRESULT WINAPI D3DXUVAtlasPartition(LPD3DXMESH, UINT, FLOAT, DWORD, CONST DWORD *, CONST DWORD *, CONST FLOAT *, LPD3DXUVATLASCB, FLOAT, LPVOID, DWORD, LPD3DXMESH *, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, FLOAT *, UINT *);
+HRESULT WINAPI D3DXValidMesh(LPD3DXMESH, CONST DWORD *, LPD3DXBUFFER *);
+HRESULT WINAPI D3DXValidPatchMesh(LPD3DXPATCHMESH, DWORD *, DWORD *, LPD3DXBUFFER *);
+HRESULT WINAPI D3DXWeldVertices(LPD3DXMESH, DWORD, CONST D3DXWELDEPSILONS *, CONST DWORD *, DWORD *, DWORD *, LPD3DXBUFFER *);
 
 #ifdef __cplusplus
 }
 #endif
 
+DEFINE_GUID(DXFILEOBJ_XSkinMeshHeader,          0x3cf169ce, 0xff7c, 0x44ab, 0x93, 0xc0, 0xf7, 0x8f, 0x62, 0xd1, 0x72, 0xe2);
+DEFINE_GUID(DXFILEOBJ_VertexDuplicationIndices, 0xb8d65549, 0xd7c9, 0x4995, 0x89, 0xcf, 0x53, 0xa9, 0xa8, 0xb0, 0x31, 0xe3);
+DEFINE_GUID(DXFILEOBJ_FaceAdjacency,            0xa64c844a, 0xe282, 0x4756, 0x8b, 0x80, 0x25, 0x0c, 0xde, 0x04, 0x39, 0x8c);
+DEFINE_GUID(DXFILEOBJ_SkinWeights,              0x6f0d123b, 0xbad2, 0x4167, 0xa0, 0xd0, 0x80, 0x22, 0x4f, 0x25, 0xfa, 0xbb);
+DEFINE_GUID(DXFILEOBJ_Patch,                    0xa3eb5d44, 0xfc22, 0x429d, 0x9a, 0xfb, 0x32, 0x21, 0xcb, 0x97, 0x19, 0xa6);
+DEFINE_GUID(DXFILEOBJ_PatchMesh,                0xd02c95cc, 0xedba, 0x4305, 0x9b, 0x5d, 0x18, 0x20, 0xd7, 0x70, 0x4d, 0xbf);
+DEFINE_GUID(DXFILEOBJ_PatchMesh9,               0xb9ec94e1, 0xb9a6, 0x4251, 0xba, 0x18, 0x94, 0x89, 0x3f, 0x02, 0xc0, 0xea);
+DEFINE_GUID(DXFILEOBJ_PMInfo,                   0xb6c3e656, 0xec8b, 0x4b92, 0x9b, 0x62, 0x68, 0x16, 0x59, 0x52, 0x29, 0x47);
+DEFINE_GUID(DXFILEOBJ_PMAttributeRange,         0x917e0427, 0xc61e, 0x4a14, 0x9c, 0x64, 0xaf, 0xe6, 0x5f, 0x9e, 0x98, 0x44);
+DEFINE_GUID(DXFILEOBJ_PMVSplitRecord,           0x574ccc14, 0xf0b3, 0x4333, 0x82, 0x2d, 0x93, 0xe8, 0xa8, 0xa0, 0x8e, 0x4c);
+DEFINE_GUID(DXFILEOBJ_FVFData,                  0xb6e70a0e, 0x8ef9, 0x4e83, 0x94, 0xad, 0xec, 0xc8, 0xb0, 0xc0, 0x48, 0x97);
+DEFINE_GUID(DXFILEOBJ_VertexElement,            0xf752461c, 0x1e23, 0x48f6, 0xb9, 0xf8, 0x83, 0x50, 0x85, 0x0f, 0x33, 0x6f);
+DEFINE_GUID(DXFILEOBJ_DeclData,                 0xbf22e553, 0x292c, 0x4781, 0x9f, 0xea, 0x62, 0xbd, 0x55, 0x4b, 0xdd, 0x93);
+DEFINE_GUID(DXFILEOBJ_EffectFloats,             0xf1cfe2b3, 0x0de3, 0x4e28, 0xaf, 0xa1, 0x15, 0x5a, 0x75, 0x0a, 0x28, 0x2d);
+DEFINE_GUID(DXFILEOBJ_EffectString,             0xd55b097e, 0xbdb6, 0x4c52, 0xb0, 0x3d, 0x60, 0x51, 0xc8, 0x9d, 0x0e, 0x42);
+DEFINE_GUID(DXFILEOBJ_EffectDWord,              0x622c0ed0, 0x956e, 0x4da9, 0x90, 0x8a, 0x2a, 0xf9, 0x4f, 0x3c, 0xe7, 0x16);
+DEFINE_GUID(DXFILEOBJ_EffectParamFloats,        0x3014b9a0, 0x62f5, 0x478c, 0x9b, 0x86, 0xe4, 0xac, 0x9f, 0x4e, 0x41, 0x8b);
+DEFINE_GUID(DXFILEOBJ_EffectParamString,        0x1dbc4c88, 0x94c1, 0x46ee, 0x90, 0x76, 0x2c, 0x28, 0x81, 0x8c, 0x94, 0x81);
+DEFINE_GUID(DXFILEOBJ_EffectParamDWord,         0xe13963bc, 0xae51, 0x4c5d, 0xb0, 0x0f, 0xcf, 0xa3, 0xa9, 0xd9, 0x7c, 0xe5);
+DEFINE_GUID(DXFILEOBJ_EffectInstance,           0xe331f7e4, 0x0559, 0x4cc2, 0x8e, 0x99, 0x1c, 0xec, 0x16, 0x57, 0x92, 0x8f);
+DEFINE_GUID(DXFILEOBJ_AnimTicksPerSecond,       0x9e415a43, 0x7ba6, 0x4a73, 0x87, 0x43, 0xb7, 0x3d, 0x47, 0xe8, 0x84, 0x76);
+DEFINE_GUID(DXFILEOBJ_CompressedAnimationSet,   0x7f9b00b3, 0xf125, 0x4890, 0x87, 0x6e, 0x1c, 0x42, 0xbf, 0x69, 0x7c, 0x4d);
+
+#define XSKINEXP_TEMPLATES \
+        "xof 0303txt 0032\
+        template XSkinMeshHeader \
+        { \
+            <3CF169CE-FF7C-44ab-93C0-F78F62D172E2> \
+            WORD nMaxSkinWeightsPerVertex; \
+            WORD nMaxSkinWeightsPerFace; \
+            WORD nBones; \
+        } \
+        template VertexDuplicationIndices \
+        { \
+            <B8D65549-D7C9-4995-89CF-53A9A8B031E3> \
+            DWORD nIndices; \
+            DWORD nOriginalVertices; \
+            array DWORD indices[nIndices]; \
+        } \
+        template FaceAdjacency \
+        { \
+            <A64C844A-E282-4756-8B80-250CDE04398C> \
+            DWORD nIndices; \
+            array DWORD indices[nIndices]; \
+        } \
+        template SkinWeights \
+        { \
+            <6F0D123B-BAD2-4167-A0D0-80224F25FABB> \
+            STRING transformNodeName; \
+            DWORD nWeights; \
+            array DWORD vertexIndices[nWeights]; \
+            array float weights[nWeights]; \
+            Matrix4x4 matrixOffset; \
+        } \
+        template Patch \
+        { \
+            <A3EB5D44-FC22-429D-9AFB-3221CB9719A6> \
+            DWORD nControlIndices; \
+            array DWORD controlIndices[nControlIndices]; \
+        } \
+        template PatchMesh \
+        { \
+            <D02C95CC-EDBA-4305-9B5D-1820D7704BBF> \
+            DWORD nVertices; \
+            array Vector vertices[nVertices]; \
+            DWORD nPatches; \
+            array Patch patches[nPatches]; \
+            [ ... ] \
+        } \
+        template PatchMesh9 \
+        { \
+            <B9EC94E1-B9A6-4251-BA18-94893F02C0EA> \
+            DWORD Type; \
+            DWORD Degree; \
+            DWORD Basis; \
+            DWORD nVertices; \
+            array Vector vertices[nVertices]; \
+            DWORD nPatches; \
+            array Patch patches[nPatches]; \
+            [ ... ] \
+        } template EffectFloats \
+        { \
+            <F1CFE2B3-0DE3-4e28-AFA1-155A750A282D> \
+            DWORD nFloats; \
+            array float Floats[nFloats]; \
+        } \
+        template EffectString \
+        { \
+            <D55B097E-BDB6-4c52-B03D-6051C89D0E42> \
+            STRING Value; \
+        } \
+        template EffectDWord \
+        { \
+            <622C0ED0-956E-4da9-908A-2AF94F3CE716> \
+            DWORD Value; \
+        } template EffectParamFloats \
+        { \
+            <3014B9A0-62F5-478c-9B86-E4AC9F4E418B> \
+            STRING ParamName; \
+            DWORD nFloats; \
+            array float Floats[nFloats]; \
+        } template EffectParamString \
+        { \
+            <1DBC4C88-94C1-46ee-9076-2C28818C9481> \
+            STRING ParamName; \
+            STRING Value; \
+        } \
+        template EffectParamDWord \
+        { \
+            <E13963BC-AE51-4c5d-B00F-CFA3A9D97CE5> \
+            STRING ParamName; \
+            DWORD Value; \
+        } \
+        template EffectInstance \
+        { \
+            <E331F7E4-0559-4cc2-8E99-1CEC1657928F> \
+            STRING EffectFilename; \
+            [ ... ] \
+        } template AnimTicksPerSecond \
+        { \
+            <9E415A43-7BA6-4a73-8743-B73D47E88476> \
+            DWORD AnimTicksPerSecond; \
+        } \
+        template CompressedAnimationSet \
+        { \
+            <7F9B00B3-F125-4890-876E-1C42BF697C4D> \
+            DWORD CompressedBlockSize; \
+            FLOAT TicksPerSec; \
+            DWORD PlaybackType; \
+            DWORD BufferLength; \
+            array DWORD CompressedData[BufferLength]; \
+        } "
+
+#define XEXTENSIONS_TEMPLATES \
+        "xof 0303txt 0032\
+        template FVFData \
+        { \
+            <B6E70A0E-8EF9-4e83-94AD-ECC8B0C04897> \
+            DWORD dwFVF; \
+            DWORD nDWords; \
+            array DWORD data[nDWords]; \
+        } \
+        template VertexElement \
+        { \
+            <F752461C-1E23-48f6-B9F8-8350850F336F> \
+            DWORD Type; \
+            DWORD Method; \
+            DWORD Usage; \
+            DWORD UsageIndex; \
+        } \
+        template DeclData \
+        { \
+            <BF22E553-292C-4781-9FEA-62BD554BDD93> \
+            DWORD nElements; \
+            array VertexElement Elements[nElements]; \
+            DWORD nDWords; \
+            array DWORD data[nDWords]; \
+        } \
+        template PMAttributeRange \
+        { \
+            <917E0427-C61E-4a14-9C64-AFE65F9E9844> \
+            DWORD iFaceOffset; \
+            DWORD nFacesMin; \
+            DWORD nFacesMax; \
+            DWORD iVertexOffset; \
+            DWORD nVerticesMin; \
+            DWORD nVerticesMax; \
+        } \
+        template PMVSplitRecord \
+        { \
+            <574CCC14-F0B3-4333-822D-93E8A8A08E4C> \
+            DWORD iFaceCLW; \
+            DWORD iVlrOffset; \
+            DWORD iCode; \
+        } \
+        template PMInfo \
+        { \
+            <B6C3E656-EC8B-4b92-9B62-681659522947> \
+            DWORD nAttributes; \
+            array PMAttributeRange attributeRanges[nAttributes]; \
+            DWORD nMaxValence; \
+            DWORD nMinLogicalVertices; \
+            DWORD nMaxLogicalVertices; \
+            DWORD nVSplits; \
+            array PMVSplitRecord splitRecords[nVSplits]; \
+            DWORD nAttributeMispredicts; \
+            array DWORD attributeMispredicts[nAttributeMispredicts]; \
+        } "
+
 #endif /* __WINE_D3DX9MESH_H */
diff --git a/mingw-w64-headers/include/corerror.h b/mingw-w64-headers/include/corerror.h
index 10e0bd2..aef7f63 100644
--- a/mingw-w64-headers/include/corerror.h
+++ b/mingw-w64-headers/include/corerror.h
@@ -124,5 +124,6 @@
 #define CLDB_E_FILE_OLDVER              EMAKEHR(0x1107)
 
 #define CLR_E_SHIM_RUNTIME              EMAKEHR(0x1700)
+#define CLR_E_SHIM_RUNTIMEEXPORT        EMAKEHR(0x1701)
 
 #endif	/* __WINE_CORERROR_H */