[PATCH 0/5] MR3282: Remove DECLSPEC_HIDDEN macro DirectX series
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3d10/d3d10_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index facd51ede6c..c174792e14b 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -309,7 +309,7 @@ struct d3d10_effect struct d3d10_effect_technique *techniques; }; -HRESULT d3d10_effect_parse(struct d3d10_effect *effect, const void *data, SIZE_T data_size) DECLSPEC_HIDDEN; +HRESULT d3d10_effect_parse(struct d3d10_effect *effect, const void *data, SIZE_T data_size); /* D3D10Core */ HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3282
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 74 +++++++++++------------ dlls/d3dcompiler_43/utils.h | 2 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 12db34891e0..c1349fbfc4d 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -48,9 +48,9 @@ #define D3DERR_INVALIDCALL 0x8876086c /* TRACE helper functions */ -const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part) DECLSPEC_HIDDEN; -const char *debug_d3dcompiler_shader_variable_class(D3D_SHADER_VARIABLE_CLASS c) DECLSPEC_HIDDEN; -const char *debug_d3dcompiler_shader_variable_type(D3D_SHADER_VARIABLE_TYPE t) DECLSPEC_HIDDEN; +const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part); +const char *debug_d3dcompiler_shader_variable_class(D3D_SHADER_VARIABLE_CLASS c); +const char *debug_d3dcompiler_shader_variable_type(D3D_SHADER_VARIABLE_TYPE t); enum shader_type { @@ -221,14 +221,14 @@ struct asmparser_backend const struct src_regs *srcs, int expectednsrcs); }; -struct instruction *alloc_instr(unsigned int srcs) DECLSPEC_HIDDEN; -BOOL add_instruction(struct bwriter_shader *shader, struct instruction *instr) DECLSPEC_HIDDEN; -BOOL add_constF(struct bwriter_shader *shader, uint32_t reg, float x, float y, float z, float w) DECLSPEC_HIDDEN; -BOOL add_constI(struct bwriter_shader *shader, uint32_t reg, int x, int y, int z, int w) DECLSPEC_HIDDEN; -BOOL add_constB(struct bwriter_shader *shader, uint32_t reg, BOOL x) DECLSPEC_HIDDEN; +struct instruction *alloc_instr(unsigned int srcs); +BOOL add_instruction(struct bwriter_shader *shader, struct instruction *instr); +BOOL add_constF(struct bwriter_shader *shader, uint32_t reg, float x, float y, float z, float w); +BOOL add_constI(struct bwriter_shader *shader, uint32_t reg, int x, int y, int z, int w); +BOOL add_constB(struct bwriter_shader *shader, uint32_t reg, BOOL x); BOOL record_declaration(struct bwriter_shader *shader, uint32_t usage, uint32_t usage_idx, - uint32_t mod, BOOL output, uint32_t regnum, uint32_t writemask, BOOL builtin) DECLSPEC_HIDDEN; -BOOL record_sampler(struct bwriter_shader *shader, uint32_t samptype, uint32_t mod, uint32_t regnum) DECLSPEC_HIDDEN; + uint32_t mod, BOOL output, uint32_t regnum, uint32_t writemask, BOOL builtin); +BOOL record_sampler(struct bwriter_shader *shader, uint32_t samptype, uint32_t mod, uint32_t regnum); #define MESSAGEBUFFER_INITIAL_SIZE 256 @@ -260,23 +260,23 @@ struct asm_parser unsigned int line_no; }; -extern struct asm_parser asm_ctx DECLSPEC_HIDDEN; +extern struct asm_parser asm_ctx; -void create_vs10_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_vs11_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_vs20_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_vs2x_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_vs30_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_ps10_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_ps11_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_ps12_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_ps13_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_ps14_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_ps20_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_ps2x_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -void create_ps30_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; +void create_vs10_parser(struct asm_parser *ret); +void create_vs11_parser(struct asm_parser *ret); +void create_vs20_parser(struct asm_parser *ret); +void create_vs2x_parser(struct asm_parser *ret); +void create_vs30_parser(struct asm_parser *ret); +void create_ps10_parser(struct asm_parser *ret); +void create_ps11_parser(struct asm_parser *ret); +void create_ps12_parser(struct asm_parser *ret); +void create_ps13_parser(struct asm_parser *ret); +void create_ps14_parser(struct asm_parser *ret); +void create_ps20_parser(struct asm_parser *ret); +void create_ps2x_parser(struct asm_parser *ret); +void create_ps30_parser(struct asm_parser *ret); -struct bwriter_shader *parse_asm_shader(char **messages) DECLSPEC_HIDDEN; +struct bwriter_shader *parse_asm_shader(char **messages); #ifdef __GNUC__ #define PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) @@ -284,8 +284,8 @@ struct bwriter_shader *parse_asm_shader(char **messages) DECLSPEC_HIDDEN; #define PRINTF_ATTR(fmt,args) #endif -void compilation_message(struct compilation_messages *msg, const char *fmt, va_list args) DECLSPEC_HIDDEN; -void WINAPIV asmparser_message(struct asm_parser *ctx, const char *fmt, ...) PRINTF_ATTR(2,3) DECLSPEC_HIDDEN; +void compilation_message(struct compilation_messages *msg, const char *fmt, va_list args); +void WINAPIV asmparser_message(struct asm_parser *ctx, const char *fmt, ...) PRINTF_ATTR(2,3); static inline void set_parse_status(enum parse_status *current, enum parse_status update) { if (update == PARSE_ERR) @@ -295,13 +295,13 @@ static inline void set_parse_status(enum parse_status *current, enum parse_statu } /* Debug utility routines */ -const char *debug_print_srcmod(uint32_t mod) DECLSPEC_HIDDEN; -const char *debug_print_dstmod(uint32_t mod) DECLSPEC_HIDDEN; -const char *debug_print_shift(uint32_t shift) DECLSPEC_HIDDEN; -const char *debug_print_dstreg(const struct shader_reg *reg) DECLSPEC_HIDDEN; -const char *debug_print_srcreg(const struct shader_reg *reg) DECLSPEC_HIDDEN; -const char *debug_print_comp(uint32_t comp) DECLSPEC_HIDDEN; -const char *debug_print_opcode(uint32_t opcode) DECLSPEC_HIDDEN; +const char *debug_print_srcmod(uint32_t mod); +const char *debug_print_dstmod(uint32_t mod); +const char *debug_print_shift(uint32_t shift); +const char *debug_print_dstreg(const struct shader_reg *reg); +const char *debug_print_srcreg(const struct shader_reg *reg); +const char *debug_print_comp(uint32_t comp); +const char *debug_print_opcode(uint32_t opcode); /* Used to signal an incorrect swizzle/writemask */ #define SWIZZLE_ERR ~0U @@ -530,9 +530,9 @@ enum bwriterdeclusage #define T2_REG 4 #define T3_REG 5 -struct bwriter_shader *SlAssembleShader(const char *text, char **messages) DECLSPEC_HIDDEN; -HRESULT shader_write_bytecode(const struct bwriter_shader *shader, uint32_t **result, uint32_t *size) DECLSPEC_HIDDEN; -void SlDeleteShader(struct bwriter_shader *shader) DECLSPEC_HIDDEN; +struct bwriter_shader *SlAssembleShader(const char *text, char **messages); +HRESULT shader_write_bytecode(const struct bwriter_shader *shader, uint32_t **result, uint32_t *size); +void SlDeleteShader(struct bwriter_shader *shader); #define DXBC_HEADER_SIZE (8 * sizeof(uint32_t)) diff --git a/dlls/d3dcompiler_43/utils.h b/dlls/d3dcompiler_43/utils.h index 5259c057f6e..f587778d13e 100644 --- a/dlls/d3dcompiler_43/utils.h +++ b/dlls/d3dcompiler_43/utils.h @@ -30,6 +30,6 @@ static inline uint32_t read_u32(const char **ptr) return r; } -void skip_u32_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; +void skip_u32_unknown(const char **ptr, unsigned int count); #endif /* __WINE_UTILS_H */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3282
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3d8/d3d8_private.h | 66 ++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 181a952a347..889cc57ce15 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -49,10 +49,10 @@ /* CreateVertexShader can return > 0xFFFF */ #define VS_HIGHESTFIXEDFXF 0xF0000000 -extern const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops DECLSPEC_HIDDEN; +extern const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops; void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d_caps, - unsigned int adapter_ordinal) DECLSPEC_HIDDEN; + unsigned int adapter_ordinal); struct d3d8 { @@ -63,7 +63,7 @@ struct d3d8 unsigned int wined3d_output_count; }; -BOOL d3d8_init(struct d3d8 *d3d8) DECLSPEC_HIDDEN; +BOOL d3d8_init(struct d3d8 *d3d8); /***************************************************************************** * IDirect3DDevice8 implementation structure @@ -142,7 +142,7 @@ struct d3d8_device }; HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wined3d *wined3d, UINT adapter, - D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) DECLSPEC_HIDDEN; + D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters); static inline struct d3d8_device *impl_from_IDirect3DDevice8(IDirect3DDevice8 *iface) { @@ -155,13 +155,13 @@ struct d3d8_resource struct wined3d_private_store private_store; }; -void d3d8_resource_cleanup(struct d3d8_resource *resource) DECLSPEC_HIDDEN; -HRESULT d3d8_resource_free_private_data(struct d3d8_resource *resource, const GUID *guid) DECLSPEC_HIDDEN; +void d3d8_resource_cleanup(struct d3d8_resource *resource); +HRESULT d3d8_resource_free_private_data(struct d3d8_resource *resource, const GUID *guid); HRESULT d3d8_resource_get_private_data(struct d3d8_resource *resource, const GUID *guid, - void *data, DWORD *data_size) DECLSPEC_HIDDEN; -void d3d8_resource_init(struct d3d8_resource *resource) DECLSPEC_HIDDEN; + void *data, DWORD *data_size); +void d3d8_resource_init(struct d3d8_resource *resource); HRESULT d3d8_resource_set_private_data(struct d3d8_resource *resource, const GUID *guid, - const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN; + const void *data, DWORD data_size, DWORD flags); struct d3d8_volume { @@ -173,7 +173,7 @@ struct d3d8_volume }; void volume_init(struct d3d8_volume *volume, struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops); struct d3d8_swapchain { @@ -186,7 +186,7 @@ struct d3d8_swapchain }; HRESULT d3d8_swapchain_create(struct d3d8_device *device, struct wined3d_swapchain_desc *desc, - unsigned int swap_interval, struct d3d8_swapchain **swapchain) DECLSPEC_HIDDEN; + unsigned int swap_interval, struct d3d8_swapchain **swapchain); struct d3d8_surface { @@ -202,13 +202,13 @@ struct d3d8_surface struct wined3d_swapchain *swapchain; }; -struct wined3d_rendertarget_view *d3d8_surface_acquire_rendertarget_view(struct d3d8_surface *surface) DECLSPEC_HIDDEN; +struct wined3d_rendertarget_view *d3d8_surface_acquire_rendertarget_view(struct d3d8_surface *surface); struct d3d8_surface *d3d8_surface_create(struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx, IUnknown *container) DECLSPEC_HIDDEN; -struct d3d8_device *d3d8_surface_get_device(const struct d3d8_surface *surface) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, IUnknown *container); +struct d3d8_device *d3d8_surface_get_device(const struct d3d8_surface *surface); void d3d8_surface_release_rendertarget_view(struct d3d8_surface *surface, - struct wined3d_rendertarget_view *rtv) DECLSPEC_HIDDEN; -struct d3d8_surface *unsafe_impl_from_IDirect3DSurface8(IDirect3DSurface8 *iface) DECLSPEC_HIDDEN; + struct wined3d_rendertarget_view *rtv); +struct d3d8_surface *unsafe_impl_from_IDirect3DSurface8(IDirect3DSurface8 *iface); struct d3d8_vertexbuffer { @@ -222,8 +222,8 @@ struct d3d8_vertexbuffer }; HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device *device, - UINT size, DWORD usage, DWORD fvf, D3DPOOL pool) DECLSPEC_HIDDEN; -struct d3d8_vertexbuffer *unsafe_impl_from_IDirect3DVertexBuffer8(IDirect3DVertexBuffer8 *iface) DECLSPEC_HIDDEN; + UINT size, DWORD usage, DWORD fvf, D3DPOOL pool); +struct d3d8_vertexbuffer *unsafe_impl_from_IDirect3DVertexBuffer8(IDirect3DVertexBuffer8 *iface); struct d3d8_indexbuffer { @@ -238,8 +238,8 @@ struct d3d8_indexbuffer }; HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *device, - UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; -struct d3d8_indexbuffer *unsafe_impl_from_IDirect3DIndexBuffer8(IDirect3DIndexBuffer8 *iface) DECLSPEC_HIDDEN; + UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool); +struct d3d8_indexbuffer *unsafe_impl_from_IDirect3DIndexBuffer8(IDirect3DIndexBuffer8 *iface); struct d3d8_texture { @@ -262,7 +262,7 @@ static inline struct wined3d_texture *d3d8_texture_get_draw_texture(struct d3d8_ return texture->draw_texture ? texture->draw_texture : texture->wined3d_texture; } -struct d3d8_texture *unsafe_impl_from_IDirect3DBaseTexture8(IDirect3DBaseTexture8 *iface) DECLSPEC_HIDDEN; +struct d3d8_texture *unsafe_impl_from_IDirect3DBaseTexture8(IDirect3DBaseTexture8 *iface); struct d3d8_vertex_declaration { @@ -273,11 +273,11 @@ struct d3d8_vertex_declaration DWORD shader_handle; }; -void d3d8_vertex_declaration_destroy(struct d3d8_vertex_declaration *declaration) DECLSPEC_HIDDEN; +void d3d8_vertex_declaration_destroy(struct d3d8_vertex_declaration *declaration); HRESULT d3d8_vertex_declaration_init(struct d3d8_vertex_declaration *declaration, - struct d3d8_device *device, const DWORD *elements, DWORD shader_handle) DECLSPEC_HIDDEN; + struct d3d8_device *device, const DWORD *elements, DWORD shader_handle); HRESULT d3d8_vertex_declaration_init_fvf(struct d3d8_vertex_declaration *declaration, - struct d3d8_device *device, DWORD fvf) DECLSPEC_HIDDEN; + struct d3d8_device *device, DWORD fvf); struct d3d8_vertex_shader { @@ -285,9 +285,9 @@ struct d3d8_vertex_shader struct wined3d_shader *wined3d_shader; }; -void d3d8_vertex_shader_destroy(struct d3d8_vertex_shader *shader) DECLSPEC_HIDDEN; +void d3d8_vertex_shader_destroy(struct d3d8_vertex_shader *shader); HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_device *device, - const DWORD *declaration, const DWORD *byte_code, DWORD shader_handle, DWORD usage) DECLSPEC_HIDDEN; + const DWORD *declaration, const DWORD *byte_code, DWORD shader_handle, DWORD usage); struct d3d8_pixel_shader { @@ -295,15 +295,15 @@ struct d3d8_pixel_shader struct wined3d_shader *wined3d_shader; }; -void d3d8_pixel_shader_destroy(struct d3d8_pixel_shader *shader) DECLSPEC_HIDDEN; +void d3d8_pixel_shader_destroy(struct d3d8_pixel_shader *shader); HRESULT d3d8_pixel_shader_init(struct d3d8_pixel_shader *shader, struct d3d8_device *device, - const DWORD *byte_code, DWORD shader_handle) DECLSPEC_HIDDEN; + const DWORD *byte_code, DWORD shader_handle); -D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; -enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; -unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags, unsigned int usage) DECLSPEC_HIDDEN; -void load_local_constants(const DWORD *d3d8_elements, struct wined3d_shader *wined3d_vertex_shader) DECLSPEC_HIDDEN; -size_t parse_token(const DWORD *pToken) DECLSPEC_HIDDEN; +D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format); +enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format); +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags, unsigned int usage); +void load_local_constants(const DWORD *d3d8_elements, struct wined3d_shader *wined3d_vertex_shader); +size_t parse_token(const DWORD *pToken); static inline DWORD d3dusage_from_wined3dusage(unsigned int wined3d_usage, unsigned int bind_flags) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3282
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3drm/d3drm_private.h | 62 +++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 296a9730954..34805e7b21b 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -272,39 +272,39 @@ struct d3drm_wrap LONG ref; }; -HRESULT d3drm_device_create(struct d3drm_device **device, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; +HRESULT d3drm_device_create(struct d3drm_device **device, IDirect3DRM *d3drm); HRESULT d3drm_device_create_surfaces_from_clipper(struct d3drm_device *object, IDirectDraw *ddraw, - IDirectDrawClipper *clipper, int width, int height, IDirectDrawSurface **surface) DECLSPEC_HIDDEN; -void d3drm_device_destroy(struct d3drm_device *device) DECLSPEC_HIDDEN; + IDirectDrawClipper *clipper, int width, int height, IDirectDrawSurface **surface); +void d3drm_device_destroy(struct d3drm_device *device); HRESULT d3drm_device_init(struct d3drm_device *device, UINT version, IDirectDraw *ddraw, - IDirectDrawSurface *surface, BOOL create_z_surface) DECLSPEC_HIDDEN; - -void d3drm_object_init(struct d3drm_object *object, const char *classname) DECLSPEC_HIDDEN; -HRESULT d3drm_object_add_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) DECLSPEC_HIDDEN; -HRESULT d3drm_object_delete_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) DECLSPEC_HIDDEN; -HRESULT d3drm_object_get_class_name(struct d3drm_object *object, DWORD *size, char *name) DECLSPEC_HIDDEN; -HRESULT d3drm_object_get_name(struct d3drm_object *object, DWORD *size, char *name) DECLSPEC_HIDDEN; -HRESULT d3drm_object_set_name(struct d3drm_object *object, const char *name) DECLSPEC_HIDDEN; -void d3drm_object_cleanup(IDirect3DRMObject *iface, struct d3drm_object *object) DECLSPEC_HIDDEN; - -struct d3drm_frame *unsafe_impl_from_IDirect3DRMFrame(IDirect3DRMFrame *iface) DECLSPEC_HIDDEN; -struct d3drm_frame *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface) DECLSPEC_HIDDEN; - -struct d3drm_device *unsafe_impl_from_IDirect3DRMDevice3(IDirect3DRMDevice3 *iface) DECLSPEC_HIDDEN; - -HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; -HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; -HRESULT d3drm_face_create(struct d3drm_face **face) DECLSPEC_HIDDEN; -HRESULT d3drm_viewport_create(struct d3drm_viewport **viewport, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; -HRESULT d3drm_mesh_builder_create(struct d3drm_mesh_builder **mesh_builder, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; -HRESULT d3drm_light_create(struct d3drm_light **light, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; -HRESULT d3drm_material_create(struct d3drm_material **material, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; -HRESULT d3drm_mesh_create(struct d3drm_mesh **mesh, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; -HRESULT d3drm_animation_create(struct d3drm_animation **animation, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; -HRESULT d3drm_wrap_create(struct d3drm_wrap **wrap, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; + IDirectDrawSurface *surface, BOOL create_z_surface); + +void d3drm_object_init(struct d3drm_object *object, const char *classname); +HRESULT d3drm_object_add_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx); +HRESULT d3drm_object_delete_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx); +HRESULT d3drm_object_get_class_name(struct d3drm_object *object, DWORD *size, char *name); +HRESULT d3drm_object_get_name(struct d3drm_object *object, DWORD *size, char *name); +HRESULT d3drm_object_set_name(struct d3drm_object *object, const char *name); +void d3drm_object_cleanup(IDirect3DRMObject *iface, struct d3drm_object *object); + +struct d3drm_frame *unsafe_impl_from_IDirect3DRMFrame(IDirect3DRMFrame *iface); +struct d3drm_frame *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface); + +struct d3drm_device *unsafe_impl_from_IDirect3DRMDevice3(IDirect3DRMDevice3 *iface); + +HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm); +HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, IDirect3DRM *d3drm); +HRESULT d3drm_face_create(struct d3drm_face **face); +HRESULT d3drm_viewport_create(struct d3drm_viewport **viewport, IDirect3DRM *d3drm); +HRESULT d3drm_mesh_builder_create(struct d3drm_mesh_builder **mesh_builder, IDirect3DRM *d3drm); +HRESULT d3drm_light_create(struct d3drm_light **light, IDirect3DRM *d3drm); +HRESULT d3drm_material_create(struct d3drm_material **material, IDirect3DRM *d3drm); +HRESULT d3drm_mesh_create(struct d3drm_mesh **mesh, IDirect3DRM *d3drm); +HRESULT d3drm_animation_create(struct d3drm_animation **animation, IDirect3DRM *d3drm); +HRESULT d3drm_wrap_create(struct d3drm_wrap **wrap, IDirect3DRM *d3drm); HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *data, - D3DRMLOADTEXTURECALLBACK load_texture_proc, void *arg) DECLSPEC_HIDDEN; + D3DRMLOADTEXTURECALLBACK load_texture_proc, void *arg); struct d3drm_file_header { @@ -313,7 +313,7 @@ struct d3drm_file_header DWORD flags; }; -extern char templates[] DECLSPEC_HIDDEN; +extern char templates[]; static inline BYTE d3drm_color_component(float c) { @@ -330,6 +330,6 @@ static inline void d3drm_set_color(D3DCOLOR *color, float r, float g, float b, f d3drm_color_component(b), d3drm_color_component(a)); } -BOOL d3drm_array_reserve(void **elements, SIZE_T *capacity, SIZE_T element_count, SIZE_T element_size) DECLSPEC_HIDDEN; +BOOL d3drm_array_reserve(void **elements, SIZE_T *capacity, SIZE_T element_count, SIZE_T element_size); #endif /* __D3DRM_PRIVATE_INCLUDED__ */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3282
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3d9/d3d9_private.h | 74 ++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index cb86ce678fb..81a37e7dffc 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -50,15 +50,15 @@ #define D3DFMT_RESZ MAKEFOURCC('R','E','S','Z') #define D3D9_RESZ_CODE 0x7fa05000 -extern const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops DECLSPEC_HIDDEN; +extern const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops; -HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLSPEC_HIDDEN; -D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; -BOOL is_gdi_compat_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; -enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; -unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags, unsigned int usage) DECLSPEC_HIDDEN; +HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements); +D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format); +BOOL is_gdi_compat_wined3dformat(enum wined3d_format_id format); +enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format); +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags, unsigned int usage); void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, - const struct wined3d_swapchain_desc *swapchain_desc, DWORD presentation_interval) DECLSPEC_HIDDEN; + const struct wined3d_swapchain_desc *swapchain_desc, DWORD presentation_interval); struct d3d9 { @@ -71,8 +71,8 @@ struct d3d9 }; void d3d9_caps_from_wined3dcaps(const struct d3d9 *d3d9, unsigned int adapter_ordinal, - D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps) DECLSPEC_HIDDEN; -BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) DECLSPEC_HIDDEN; + D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps); +BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended); struct fvf_declaration { @@ -124,7 +124,7 @@ struct d3d9_device HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, - D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode) DECLSPEC_HIDDEN; + D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode); struct d3d9_resource { @@ -132,13 +132,13 @@ struct d3d9_resource struct wined3d_private_store private_store; }; -void d3d9_resource_cleanup(struct d3d9_resource *resource) DECLSPEC_HIDDEN; -HRESULT d3d9_resource_free_private_data(struct d3d9_resource *resource, const GUID *guid) DECLSPEC_HIDDEN; +void d3d9_resource_cleanup(struct d3d9_resource *resource); +HRESULT d3d9_resource_free_private_data(struct d3d9_resource *resource, const GUID *guid); HRESULT d3d9_resource_get_private_data(struct d3d9_resource *resource, const GUID *guid, - void *data, DWORD *data_size) DECLSPEC_HIDDEN; -void d3d9_resource_init(struct d3d9_resource *resource) DECLSPEC_HIDDEN; + void *data, DWORD *data_size); +void d3d9_resource_init(struct d3d9_resource *resource); HRESULT d3d9_resource_set_private_data(struct d3d9_resource *resource, const GUID *guid, - const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN; + const void *data, DWORD data_size, DWORD flags); struct d3d9_volume { @@ -150,7 +150,7 @@ struct d3d9_volume }; void volume_init(struct d3d9_volume *volume, struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops); struct d3d9_swapchain { @@ -163,7 +163,7 @@ struct d3d9_swapchain }; HRESULT d3d9_swapchain_create(struct d3d9_device *device, struct wined3d_swapchain_desc *desc, - unsigned int swap_interval, struct d3d9_swapchain **swapchain) DECLSPEC_HIDDEN; + unsigned int swap_interval, struct d3d9_swapchain **swapchain); struct d3d9_surface { @@ -179,13 +179,13 @@ struct d3d9_surface struct wined3d_swapchain *swapchain; }; -struct wined3d_rendertarget_view *d3d9_surface_acquire_rendertarget_view(struct d3d9_surface *surface) DECLSPEC_HIDDEN; +struct wined3d_rendertarget_view *d3d9_surface_acquire_rendertarget_view(struct d3d9_surface *surface); struct d3d9_surface *d3d9_surface_create(struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx, IUnknown *container) DECLSPEC_HIDDEN; -struct d3d9_device *d3d9_surface_get_device(const struct d3d9_surface *surface) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, IUnknown *container); +struct d3d9_device *d3d9_surface_get_device(const struct d3d9_surface *surface); void d3d9_surface_release_rendertarget_view(struct d3d9_surface *surface, - struct wined3d_rendertarget_view *rtv) DECLSPEC_HIDDEN; -struct d3d9_surface *unsafe_impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) DECLSPEC_HIDDEN; + struct wined3d_rendertarget_view *rtv); +struct d3d9_surface *unsafe_impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface); struct d3d9_vertexbuffer { @@ -198,8 +198,8 @@ struct d3d9_vertexbuffer }; HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device *device, - UINT size, UINT usage, DWORD fvf, D3DPOOL pool) DECLSPEC_HIDDEN; -struct d3d9_vertexbuffer *unsafe_impl_from_IDirect3DVertexBuffer9(IDirect3DVertexBuffer9 *iface) DECLSPEC_HIDDEN; + UINT size, UINT usage, DWORD fvf, D3DPOOL pool); +struct d3d9_vertexbuffer *unsafe_impl_from_IDirect3DVertexBuffer9(IDirect3DVertexBuffer9 *iface); struct d3d9_indexbuffer { @@ -213,8 +213,8 @@ struct d3d9_indexbuffer }; HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *device, - UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; -struct d3d9_indexbuffer *unsafe_impl_from_IDirect3DIndexBuffer9(IDirect3DIndexBuffer9 *iface) DECLSPEC_HIDDEN; + UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool); +struct d3d9_indexbuffer *unsafe_impl_from_IDirect3DIndexBuffer9(IDirect3DIndexBuffer9 *iface); struct d3d9_texture { @@ -241,9 +241,9 @@ static inline struct wined3d_texture *d3d9_texture_get_draw_texture(struct d3d9_ return texture->draw_texture ? texture->draw_texture : texture->wined3d_texture; } -struct d3d9_texture *unsafe_impl_from_IDirect3DBaseTexture9(IDirect3DBaseTexture9 *iface) DECLSPEC_HIDDEN; -void d3d9_texture_flag_auto_gen_mipmap(struct d3d9_texture *texture) DECLSPEC_HIDDEN; -void d3d9_texture_gen_auto_mipmap(struct d3d9_texture *texture) DECLSPEC_HIDDEN; +struct d3d9_texture *unsafe_impl_from_IDirect3DBaseTexture9(IDirect3DBaseTexture9 *iface); +void d3d9_texture_flag_auto_gen_mipmap(struct d3d9_texture *texture); +void d3d9_texture_gen_auto_mipmap(struct d3d9_texture *texture); struct d3d9_stateblock { @@ -254,7 +254,7 @@ struct d3d9_stateblock }; HRESULT stateblock_init(struct d3d9_stateblock *stateblock, struct d3d9_device *device, - D3DSTATEBLOCKTYPE type, struct wined3d_stateblock *wined3d_stateblock) DECLSPEC_HIDDEN; + D3DSTATEBLOCKTYPE type, struct wined3d_stateblock *wined3d_stateblock); struct d3d9_vertex_declaration { @@ -269,9 +269,9 @@ struct d3d9_vertex_declaration }; HRESULT d3d9_vertex_declaration_create(struct d3d9_device *device, - const D3DVERTEXELEMENT9 *elements, struct d3d9_vertex_declaration **declaration) DECLSPEC_HIDDEN; + const D3DVERTEXELEMENT9 *elements, struct d3d9_vertex_declaration **declaration); struct d3d9_vertex_declaration *unsafe_impl_from_IDirect3DVertexDeclaration9( - IDirect3DVertexDeclaration9 *iface) DECLSPEC_HIDDEN; + IDirect3DVertexDeclaration9 *iface); struct d3d9_vertexshader { @@ -282,8 +282,8 @@ struct d3d9_vertexshader }; HRESULT vertexshader_init(struct d3d9_vertexshader *shader, - struct d3d9_device *device, const DWORD *byte_code) DECLSPEC_HIDDEN; -struct d3d9_vertexshader *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) DECLSPEC_HIDDEN; + struct d3d9_device *device, const DWORD *byte_code); +struct d3d9_vertexshader *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface); struct d3d9_pixelshader { @@ -294,8 +294,8 @@ struct d3d9_pixelshader }; HRESULT pixelshader_init(struct d3d9_pixelshader *shader, - struct d3d9_device *device, const DWORD *byte_code) DECLSPEC_HIDDEN; -struct d3d9_pixelshader *unsafe_impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) DECLSPEC_HIDDEN; + struct d3d9_device *device, const DWORD *byte_code); +struct d3d9_pixelshader *unsafe_impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface); struct d3d9_query { @@ -306,7 +306,7 @@ struct d3d9_query DWORD data_size; }; -HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUERYTYPE type) DECLSPEC_HIDDEN; +HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUERYTYPE type); static inline struct d3d9_device *impl_from_IDirect3DDevice9Ex(IDirect3DDevice9Ex *iface) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3282
This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3282
This merge request was approved by Matteo Bruni. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3282
participants (4)
-
Alistair Leslie-Hughes -
Alistair Leslie-Hughes (＠alesliehughes)
-
Matteo Bruni (＠Mystral)
-
Zebediah Figura (＠zfigura)