[PATCH 4/5] include: Don't add d3d8 LP* interface typedefs for __WINESRC__.

Alexandre Julliard julliard at winehq.org
Tue Oct 30 04:41:33 CDT 2012


Henri Verbeet <hverbeet at codeweavers.com> writes:

> @@ -1128,6 +1105,21 @@ DECLARE_INTERFACE_(IDirect3DDevice8,IUnknown)
>  #define IDirect3DDevice8_DeletePatch(p,a)                          (p)->DeletePatch(a)
>  #endif
>  
> +#ifndef __WINESRC__
> +typedef struct IDirect3D8 *LPDIRECT3D8;
> +typedef struct IDirect3DDevice8 *LPDIRECT3DDEVICE8;
> +typedef struct IDirect3DResource8 *LPDIRECT3DRESOURCE8, *PDIRECT3DRESOURCE8;
> +typedef struct IDirect3DVertexBuffer8 *LPDIRECT3DVERTEXBUFFER8, *PDIRECT3DVERTEXBUFFER8;
> +typedef struct IDirect3DVolume8 *LPDIRECT3DVOLUME8, *PDIRECT3DVOLUME8;
> +typedef struct IDirect3DSwapChain8 *LPDIRECT3DSWAPCHAIN8, *PDIRECT3DSWAPCHAIN8;
> +typedef struct IDirect3DSurface8 *LPDIRECT3DSURFACE8, *PDIRECT3DSURFACE8;
> +typedef struct IDirect3DIndexBuffer8 *LPDIRECT3DINDEXBUFFER8, *PDIRECT3DINDEXBUFFER8;
> +typedef struct IDirect3DBaseTexture8 *LPDIRECT3DBASETEXTURE8, *PDIRECT3DBASETEXTURE8;
> +typedef struct IDirect3DTexture8 *LPDIRECT3DTEXTURE8, *PDIRECT3DTEXTURE8;
> +typedef struct IDirect3DCubeTexture8 *LPDIRECT3DCUBETEXTURE8, *PDIRECT3DCUBETEXTURE8;
> +typedef struct IDirect3DVolumeTexture8 *LPDIRECT3DVOLUMETEXTURE8, *PDIRECT3DVOLUMETEXTURE8;
> +#endif

I don't think we want to do that sort of thing, otherwise we'll end up
with ifdef __WINESRC__ all over the standard headers. If we really want
to disable interface typedefs this should be done in a generic way,
preferably when generating headers from idl.

-- 
Alexandre Julliard
julliard at winehq.org



More information about the wine-devel mailing list