[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690
The following commit has been merged in the wheezy branch:
commit d923dce84d7041724019b9ef384a3d9fc0f84571
Author: Henri Verbeet <hverbeet@codeweavers.com>
Date: Thu Apr 12 22:49:05 2012 +0200
include: Fix a couple of ID3DXSaveUserData prototypes.
(cherry picked from commit bdcc868ec473739076204e1fb6f3dec68af7a7bd)
diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h
index 142acba..1e31299 100644
--- a/include/d3dx9anim.h
+++ b/include/d3dx9anim.h
@@ -192,10 +192,10 @@ DECLARE_INTERFACE(ID3DXLoadUserData)
#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(AddFrameChildData)(const D3DXFRAME *frame,
+ ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *frame_data) PURE;
+ STDMETHOD(AddMeshChildData)(const D3DXMESHCONTAINER *mesh_container,
+ ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *mesh_data) PURE;
STDMETHOD(AddTopLevelDataObjectsPre)(LPD3DXFILESAVEOBJECT save_obj) PURE;
STDMETHOD(AddTopLevelDataObjectsPost)(LPD3DXFILESAVEOBJECT save_obj) PURE;
STDMETHOD(RegisterTemplates)(LPD3DXFILE xfile) PURE;
--
Debian Wine packaging
Reply to: