From: José Fonseca Date: Wed, 28 Sep 2011 07:23:29 +0000 (+0100) Subject: Elminate dead WrapPointer function. X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=0bbc2873535169bd6ddcda0f6c929e37ad455669;p=apitrace Elminate dead WrapPointer function. --- diff --git a/specs/d3d.py b/specs/d3d.py index 857e5b3..44422e6 100644 --- a/specs/d3d.py +++ b/specs/d3d.py @@ -155,31 +155,31 @@ IDirect3DViewport3 = Interface("IDirect3DViewport3", IDirect3DViewport2) IDirect3DVertexBuffer = Interface("IDirect3DVertexBuffer", IUnknown) IDirect3DVertexBuffer7 = Interface("IDirect3DVertexBuffer7", IUnknown) -LPUNKNOWN = WrapPointer(IUnknown) - -LPDIRECT3D = WrapPointer(IDirect3D) -LPDIRECT3DDEVICE = WrapPointer(IDirect3DDevice) -LPDIRECT3DEXECUTEBUFFER = WrapPointer(IDirect3DExecuteBuffer) -LPDIRECT3DLIGHT = WrapPointer(IDirect3DLight) -LPDIRECT3DMATERIAL = WrapPointer(IDirect3DMaterial) -LPDIRECT3DTEXTURE = WrapPointer(IDirect3DTexture) -LPDIRECT3DVIEWPORT = WrapPointer(IDirect3DViewport) - -LPDIRECT3D2 = WrapPointer(IDirect3D2) -LPDIRECT3DDEVICE2 = WrapPointer(IDirect3DDevice2) -LPDIRECT3DMATERIAL2 = WrapPointer(IDirect3DMaterial2) -LPDIRECT3DTEXTURE2 = WrapPointer(IDirect3DTexture2) -LPDIRECT3DVIEWPORT2 = WrapPointer(IDirect3DViewport2) - -LPDIRECT3D3 = WrapPointer(IDirect3D3) -LPDIRECT3DDEVICE3 = WrapPointer(IDirect3DDevice3) -LPDIRECT3DMATERIAL3 = WrapPointer(IDirect3DMaterial3) -LPDIRECT3DVIEWPORT3 = WrapPointer(IDirect3DViewport3) -LPDIRECT3DVERTEXBUFFER = WrapPointer(IDirect3DVertexBuffer) - -LPDIRECT3D7 = WrapPointer(IDirect3D7) -LPDIRECT3DDEVICE7 = WrapPointer(IDirect3DDevice7) -LPDIRECT3DVERTEXBUFFER7 = WrapPointer(IDirect3DVertexBuffer7) +LPUNKNOWN = Pointer(IUnknown) + +LPDIRECT3D = Pointer(IDirect3D) +LPDIRECT3DDEVICE = Pointer(IDirect3DDevice) +LPDIRECT3DEXECUTEBUFFER = Pointer(IDirect3DExecuteBuffer) +LPDIRECT3DLIGHT = Pointer(IDirect3DLight) +LPDIRECT3DMATERIAL = Pointer(IDirect3DMaterial) +LPDIRECT3DTEXTURE = Pointer(IDirect3DTexture) +LPDIRECT3DVIEWPORT = Pointer(IDirect3DViewport) + +LPDIRECT3D2 = Pointer(IDirect3D2) +LPDIRECT3DDEVICE2 = Pointer(IDirect3DDevice2) +LPDIRECT3DMATERIAL2 = Pointer(IDirect3DMaterial2) +LPDIRECT3DTEXTURE2 = Pointer(IDirect3DTexture2) +LPDIRECT3DVIEWPORT2 = Pointer(IDirect3DViewport2) + +LPDIRECT3D3 = Pointer(IDirect3D3) +LPDIRECT3DDEVICE3 = Pointer(IDirect3DDevice3) +LPDIRECT3DMATERIAL3 = Pointer(IDirect3DMaterial3) +LPDIRECT3DVIEWPORT3 = Pointer(IDirect3DViewport3) +LPDIRECT3DVERTEXBUFFER = Pointer(IDirect3DVertexBuffer) + +LPDIRECT3D7 = Pointer(IDirect3D7) +LPDIRECT3DDEVICE7 = Pointer(IDirect3DDevice7) +LPDIRECT3DVERTEXBUFFER7 = Pointer(IDirect3DVertexBuffer7) IDirect3D.methods += [ Method(HRESULT, "Initialize", [(REFCLSID, "riid")]), diff --git a/specs/d3d8.py b/specs/d3d8.py index 0713696..a17e95e 100644 --- a/specs/d3d8.py +++ b/specs/d3d8.py @@ -67,18 +67,18 @@ IDirect3DIndexBuffer8 = Interface("IDirect3DIndexBuffer8", IDirect3DResource8) IDirect3DSurface8 = Interface("IDirect3DSurface8", IUnknown) IDirect3DVolume8 = Interface("IDirect3DVolume8", IUnknown) -PDIRECT3D8 = WrapPointer(IDirect3D8) -PDIRECT3DDEVICE8 = WrapPointer(IDirect3DDevice8) -PDIRECT3DSWAPCHAIN8 = WrapPointer(IDirect3DSwapChain8) -PDIRECT3DRESOURCE8 = WrapPointer(IDirect3DResource8) -PDIRECT3DBASETEXTURE8 = WrapPointer(IDirect3DBaseTexture8) -PDIRECT3DTEXTURE8 = WrapPointer(IDirect3DTexture8) -PDIRECT3DVOLUMETEXTURE8 = WrapPointer(IDirect3DVolumeTexture8) -PDIRECT3DCUBETEXTURE8 = WrapPointer(IDirect3DCubeTexture8) -PDIRECT3DVERTEXBUFFER8 = WrapPointer(IDirect3DVertexBuffer8) -PDIRECT3DINDEXBUFFER8 = WrapPointer(IDirect3DIndexBuffer8) -PDIRECT3DSURFACE8 = WrapPointer(IDirect3DSurface8) -PDIRECT3DVOLUME8 = WrapPointer(IDirect3DVolume8) +PDIRECT3D8 = Pointer(IDirect3D8) +PDIRECT3DDEVICE8 = Pointer(IDirect3DDevice8) +PDIRECT3DSWAPCHAIN8 = Pointer(IDirect3DSwapChain8) +PDIRECT3DRESOURCE8 = Pointer(IDirect3DResource8) +PDIRECT3DBASETEXTURE8 = Pointer(IDirect3DBaseTexture8) +PDIRECT3DTEXTURE8 = Pointer(IDirect3DTexture8) +PDIRECT3DVOLUMETEXTURE8 = Pointer(IDirect3DVolumeTexture8) +PDIRECT3DCUBETEXTURE8 = Pointer(IDirect3DCubeTexture8) +PDIRECT3DVERTEXBUFFER8 = Pointer(IDirect3DVertexBuffer8) +PDIRECT3DINDEXBUFFER8 = Pointer(IDirect3DIndexBuffer8) +PDIRECT3DSURFACE8 = Pointer(IDirect3DSurface8) +PDIRECT3DVOLUME8 = Pointer(IDirect3DVolume8) IDirect3D8.methods += [ Method(HRESULT, "RegisterSoftwareDevice", [(OpaquePointer(Void), "pInitializeFunction")]), diff --git a/specs/d3d9.py b/specs/d3d9.py index ffb643e..d1cceb3 100644 --- a/specs/d3d9.py +++ b/specs/d3d9.py @@ -132,26 +132,26 @@ IDirect3D9Ex = Interface("IDirect3D9Ex", IDirect3D9) IDirect3DDevice9Ex = Interface("IDirect3DDevice9Ex", IDirect3DDevice9) IDirect3DSwapChain9Ex = Interface("IDirect3DSwapChain9Ex", IDirect3DSwapChain9) -PDIRECT3D9 = WrapPointer(IDirect3D9) -PDIRECT3DDEVICE9 = WrapPointer(IDirect3DDevice9) -PDIRECT3DSTATEBLOCK9 = WrapPointer(IDirect3DStateBlock9) -PDIRECT3DSWAPCHAIN9 = WrapPointer(IDirect3DSwapChain9) -PDIRECT3DRESOURCE9 = WrapPointer(IDirect3DResource9) -PDIRECT3DVERTEXDECLARATION9 = WrapPointer(IDirect3DVertexDeclaration9) -PDIRECT3DVERTEXSHADER9 = WrapPointer(IDirect3DVertexShader9) -PDIRECT3DPIXELSHADER9 = WrapPointer(IDirect3DPixelShader9) -PDIRECT3DBASETEXTURE9 = WrapPointer(IDirect3DBaseTexture9) -PDIRECT3DTEXTURE9 = WrapPointer(IDirect3DTexture9) -PDIRECT3DVOLUMETEXTURE9 = WrapPointer(IDirect3DVolumeTexture9) -PDIRECT3DCUBETEXTURE9 = WrapPointer(IDirect3DCubeTexture9) -PDIRECT3DVERTEXBUFFER9 = WrapPointer(IDirect3DVertexBuffer9) -PDIRECT3DINDEXBUFFER9 = WrapPointer(IDirect3DIndexBuffer9) -PDIRECT3DSURFACE9 = WrapPointer(IDirect3DSurface9) -PDIRECT3DVOLUME9 = WrapPointer(IDirect3DVolume9) -PDIRECT3DQUERY9 = WrapPointer(IDirect3DQuery9) -PDIRECT3D9EX = WrapPointer(IDirect3D9Ex) -PDIRECT3DDEVICE9EX = WrapPointer(IDirect3DDevice9Ex) -PDIRECT3DSWAPCHAIN9EX = WrapPointer(IDirect3DSwapChain9Ex) +PDIRECT3D9 = Pointer(IDirect3D9) +PDIRECT3DDEVICE9 = Pointer(IDirect3DDevice9) +PDIRECT3DSTATEBLOCK9 = Pointer(IDirect3DStateBlock9) +PDIRECT3DSWAPCHAIN9 = Pointer(IDirect3DSwapChain9) +PDIRECT3DRESOURCE9 = Pointer(IDirect3DResource9) +PDIRECT3DVERTEXDECLARATION9 = Pointer(IDirect3DVertexDeclaration9) +PDIRECT3DVERTEXSHADER9 = Pointer(IDirect3DVertexShader9) +PDIRECT3DPIXELSHADER9 = Pointer(IDirect3DPixelShader9) +PDIRECT3DBASETEXTURE9 = Pointer(IDirect3DBaseTexture9) +PDIRECT3DTEXTURE9 = Pointer(IDirect3DTexture9) +PDIRECT3DVOLUMETEXTURE9 = Pointer(IDirect3DVolumeTexture9) +PDIRECT3DCUBETEXTURE9 = Pointer(IDirect3DCubeTexture9) +PDIRECT3DVERTEXBUFFER9 = Pointer(IDirect3DVertexBuffer9) +PDIRECT3DINDEXBUFFER9 = Pointer(IDirect3DIndexBuffer9) +PDIRECT3DSURFACE9 = Pointer(IDirect3DSurface9) +PDIRECT3DVOLUME9 = Pointer(IDirect3DVolume9) +PDIRECT3DQUERY9 = Pointer(IDirect3DQuery9) +PDIRECT3D9EX = Pointer(IDirect3D9Ex) +PDIRECT3DDEVICE9EX = Pointer(IDirect3DDevice9Ex) +PDIRECT3DSWAPCHAIN9EX = Pointer(IDirect3DSwapChain9Ex) IDirect3D9.methods += [ Method(HRESULT, "RegisterSoftwareDevice", [(OpaquePointer(Void), "pInitializeFunction")]), diff --git a/specs/stdapi.py b/specs/stdapi.py index d6973c1..53d874e 100644 --- a/specs/stdapi.py +++ b/specs/stdapi.py @@ -305,10 +305,6 @@ class Method(Function): self.args[index].index = index + 1 -def WrapPointer(type): - return Pointer(type) - - class String(Type): def __init__(self, expr = "char *", length = None):