ddraw: Mark internal symbols hidden.

This commit is contained in:
Henri Verbeet 2009-09-17 12:35:28 +02:00 committed by Alexandre Julliard
parent 4aaf47f277
commit 6c8636c337
1 changed files with 68 additions and 79 deletions

View File

@ -77,12 +77,12 @@ typedef struct IDirect3DVertexBufferImpl IDirect3DVertexBufferImpl;
typedef struct IParentImpl IParentImpl; typedef struct IParentImpl IParentImpl;
/* Callbacks for implicit object destruction */ /* Callbacks for implicit object destruction */
extern ULONG WINAPI D3D7CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain); extern ULONG WINAPI D3D7CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) DECLSPEC_HIDDEN;
/* Global critical section */ /* Global critical section */
extern CRITICAL_SECTION ddraw_cs; extern CRITICAL_SECTION ddraw_cs DECLSPEC_HIDDEN;
extern DWORD force_refresh_rate; extern DWORD force_refresh_rate DECLSPEC_HIDDEN;
/***************************************************************************** /*****************************************************************************
* IDirectDraw implementation structure * IDirectDraw implementation structure
@ -164,12 +164,12 @@ struct IDirectDrawImpl
}; };
/* Declare the VTables. They can be found ddraw.c */ /* Declare the VTables. They can be found ddraw.c */
extern const IDirectDraw7Vtbl IDirectDraw7_Vtbl; extern const IDirectDraw7Vtbl IDirectDraw7_Vtbl DECLSPEC_HIDDEN;
extern const IDirectDraw4Vtbl IDirectDraw4_Vtbl; extern const IDirectDraw4Vtbl IDirectDraw4_Vtbl DECLSPEC_HIDDEN;
extern const IDirectDraw3Vtbl IDirectDraw3_Vtbl; extern const IDirectDraw3Vtbl IDirectDraw3_Vtbl DECLSPEC_HIDDEN;
extern const IDirectDraw2Vtbl IDirectDraw2_Vtbl; extern const IDirectDraw2Vtbl IDirectDraw2_Vtbl DECLSPEC_HIDDEN;
extern const IDirectDrawVtbl IDirectDraw1_Vtbl; extern const IDirectDrawVtbl IDirectDraw1_Vtbl DECLSPEC_HIDDEN;
extern const IWineD3DDeviceParentVtbl ddraw_wined3d_device_parent_vtbl; extern const IWineD3DDeviceParentVtbl ddraw_wined3d_device_parent_vtbl DECLSPEC_HIDDEN;
/* Helper structures */ /* Helper structures */
typedef struct EnumDisplayModesCBS typedef struct EnumDisplayModesCBS
@ -187,22 +187,12 @@ typedef struct EnumSurfacesCBS
} EnumSurfacesCBS; } EnumSurfacesCBS;
/* Utility functions */ /* Utility functions */
void void DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS *pIn, DDSCAPS2 *pOut) DECLSPEC_HIDDEN;
DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS* pIn, void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER2 *pIn, DDDEVICEIDENTIFIER *pOut) DECLSPEC_HIDDEN;
DDSCAPS2* pOut); void IDirectDrawImpl_Destroy(IDirectDrawImpl *This) DECLSPEC_HIDDEN;
void HRESULT WINAPI IDirectDrawImpl_RecreateSurfacesCallback(IDirectDrawSurface7 *surf,
DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER2* pIn, DDSURFACEDESC2 *desc, void *Context) DECLSPEC_HIDDEN;
DDDEVICEIDENTIFIER* pOut); IWineD3DVertexDeclaration *IDirectDrawImpl_FindDecl(IDirectDrawImpl *This, DWORD fvf) DECLSPEC_HIDDEN;
void
IDirectDrawImpl_Destroy(IDirectDrawImpl *This);
HRESULT WINAPI
IDirectDrawImpl_RecreateSurfacesCallback(IDirectDrawSurface7 *surf,
DDSURFACEDESC2 *desc,
void *Context);
IWineD3DVertexDeclaration *
IDirectDrawImpl_FindDecl(IDirectDrawImpl *This,
DWORD fvf);
static inline IDirectDrawImpl *ddraw_from_d3d1(IDirect3D *iface) static inline IDirectDrawImpl *ddraw_from_d3d1(IDirect3D *iface)
{ {
@ -245,7 +235,7 @@ static inline IDirectDrawImpl *ddraw_from_ddraw4(IDirectDraw4 *iface)
} }
/* The default surface type */ /* The default surface type */
extern WINED3DSURFTYPE DefaultSurfaceType; extern WINED3DSURFTYPE DefaultSurfaceType DECLSPEC_HIDDEN;
/***************************************************************************** /*****************************************************************************
* IDirectDrawSurface implementation structure * IDirectDrawSurface implementation structure
@ -308,14 +298,15 @@ struct IDirectDrawSurfaceImpl
}; };
/* VTable declaration. It's located in surface.c / surface_thunks.c */ /* VTable declaration. It's located in surface.c / surface_thunks.c */
extern const IDirectDrawSurface7Vtbl IDirectDrawSurface7_Vtbl; extern const IDirectDrawSurface7Vtbl IDirectDrawSurface7_Vtbl DECLSPEC_HIDDEN;
extern const IDirectDrawSurface3Vtbl IDirectDrawSurface3_Vtbl; extern const IDirectDrawSurface3Vtbl IDirectDrawSurface3_Vtbl DECLSPEC_HIDDEN;
extern const IDirectDrawGammaControlVtbl IDirectDrawGammaControl_Vtbl; extern const IDirectDrawGammaControlVtbl IDirectDrawGammaControl_Vtbl DECLSPEC_HIDDEN;
extern const IDirect3DTexture2Vtbl IDirect3DTexture2_Vtbl; extern const IDirect3DTexture2Vtbl IDirect3DTexture2_Vtbl DECLSPEC_HIDDEN;
extern const IDirect3DTextureVtbl IDirect3DTexture1_Vtbl; extern const IDirect3DTextureVtbl IDirect3DTexture1_Vtbl DECLSPEC_HIDDEN;
HRESULT WINAPI IDirectDrawSurfaceImpl_AddAttachedSurface(IDirectDrawSurfaceImpl *This, IDirectDrawSurfaceImpl *Surf); HRESULT WINAPI IDirectDrawSurfaceImpl_AddAttachedSurface(IDirectDrawSurfaceImpl *This,
void IDirectDrawSurfaceImpl_Destroy(IDirectDrawSurfaceImpl *This); IDirectDrawSurfaceImpl *Surf) DECLSPEC_HIDDEN;
void IDirectDrawSurfaceImpl_Destroy(IDirectDrawSurfaceImpl *This) DECLSPEC_HIDDEN;
static inline IDirectDrawSurfaceImpl *surface_from_texture1(IDirect3DTexture *iface) static inline IDirectDrawSurfaceImpl *surface_from_texture1(IDirect3DTexture *iface)
{ {
@ -350,7 +341,7 @@ struct IParentImpl
}; };
extern const IParentVtbl IParent_Vtbl; extern const IParentVtbl IParent_Vtbl DECLSPEC_HIDDEN;
/***************************************************************************** /*****************************************************************************
* IDirect3DDevice implementation * IDirect3DDevice implementation
@ -413,19 +404,19 @@ struct IDirect3DDeviceImpl
}; };
/* Vtables in various versions */ /* Vtables in various versions */
extern const IDirect3DDevice7Vtbl IDirect3DDevice7_FPUSetup_Vtbl; extern const IDirect3DDevice7Vtbl IDirect3DDevice7_FPUSetup_Vtbl DECLSPEC_HIDDEN;
extern const IDirect3DDevice7Vtbl IDirect3DDevice7_FPUPreserve_Vtbl; extern const IDirect3DDevice7Vtbl IDirect3DDevice7_FPUPreserve_Vtbl DECLSPEC_HIDDEN;
extern const IDirect3DDevice3Vtbl IDirect3DDevice3_Vtbl; extern const IDirect3DDevice3Vtbl IDirect3DDevice3_Vtbl DECLSPEC_HIDDEN;
extern const IDirect3DDevice2Vtbl IDirect3DDevice2_Vtbl; extern const IDirect3DDevice2Vtbl IDirect3DDevice2_Vtbl DECLSPEC_HIDDEN;
extern const IDirect3DDeviceVtbl IDirect3DDevice1_Vtbl; extern const IDirect3DDeviceVtbl IDirect3DDevice1_Vtbl DECLSPEC_HIDDEN;
/* The IID */ /* The IID */
extern const GUID IID_D3DDEVICE_WineD3D; extern const GUID IID_D3DDEVICE_WineD3D DECLSPEC_HIDDEN;
/* Helper functions */ /* Helper functions */
HRESULT IDirect3DImpl_GetCaps(IWineD3D *WineD3D, D3DDEVICEDESC *Desc123, D3DDEVICEDESC7 *Desc7); HRESULT IDirect3DImpl_GetCaps(IWineD3D *WineD3D, D3DDEVICEDESC *Desc123, D3DDEVICEDESC7 *Desc7) DECLSPEC_HIDDEN;
DWORD IDirect3DDeviceImpl_CreateHandle(IDirect3DDeviceImpl *This); DWORD IDirect3DDeviceImpl_CreateHandle(IDirect3DDeviceImpl *This) DECLSPEC_HIDDEN;
WINED3DZBUFFERTYPE IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DDeviceImpl *This); WINED3DZBUFFERTYPE IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DDeviceImpl *This) DECLSPEC_HIDDEN;
static inline IDirect3DDeviceImpl *device_from_device1(IDirect3DDevice *iface) static inline IDirect3DDeviceImpl *device_from_device1(IDirect3DDevice *iface)
{ {
@ -457,10 +448,10 @@ struct EnumTextureFormatsCBS
/* No implementation structure as this is only another interface to DirectDraw */ /* No implementation structure as this is only another interface to DirectDraw */
/* the Vtables */ /* the Vtables */
extern const IDirect3DVtbl IDirect3D1_Vtbl; extern const IDirect3DVtbl IDirect3D1_Vtbl DECLSPEC_HIDDEN;
extern const IDirect3D2Vtbl IDirect3D2_Vtbl; extern const IDirect3D2Vtbl IDirect3D2_Vtbl DECLSPEC_HIDDEN;
extern const IDirect3D3Vtbl IDirect3D3_Vtbl; extern const IDirect3D3Vtbl IDirect3D3_Vtbl DECLSPEC_HIDDEN;
extern const IDirect3D7Vtbl IDirect3D7_Vtbl; extern const IDirect3D7Vtbl IDirect3D7_Vtbl DECLSPEC_HIDDEN;
/* Structure for EnumZBufferFormats */ /* Structure for EnumZBufferFormats */
struct EnumZBufferFormatsData struct EnumZBufferFormatsData
@ -482,9 +473,9 @@ struct IDirectDrawClipperImpl
IDirectDrawImpl *ddraw_owner; IDirectDrawImpl *ddraw_owner;
}; };
extern const IDirectDrawClipperVtbl IDirectDrawClipper_Vtbl; extern const IDirectDrawClipperVtbl IDirectDrawClipper_Vtbl DECLSPEC_HIDDEN;
typeof(WineDirect3DCreateClipper) *pWineDirect3DCreateClipper; typeof(WineDirect3DCreateClipper) *pWineDirect3DCreateClipper DECLSPEC_HIDDEN;
/***************************************************************************** /*****************************************************************************
* IDirectDrawPalette implementation structure * IDirectDrawPalette implementation structure
@ -502,7 +493,7 @@ struct IDirectDrawPaletteImpl
IDirectDrawImpl *ddraw_owner; IDirectDrawImpl *ddraw_owner;
IUnknown *ifaceToRelease; IUnknown *ifaceToRelease;
}; };
extern const IDirectDrawPaletteVtbl IDirectDrawPalette_Vtbl; extern const IDirectDrawPaletteVtbl IDirectDrawPalette_Vtbl DECLSPEC_HIDDEN;
/****************************************************************************** /******************************************************************************
* DirectDraw ClassFactory implementation - incomplete * DirectDraw ClassFactory implementation - incomplete
@ -552,12 +543,12 @@ struct IDirect3DLightImpl
}; };
/* Vtable */ /* Vtable */
extern const IDirect3DLightVtbl IDirect3DLight_Vtbl; extern const IDirect3DLightVtbl IDirect3DLight_Vtbl DECLSPEC_HIDDEN;
/* Helper functions */ /* Helper functions */
void light_update(IDirect3DLightImpl* This); void light_update(IDirect3DLightImpl *This) DECLSPEC_HIDDEN;
void light_activate(IDirect3DLightImpl* This); void light_activate(IDirect3DLightImpl *This) DECLSPEC_HIDDEN;
void light_desactivate(IDirect3DLightImpl* This); void light_desactivate(IDirect3DLightImpl *This) DECLSPEC_HIDDEN;
/****************************************************************************** /******************************************************************************
* IDirect3DMaterial implementation structure - Wraps to D3D7 * IDirect3DMaterial implementation structure - Wraps to D3D7
@ -580,12 +571,12 @@ struct IDirect3DMaterialImpl
}; };
/* VTables in various versions */ /* VTables in various versions */
extern const IDirect3DMaterialVtbl IDirect3DMaterial_Vtbl; extern const IDirect3DMaterialVtbl IDirect3DMaterial_Vtbl DECLSPEC_HIDDEN;
extern const IDirect3DMaterial2Vtbl IDirect3DMaterial2_Vtbl; extern const IDirect3DMaterial2Vtbl IDirect3DMaterial2_Vtbl DECLSPEC_HIDDEN;
extern const IDirect3DMaterial3Vtbl IDirect3DMaterial3_Vtbl; extern const IDirect3DMaterial3Vtbl IDirect3DMaterial3_Vtbl DECLSPEC_HIDDEN;
/* Helper functions */ /* Helper functions */
void material_activate(IDirect3DMaterialImpl* This); void material_activate(IDirect3DMaterialImpl* This) DECLSPEC_HIDDEN;
/***************************************************************************** /*****************************************************************************
* IDirect3DViewport - Wraps to D3D7 * IDirect3DViewport - Wraps to D3D7
@ -626,10 +617,10 @@ struct IDirect3DViewportImpl
}; };
/* Vtable */ /* Vtable */
extern const IDirect3DViewport3Vtbl IDirect3DViewport3_Vtbl; extern const IDirect3DViewport3Vtbl IDirect3DViewport3_Vtbl DECLSPEC_HIDDEN;
/* Helper functions */ /* Helper functions */
void viewport_activate(IDirect3DViewportImpl* This, BOOL ignore_lights); void viewport_activate(IDirect3DViewportImpl* This, BOOL ignore_lights) DECLSPEC_HIDDEN;
/***************************************************************************** /*****************************************************************************
* IDirect3DExecuteBuffer - Wraps to D3D7 * IDirect3DExecuteBuffer - Wraps to D3D7
@ -659,13 +650,11 @@ struct IDirect3DExecuteBufferImpl
}; };
/* The VTable */ /* The VTable */
extern const IDirect3DExecuteBufferVtbl IDirect3DExecuteBuffer_Vtbl; extern const IDirect3DExecuteBufferVtbl IDirect3DExecuteBuffer_Vtbl DECLSPEC_HIDDEN;
/* The execute function */ /* The execute function */
void void IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, IDirect3DDeviceImpl *Device, IDirect3DViewportImpl *ViewportImpl) DECLSPEC_HIDDEN;
IDirect3DDeviceImpl *Device,
IDirect3DViewportImpl *ViewportImpl);
/***************************************************************************** /*****************************************************************************
* IDirect3DVertexBuffer * IDirect3DVertexBuffer
@ -688,8 +677,8 @@ struct IDirect3DVertexBufferImpl
}; };
/* The Vtables */ /* The Vtables */
extern const IDirect3DVertexBuffer7Vtbl IDirect3DVertexBuffer7_Vtbl; extern const IDirect3DVertexBuffer7Vtbl IDirect3DVertexBuffer7_Vtbl DECLSPEC_HIDDEN;
extern const IDirect3DVertexBufferVtbl IDirect3DVertexBuffer1_Vtbl; extern const IDirect3DVertexBufferVtbl IDirect3DVertexBuffer1_Vtbl DECLSPEC_HIDDEN;
static inline IDirect3DVertexBufferImpl *vb_from_vb1(IDirect3DVertexBuffer *iface) static inline IDirect3DVertexBufferImpl *vb_from_vb1(IDirect3DVertexBuffer *iface)
{ {
@ -707,23 +696,23 @@ static inline IDirect3DVertexBufferImpl *vb_from_vb1(IDirect3DVertexBuffer *ifac
#define GET_TEXCOORD_SIZE_FROM_FVF(d3dvtVertexType, tex_num) \ #define GET_TEXCOORD_SIZE_FROM_FVF(d3dvtVertexType, tex_num) \
(((((d3dvtVertexType) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1) (((((d3dvtVertexType) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1)
void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, WINED3DFORMAT WineD3DFormat); void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, WINED3DFORMAT WineD3DFormat) DECLSPEC_HIDDEN;
WINED3DFORMAT PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat); WINED3DFORMAT PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat) DECLSPEC_HIDDEN;
void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd); void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) DECLSPEC_HIDDEN;
void dump_D3DMATRIX(const D3DMATRIX *mat); void dump_D3DMATRIX(const D3DMATRIX *mat) DECLSPEC_HIDDEN;
void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps); void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) DECLSPEC_HIDDEN;
DWORD get_flexible_vertex_size(DWORD d3dvtVertexType); DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN;
void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in); void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in) DECLSPEC_HIDDEN;
void DDRAW_dump_cooperativelevel(DWORD cooplevel); void DDRAW_dump_cooperativelevel(DWORD cooplevel) DECLSPEC_HIDDEN;
/* This only needs to be here as long the processvertices functionality of /* This only needs to be here as long the processvertices functionality of
* IDirect3DExecuteBuffer isn't in WineD3D */ * IDirect3DExecuteBuffer isn't in WineD3D */
void multiply_matrix(LPD3DMATRIX dest, const D3DMATRIX *src1, const D3DMATRIX *src2); void multiply_matrix(LPD3DMATRIX dest, const D3DMATRIX *src1, const D3DMATRIX *src2) DECLSPEC_HIDDEN;
void multiply_matrix_D3D_way(LPD3DMATRIX result, const D3DMATRIX *m1, const D3DMATRIX *m2); void multiply_matrix_D3D_way(LPD3DMATRIX result, const D3DMATRIX *m1, const D3DMATRIX *m2) DECLSPEC_HIDDEN;
/* Helper function in main.c */ /* Helper function in main.c */
BOOL LoadWineD3D(void); BOOL LoadWineD3D(void) DECLSPEC_HIDDEN;
/* Used for generic dumping */ /* Used for generic dumping */
typedef struct typedef struct
@ -763,4 +752,4 @@ typedef struct
#endif #endif
HRESULT hr_ddraw_from_wined3d(HRESULT hr); HRESULT hr_ddraw_from_wined3d(HRESULT hr) DECLSPEC_HIDDEN;