From: Alistair Leslie-Hughes leslie_alistair@hotmail.com
--- dlls/ddrawex/ddrawex_private.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index f5adf790c82..f60d3cb4e1b 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -48,10 +48,10 @@ DECLARE_INTERFACE_(IDirectDrawFactory, IUnknown)
HRESULT WINAPI ddrawex_factory_CreateDirectDraw(IDirectDrawFactory *iface, GUID *guid, HWND window, DWORD coop_level, DWORD reserved, IUnknown *outer_unknown, - IDirectDraw **ddraw) DECLSPEC_HIDDEN; + IDirectDraw **ddraw);
-void DDSD_to_DDSD2(const DDSURFACEDESC *in, DDSURFACEDESC2 *out) DECLSPEC_HIDDEN; -void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out) DECLSPEC_HIDDEN; +void DDSD_to_DDSD2(const DDSURFACEDESC *in, DDSURFACEDESC2 *out); +void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out);
struct ddrawex { @@ -65,8 +65,8 @@ struct ddrawex IDirectDraw4 *parent; };
-IDirectDraw4 *dd_get_outer(IDirectDraw4 *inner) DECLSPEC_HIDDEN; -IDirectDraw4 *dd_get_inner(IDirectDraw4 *outer) DECLSPEC_HIDDEN; +IDirectDraw4 *dd_get_outer(IDirectDraw4 *inner); +IDirectDraw4 *dd_get_inner(IDirectDraw4 *outer);
struct ddrawex_surface { @@ -84,8 +84,8 @@ struct ddrawex_surface #define IID_DDrawexPriv IID_IDirectDrawSurface4 };
-struct ddrawex_surface *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN; -IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner) DECLSPEC_HIDDEN; -HRESULT prepare_permanent_dc(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN; +struct ddrawex_surface *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface); +IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner); +HRESULT prepare_permanent_dc(IDirectDrawSurface4 *iface);
#endif /* __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H */
From: Alistair Leslie-Hughes leslie_alistair@hotmail.com
--- dlls/dxgi/dxgi_private.h | 60 ++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index fa704d28b0f..bae728abadb 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -78,36 +78,36 @@ struct dxgi_device_layer };
/* TRACE helper functions */ -const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; -const char *debug_dxgi_mode(const DXGI_MODE_DESC *desc) DECLSPEC_HIDDEN; -const char *debug_dxgi_mode1(const DXGI_MODE_DESC1 *desc) DECLSPEC_HIDDEN; -void dump_feature_levels(const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) DECLSPEC_HIDDEN; +const char *debug_dxgi_format(DXGI_FORMAT format); +const char *debug_dxgi_mode(const DXGI_MODE_DESC *desc); +const char *debug_dxgi_mode1(const DXGI_MODE_DESC1 *desc); +void dump_feature_levels(const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count);
-DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; -enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; +DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format); +enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format); void dxgi_sample_desc_from_wined3d(DXGI_SAMPLE_DESC *desc, - enum wined3d_multisample_type wined3d_type, unsigned int wined3d_quality) DECLSPEC_HIDDEN; + enum wined3d_multisample_type wined3d_type, unsigned int wined3d_quality); void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, - unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) DECLSPEC_HIDDEN; + unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc); void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, - const DXGI_MODE_DESC *mode) DECLSPEC_HIDDEN; + const DXGI_MODE_DESC *mode); void wined3d_display_mode_from_dxgi1(struct wined3d_display_mode *wined3d_mode, - const DXGI_MODE_DESC1 *mode) DECLSPEC_HIDDEN; -DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags) DECLSPEC_HIDDEN; -unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE usage) DECLSPEC_HIDDEN; -unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) DECLSPEC_HIDDEN; + const DXGI_MODE_DESC1 *mode); +DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags); +unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE usage); +unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags); HRESULT dxgi_get_output_from_window(IWineDXGIFactory *factory, HWND window, IDXGIOutput **dxgi_output) - DECLSPEC_HIDDEN; + ; HRESULT wined3d_swapchain_desc_from_dxgi(struct wined3d_swapchain_desc *wined3d_desc, IDXGIOutput *dxgi_containing_output, HWND window, const DXGI_SWAP_CHAIN_DESC1 *dxgi_desc, - const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *dxgi_fullscreen_desc) DECLSPEC_HIDDEN; + const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *dxgi_fullscreen_desc);
HRESULT dxgi_get_private_data(struct wined3d_private_store *store, - REFGUID guid, UINT *data_size, void *data) DECLSPEC_HIDDEN; + REFGUID guid, UINT *data_size, void *data); HRESULT dxgi_set_private_data(struct wined3d_private_store *store, - REFGUID guid, UINT data_size, const void *data) DECLSPEC_HIDDEN; + REFGUID guid, UINT data_size, const void *data); HRESULT dxgi_set_private_data_interface(struct wined3d_private_store *store, - REFGUID guid, const IUnknown *object) DECLSPEC_HIDDEN; + REFGUID guid, const IUnknown *object);
/* IDXGIFactory */ struct dxgi_factory @@ -120,9 +120,9 @@ struct dxgi_factory HWND device_window; };
-HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) DECLSPEC_HIDDEN; -HWND dxgi_factory_get_device_window(struct dxgi_factory *factory) DECLSPEC_HIDDEN; -struct dxgi_factory *unsafe_impl_from_IDXGIFactory(IDXGIFactory *iface) DECLSPEC_HIDDEN; +HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended); +HWND dxgi_factory_get_device_window(struct dxgi_factory *factory); +struct dxgi_factory *unsafe_impl_from_IDXGIFactory(IDXGIFactory *iface);
/* IDXGIDevice */ struct dxgi_device @@ -139,7 +139,7 @@ struct dxgi_device
HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *layer, IDXGIFactory *factory, IDXGIAdapter *adapter, - const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) DECLSPEC_HIDDEN; + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count);
/* IDXGIOutput */ struct dxgi_output @@ -152,8 +152,8 @@ struct dxgi_output };
HRESULT dxgi_output_create(struct dxgi_adapter *adapter, unsigned int output_idx, - struct dxgi_output **output) DECLSPEC_HIDDEN; -struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) DECLSPEC_HIDDEN; + struct dxgi_output **output); +struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface);
/* IDXGIAdapter */ struct dxgi_adapter @@ -167,8 +167,8 @@ struct dxgi_adapter };
HRESULT dxgi_adapter_create(struct dxgi_factory *factory, UINT ordinal, - struct dxgi_adapter **adapter) DECLSPEC_HIDDEN; -struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface) DECLSPEC_HIDDEN; + struct dxgi_adapter **adapter); +struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface);
/* IDXGISwapChain */ struct d3d11_swapchain @@ -187,13 +187,13 @@ struct d3d11_swapchain };
HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, - struct wined3d_swapchain_desc *desc) DECLSPEC_HIDDEN; + struct wined3d_swapchain_desc *desc);
HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *queue, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, - IDXGISwapChain1 **swapchain) DECLSPEC_HIDDEN; + IDXGISwapChain1 **swapchain);
-BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) DECLSPEC_HIDDEN; +BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc);
/* IDXGISurface/IDXGIResource */ struct dxgi_resource @@ -210,6 +210,6 @@ struct dxgi_resource };
HRESULT dxgi_resource_init(struct dxgi_resource *resource, IDXGIDevice *device, - IUnknown *outer, BOOL needs_surface, struct wined3d_resource *wined3d_resource) DECLSPEC_HIDDEN; + IUnknown *outer, BOOL needs_surface, struct wined3d_resource *wined3d_resource);
#endif /* __WINE_DXGI_PRIVATE_H */
From: Alistair Leslie-Hughes leslie_alistair@hotmail.com
--- dlls/d3d11/d3d11_private.h | 174 ++++++++++++++++++------------------- 1 file changed, 87 insertions(+), 87 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 6177f24afe3..20ed7c349fe 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -41,46 +41,46 @@ struct d3d_device;
/* TRACE helper functions */ -const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology) DECLSPEC_HIDDEN; -const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; -const char *debug_float4(const float *values) DECLSPEC_HIDDEN; +const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology); +const char *debug_dxgi_format(DXGI_FORMAT format); +const char *debug_float4(const float *values);
-DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; -enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; +DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format); +enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format); void d3d11_primitive_topology_from_wined3d_primitive_type(enum wined3d_primitive_type primitive_type, - unsigned int patch_vertex_count, D3D11_PRIMITIVE_TOPOLOGY *topology) DECLSPEC_HIDDEN; + unsigned int patch_vertex_count, D3D11_PRIMITIVE_TOPOLOGY *topology); void wined3d_primitive_type_from_d3d11_primitive_topology(D3D11_PRIMITIVE_TOPOLOGY topology, - enum wined3d_primitive_type *type, unsigned int *patch_vertex_count) DECLSPEC_HIDDEN; -unsigned int wined3d_getdata_flags_from_d3d11_async_getdata_flags(unsigned int d3d11_flags) DECLSPEC_HIDDEN; -DWORD wined3d_usage_from_d3d11(enum D3D11_USAGE usage) DECLSPEC_HIDDEN; -struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *resource) DECLSPEC_HIDDEN; -struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; -DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type) DECLSPEC_HIDDEN; -DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN; -DWORD wined3d_clear_flags_from_d3d11_clear_flags(UINT clear_flags) DECLSPEC_HIDDEN; -unsigned int wined3d_access_from_d3d11(D3D11_USAGE usage, UINT cpu_access) DECLSPEC_HIDDEN; + enum wined3d_primitive_type *type, unsigned int *patch_vertex_count); +unsigned int wined3d_getdata_flags_from_d3d11_async_getdata_flags(unsigned int d3d11_flags); +DWORD wined3d_usage_from_d3d11(enum D3D11_USAGE usage); +struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *resource); +struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *resource); +DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type); +DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type); +DWORD wined3d_clear_flags_from_d3d11_clear_flags(UINT clear_flags); +unsigned int wined3d_access_from_d3d11(D3D11_USAGE usage, UINT cpu_access); HRESULT d3d_device_create_dxgi_resource(IUnknown *device, struct wined3d_resource *wined3d_resource, - IUnknown *outer, BOOL needs_surface, IUnknown **dxgi_resource) DECLSPEC_HIDDEN; + IUnknown *outer, BOOL needs_surface, IUnknown **dxgi_resource);
-enum D3D11_USAGE d3d11_usage_from_d3d10_usage(enum D3D10_USAGE usage) DECLSPEC_HIDDEN; -enum D3D10_USAGE d3d10_usage_from_d3d11_usage(enum D3D11_USAGE usage) DECLSPEC_HIDDEN; -UINT d3d11_bind_flags_from_d3d10_bind_flags(UINT bind_flags) DECLSPEC_HIDDEN; -UINT d3d10_bind_flags_from_d3d11_bind_flags(UINT bind_flags) DECLSPEC_HIDDEN; -UINT d3d11_cpu_access_flags_from_d3d10_cpu_access_flags(UINT cpu_access_flags) DECLSPEC_HIDDEN; -UINT d3d10_cpu_access_flags_from_d3d11_cpu_access_flags(UINT cpu_access_flags) DECLSPEC_HIDDEN; -UINT d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(UINT resource_misc_flags) DECLSPEC_HIDDEN; -UINT d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(UINT resource_misc_flags) DECLSPEC_HIDDEN; +enum D3D11_USAGE d3d11_usage_from_d3d10_usage(enum D3D10_USAGE usage); +enum D3D10_USAGE d3d10_usage_from_d3d11_usage(enum D3D11_USAGE usage); +UINT d3d11_bind_flags_from_d3d10_bind_flags(UINT bind_flags); +UINT d3d10_bind_flags_from_d3d11_bind_flags(UINT bind_flags); +UINT d3d11_cpu_access_flags_from_d3d10_cpu_access_flags(UINT cpu_access_flags); +UINT d3d10_cpu_access_flags_from_d3d11_cpu_access_flags(UINT cpu_access_flags); +UINT d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(UINT resource_misc_flags); +UINT d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(UINT resource_misc_flags);
BOOL validate_d3d11_resource_access_flags(D3D11_RESOURCE_DIMENSION resource_dimension, D3D11_USAGE usage, UINT bind_flags, UINT cpu_access_flags, - D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; + D3D_FEATURE_LEVEL feature_level);
HRESULT d3d_get_private_data(struct wined3d_private_store *store, - REFGUID guid, UINT *data_size, void *data) DECLSPEC_HIDDEN; + REFGUID guid, UINT *data_size, void *data); HRESULT d3d_set_private_data(struct wined3d_private_store *store, - REFGUID guid, UINT data_size, const void *data) DECLSPEC_HIDDEN; + REFGUID guid, UINT data_size, const void *data); HRESULT d3d_set_private_data_interface(struct wined3d_private_store *store, - REFGUID guid, const IUnknown *object) DECLSPEC_HIDDEN; + REFGUID guid, const IUnknown *object);
static inline unsigned int wined3d_bind_flags_from_d3d11(UINT bind_flags, UINT misc_flags) { @@ -125,9 +125,9 @@ struct d3d_texture1d };
HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DESC *desc, - const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture1d **texture) DECLSPEC_HIDDEN; -struct d3d_texture1d *unsafe_impl_from_ID3D11Texture1D(ID3D11Texture1D *iface) DECLSPEC_HIDDEN; -struct d3d_texture1d *unsafe_impl_from_ID3D10Texture1D(ID3D10Texture1D *iface) DECLSPEC_HIDDEN; + const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture1d **texture); +struct d3d_texture1d *unsafe_impl_from_ID3D11Texture1D(ID3D11Texture1D *iface); +struct d3d_texture1d *unsafe_impl_from_ID3D10Texture1D(ID3D10Texture1D *iface);
/* ID3D11Texture2D, ID3D10Texture2D */ struct d3d_texture2d @@ -150,9 +150,9 @@ static inline struct d3d_texture2d *impl_from_ID3D11Texture2D(ID3D11Texture2D *i
HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DESC *desc, struct wined3d_texture *wined3d_texture, - const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture2d **out) DECLSPEC_HIDDEN; -struct d3d_texture2d *unsafe_impl_from_ID3D11Texture2D(ID3D11Texture2D *iface) DECLSPEC_HIDDEN; -struct d3d_texture2d *unsafe_impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) DECLSPEC_HIDDEN; + const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture2d **out); +struct d3d_texture2d *unsafe_impl_from_ID3D11Texture2D(ID3D11Texture2D *iface); +struct d3d_texture2d *unsafe_impl_from_ID3D10Texture2D(ID3D10Texture2D *iface);
/* ID3D11Texture3D, ID3D10Texture3D */ struct d3d_texture3d @@ -168,9 +168,9 @@ struct d3d_texture3d };
HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DESC *desc, - const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture3d **texture) DECLSPEC_HIDDEN; -struct d3d_texture3d *unsafe_impl_from_ID3D11Texture3D(ID3D11Texture3D *iface) DECLSPEC_HIDDEN; -struct d3d_texture3d *unsafe_impl_from_ID3D10Texture3D(ID3D10Texture3D *iface) DECLSPEC_HIDDEN; + const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture3d **texture); +struct d3d_texture3d *unsafe_impl_from_ID3D11Texture3D(ID3D11Texture3D *iface); +struct d3d_texture3d *unsafe_impl_from_ID3D10Texture3D(ID3D10Texture3D *iface);
/* ID3D11Buffer, ID3D10Buffer */ struct d3d_buffer @@ -186,9 +186,9 @@ struct d3d_buffer };
HRESULT d3d_buffer_create(struct d3d_device *device, const D3D11_BUFFER_DESC *desc, - const D3D11_SUBRESOURCE_DATA *data, struct d3d_buffer **buffer) DECLSPEC_HIDDEN; -struct d3d_buffer *unsafe_impl_from_ID3D11Buffer(ID3D11Buffer *iface) DECLSPEC_HIDDEN; -struct d3d_buffer *unsafe_impl_from_ID3D10Buffer(ID3D10Buffer *iface) DECLSPEC_HIDDEN; + const D3D11_SUBRESOURCE_DATA *data, struct d3d_buffer **buffer); +struct d3d_buffer *unsafe_impl_from_ID3D11Buffer(ID3D11Buffer *iface); +struct d3d_buffer *unsafe_impl_from_ID3D10Buffer(ID3D10Buffer *iface);
/* ID3D11DepthStencilView, ID3D10DepthStencilView */ struct d3d_depthstencil_view @@ -205,9 +205,9 @@ struct d3d_depthstencil_view };
HRESULT d3d_depthstencil_view_create(struct d3d_device *device, ID3D11Resource *resource, - const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, struct d3d_depthstencil_view **view) DECLSPEC_HIDDEN; -struct d3d_depthstencil_view *unsafe_impl_from_ID3D11DepthStencilView(ID3D11DepthStencilView *iface) DECLSPEC_HIDDEN; -struct d3d_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface) DECLSPEC_HIDDEN; + const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, struct d3d_depthstencil_view **view); +struct d3d_depthstencil_view *unsafe_impl_from_ID3D11DepthStencilView(ID3D11DepthStencilView *iface); +struct d3d_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface);
/* ID3D11RenderTargetView, ID3D10RenderTargetView */ struct d3d_rendertarget_view @@ -224,9 +224,9 @@ struct d3d_rendertarget_view };
HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource *resource, - const D3D11_RENDER_TARGET_VIEW_DESC *desc, struct d3d_rendertarget_view **view) DECLSPEC_HIDDEN; -struct d3d_rendertarget_view *unsafe_impl_from_ID3D11RenderTargetView(ID3D11RenderTargetView *iface) DECLSPEC_HIDDEN; -struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN; + const D3D11_RENDER_TARGET_VIEW_DESC *desc, struct d3d_rendertarget_view **view); +struct d3d_rendertarget_view *unsafe_impl_from_ID3D11RenderTargetView(ID3D11RenderTargetView *iface); +struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface);
/* ID3D11ShaderResourceView, ID3D10ShaderResourceView1 */ struct d3d_shader_resource_view @@ -243,11 +243,11 @@ struct d3d_shader_resource_view };
HRESULT d3d_shader_resource_view_create(struct d3d_device *device, ID3D11Resource *resource, - const D3D11_SHADER_RESOURCE_VIEW_DESC *desc, struct d3d_shader_resource_view **view) DECLSPEC_HIDDEN; + const D3D11_SHADER_RESOURCE_VIEW_DESC *desc, struct d3d_shader_resource_view **view); struct d3d_shader_resource_view *unsafe_impl_from_ID3D11ShaderResourceView( - ID3D11ShaderResourceView *iface) DECLSPEC_HIDDEN; + ID3D11ShaderResourceView *iface); struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView( - ID3D10ShaderResourceView *iface) DECLSPEC_HIDDEN; + ID3D10ShaderResourceView *iface);
/* ID3D11UnorderedAccessView */ struct d3d11_unordered_access_view @@ -263,9 +263,9 @@ struct d3d11_unordered_access_view };
HRESULT d3d11_unordered_access_view_create(struct d3d_device *device, ID3D11Resource *resource, - const D3D11_UNORDERED_ACCESS_VIEW_DESC *desc, struct d3d11_unordered_access_view **view) DECLSPEC_HIDDEN; + const D3D11_UNORDERED_ACCESS_VIEW_DESC *desc, struct d3d11_unordered_access_view **view); struct d3d11_unordered_access_view *unsafe_impl_from_ID3D11UnorderedAccessView( - ID3D11UnorderedAccessView *iface) DECLSPEC_HIDDEN; + ID3D11UnorderedAccessView *iface);
/* ID3D11InputLayout, ID3D10InputLayout */ struct d3d_input_layout @@ -282,9 +282,9 @@ struct d3d_input_layout HRESULT d3d_input_layout_create(struct d3d_device *device, const D3D11_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, - struct d3d_input_layout **layout) DECLSPEC_HIDDEN; -struct d3d_input_layout *unsafe_impl_from_ID3D11InputLayout(ID3D11InputLayout *iface) DECLSPEC_HIDDEN; -struct d3d_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) DECLSPEC_HIDDEN; + struct d3d_input_layout **layout); +struct d3d_input_layout *unsafe_impl_from_ID3D11InputLayout(ID3D11InputLayout *iface); +struct d3d_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface);
/* ID3D11VertexShader, ID3D10VertexShader */ struct d3d_vertex_shader @@ -299,9 +299,9 @@ struct d3d_vertex_shader };
HRESULT d3d_vertex_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, - struct d3d_vertex_shader **shader) DECLSPEC_HIDDEN; -struct d3d_vertex_shader *unsafe_impl_from_ID3D11VertexShader(ID3D11VertexShader *iface) DECLSPEC_HIDDEN; -struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) DECLSPEC_HIDDEN; + struct d3d_vertex_shader **shader); +struct d3d_vertex_shader *unsafe_impl_from_ID3D11VertexShader(ID3D11VertexShader *iface); +struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface);
/* ID3D11HullShader */ struct d3d11_hull_shader @@ -315,8 +315,8 @@ struct d3d11_hull_shader };
HRESULT d3d11_hull_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, - struct d3d11_hull_shader **shader) DECLSPEC_HIDDEN; -struct d3d11_hull_shader *unsafe_impl_from_ID3D11HullShader(ID3D11HullShader *iface) DECLSPEC_HIDDEN; + struct d3d11_hull_shader **shader); +struct d3d11_hull_shader *unsafe_impl_from_ID3D11HullShader(ID3D11HullShader *iface);
/* ID3D11DomainShader */ struct d3d11_domain_shader @@ -330,8 +330,8 @@ struct d3d11_domain_shader };
HRESULT d3d11_domain_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, - struct d3d11_domain_shader **shader) DECLSPEC_HIDDEN; -struct d3d11_domain_shader *unsafe_impl_from_ID3D11DomainShader(ID3D11DomainShader *iface) DECLSPEC_HIDDEN; + struct d3d11_domain_shader **shader); +struct d3d11_domain_shader *unsafe_impl_from_ID3D11DomainShader(ID3D11DomainShader *iface);
/* ID3D11GeometryShader, ID3D10GeometryShader */ struct d3d_geometry_shader @@ -348,9 +348,9 @@ struct d3d_geometry_shader HRESULT d3d_geometry_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, const D3D11_SO_DECLARATION_ENTRY *so_entries, unsigned int so_entry_count, const unsigned int *buffer_strides, unsigned int buffer_stride_count, unsigned int rasterizer_stream, - struct d3d_geometry_shader **shader) DECLSPEC_HIDDEN; -struct d3d_geometry_shader *unsafe_impl_from_ID3D11GeometryShader(ID3D11GeometryShader *iface) DECLSPEC_HIDDEN; -struct d3d_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) DECLSPEC_HIDDEN; + struct d3d_geometry_shader **shader); +struct d3d_geometry_shader *unsafe_impl_from_ID3D11GeometryShader(ID3D11GeometryShader *iface); +struct d3d_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface);
/* ID3D11PixelShader, ID3D10PixelShader */ struct d3d_pixel_shader @@ -365,9 +365,9 @@ struct d3d_pixel_shader };
HRESULT d3d_pixel_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, - struct d3d_pixel_shader **shader) DECLSPEC_HIDDEN; -struct d3d_pixel_shader *unsafe_impl_from_ID3D11PixelShader(ID3D11PixelShader *iface) DECLSPEC_HIDDEN; -struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) DECLSPEC_HIDDEN; + struct d3d_pixel_shader **shader); +struct d3d_pixel_shader *unsafe_impl_from_ID3D11PixelShader(ID3D11PixelShader *iface); +struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface);
/* ID3D11ComputeShader */ struct d3d11_compute_shader @@ -381,8 +381,8 @@ struct d3d11_compute_shader };
HRESULT d3d11_compute_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, - struct d3d11_compute_shader **shader) DECLSPEC_HIDDEN; -struct d3d11_compute_shader *unsafe_impl_from_ID3D11ComputeShader(ID3D11ComputeShader *iface) DECLSPEC_HIDDEN; + struct d3d11_compute_shader **shader); +struct d3d11_compute_shader *unsafe_impl_from_ID3D11ComputeShader(ID3D11ComputeShader *iface);
/* ID3D11ClassLinkage */ struct d3d11_class_linkage @@ -395,7 +395,7 @@ struct d3d11_class_linkage };
HRESULT d3d11_class_linkage_create(struct d3d_device *device, - struct d3d11_class_linkage **class_linkage) DECLSPEC_HIDDEN; + struct d3d11_class_linkage **class_linkage);
/* ID3D11BlendState1, ID3D10BlendState1 */ struct d3d_blend_state @@ -417,9 +417,9 @@ static inline struct d3d_blend_state *impl_from_ID3D11BlendState1(ID3D11BlendSta }
HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC1 *desc, - struct d3d_blend_state **state) DECLSPEC_HIDDEN; -struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *iface) DECLSPEC_HIDDEN; -struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN; + struct d3d_blend_state **state); +struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *iface); +struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface);
/* ID3D11DepthStencilState, ID3D10DepthStencilState */ struct d3d_depthstencil_state @@ -441,11 +441,11 @@ static inline struct d3d_depthstencil_state *impl_from_ID3D11DepthStencilState(I }
HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEPTH_STENCIL_DESC *desc, - struct d3d_depthstencil_state **state) DECLSPEC_HIDDEN; + struct d3d_depthstencil_state **state); struct d3d_depthstencil_state *unsafe_impl_from_ID3D11DepthStencilState( - ID3D11DepthStencilState *iface) DECLSPEC_HIDDEN; + ID3D11DepthStencilState *iface); struct d3d_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState( - ID3D10DepthStencilState *iface) DECLSPEC_HIDDEN; + ID3D10DepthStencilState *iface);
/* ID3D11RasterizerState, ID3D10RasterizerState */ struct d3d_rasterizer_state @@ -462,9 +462,9 @@ struct d3d_rasterizer_state };
HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTERIZER_DESC1 *desc, - struct d3d_rasterizer_state **state) DECLSPEC_HIDDEN; -struct d3d_rasterizer_state *unsafe_impl_from_ID3D11RasterizerState(ID3D11RasterizerState *iface) DECLSPEC_HIDDEN; -struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; + struct d3d_rasterizer_state **state); +struct d3d_rasterizer_state *unsafe_impl_from_ID3D11RasterizerState(ID3D11RasterizerState *iface); +struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface);
/* ID3D11SamplerState, ID3D10SamplerState */ struct d3d_sampler_state @@ -481,9 +481,9 @@ struct d3d_sampler_state };
HRESULT d3d_sampler_state_create(struct d3d_device *device, const D3D11_SAMPLER_DESC *desc, - struct d3d_sampler_state **state) DECLSPEC_HIDDEN; -struct d3d_sampler_state *unsafe_impl_from_ID3D11SamplerState(ID3D11SamplerState *iface) DECLSPEC_HIDDEN; -struct d3d_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) DECLSPEC_HIDDEN; + struct d3d_sampler_state **state); +struct d3d_sampler_state *unsafe_impl_from_ID3D11SamplerState(ID3D11SamplerState *iface); +struct d3d_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface);
/* ID3D11Query, ID3D10Query */ struct d3d_query @@ -500,10 +500,10 @@ struct d3d_query };
HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc, BOOL predicate, - struct d3d_query **query) DECLSPEC_HIDDEN; -struct d3d_query *unsafe_impl_from_ID3D11Query(ID3D11Query *iface) DECLSPEC_HIDDEN; -struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; -struct d3d_query *unsafe_impl_from_ID3D11Asynchronous(ID3D11Asynchronous *iface) DECLSPEC_HIDDEN; + struct d3d_query **query); +struct d3d_query *unsafe_impl_from_ID3D11Query(ID3D11Query *iface); +struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface); +struct d3d_query *unsafe_impl_from_ID3D11Asynchronous(ID3D11Asynchronous *iface);
struct d3d_device_context_state_entry { @@ -598,7 +598,7 @@ static inline struct d3d_device *impl_from_ID3D10Device(ID3D10Device1 *iface) return CONTAINING_RECORD(iface, struct d3d_device, ID3D10Device1_iface); }
-void d3d_device_init(struct d3d_device *device, void *outer_unknown) DECLSPEC_HIDDEN; +void d3d_device_init(struct d3d_device *device, void *outer_unknown);
/* Layered device */ enum dxgi_device_layer_id
From: Alistair Leslie-Hughes leslie_alistair@hotmail.com
--- dlls/d3dx10_43/dxhelpers.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/d3dx10_43/dxhelpers.h b/dlls/d3dx10_43/dxhelpers.h index 5d0cdb54c59..50d509973cd 100644 --- a/dlls/d3dx10_43/dxhelpers.h +++ b/dlls/d3dx10_43/dxhelpers.h @@ -16,18 +16,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-extern HRESULT load_file(const WCHAR *path, void **data, DWORD *size) DECLSPEC_HIDDEN; +extern HRESULT load_file(const WCHAR *path, void **data, DWORD *size); extern HRESULT load_resourceA(HMODULE module, const char *resource, - void **data, DWORD *size) DECLSPEC_HIDDEN; + void **data, DWORD *size); extern HRESULT load_resourceW(HMODULE module, const WCHAR *resource, - void **data, DWORD *size) DECLSPEC_HIDDEN; + void **data, DWORD *size);
-extern HRESULT get_image_info(const void *data, SIZE_T size, D3DX10_IMAGE_INFO *img_info) DECLSPEC_HIDDEN; +extern HRESULT get_image_info(const void *data, SIZE_T size, D3DX10_IMAGE_INFO *img_info);
extern void init_load_info(const D3DX10_IMAGE_LOAD_INFO *load_info, - D3DX10_IMAGE_LOAD_INFO *out) DECLSPEC_HIDDEN; + D3DX10_IMAGE_LOAD_INFO *out); /* Returns array of D3D10_SUBRESOURCE_DATA structures followed by textures data. */ extern HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO *load_info, - D3D10_SUBRESOURCE_DATA **resource_data) DECLSPEC_HIDDEN; + D3D10_SUBRESOURCE_DATA **resource_data); extern HRESULT create_d3d_texture(ID3D10Device *device, D3DX10_IMAGE_LOAD_INFO *load_info, - D3D10_SUBRESOURCE_DATA *resource_data, ID3D10Resource **texture) DECLSPEC_HIDDEN; + D3D10_SUBRESOURCE_DATA *resource_data, ID3D10Resource **texture);
From: Alistair Leslie-Hughes leslie_alistair@hotmail.com
--- dlls/d2d1/d2d1_private.h | 134 +++++++++++++++++++-------------------- 1 file changed, 67 insertions(+), 67 deletions(-)
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index f8dc9f9deb3..dfd4e130f58 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -60,7 +60,7 @@ struct d2d_settings { unsigned int max_version_factory; }; -extern struct d2d_settings d2d_settings DECLSPEC_HIDDEN; +extern struct d2d_settings d2d_settings;
struct d2d_clip_stack { @@ -211,7 +211,7 @@ struct d2d_device_context
HRESULT d2d_d3d_create_render_target(ID2D1Device *device, IDXGISurface *surface, IUnknown *outer_unknown, const struct d2d_device_context_ops *ops, const D2D1_RENDER_TARGET_PROPERTIES *desc, - void **render_target) DECLSPEC_HIDDEN; + void **render_target);
static inline BOOL d2d_device_context_is_dxgi_target(const struct d2d_device_context *context) { @@ -235,7 +235,7 @@ struct d2d_wic_render_target };
HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ID2D1Factory1 *factory, - ID3D10Device1 *d3d_device, IWICBitmap *bitmap, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN; + ID3D10Device1 *d3d_device, IWICBitmap *bitmap, const D2D1_RENDER_TARGET_PROPERTIES *desc);
struct d2d_dc_render_target { @@ -254,7 +254,7 @@ struct d2d_dc_render_target };
HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID2D1Factory1 *factory, - ID3D10Device1 *d3d_device, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN; + ID3D10Device1 *d3d_device, const D2D1_RENDER_TARGET_PROPERTIES *desc);
struct d2d_hwnd_render_target { @@ -272,7 +272,7 @@ struct d2d_hwnd_render_target
HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target, ID2D1Factory1 *factory, ID3D10Device1 *d3d_device, const D2D1_RENDER_TARGET_PROPERTIES *desc, - const D2D1_HWND_RENDER_TARGET_PROPERTIES *hwnd_desc) DECLSPEC_HIDDEN; + const D2D1_HWND_RENDER_TARGET_PROPERTIES *hwnd_desc);
struct d2d_bitmap_render_target { @@ -287,7 +287,7 @@ struct d2d_bitmap_render_target HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_target, const struct d2d_device_context *parent_target, const D2D1_SIZE_F *size, const D2D1_SIZE_U *pixel_size, const D2D1_PIXEL_FORMAT *format, - D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS options) DECLSPEC_HIDDEN; + D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS options);
struct d2d_gradient { @@ -302,7 +302,7 @@ struct d2d_gradient
HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D11Device1 *device, const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode, - struct d2d_gradient **gradient) DECLSPEC_HIDDEN; + struct d2d_gradient **gradient);
struct d2d_brush { @@ -352,23 +352,23 @@ struct d2d_brush };
HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F *color, - const D2D1_BRUSH_PROPERTIES *desc, struct d2d_brush **brush) DECLSPEC_HIDDEN; + const D2D1_BRUSH_PROPERTIES *desc, struct d2d_brush **brush); HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory, const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, - ID2D1GradientStopCollection *gradient, struct d2d_brush **brush) DECLSPEC_HIDDEN; + ID2D1GradientStopCollection *gradient, struct d2d_brush **brush); HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, const D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES *gradient_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, - ID2D1GradientStopCollection *gradient, struct d2d_brush **brush) DECLSPEC_HIDDEN; + ID2D1GradientStopCollection *gradient, struct d2d_brush **brush); HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, - struct d2d_brush **brush) DECLSPEC_HIDDEN; + struct d2d_brush **brush); HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image, const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, - struct d2d_brush **brush) DECLSPEC_HIDDEN; + struct d2d_brush **brush); void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context, - unsigned int brush_idx) DECLSPEC_HIDDEN; -BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) DECLSPEC_HIDDEN; -struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) DECLSPEC_HIDDEN; + unsigned int brush_idx); +BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb); +struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface);
struct d2d_stroke_style { @@ -382,7 +382,7 @@ struct d2d_stroke_style };
HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, - const D2D1_STROKE_STYLE_PROPERTIES1 *desc, const float *dashes, UINT32 dash_count) DECLSPEC_HIDDEN; + const D2D1_STROKE_STYLE_PROPERTIES1 *desc, const float *dashes, UINT32 dash_count);
struct d2d_layer { @@ -393,7 +393,7 @@ struct d2d_layer D2D1_SIZE_F size; };
-HRESULT d2d_layer_create(ID2D1Factory *factory, const D2D1_SIZE_F *size, struct d2d_layer **layer) DECLSPEC_HIDDEN; +HRESULT d2d_layer_create(ID2D1Factory *factory, const D2D1_SIZE_F *size, struct d2d_layer **layer);
struct d2d_mesh { @@ -403,7 +403,7 @@ struct d2d_mesh ID2D1Factory *factory; };
-HRESULT d2d_mesh_create(ID2D1Factory *factory, struct d2d_mesh **mesh) DECLSPEC_HIDDEN; +HRESULT d2d_mesh_create(ID2D1Factory *factory, struct d2d_mesh **mesh);
struct d2d_bitmap { @@ -424,13 +424,13 @@ struct d2d_bitmap };
HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, const void *src_data, - UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; + UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap); HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, void *data, - const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; + const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap); HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IWICBitmapSource *bitmap_source, - const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; -unsigned int d2d_get_bitmap_options_for_surface(IDXGISurface *surface) DECLSPEC_HIDDEN; -struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) DECLSPEC_HIDDEN; + const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap); +unsigned int d2d_get_bitmap_options_for_surface(IDXGISurface *surface); +struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface);
struct d2d_state_block { @@ -443,8 +443,8 @@ struct d2d_state_block };
void d2d_state_block_init(struct d2d_state_block *state_block, ID2D1Factory *factory, - const D2D1_DRAWING_STATE_DESCRIPTION1 *desc, IDWriteRenderingParams *text_rendering_params) DECLSPEC_HIDDEN; -struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStateBlock *iface) DECLSPEC_HIDDEN; + const D2D1_DRAWING_STATE_DESCRIPTION1 *desc, IDWriteRenderingParams *text_rendering_params); +struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStateBlock *iface);
enum d2d_geometry_state { @@ -580,17 +580,17 @@ struct d2d_geometry };
HRESULT d2d_ellipse_geometry_init(struct d2d_geometry *geometry, - ID2D1Factory *factory, const D2D1_ELLIPSE *ellipse) DECLSPEC_HIDDEN; -void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory) DECLSPEC_HIDDEN; + ID2D1Factory *factory, const D2D1_ELLIPSE *ellipse); +void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory); HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, - ID2D1Factory *factory, const D2D1_RECT_F *rect) DECLSPEC_HIDDEN; + ID2D1Factory *factory, const D2D1_RECT_F *rect); HRESULT d2d_rounded_rectangle_geometry_init(struct d2d_geometry *geometry, - ID2D1Factory *factory, const D2D1_ROUNDED_RECT *rounded_rect) DECLSPEC_HIDDEN; + ID2D1Factory *factory, const D2D1_ROUNDED_RECT *rounded_rect); void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory, - ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform) DECLSPEC_HIDDEN; + ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform); HRESULT d2d_geometry_group_init(struct d2d_geometry *geometry, ID2D1Factory *factory, - D2D1_FILL_MODE fill_mode, ID2D1Geometry **src_geometries, unsigned int geometry_count) DECLSPEC_HIDDEN; -struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) DECLSPEC_HIDDEN; + D2D1_FILL_MODE fill_mode, ID2D1Geometry **src_geometries, unsigned int geometry_count); +struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface);
struct d2d_device { @@ -600,7 +600,7 @@ struct d2d_device IDXGIDevice *dxgi_device; };
-void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; +void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device);
struct d2d_shader { @@ -621,7 +621,7 @@ struct d2d_effect_context };
void d2d_effect_context_init(struct d2d_effect_context *effect_context, - struct d2d_device_context *device_context) DECLSPEC_HIDDEN; + struct d2d_device_context *device_context);
struct d2d_effect_property { @@ -672,11 +672,11 @@ struct d2d_effect_registration };
struct d2d_factory; -void d2d_effects_init_builtins(struct d2d_factory *factory) DECLSPEC_HIDDEN; +void d2d_effects_init_builtins(struct d2d_factory *factory); struct d2d_effect_registration * d2d_factory_get_registered_effect(ID2D1Factory *factory, - const GUID *effect_id) DECLSPEC_HIDDEN; + const GUID *effect_id); void d2d_factory_register_effect(struct d2d_factory *factory, - struct d2d_effect_registration *effect) DECLSPEC_HIDDEN; + struct d2d_effect_registration *effect);
struct d2d_transform_graph { @@ -700,14 +700,14 @@ struct d2d_effect };
HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effect_id, - ID2D1Effect **effect) DECLSPEC_HIDDEN; + ID2D1Effect **effect); HRESULT d2d_effect_properties_add(struct d2d_effect_properties *props, const WCHAR *name, - UINT32 index, D2D1_PROPERTY_TYPE type, const WCHAR *value) DECLSPEC_HIDDEN; + UINT32 index, D2D1_PROPERTY_TYPE type, const WCHAR *value); HRESULT d2d_effect_subproperties_add(struct d2d_effect_properties *props, const WCHAR *name, - UINT32 index, D2D1_PROPERTY_TYPE type, const WCHAR *value) DECLSPEC_HIDDEN; + UINT32 index, D2D1_PROPERTY_TYPE type, const WCHAR *value); struct d2d_effect_property * d2d_effect_properties_get_property_by_name( - const struct d2d_effect_properties *properties, const WCHAR *name) DECLSPEC_HIDDEN; -void d2d_effect_properties_cleanup(struct d2d_effect_properties *props) DECLSPEC_HIDDEN; + const struct d2d_effect_properties *properties, const WCHAR *name); +void d2d_effect_properties_cleanup(struct d2d_effect_properties *props);
enum d2d_command_list_state { @@ -735,54 +735,54 @@ struct d2d_command_list IUnknown **objects; };
-HRESULT d2d_command_list_create(ID2D1Factory *factory, struct d2d_command_list **command_list) DECLSPEC_HIDDEN; -struct d2d_command_list *unsafe_impl_from_ID2D1CommandList(ID2D1CommandList *iface) DECLSPEC_HIDDEN; -void d2d_command_list_begin_draw(struct d2d_command_list *command_list, const struct d2d_device_context *context) DECLSPEC_HIDDEN; -void d2d_command_list_set_antialias_mode(struct d2d_command_list *command_list, D2D1_ANTIALIAS_MODE mode) DECLSPEC_HIDDEN; +HRESULT d2d_command_list_create(ID2D1Factory *factory, struct d2d_command_list **command_list); +struct d2d_command_list *unsafe_impl_from_ID2D1CommandList(ID2D1CommandList *iface); +void d2d_command_list_begin_draw(struct d2d_command_list *command_list, const struct d2d_device_context *context); +void d2d_command_list_set_antialias_mode(struct d2d_command_list *command_list, D2D1_ANTIALIAS_MODE mode); void d2d_command_list_set_primitive_blend(struct d2d_command_list *command_list, - D2D1_PRIMITIVE_BLEND primitive_blend) DECLSPEC_HIDDEN; -void d2d_command_list_set_unit_mode(struct d2d_command_list *command_list, D2D1_UNIT_MODE mode) DECLSPEC_HIDDEN; + D2D1_PRIMITIVE_BLEND primitive_blend); +void d2d_command_list_set_unit_mode(struct d2d_command_list *command_list, D2D1_UNIT_MODE mode); void d2d_command_list_set_text_antialias_mode(struct d2d_command_list *command_list, - D2D1_TEXT_ANTIALIAS_MODE mode) DECLSPEC_HIDDEN; -void d2d_command_list_set_tags(struct d2d_command_list *command_list, D2D1_TAG tag1, D2D1_TAG tag2) DECLSPEC_HIDDEN; + D2D1_TEXT_ANTIALIAS_MODE mode); +void d2d_command_list_set_tags(struct d2d_command_list *command_list, D2D1_TAG tag1, D2D1_TAG tag2); void d2d_command_list_set_transform(struct d2d_command_list *command_list, - const D2D1_MATRIX_3X2_F *transform) DECLSPEC_HIDDEN; + const D2D1_MATRIX_3X2_F *transform); void d2d_command_list_push_clip(struct d2d_command_list *command_list, const D2D1_RECT_F *rect, - D2D1_ANTIALIAS_MODE antialias_mode) DECLSPEC_HIDDEN; -void d2d_command_list_pop_clip(struct d2d_command_list *command_list) DECLSPEC_HIDDEN; -void d2d_command_list_clear(struct d2d_command_list *command_list, const D2D1_COLOR_F *color) DECLSPEC_HIDDEN; + D2D1_ANTIALIAS_MODE antialias_mode); +void d2d_command_list_pop_clip(struct d2d_command_list *command_list); +void d2d_command_list_clear(struct d2d_command_list *command_list, const D2D1_COLOR_F *color); void d2d_command_list_draw_line(struct d2d_command_list *command_list, const struct d2d_device_context *context, D2D1_POINT_2F p0, D2D1_POINT_2F p1, ID2D1Brush *orig_brush, float stroke_width, - ID2D1StrokeStyle *stroke_style) DECLSPEC_HIDDEN; + ID2D1StrokeStyle *stroke_style); void d2d_command_list_draw_geometry(struct d2d_command_list *command_list, const struct d2d_device_context *context, ID2D1Geometry *geometry, ID2D1Brush *orig_brush, - float stroke_width, ID2D1StrokeStyle *stroke_style) DECLSPEC_HIDDEN; + float stroke_width, ID2D1StrokeStyle *stroke_style); void d2d_command_list_draw_rectangle(struct d2d_command_list *command_list, const struct d2d_device_context *context, - const D2D1_RECT_F *rect, ID2D1Brush *orig_brush, float stroke_width, ID2D1StrokeStyle *stroke_style) DECLSPEC_HIDDEN; + const D2D1_RECT_F *rect, ID2D1Brush *orig_brush, float stroke_width, ID2D1StrokeStyle *stroke_style); void d2d_command_list_fill_geometry(struct d2d_command_list *command_list, const struct d2d_device_context *context, ID2D1Geometry *geometry, ID2D1Brush *orig_brush, - ID2D1Brush *orig_opacity_brush) DECLSPEC_HIDDEN; + ID2D1Brush *orig_opacity_brush); void d2d_command_list_fill_rectangle(struct d2d_command_list *command_list, - const struct d2d_device_context *context, const D2D1_RECT_F *rect, ID2D1Brush *orig_brush) DECLSPEC_HIDDEN; + const struct d2d_device_context *context, const D2D1_RECT_F *rect, ID2D1Brush *orig_brush); void d2d_command_list_set_text_rendering_params(struct d2d_command_list *command_list, - IDWriteRenderingParams *params) DECLSPEC_HIDDEN; + IDWriteRenderingParams *params); void d2d_command_list_draw_glyph_run(struct d2d_command_list *command_list, const struct d2d_device_context *context, D2D1_POINT_2F origin, const DWRITE_GLYPH_RUN *run, const DWRITE_GLYPH_RUN_DESCRIPTION *run_desc, ID2D1Brush *orig_brush, - DWRITE_MEASURING_MODE measuring_mode) DECLSPEC_HIDDEN; + DWRITE_MEASURING_MODE measuring_mode); void d2d_command_list_draw_bitmap(struct d2d_command_list *command_list, ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, D2D1_INTERPOLATION_MODE interpolation_mode, - const D2D1_RECT_F *src_rect, const D2D1_MATRIX_4X4_F *perspective_transform) DECLSPEC_HIDDEN; + const D2D1_RECT_F *src_rect, const D2D1_MATRIX_4X4_F *perspective_transform); void d2d_command_list_draw_image(struct d2d_command_list *command_list, ID2D1Image *image, const D2D1_POINT_2F *target_offset, const D2D1_RECT_F *image_rect, D2D1_INTERPOLATION_MODE interpolation_mode, - D2D1_COMPOSITE_MODE composite_mode) DECLSPEC_HIDDEN; + D2D1_COMPOSITE_MODE composite_mode); void d2d_command_list_fill_mesh(struct d2d_command_list *command_list, const struct d2d_device_context *context, - ID2D1Mesh *mesh, ID2D1Brush *orig_brush) DECLSPEC_HIDDEN; + ID2D1Mesh *mesh, ID2D1Brush *orig_brush); void d2d_command_list_fill_opacity_mask(struct d2d_command_list *command_list, const struct d2d_device_context *context, - ID2D1Bitmap *bitmap, ID2D1Brush *orig_brush, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect) DECLSPEC_HIDDEN; + ID2D1Bitmap *bitmap, ID2D1Brush *orig_brush, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect); void d2d_command_list_push_layer(struct d2d_command_list *command_list, const struct d2d_device_context *context, - const D2D1_LAYER_PARAMETERS1 *params, ID2D1Layer *layer) DECLSPEC_HIDDEN; -void d2d_command_list_pop_layer(struct d2d_command_list *command_list) DECLSPEC_HIDDEN; + const D2D1_LAYER_PARAMETERS1 *params, ID2D1Layer *layer); +void d2d_command_list_pop_layer(struct d2d_command_list *command_list);
static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) {
From: Alistair Leslie-Hughes leslie_alistair@hotmail.com
--- dlls/ddraw/ddraw_private.h | 138 ++++++++++++++++++------------------- 1 file changed, 69 insertions(+), 69 deletions(-)
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a3f309f89f0..e85583b60d0 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -41,8 +41,8 @@ #include "wine/list.h" #include "wine/wined3d.h"
-extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN; -extern DWORD force_refresh_rate DECLSPEC_HIDDEN; +extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops; +extern DWORD force_refresh_rate;
/***************************************************************************** * IDirectDraw implementation structure @@ -141,10 +141,10 @@ struct ddraw
#define DDRAW_WINDOW_CLASS_NAME "DirectDrawDeviceWnd"
-HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type device_type) DECLSPEC_HIDDEN; -void ddraw_d3dcaps1_from_7(D3DDEVICEDESC *caps1, D3DDEVICEDESC7 *caps7) DECLSPEC_HIDDEN; -HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps) DECLSPEC_HIDDEN; -void ddraw_update_lost_surfaces(struct ddraw *ddraw) DECLSPEC_HIDDEN; +HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type device_type); +void ddraw_d3dcaps1_from_7(D3DDEVICEDESC *caps1, D3DDEVICEDESC7 *caps7); +HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps); +void ddraw_update_lost_surfaces(struct ddraw *ddraw);
static inline void ddraw_set_swapchain_window(struct ddraw *ddraw, HWND window) { @@ -154,9 +154,9 @@ static inline void ddraw_set_swapchain_window(struct ddraw *ddraw, HWND window) }
/* Utility functions */ -void DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS *pIn, DDSCAPS2 *pOut) DECLSPEC_HIDDEN; -void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER2 *pIn, DDDEVICEIDENTIFIER *pOut) DECLSPEC_HIDDEN; -struct wined3d_vertex_declaration *ddraw_find_decl(struct ddraw *ddraw, DWORD fvf) DECLSPEC_HIDDEN; +void DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS *pIn, DDSCAPS2 *pOut); +void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER2 *pIn, DDDEVICEIDENTIFIER *pOut); +struct wined3d_vertex_declaration *ddraw_find_decl(struct ddraw *ddraw, DWORD fvf);
#define DDRAW_SURFACE_LOCATION_DEFAULT 0x00000001 #define DDRAW_SURFACE_LOCATION_DRAW 0x00000002 @@ -234,10 +234,10 @@ struct ddraw_texture };
HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, - struct ddraw_surface **surface, IUnknown *outer_unknown, unsigned int version) DECLSPEC_HIDDEN; -struct wined3d_rendertarget_view *ddraw_surface_get_rendertarget_view(struct ddraw_surface *surface) DECLSPEC_HIDDEN; + struct ddraw_surface **surface, IUnknown *outer_unknown, unsigned int version); +struct wined3d_rendertarget_view *ddraw_surface_get_rendertarget_view(struct ddraw_surface *surface); HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, - const RECT *rect, BOOL read, unsigned int swap_interval) DECLSPEC_HIDDEN; + const RECT *rect, BOOL read, unsigned int swap_interval);
static inline struct ddraw_surface *impl_from_IDirect3DTexture(IDirect3DTexture *iface) { @@ -274,12 +274,12 @@ static inline struct ddraw_surface *impl_from_IDirectDrawSurface7(IDirectDrawSur return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface7_iface); }
-struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface(IDirectDrawSurface *iface) DECLSPEC_HIDDEN; -struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN; -struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface7(IDirectDrawSurface7 *iface) DECLSPEC_HIDDEN; +struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface(IDirectDrawSurface *iface); +struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface); +struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface7(IDirectDrawSurface7 *iface);
-struct ddraw_surface *unsafe_impl_from_IDirect3DTexture(IDirect3DTexture *iface) DECLSPEC_HIDDEN; -struct ddraw_surface *unsafe_impl_from_IDirect3DTexture2(IDirect3DTexture2 *iface) DECLSPEC_HIDDEN; +struct ddraw_surface *unsafe_impl_from_IDirect3DTexture(IDirect3DTexture *iface); +struct ddraw_surface *unsafe_impl_from_IDirect3DTexture2(IDirect3DTexture2 *iface);
#define DDRAW_INVALID_HANDLE ~0U
@@ -306,11 +306,11 @@ struct ddraw_handle_table UINT entry_count; };
-BOOL ddraw_handle_table_init(struct ddraw_handle_table *t, UINT initial_size) DECLSPEC_HIDDEN; -void ddraw_handle_table_destroy(struct ddraw_handle_table *t) DECLSPEC_HIDDEN; -DWORD ddraw_allocate_handle(struct ddraw_handle_table *t, void *object, enum ddraw_handle_type type) DECLSPEC_HIDDEN; -void *ddraw_free_handle(struct ddraw_handle_table *t, DWORD handle, enum ddraw_handle_type type) DECLSPEC_HIDDEN; -void *ddraw_get_object(struct ddraw_handle_table *t, DWORD handle, enum ddraw_handle_type type) DECLSPEC_HIDDEN; +BOOL ddraw_handle_table_init(struct ddraw_handle_table *t, UINT initial_size); +void ddraw_handle_table_destroy(struct ddraw_handle_table *t); +DWORD ddraw_allocate_handle(struct ddraw_handle_table *t, void *object, enum ddraw_handle_type type); +void *ddraw_free_handle(struct ddraw_handle_table *t, DWORD handle, enum ddraw_handle_type type); +void *ddraw_get_object(struct ddraw_handle_table *t, DWORD handle, enum ddraw_handle_type type);
struct d3d_device { @@ -367,11 +367,11 @@ struct d3d_device };
HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, - UINT version, struct d3d_device **device, IUnknown *outer_unknown) DECLSPEC_HIDDEN; -enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device *device) DECLSPEC_HIDDEN; + UINT version, struct d3d_device **device, IUnknown *outer_unknown); +enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device *device);
/* The IID */ -extern const GUID IID_D3DDEVICE_WineD3D DECLSPEC_HIDDEN; +extern const GUID IID_D3DDEVICE_WineD3D;
static inline struct d3d_device *impl_from_IDirect3DDevice(IDirect3DDevice *iface) { @@ -393,10 +393,10 @@ static inline struct d3d_device *impl_from_IDirect3DDevice7(IDirect3DDevice7 *if return CONTAINING_RECORD(iface, struct d3d_device, IDirect3DDevice7_iface); }
-struct d3d_device *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) DECLSPEC_HIDDEN; -struct d3d_device *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface) DECLSPEC_HIDDEN; -struct d3d_device *unsafe_impl_from_IDirect3DDevice3(IDirect3DDevice3 *iface) DECLSPEC_HIDDEN; -struct d3d_device *unsafe_impl_from_IDirect3DDevice7(IDirect3DDevice7 *iface) DECLSPEC_HIDDEN; +struct d3d_device *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface); +struct d3d_device *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface); +struct d3d_device *unsafe_impl_from_IDirect3DDevice3(IDirect3DDevice3 *iface); +struct d3d_device *unsafe_impl_from_IDirect3DDevice7(IDirect3DDevice7 *iface);
struct ddraw_clipper { @@ -407,9 +407,9 @@ struct ddraw_clipper BOOL initialized; };
-HRESULT ddraw_clipper_init(struct ddraw_clipper *clipper) DECLSPEC_HIDDEN; -struct ddraw_clipper *unsafe_impl_from_IDirectDrawClipper(IDirectDrawClipper *iface) DECLSPEC_HIDDEN; -BOOL ddraw_clipper_is_valid(const struct ddraw_clipper *clipper) DECLSPEC_HIDDEN; +HRESULT ddraw_clipper_init(struct ddraw_clipper *clipper); +struct ddraw_clipper *unsafe_impl_from_IDirectDrawClipper(IDirectDrawClipper *iface); +BOOL ddraw_clipper_is_valid(const struct ddraw_clipper *clipper);
/***************************************************************************** * IDirectDrawPalette implementation structure @@ -431,10 +431,10 @@ static inline struct ddraw_palette *impl_from_IDirectDrawPalette(IDirectDrawPale return CONTAINING_RECORD(iface, struct ddraw_palette, IDirectDrawPalette_iface); }
-struct ddraw_palette *unsafe_impl_from_IDirectDrawPalette(IDirectDrawPalette *iface) DECLSPEC_HIDDEN; +struct ddraw_palette *unsafe_impl_from_IDirectDrawPalette(IDirectDrawPalette *iface);
HRESULT ddraw_palette_init(struct ddraw_palette *palette, - struct ddraw *ddraw, DWORD flags, PALETTEENTRY *entries) DECLSPEC_HIDDEN; + struct ddraw *ddraw, DWORD flags, PALETTEENTRY *entries);
/* Helper structures */ struct object_creation_info @@ -467,10 +467,10 @@ struct d3d_light };
/* Helper functions */ -void light_activate(struct d3d_light *light) DECLSPEC_HIDDEN; -void light_deactivate(struct d3d_light *light) DECLSPEC_HIDDEN; -void d3d_light_init(struct d3d_light *light, struct ddraw *ddraw) DECLSPEC_HIDDEN; -struct d3d_light *unsafe_impl_from_IDirect3DLight(IDirect3DLight *iface) DECLSPEC_HIDDEN; +void light_activate(struct d3d_light *light); +void light_deactivate(struct d3d_light *light); +void d3d_light_init(struct d3d_light *light, struct ddraw *ddraw); +struct d3d_light *unsafe_impl_from_IDirect3DLight(IDirect3DLight *iface);
/****************************************************************************** * IDirect3DMaterial implementation structure - Wraps to D3D7 @@ -491,8 +491,8 @@ struct d3d_material };
/* Helper functions */ -void material_activate(struct d3d_material *material) DECLSPEC_HIDDEN; -struct d3d_material *d3d_material_create(struct ddraw *ddraw) DECLSPEC_HIDDEN; +void material_activate(struct d3d_material *material); +struct d3d_material *d3d_material_create(struct ddraw *ddraw);
enum ddraw_viewport_version { @@ -531,14 +531,14 @@ struct d3d_viewport struct d3d_material *background; };
-struct d3d_viewport *unsafe_impl_from_IDirect3DViewport3(IDirect3DViewport3 *iface) DECLSPEC_HIDDEN; -struct d3d_viewport *unsafe_impl_from_IDirect3DViewport2(IDirect3DViewport2 *iface) DECLSPEC_HIDDEN; -struct d3d_viewport *unsafe_impl_from_IDirect3DViewport(IDirect3DViewport *iface) DECLSPEC_HIDDEN; +struct d3d_viewport *unsafe_impl_from_IDirect3DViewport3(IDirect3DViewport3 *iface); +struct d3d_viewport *unsafe_impl_from_IDirect3DViewport2(IDirect3DViewport2 *iface); +struct d3d_viewport *unsafe_impl_from_IDirect3DViewport(IDirect3DViewport *iface);
/* Helper functions */ -void viewport_activate(struct d3d_viewport *viewport, BOOL ignore_lights) DECLSPEC_HIDDEN; -void viewport_deactivate(struct d3d_viewport *viewport) DECLSPEC_HIDDEN; -void d3d_viewport_init(struct d3d_viewport *viewport, struct ddraw *ddraw) DECLSPEC_HIDDEN; +void viewport_activate(struct d3d_viewport *viewport, BOOL ignore_lights); +void viewport_deactivate(struct d3d_viewport *viewport); +void d3d_viewport_init(struct d3d_viewport *viewport, struct ddraw *ddraw);
/***************************************************************************** * IDirect3DExecuteBuffer - Wraps to D3D7 @@ -566,12 +566,12 @@ struct d3d_execute_buffer };
HRESULT d3d_execute_buffer_init(struct d3d_execute_buffer *execute_buffer, - struct d3d_device *device, D3DEXECUTEBUFFERDESC *desc) DECLSPEC_HIDDEN; -struct d3d_execute_buffer *unsafe_impl_from_IDirect3DExecuteBuffer(IDirect3DExecuteBuffer *iface) DECLSPEC_HIDDEN; + struct d3d_device *device, D3DEXECUTEBUFFERDESC *desc); +struct d3d_execute_buffer *unsafe_impl_from_IDirect3DExecuteBuffer(IDirect3DExecuteBuffer *iface);
/* The execute function */ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *execute_buffer, - struct d3d_device *device) DECLSPEC_HIDDEN; + struct d3d_device *device);
/***************************************************************************** * IDirect3DVertexBuffer @@ -596,9 +596,9 @@ struct d3d_vertex_buffer };
HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **buffer, struct ddraw *ddraw, - D3DVERTEXBUFFERDESC *desc) DECLSPEC_HIDDEN; -struct d3d_vertex_buffer *unsafe_impl_from_IDirect3DVertexBuffer(IDirect3DVertexBuffer *iface) DECLSPEC_HIDDEN; -struct d3d_vertex_buffer *unsafe_impl_from_IDirect3DVertexBuffer7(IDirect3DVertexBuffer7 *iface) DECLSPEC_HIDDEN; + D3DVERTEXBUFFERDESC *desc); +struct d3d_vertex_buffer *unsafe_impl_from_IDirect3DVertexBuffer(IDirect3DVertexBuffer *iface); +struct d3d_vertex_buffer *unsafe_impl_from_IDirect3DVertexBuffer7(IDirect3DVertexBuffer7 *iface);
/***************************************************************************** * Helper functions from utils.c @@ -611,22 +611,22 @@ struct d3d_vertex_buffer *unsafe_impl_from_IDirect3DVertexBuffer7(IDirect3DVerte (((((d3dvtVertexType) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1)
void ddrawformat_from_wined3dformat(DDPIXELFORMAT *ddraw_format, - enum wined3d_format_id wined3d_format) DECLSPEC_HIDDEN; + enum wined3d_format_id wined3d_format); BOOL wined3d_colour_from_ddraw_colour(const DDPIXELFORMAT *pf, const struct ddraw_palette *palette, - DWORD colour, struct wined3d_color *wined3d_colour) DECLSPEC_HIDDEN; -enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *format) DECLSPEC_HIDDEN; -unsigned int wined3dmapflags_from_ddrawmapflags(unsigned int flags) DECLSPEC_HIDDEN; -void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) DECLSPEC_HIDDEN; -void dump_D3DMATRIX(const D3DMATRIX *mat) DECLSPEC_HIDDEN; -void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) DECLSPEC_HIDDEN; -DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; -void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in) DECLSPEC_HIDDEN; -void DDRAW_dump_cooperativelevel(DWORD cooplevel) DECLSPEC_HIDDEN; -void DDSD_to_DDSD2(const DDSURFACEDESC *in, DDSURFACEDESC2 *out) DECLSPEC_HIDDEN; -void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out) DECLSPEC_HIDDEN; + DWORD colour, struct wined3d_color *wined3d_colour); +enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *format); +unsigned int wined3dmapflags_from_ddrawmapflags(unsigned int flags); +void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd); +void dump_D3DMATRIX(const D3DMATRIX *mat); +void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps); +DWORD get_flexible_vertex_size(DWORD d3dvtVertexType); +void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in); +void DDRAW_dump_cooperativelevel(DWORD cooplevel); +void DDSD_to_DDSD2(const DDSURFACEDESC *in, DDSURFACEDESC2 *out); +void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out);
void multiply_matrix(struct wined3d_matrix *dst, const struct wined3d_matrix *src1, - const struct wined3d_matrix *src2) DECLSPEC_HIDDEN; + const struct wined3d_matrix *src2);
static inline BOOL format_is_compressed(const DDPIXELFORMAT *format) { @@ -705,7 +705,7 @@ static inline struct wined3d_texture *ddraw_surface_get_any_texture(struct ddraw return ddraw_surface_get_draw_texture(surface, flags); }
-void d3d_device_sync_surfaces(struct d3d_device *device) DECLSPEC_HIDDEN; +void d3d_device_sync_surfaces(struct d3d_device *device);
/* Used for generic dumping */ struct flag_info @@ -740,9 +740,9 @@ struct member_info
#define DD_STRUCT_COPY_BYSIZE(to,from) DD_STRUCT_COPY_BYSIZE_(to,from,(to)->dwSize,(from)->dwSize)
-HRESULT hr_ddraw_from_wined3d(HRESULT hr) DECLSPEC_HIDDEN; +HRESULT hr_ddraw_from_wined3d(HRESULT hr);
-void viewport_alloc_active_light_index(struct d3d_light *light) DECLSPEC_HIDDEN; -void viewport_free_active_light_index(struct d3d_light *light) DECLSPEC_HIDDEN; +void viewport_alloc_active_light_index(struct d3d_light *light); +void viewport_free_active_light_index(struct d3d_light *light);
#endif
From: Alistair Leslie-Hughes leslie_alistair@hotmail.com
--- dlls/d3dx9_36/d3dx9_private.h | 60 +++++++++++++++++------------------ 1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 34ce272de1a..5d8f5b332f8 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -72,8 +72,8 @@ struct d3dx_include_from_file ID3DXInclude ID3DXInclude_iface; };
-extern CRITICAL_SECTION from_file_mutex DECLSPEC_HIDDEN; -extern const struct ID3DXIncludeVtbl d3dx_include_from_file_vtbl DECLSPEC_HIDDEN; +extern CRITICAL_SECTION from_file_mutex; +extern const struct ID3DXIncludeVtbl d3dx_include_from_file_vtbl;
static inline BOOL is_conversion_from_supported(const struct pixel_format_desc *format) { @@ -91,50 +91,50 @@ static inline BOOL is_conversion_to_supported(const struct pixel_format_desc *fo return !!format->from_rgba; }
-HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length) DECLSPEC_HIDDEN; -HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, void **buffer, DWORD *length) DECLSPEC_HIDDEN; +HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length); +HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, void **buffer, DWORD *length);
-HRESULT write_buffer_to_file(const WCHAR *filename, ID3DXBuffer *buffer) DECLSPEC_HIDDEN; +HRESULT write_buffer_to_file(const WCHAR *filename, ID3DXBuffer *buffer);
-const struct pixel_format_desc *get_format_info(D3DFORMAT format) DECLSPEC_HIDDEN; -const struct pixel_format_desc *get_format_info_idx(int idx) DECLSPEC_HIDDEN; +const struct pixel_format_desc *get_format_info(D3DFORMAT format); +const struct pixel_format_desc *get_format_info_idx(int idx);
void format_to_vec4(const struct pixel_format_desc *format, const BYTE *src, struct vec4 *dst);
void copy_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *size, - const struct pixel_format_desc *format) DECLSPEC_HIDDEN; + const struct pixel_format_desc *format); void convert_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, const struct volume *src_size, const struct pixel_format_desc *src_format, BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *dst_size, - const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette) DECLSPEC_HIDDEN; + const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette); void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, const struct volume *src_size, const struct pixel_format_desc *src_format, BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *dst_size, - const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette) DECLSPEC_HIDDEN; + const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette);
HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info, unsigned int skip_levels, - unsigned int *loaded_miplevels) DECLSPEC_HIDDEN; + unsigned int *loaded_miplevels); HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const void *src_data, - const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; + const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info); HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette, const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key, - const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; + const D3DXIMAGE_INFO *src_info); HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, const void *src_data, - const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; + const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info); HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLOCKED_RECT *lock, - IDirect3DSurface9 **temp_surface, BOOL write) DECLSPEC_HIDDEN; + IDirect3DSurface9 **temp_surface, BOOL write); HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, - IDirect3DSurface9 *temp_surface, BOOL update) DECLSPEC_HIDDEN; + IDirect3DSurface9 *temp_surface, BOOL update);
-unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN; -float float_16_to_32(const unsigned short in) DECLSPEC_HIDDEN; +unsigned short float_32_to_16(const float in); +float float_16_to_32(const unsigned short in);
/* debug helpers */ -const char *debug_d3dxparameter_class(D3DXPARAMETER_CLASS c) DECLSPEC_HIDDEN; -const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t) DECLSPEC_HIDDEN; -const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; +const char *debug_d3dxparameter_class(D3DXPARAMETER_CLASS c); +const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t); +const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r);
/* parameter type conversion helpers */ static inline BOOL get_bool(D3DXPARAMETER_TYPE type, const void *data) @@ -396,10 +396,10 @@ struct d3dx_parameters_store unsigned int full_name_tmp_size; };
-HRESULT d3dx_init_parameters_store(struct d3dx_parameters_store *store, unsigned int count) DECLSPEC_HIDDEN; -void d3dx_parameters_store_cleanup(struct d3dx_parameters_store *store) DECLSPEC_HIDDEN; +HRESULT d3dx_init_parameters_store(struct d3dx_parameters_store *store, unsigned int count); +void d3dx_parameters_store_cleanup(struct d3dx_parameters_store *store); struct d3dx_parameter *get_parameter_by_name(struct d3dx_parameters_store *store, - struct d3dx_parameter *parameter, const char *name) DECLSPEC_HIDDEN; + struct d3dx_parameter *parameter, const char *name);
#define SET_D3D_STATE_(manager, device, method, ...) (manager ? manager->lpVtbl->method(manager, __VA_ARGS__) \ : device->lpVtbl->method(device, __VA_ARGS__)) @@ -408,13 +408,13 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx_parameters_store *store HRESULT d3dx_create_param_eval(struct d3dx_parameters_store *parameters, void *byte_code, unsigned int byte_code_size, D3DXPARAMETER_TYPE type, struct d3dx_param_eval **peval, ULONG64 *version_counter, - const char **skip_constants, unsigned int skip_constants_count) DECLSPEC_HIDDEN; -void d3dx_free_param_eval(struct d3dx_param_eval *peval) DECLSPEC_HIDDEN; + const char **skip_constants, unsigned int skip_constants_count); +void d3dx_free_param_eval(struct d3dx_param_eval *peval); HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval, - const struct d3dx_parameter *param, void *param_value) DECLSPEC_HIDDEN; + const struct d3dx_parameter *param, void *param_value); HRESULT d3dx_param_eval_set_shader_constants(ID3DXEffectStateManager *manager, struct IDirect3DDevice9 *device, - struct d3dx_param_eval *peval, BOOL update_all) DECLSPEC_HIDDEN; -BOOL is_param_eval_input_dirty(struct d3dx_param_eval *peval, ULONG64 update_version) DECLSPEC_HIDDEN; + struct d3dx_param_eval *peval, BOOL update_all); +BOOL is_param_eval_input_dirty(struct d3dx_param_eval *peval, ULONG64 update_version);
struct ctab_constant { D3DXCONSTANT_DESC desc; @@ -423,6 +423,6 @@ struct ctab_constant { };
const struct ctab_constant *d3dx_shader_get_ctab_constant(ID3DXConstantTable *iface, - D3DXHANDLE constant) DECLSPEC_HIDDEN; + D3DXHANDLE constant);
#endif /* __WINE_D3DX9_PRIVATE_H */
-
Alistair Leslie-Hughes -
Alistair Leslie-Hughes (＠alesliehughes)