[PATCH 5/5] d3dx9: Avoid LPDIRECT3DTEXTURE9.
Henri Verbeet
hverbeet at codeweavers.com
Wed Oct 24 14:23:39 CDT 2012
---
dlls/d3dx9_36/texture.c | 147 +++++++++++-------------------------------
include/d3dx9core.h | 12 ++--
include/d3dx9mesh.h | 19 +++---
include/d3dx9tex.h | 162 ++++++++++++-----------------------------------
4 files changed, 96 insertions(+), 244 deletions(-)
diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
index 971a5c4..92540f2 100644
--- a/dlls/d3dx9_36/texture.c
+++ b/dlls/d3dx9_36/texture.c
@@ -508,46 +508,27 @@ HRESULT WINAPI D3DXCheckVolumeTextureRequirements(LPDIRECT3DDEVICE9 device,
return hr;
}
-HRESULT WINAPI D3DXCreateTexture(LPDIRECT3DDEVICE9 pDevice,
- UINT width,
- UINT height,
- UINT miplevels,
- DWORD usage,
- D3DFORMAT format,
- D3DPOOL pool,
- LPDIRECT3DTEXTURE9 *ppTexture)
+HRESULT WINAPI D3DXCreateTexture(struct IDirect3DDevice9 *device, UINT width, UINT height,
+ UINT miplevels, DWORD usage, D3DFORMAT format, D3DPOOL pool, struct IDirect3DTexture9 **texture)
{
HRESULT hr;
- TRACE("(%p, %u, %u, %u, %x, %x, %x, %p)\n", pDevice, width, height, miplevels, usage, format,
- pool, ppTexture);
+ TRACE("device %p, width %u, height %u, miplevels %u, usage %#x, format %#x, pool %#x, texture %p.\n",
+ device, width, height, miplevels, usage, format, pool, texture);
- if (!pDevice || !ppTexture)
+ if (!device || !texture)
return D3DERR_INVALIDCALL;
- hr = D3DXCheckTextureRequirements(pDevice, &width, &height, &miplevels, usage, &format, pool);
-
- if (FAILED(hr))
+ if (FAILED(hr = D3DXCheckTextureRequirements(device, &width, &height, &miplevels, usage, &format, pool)))
return hr;
- return IDirect3DDevice9_CreateTexture(pDevice, width, height, miplevels, usage, format, pool, ppTexture, NULL);
+ return IDirect3DDevice9_CreateTexture(device, width, height, miplevels, usage, format, pool, texture, NULL);
}
-HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device,
- LPCVOID srcdata,
- UINT srcdatasize,
- UINT width,
- UINT height,
- UINT miplevels,
- DWORD usage,
- D3DFORMAT format,
- D3DPOOL pool,
- DWORD filter,
- DWORD mipfilter,
- D3DCOLOR colorkey,
- D3DXIMAGE_INFO* srcinfo,
- PALETTEENTRY* palette,
- LPDIRECT3DTEXTURE9* texture)
+HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *device, const void *srcdata,
+ UINT srcdatasize, UINT width, UINT height, UINT miplevels, DWORD usage, D3DFORMAT format,
+ D3DPOOL pool, DWORD filter, DWORD mipfilter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo,
+ PALETTEENTRY *palette, struct IDirect3DTexture9 **texture)
{
IDirect3DTexture9 **texptr;
IDirect3DTexture9 *buftex;
@@ -711,10 +692,8 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device,
return D3D_OK;
}
-HRESULT WINAPI D3DXCreateTextureFromFileInMemory(LPDIRECT3DDEVICE9 device,
- LPCVOID srcdata,
- UINT srcdatasize,
- LPDIRECT3DTEXTURE9 *texture)
+HRESULT WINAPI D3DXCreateTextureFromFileInMemory(struct IDirect3DDevice9 *device,
+ const void *srcdata, UINT srcdatasize, struct IDirect3DTexture9 **texture)
{
TRACE("(%p, %p, %d, %p)\n", device, srcdata, srcdatasize, texture);
@@ -722,20 +701,10 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemory(LPDIRECT3DDEVICE9 device,
D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, texture);
}
-HRESULT WINAPI D3DXCreateTextureFromFileExW(LPDIRECT3DDEVICE9 device,
- LPCWSTR srcfile,
- UINT width,
- UINT height,
- UINT miplevels,
- DWORD usage,
- D3DFORMAT format,
- D3DPOOL pool,
- DWORD filter,
- DWORD mipfilter,
- D3DCOLOR colorkey,
- D3DXIMAGE_INFO *srcinfo,
- PALETTEENTRY *palette,
- LPDIRECT3DTEXTURE9 *texture)
+HRESULT WINAPI D3DXCreateTextureFromFileExW(struct IDirect3DDevice9 *device, const WCHAR *srcfile,
+ UINT width, UINT height, UINT miplevels, DWORD usage, D3DFORMAT format,
+ D3DPOOL pool, DWORD filter, DWORD mipfilter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo,
+ PALETTEENTRY *palette, struct IDirect3DTexture9 **texture)
{
HRESULT hr;
DWORD size;
@@ -760,20 +729,10 @@ HRESULT WINAPI D3DXCreateTextureFromFileExW(LPDIRECT3DDEVICE9 device,
return hr;
}
-HRESULT WINAPI D3DXCreateTextureFromFileExA(LPDIRECT3DDEVICE9 device,
- LPCSTR srcfile,
- UINT width,
- UINT height,
- UINT miplevels,
- DWORD usage,
- D3DFORMAT format,
- D3DPOOL pool,
- DWORD filter,
- DWORD mipfilter,
- D3DCOLOR colorkey,
- D3DXIMAGE_INFO *srcinfo,
- PALETTEENTRY *palette,
- LPDIRECT3DTEXTURE9 *texture)
+HRESULT WINAPI D3DXCreateTextureFromFileExA(struct IDirect3DDevice9 *device, const char *srcfile,
+ UINT width, UINT height, UINT miplevels, DWORD usage, D3DFORMAT format,
+ D3DPOOL pool, DWORD filter, DWORD mipfilter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo,
+ PALETTEENTRY *palette, struct IDirect3DTexture9 **texture)
{
LPWSTR widename;
HRESULT hr;
@@ -798,9 +757,8 @@ HRESULT WINAPI D3DXCreateTextureFromFileExA(LPDIRECT3DDEVICE9 device,
return hr;
}
-HRESULT WINAPI D3DXCreateTextureFromFileA(LPDIRECT3DDEVICE9 device,
- LPCSTR srcfile,
- LPDIRECT3DTEXTURE9 *texture)
+HRESULT WINAPI D3DXCreateTextureFromFileA(struct IDirect3DDevice9 *device,
+ const char *srcfile, struct IDirect3DTexture9 **texture)
{
TRACE("(%p, %s, %p)\n", device, debugstr_a(srcfile), texture);
@@ -808,9 +766,8 @@ HRESULT WINAPI D3DXCreateTextureFromFileA(LPDIRECT3DDEVICE9 device,
D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, texture);
}
-HRESULT WINAPI D3DXCreateTextureFromFileW(LPDIRECT3DDEVICE9 device,
- LPCWSTR srcfile,
- LPDIRECT3DTEXTURE9 *texture)
+HRESULT WINAPI D3DXCreateTextureFromFileW(struct IDirect3DDevice9 *device,
+ const WCHAR *srcfile, struct IDirect3DTexture9 **texture)
{
TRACE("(%p, %s, %p)\n", device, debugstr_w(srcfile), texture);
@@ -819,10 +776,8 @@ HRESULT WINAPI D3DXCreateTextureFromFileW(LPDIRECT3DDEVICE9 device,
}
-HRESULT WINAPI D3DXCreateTextureFromResourceA(LPDIRECT3DDEVICE9 device,
- HMODULE srcmodule,
- LPCSTR resource,
- LPDIRECT3DTEXTURE9 *texture)
+HRESULT WINAPI D3DXCreateTextureFromResourceA(struct IDirect3DDevice9 *device,
+ HMODULE srcmodule, const char *resource, struct IDirect3DTexture9 **texture)
{
TRACE("(%p, %s): relay\n", srcmodule, debugstr_a(resource));
@@ -830,10 +785,8 @@ HRESULT WINAPI D3DXCreateTextureFromResourceA(LPDIRECT3DDEVICE9 device,
D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, texture);
}
-HRESULT WINAPI D3DXCreateTextureFromResourceW(LPDIRECT3DDEVICE9 device,
- HMODULE srcmodule,
- LPCWSTR resource,
- LPDIRECT3DTEXTURE9 *texture)
+HRESULT WINAPI D3DXCreateTextureFromResourceW(struct IDirect3DDevice9 *device,
+ HMODULE srcmodule, const WCHAR *resource, struct IDirect3DTexture9 **texture)
{
TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(resource));
@@ -841,21 +794,10 @@ HRESULT WINAPI D3DXCreateTextureFromResourceW(LPDIRECT3DDEVICE9 device,
D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, texture);
}
-HRESULT WINAPI D3DXCreateTextureFromResourceExA(LPDIRECT3DDEVICE9 device,
- HMODULE srcmodule,
- LPCSTR resource,
- UINT width,
- UINT height,
- UINT miplevels,
- DWORD usage,
- D3DFORMAT format,
- D3DPOOL pool,
- DWORD filter,
- DWORD mipfilter,
- D3DCOLOR colorkey,
- D3DXIMAGE_INFO *srcinfo,
- PALETTEENTRY *palette,
- LPDIRECT3DTEXTURE9 *texture)
+HRESULT WINAPI D3DXCreateTextureFromResourceExA(struct IDirect3DDevice9 *device, HMODULE srcmodule,
+ const char *resource, UINT width, UINT height, UINT miplevels, DWORD usage, D3DFORMAT format,
+ D3DPOOL pool, DWORD filter, DWORD mipfilter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo,
+ PALETTEENTRY *palette, struct IDirect3DTexture9 **texture)
{
HRSRC resinfo;
@@ -895,21 +837,10 @@ HRESULT WINAPI D3DXCreateTextureFromResourceExA(LPDIRECT3DDEVICE9 device,
return D3DXERR_INVALIDDATA;
}
-HRESULT WINAPI D3DXCreateTextureFromResourceExW(LPDIRECT3DDEVICE9 device,
- HMODULE srcmodule,
- LPCWSTR resource,
- UINT width,
- UINT height,
- UINT miplevels,
- DWORD usage,
- D3DFORMAT format,
- D3DPOOL pool,
- DWORD filter,
- DWORD mipfilter,
- D3DCOLOR colorkey,
- D3DXIMAGE_INFO *srcinfo,
- PALETTEENTRY *palette,
- LPDIRECT3DTEXTURE9 *texture)
+HRESULT WINAPI D3DXCreateTextureFromResourceExW(struct IDirect3DDevice9 *device, HMODULE srcmodule,
+ const WCHAR *resource, UINT width, UINT height, UINT miplevels, DWORD usage, D3DFORMAT format,
+ D3DPOOL pool, DWORD filter, DWORD mipfilter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo,
+ PALETTEENTRY *palette, struct IDirect3DTexture9 **texture)
{
HRSRC resinfo;
@@ -1304,9 +1235,7 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic
return D3D_OK;
}
-HRESULT WINAPI D3DXFillTexture(LPDIRECT3DTEXTURE9 texture,
- LPD3DXFILL2D function,
- LPVOID funcdata)
+HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D function, void *funcdata)
{
DWORD miplevels;
DWORD m, i, x, y, c, v;
diff --git a/include/d3dx9core.h b/include/d3dx9core.h
index c78d718..909d81e 100644
--- a/include/d3dx9core.h
+++ b/include/d3dx9core.h
@@ -138,7 +138,8 @@ DECLARE_INTERFACE_(ID3DXFont, IUnknown)
STDMETHOD_(BOOL, GetTextMetricsW)(THIS_ TEXTMETRICW *metrics) PURE;
STDMETHOD_(HDC, GetDC)(THIS) PURE;
- STDMETHOD(GetGlyphData)(THIS_ UINT glyph, LPDIRECT3DTEXTURE9 *texture, RECT *blackbox, POINT *cellinc) PURE;
+ STDMETHOD(GetGlyphData)(THIS_ UINT glyph, struct IDirect3DTexture9 **texture,
+ RECT *blackbox, POINT *cellinc) PURE;
STDMETHOD(PreloadCharacters)(THIS_ UINT first, UINT last) PURE;
STDMETHOD(PreloadGlyphs)(THIS_ UINT first, UINT last) PURE;
@@ -304,9 +305,9 @@ DECLARE_INTERFACE_(ID3DXRenderToEnvMap, IUnknown)
STDMETHOD(GetDesc)(THIS_ D3DXRTE_DESC *desc) PURE;
STDMETHOD(BeginCube)(THIS_ struct IDirect3DCubeTexture9 *cubetex) PURE;
- STDMETHOD(BeginSphere)(THIS_ LPDIRECT3DTEXTURE9 tex) PURE;
- STDMETHOD(BeginHemisphere)(THIS_ LPDIRECT3DTEXTURE9 texzpos, LPDIRECT3DTEXTURE9 texzneg) PURE;
- STDMETHOD(BeginParabolic)(THIS_ LPDIRECT3DTEXTURE9 texzpos, LPDIRECT3DTEXTURE9 texzneg) PURE;
+ STDMETHOD(BeginSphere)(THIS_ struct IDirect3DTexture9 *tex) PURE;
+ STDMETHOD(BeginHemisphere)(THIS_ struct IDirect3DTexture9 *texzpos, struct IDirect3DTexture9 *texzneg) PURE;
+ STDMETHOD(BeginParabolic)(THIS_ struct IDirect3DTexture9 *texzpos, struct IDirect3DTexture9 *texzneg) PURE;
STDMETHOD(Face)(THIS_ D3DCUBEMAP_FACES face, DWORD mipfilter) PURE;
STDMETHOD(End)(THIS_ DWORD mipfilter) PURE;
@@ -420,7 +421,8 @@ DECLARE_INTERFACE_(ID3DXSprite, IUnknown)
STDMETHOD(SetWorldViewLH)(THIS_ CONST D3DXMATRIX *world, CONST D3DXMATRIX *view) PURE;
STDMETHOD(Begin)(THIS_ DWORD flags) PURE;
- STDMETHOD(Draw)(THIS_ LPDIRECT3DTEXTURE9 texture, CONST RECT *rect, CONST D3DXVECTOR3 *center, CONST D3DXVECTOR3 *position, D3DCOLOR color) PURE;
+ STDMETHOD(Draw)(THIS_ struct IDirect3DTexture9 *texture, const RECT *rect,
+ const D3DXVECTOR3 *center, const D3DXVECTOR3 *position, D3DCOLOR color) PURE;
STDMETHOD(Flush)(THIS) PURE;
STDMETHOD(End)(THIS) PURE;
diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h
index 975c34e..71812a9 100644
--- a/include/d3dx9mesh.h
+++ b/include/d3dx9mesh.h
@@ -558,7 +558,7 @@ DECLARE_INTERFACE_(ID3DXPRTBuffer, IUnknown)
STDMETHOD(ReleaseGH)(THIS) PURE;
STDMETHOD(EvalGH)(THIS) PURE;
STDMETHOD(ExtractTexture)(THIS_ UINT channel, UINT start_coefficient,
- UINT num_coefficients, LPDIRECT3DTEXTURE9 texture) PURE;
+ UINT num_coefficients, struct IDirect3DTexture9 *texture) PURE;
STDMETHOD(ExtractToMesh)(THIS_ UINT num_coefficients, D3DDECLUSAGE usage,
UINT usage_index_start, LPD3DXMESH scene) PURE;
};
@@ -584,7 +584,7 @@ DECLARE_INTERFACE_(ID3DXPRTCompBuffer, IUnknown)
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(ExtractTexture)(THIS_ UINT start_pca, UINT num_pca, struct IDirect3DTexture9 *texture) PURE;
STDMETHOD(ExtractToMesh)(THIS_ UINT num_pca, D3DDECLUSAGE usage, UINT usage_index_start, LPD3DXMESH scene) PURE;
};
#undef INTERFACE
@@ -601,10 +601,10 @@ DECLARE_INTERFACE_(ID3DXTextureGutterHelper, IUnknown)
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(ApplyGuttersTex)(THIS_ struct IDirect3DTexture9 *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(ResampleTex)(THIS_ struct IDirect3DTexture9 *texture_in, struct ID3DXMesh *mesh_in,
+ D3DDECLUSAGE usage, UINT usage_index, struct IDirect3DTexture9 *texture_out) PURE;
STDMETHOD(GetFaceMap)(THIS_ UINT *face_data) PURE;
STDMETHOD(GetBaryMap)(THIS_ D3DXVECTOR2 *bary_data) PURE;
STDMETHOD(GetTexelMap)(THIS_ D3DXVECTOR2 *texel_data) PURE;
@@ -627,10 +627,10 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
STDMETHOD(SetMeshMaterials)(THIS_ CONST D3DXSHMATERIAL **materials, UINT num_meshes,
UINT num_channels, BOOL 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(SetPerTexelAlbedo)(THIS_ struct IDirect3DTexture9 *albedo_texture,
+ UINT num_channels, struct ID3DXTextureGutterHelper *gh) PURE;
STDMETHOD(GetVertexAlbedo)(THIS_ D3DXCOLOR *vert_colors, UINT num_verts) PURE;
- STDMETHOD(SetPerTexelNormals)(THIS_ LPDIRECT3DTEXTURE9 normal_texture) PURE;
+ STDMETHOD(SetPerTexelNormals)(THIS_ struct IDirect3DTexture9 *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,
@@ -729,7 +729,8 @@ HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DX
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 D3DXComputeIMTFromTexture(struct ID3DXMesh *mesh, struct IDirect3DTexture9 *texture,
+ DWORD texture_idx, DWORD options, LPD3DXUVATLASCB cb, void *ctx, struct ID3DXBuffer **out);
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 *);
diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h
index f7f5650..b56db5a 100644
--- a/include/d3dx9tex.h
+++ b/include/d3dx9tex.h
@@ -298,27 +298,18 @@ HRESULT WINAPI D3DXCheckVolumeTextureRequirements(LPDIRECT3DDEVICE9 device,
D3DFORMAT *format,
D3DPOOL pool);
-HRESULT WINAPI D3DXCreateTexture( LPDIRECT3DDEVICE9 device,
- UINT width,
- UINT height,
- UINT miplevels,
- DWORD usage,
- D3DFORMAT format,
- D3DPOOL pool,
- LPDIRECT3DTEXTURE9 *texture);
+HRESULT WINAPI D3DXCreateTexture(struct IDirect3DDevice9 *device, UINT width, UINT height,
+ UINT miplevels, DWORD usage, D3DFORMAT format, D3DPOOL pool, struct IDirect3DTexture9 **texture);
HRESULT WINAPI D3DXCreateCubeTexture(struct IDirect3DDevice9 *device, UINT size,
UINT miplevels, DWORD usage, D3DFORMAT format, D3DPOOL pool, struct IDirect3DCubeTexture9 **cube);
HRESULT WINAPI D3DXCreateVolumeTexture(struct IDirect3DDevice9 *device, UINT width, UINT height, UINT depth,
UINT miplevels, DWORD usage, D3DFORMAT format, D3DPOOL pool, struct IDirect3DVolumeTexture9 **volume);
-HRESULT WINAPI D3DXCreateTextureFromFileA( LPDIRECT3DDEVICE9 device,
- LPCSTR srcfile,
- LPDIRECT3DTEXTURE9 *texture);
-
-HRESULT WINAPI D3DXCreateTextureFromFileW( LPDIRECT3DDEVICE9 device,
- LPCWSTR srcfile,
- LPDIRECT3DTEXTURE9 *texture);
-#define D3DXCreateTextureFromFile WINELIB_NAME_AW(D3DXCreateTextureFromFile)
+HRESULT WINAPI D3DXCreateTextureFromFileA(struct IDirect3DDevice9 *device,
+ const char *srcfile, struct IDirect3DTexture9 **texture);
+HRESULT WINAPI D3DXCreateTextureFromFileW(struct IDirect3DDevice9 *device,
+ const WCHAR *srcfile, struct IDirect3DTexture9 **texture);
+#define D3DXCreateTextureFromFile WINELIB_NAME_AW(D3DXCreateTextureFromFile)
HRESULT WINAPI D3DXCreateCubeTextureFromFileA(struct IDirect3DDevice9 *device,
const char *srcfile, struct IDirect3DCubeTexture9 **cube);
@@ -332,16 +323,11 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileW(struct IDirect3DDevice9 *device,
const WCHAR *srcfile, struct IDirect3DVolumeTexture9 **volume);
#define D3DXCreateVolumeTextureFromFile WINELIB_NAME_AW(D3DXCreateVolumeTextureFromFile)
-HRESULT WINAPI D3DXCreateTextureFromResourceA( LPDIRECT3DDEVICE9 device,
- HMODULE srcmodule,
- LPCSTR resource,
- LPDIRECT3DTEXTURE9 *texture);
-
-HRESULT WINAPI D3DXCreateTextureFromResourceW( LPDIRECT3DDEVICE9 device,
- HMODULE srcmodule,
- LPCWSTR resource,
- LPDIRECT3DTEXTURE9 *texture);
-#define D3DXCreateTextureFromResource WINELIB_NAME_AW(D3DXCreateTextureFromResource)
+HRESULT WINAPI D3DXCreateTextureFromResourceA(struct IDirect3DDevice9 *device,
+ HMODULE srcmodule, const char *resource, struct IDirect3DTexture9 **texture);
+HRESULT WINAPI D3DXCreateTextureFromResourceW(struct IDirect3DDevice9 *device,
+ HMODULE srcmodule, const WCHAR *resource, struct IDirect3DTexture9 **texture);
+#define D3DXCreateTextureFromResource WINELIB_NAME_AW(D3DXCreateTextureFromResource)
HRESULT WINAPI D3DXCreateCubeTextureFromResourceA(struct IDirect3DDevice9 *device,
HMODULE srcmodule, const char *resource, struct IDirect3DCubeTexture9 **cube);
@@ -355,36 +341,15 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromResourceW(struct IDirect3DDevice9 *dev
HMODULE srcmodule, const WCHAR *resource, struct IDirect3DVolumeTexture9 **volume);
#define D3DXCreateVolumeTextureFromResource WINELIB_NAME_AW(D3DXCreateVolumeTextureFromResource)
-HRESULT WINAPI D3DXCreateTextureFromFileExA( LPDIRECT3DDEVICE9 device,
- LPCSTR srcfile,
- UINT width,
- UINT height,
- UINT miplevels,
- DWORD usage,
- D3DFORMAT format,
- D3DPOOL pool,
- DWORD filter,
- DWORD mipfilter,
- D3DCOLOR colorkey,
- D3DXIMAGE_INFO *srcinfo,
- PALETTEENTRY *palette,
- LPDIRECT3DTEXTURE9 *texture);
-
-HRESULT WINAPI D3DXCreateTextureFromFileExW( LPDIRECT3DDEVICE9 device,
- LPCWSTR srcfile,
- UINT width,
- UINT height,
- UINT miplevels,
- DWORD usage,
- D3DFORMAT format,
- D3DPOOL pool,
- DWORD filter,
- DWORD mipfilter,
- D3DCOLOR colorkey,
- D3DXIMAGE_INFO *srcinfo,
- PALETTEENTRY *palette,
- LPDIRECT3DTEXTURE9 *texture);
-#define D3DXCreateTextureFromFileEx WINELIB_NAME_AW(D3DXCreateTextureFromFileEx)
+HRESULT WINAPI D3DXCreateTextureFromFileExA(struct IDirect3DDevice9 *device, const char *srcfile,
+ UINT width, UINT height, UINT miplevels, DWORD usage, D3DFORMAT format,
+ D3DPOOL pool, DWORD filter, DWORD mipfilter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo,
+ PALETTEENTRY *palette, struct IDirect3DTexture9 **texture);
+HRESULT WINAPI D3DXCreateTextureFromFileExW(struct IDirect3DDevice9 *device, const WCHAR *srcfile,
+ UINT width, UINT height, UINT miplevels, DWORD usage, D3DFORMAT format,
+ D3DPOOL pool, DWORD filter, DWORD mipfilter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo,
+ PALETTEENTRY *palette, struct IDirect3DTexture9 **texture);
+#define D3DXCreateTextureFromFileEx WINELIB_NAME_AW(D3DXCreateTextureFromFileEx)
HRESULT WINAPI D3DXCreateCubeTextureFromFileExA(struct IDirect3DDevice9 *device, const char *srcfile,
UINT size, UINT miplevels, DWORD usage, D3DFORMAT format,
@@ -406,38 +371,15 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileExW(struct IDirect3DDevice9 *devic
PALETTEENTRY *palette, struct IDirect3DVolumeTexture9 **volume);
#define D3DXCreateVolumeTextureFromFileEx WINELIB_NAME_AW(D3DXCreateVolumeTextureFromFileEx)
-HRESULT WINAPI D3DXCreateTextureFromResourceExA( LPDIRECT3DDEVICE9 device,
- HMODULE srcmodule,
- LPCSTR resource,
- UINT width,
- UINT height,
- UINT miplevels,
- DWORD usage,
- D3DFORMAT format,
- D3DPOOL pool,
- DWORD filter,
- DWORD mipfilter,
- D3DCOLOR colorkey,
- D3DXIMAGE_INFO *srcinfo,
- PALETTEENTRY *palette,
- LPDIRECT3DTEXTURE9 *texture);
-
-HRESULT WINAPI D3DXCreateTextureFromResourceExW( LPDIRECT3DDEVICE9 device,
- HMODULE srcmodule,
- LPCWSTR resource,
- UINT width,
- UINT height,
- UINT miplevels,
- DWORD usage,
- D3DFORMAT format,
- D3DPOOL pool,
- DWORD filter,
- DWORD mipfilter,
- D3DCOLOR colorkey,
- D3DXIMAGE_INFO *srcinfo,
- PALETTEENTRY *palette,
- LPDIRECT3DTEXTURE9 *texture);
-#define D3DXCreateTextureFromResourceEx WINELIB_NAME_AW(D3DXCreateTextureFromResourceEx)
+HRESULT WINAPI D3DXCreateTextureFromResourceExA(struct IDirect3DDevice9 *device, HMODULE srcmodule,
+ const char *resource, UINT width, UINT height, UINT miplevels, DWORD usage, D3DFORMAT format,
+ D3DPOOL pool, DWORD filter, DWORD mipfilter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo,
+ PALETTEENTRY *palette, struct IDirect3DTexture9 **texture);
+HRESULT WINAPI D3DXCreateTextureFromResourceExW(struct IDirect3DDevice9 *device, HMODULE srcmodule,
+ const WCHAR *resource, UINT width, UINT height, UINT miplevels, DWORD usage, D3DFORMAT format,
+ D3DPOOL pool, DWORD filter, DWORD mipfilter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo,
+ PALETTEENTRY *palette, struct IDirect3DTexture9 **texture);
+#define D3DXCreateTextureFromResourceEx WINELIB_NAME_AW(D3DXCreateTextureFromResourceEx)
HRESULT WINAPI D3DXCreateCubeTextureFromResourceExA(struct IDirect3DDevice9 *device, HMODULE srcmodule,
const char *resource, UINT size, UINT miplevels, DWORD usage, D3DFORMAT format,
@@ -459,30 +401,17 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromResourceExW(struct IDirect3DDevice9 *d
PALETTEENTRY *palette, struct IDirect3DVolumeTexture9 **volume);
#define D3DXCreateVolumeTextureFromResourceEx WINELIB_NAME_AW(D3DXCreateVolumeTextureFromResourceEx)
-HRESULT WINAPI D3DXCreateTextureFromFileInMemory( LPDIRECT3DDEVICE9 device,
- LPCVOID srcdata,
- UINT srcdatasize,
- LPDIRECT3DTEXTURE9* texture);
+HRESULT WINAPI D3DXCreateTextureFromFileInMemory(struct IDirect3DDevice9 *device,
+ const void *srcdata, UINT srcdatasize, struct IDirect3DTexture9 **texture);
HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemory(struct IDirect3DDevice9 *device,
const void *srcdata, UINT srcdatasize, struct IDirect3DCubeTexture9 **cube);
HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemory(struct IDirect3DDevice9 *device,
const void *srcdata, UINT srcdatasize, struct IDirect3DVolumeTexture9 **volume);
-HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx( LPDIRECT3DDEVICE9 device,
- LPCVOID srcdata,
- UINT srcdatasize,
- UINT width,
- UINT height,
- UINT miplevels,
- DWORD usage,
- D3DFORMAT format,
- D3DPOOL pool,
- DWORD filter,
- DWORD mipfilter,
- D3DCOLOR colorkey,
- D3DXIMAGE_INFO *srcinfo,
- PALETTEENTRY *palette,
- LPDIRECT3DTEXTURE9 *texture);
+HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *device, const void *srcdata,
+ UINT srcdatasize, UINT width, UINT height, UINT miplevels, DWORD usage, D3DFORMAT format,
+ D3DPOOL pool, DWORD filter, DWORD mipfilter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo,
+ PALETTEENTRY *palette, struct IDirect3DTexture9 **texture);
HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(struct IDirect3DDevice9 *device, const void *srcdata,
UINT srcdatasize, UINT size, UINT miplevels, DWORD usage, D3DFORMAT format,
D3DPOOL pool, DWORD filter, DWORD mipfilter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo,
@@ -516,28 +445,19 @@ HRESULT WINAPI D3DXFilterTexture( LPDIRECT3DBASETEXTURE9 texture,
#define D3DXFilterCubeTexture D3DXFilterTexture
#define D3DXFilterVolumeTexture D3DXFilterTexture
-HRESULT WINAPI D3DXFillTexture( LPDIRECT3DTEXTURE9 texture,
- LPD3DXFILL2D function,
- LPVOID data);
+HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D function, void *data);
HRESULT WINAPI D3DXFillCubeTexture(struct IDirect3DCubeTexture9 *cube, LPD3DXFILL3D function, void *data);
HRESULT WINAPI D3DXFillVolumeTexture(struct IDirect3DVolumeTexture9 *volume, LPD3DXFILL3D function, void *data);
-HRESULT WINAPI D3DXFillTextureTX( LPDIRECT3DTEXTURE9 texture,
- CONST DWORD *function,
- CONST D3DXVECTOR4 *constants,
- UINT numconstants);
+HRESULT WINAPI D3DXFillTextureTX(struct IDirect3DTexture9 *texture, const DWORD *function,
+ const D3DXVECTOR4 *constants, UINT numconstants);
HRESULT WINAPI D3DXFillCubeTextureTX(struct IDirect3DCubeTexture9 *cube, const DWORD *function,
const D3DXVECTOR4 *constants, UINT numconstants);
HRESULT WINAPI D3DXFillVolumeTextureTX(struct IDirect3DVolumeTexture9 *volume, const DWORD *function,
const D3DXVECTOR4 *constants, UINT numconstants);
-HRESULT WINAPI D3DXComputeNormalMap( LPDIRECT3DTEXTURE9 texture,
- LPDIRECT3DTEXTURE9 srctexture,
- CONST PALETTEENTRY *srcpalette,
- DWORD flags,
- DWORD channel,
- FLOAT amplitude);
-
+HRESULT WINAPI D3DXComputeNormalMap(IDirect3DTexture9 *texture, IDirect3DTexture9 *srctexture,
+ const PALETTEENTRY *srcpalette, DWORD flags, DWORD channel, float amplitude);
#ifdef __cplusplus
}
--
1.7.8.6
More information about the wine-patches
mailing list