[PATCH 0/3] MR1536: Preparation to long types migration (serie II)

List overview All Threads

newer

older

[PATCH 0/8] MR1489: DirectMusic:...

Re: [PATCH v2 0/1] MR1396:...

eric pouech (＠epo)

24 Nov 2022 24 Nov '22

8:40 a.m.

Migration a couple of bits to unsigned int.

Note to Zebediah (mainly on second commit of this serie): - there is also a load of 'uint32_t flags' parameters that I didn't change (mainly not to change too many things) Is this something to consider? - I didn't touch the local variables either. Maybe it's something to consider also.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1536

Show replies by date

Eric Pouech

24 Nov 24 Nov

8:40 a.m.

New subject: [PATCH 1/3] wined3d: Don't use long type for flags field/parameter (external).

From: Eric Pouech eric.pouech@gmail.com

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1f9774767ba..b598c7b7f36 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3748,7 +3748,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO

HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, UINT src_start_idx, UINT dst_idx, UINT vertex_count, struct wined3d_buffer *dst_buffer, - const struct wined3d_vertex_declaration *declaration, DWORD flags, DWORD dst_fvf) + const struct wined3d_vertex_declaration *declaration, unsigned int flags, DWORD dst_fvf) { struct wined3d_state *state = device->cs->c.state; struct wined3d_stream_info stream_info; @@ -4337,7 +4337,7 @@ HRESULT CDECL wined3d_device_end_scene(struct wined3d_device *device) }

HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, - const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) + const RECT *rects, unsigned int flags, const struct wined3d_color *color, float depth, DWORD stencil) { struct wined3d_fb_state *fb = &device->cs->c.state->fb;

@@ -5454,7 +5454,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device }

void CDECL wined3d_device_set_cursor_position(struct wined3d_device *device, - int x_screen_space, int y_screen_space, DWORD flags) + int x_screen_space, int y_screen_space, unsigned int flags) { TRACE("device %p, x %d, y %d, flags %#x.\n", device, x_screen_space, y_screen_space, flags); @@ -5892,7 +5892,7 @@ struct wined3d * CDECL wined3d_device_get_wined3d(const struct wined3d_device *d }

void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device, - UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp) + UINT swapchain_idx, unsigned int flags, const struct wined3d_gamma_ramp *ramp) { struct wined3d_swapchain *swapchain;

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8590bd4800a..239cc2d8320 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1745,7 +1745,7 @@ HRESULT wined3d_output_get_gamma_ramp(struct wined3d_output *output, struct wine }

HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapter, - DWORD flags, struct wined3d_adapter_identifier *identifier) + unsigned int flags, struct wined3d_adapter_identifier *identifier) { TRACE("adapter %p, flags %#x, identifier %p.\n", adapter, flags, identifier);

@@ -2707,7 +2707,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, }

HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, struct wined3d_adapter *adapter, - enum wined3d_device_type device_type, HWND focus_window, DWORD flags, BYTE surface_alignment, + enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index dde0843fb47..6445f4d284b 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -56,7 +56,7 @@ ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette) }

HRESULT CDECL wined3d_palette_get_entries(const struct wined3d_palette *palette, - DWORD flags, DWORD start, DWORD count, PALETTEENTRY *entries) + unsigned int flags, DWORD start, DWORD count, PALETTEENTRY *entries) { unsigned int i; TRACE("palette %p, flags %#x, start %u, count %u, entries %p.\n", @@ -95,7 +95,7 @@ void CDECL wined3d_palette_apply_to_dc(const struct wined3d_palette *palette, HD }

HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, - DWORD flags, DWORD start, DWORD count, const PALETTEENTRY *entries) + unsigned int flags, DWORD start, DWORD count, const PALETTEENTRY *entries) { unsigned int i;

@@ -158,7 +158,7 @@ static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wine return WINED3D_OK; }

-HRESULT CDECL wined3d_palette_create(struct wined3d_device *device, DWORD flags, +HRESULT CDECL wined3d_palette_create(struct wined3d_device *device, unsigned int flags, unsigned int entry_count, const PALETTEENTRY *entries, struct wined3d_palette **palette) { struct wined3d_palette *object; diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 34ee56d5d11..189efec0c42 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -448,7 +448,7 @@ ULONG CDECL wined3d_query_decref(struct wined3d_query *query) }

HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, - void *data, UINT data_size, DWORD flags) + void *data, UINT data_size, unsigned int flags) { TRACE("query %p, data %p, data_size %u, flags %#x.\n", query, data, data_size, flags); @@ -493,7 +493,7 @@ UINT CDECL wined3d_query_get_data_size(const struct wined3d_query *query) return query->data_size; }

-HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, DWORD flags) +HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, unsigned int flags) { TRACE("query %p, flags %#x.\n", query, flags);

diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index c32c9580ae9..5082a86b92e 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -313,7 +313,7 @@ void CDECL wined3d_resource_get_desc(const struct wined3d_resource *resource, st }

HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) { TRACE("resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", resource, sub_resource_idx, map_desc, debug_box(box), flags); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 346fd1e6497..3fbd3649039 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -206,7 +206,7 @@ void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWN

HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, - unsigned int swap_interval, DWORD flags) + unsigned int swap_interval, unsigned int flags) { RECT s, d;

@@ -359,7 +359,7 @@ void CDECL wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchain, }

HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, - DWORD flags, const struct wined3d_gamma_ramp *ramp) + unsigned int flags, const struct wined3d_gamma_ramp *ramp) { struct wined3d_output *output;

diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c9d5193e291..d3fc3fb2219 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1786,7 +1786,7 @@ DWORD CDECL wined3d_texture_get_level_count(const struct wined3d_texture *textur }

HRESULT CDECL wined3d_texture_set_color_key(struct wined3d_texture *texture, - DWORD flags, const struct wined3d_color_key *color_key) + unsigned int flags, const struct wined3d_color_key *color_key) { struct wined3d_device *device = texture->resource.device; static const DWORD all_flags = WINED3D_CKEY_DST_BLT | WINED3D_CKEY_DST_OVERLAY @@ -4226,7 +4226,7 @@ HRESULT CDECL wined3d_texture_set_overlay_position(struct wined3d_texture *textu

HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, unsigned int sub_resource_idx, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, - const RECT *dst_rect, DWORD flags) + const RECT *dst_rect, unsigned int flags) { struct wined3d_overlay_info *overlay; unsigned int level, dst_level; @@ -4417,7 +4417,7 @@ HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, struct wi }

HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, - UINT layer_count, UINT level_count, DWORD flags, const struct wined3d_sub_resource_data *data, + UINT layer_count, UINT level_count, unsigned int flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) { unsigned int sub_count = level_count * layer_count; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 576da8034c9..e20fd3545f9 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -129,7 +129,7 @@ struct wined3d_settings wined3d_settings = .shader_backend = WINED3D_SHADER_BACKEND_AUTO, };

-struct wined3d * CDECL wined3d_create(DWORD flags) +struct wined3d * CDECL wined3d_create(unsigned int flags) { struct wined3d *object; HRESULT hr; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a18dcda45be..e58f3a93385 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1768,7 +1768,7 @@ struct wined3d_swapchain_desc BOOL windowed; BOOL enable_auto_depth_stencil; enum wined3d_format_id auto_depth_stencil_format; - DWORD flags; + unsigned int flags; unsigned int refresh_rate; BOOL auto_restore_display_mode; }; @@ -1832,7 +1832,7 @@ struct wined3d_device_creation_parameters UINT adapter_idx; enum wined3d_device_type device_type; HWND focus_window; - DWORD flags; + unsigned int flags; };

struct wined3d_raster_status @@ -2305,7 +2305,7 @@ HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, struct wined3d_output *output, enum wined3d_device_type device_type, enum wined3d_format_id display_format_id, enum wined3d_format_id backbuffer_format_id, BOOL windowed); -struct wined3d * __cdecl wined3d_create(DWORD flags); +struct wined3d * __cdecl wined3d_create(unsigned int flags); ULONG __cdecl wined3d_decref(struct wined3d *wined3d); struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined3d, unsigned int idx); @@ -2320,7 +2320,7 @@ HRESULT __cdecl wined3d_restore_display_modes(struct wined3d *wined3d); void __cdecl wined3d_unregister_windows(struct wined3d *wined3d);

HRESULT __cdecl wined3d_adapter_get_identifier(const struct wined3d_adapter *adapter, - DWORD flags, struct wined3d_adapter_identifier *identifier); + unsigned int flags, struct wined3d_adapter_identifier *identifier); struct wined3d_output * __cdecl wined3d_adapter_get_output(const struct wined3d_adapter *adapter, unsigned int idx); unsigned int __cdecl wined3d_adapter_get_output_count(const struct wined3d_adapter *adapter); @@ -2357,10 +2357,10 @@ ULONG __cdecl wined3d_depth_stencil_state_incref(struct wined3d_depth_stencil_st HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window); void __cdecl wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, - const struct wined3d_color *color, float z, DWORD stencil); +HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, + unsigned int flags, const struct wined3d_color *color, float z, DWORD stencil); HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, struct wined3d_adapter *adapter, - enum wined3d_device_type device_type, HWND focus_window, DWORD behaviour_flags, BYTE surface_alignment, + enum wined3d_device_type device_type, HWND focus_window, unsigned int behaviour_flags, BYTE surface_alignment, const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device); ULONG __cdecl wined3d_device_decref(struct wined3d_device *device); @@ -2390,7 +2390,7 @@ struct wined3d * __cdecl wined3d_device_get_wined3d(const struct wined3d_device ULONG __cdecl wined3d_device_incref(struct wined3d_device *device); HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device, UINT src_start_idx, UINT dst_idx, UINT vertex_count, struct wined3d_buffer *dst_buffer, - const struct wined3d_vertex_declaration *declaration, DWORD flags, DWORD dst_fvf); + const struct wined3d_vertex_declaration *declaration, unsigned int flags, DWORD dst_fvf); void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device); HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, @@ -2398,12 +2398,12 @@ HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device, const struct wined3d_clip_status *clip_status); void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device, - int x_screen_space, int y_screen_space, DWORD flags); + int x_screen_space, int y_screen_space, unsigned int flags); HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device, UINT x_hotspot, UINT y_hotspot, struct wined3d_texture *texture, unsigned int sub_resource_idx); HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, - UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); + UINT swapchain_idx, unsigned int flags, const struct wined3d_gamma_ramp *ramp); void __cdecl wined3d_device_set_max_frame_latency(struct wined3d_device *device, unsigned int max_frame_latency); void __cdecl wined3d_device_set_multithreaded(struct wined3d_device *device); HRESULT __cdecl wined3d_device_set_npatch_mode(struct wined3d_device *device, float segments); @@ -2562,25 +2562,26 @@ HRESULT __cdecl wined3d_output_set_display_mode(struct wined3d_output *output, HRESULT __cdecl wined3d_output_set_gamma_ramp(struct wined3d_output *output, const struct wined3d_gamma_ramp *ramp); HRESULT __cdecl wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive);

-HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flags, +HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, unsigned int flags, unsigned int entry_count, const PALETTEENTRY *entries, struct wined3d_palette **palette); ULONG __cdecl wined3d_palette_decref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_get_entries(const struct wined3d_palette *palette, - DWORD flags, DWORD start, DWORD count, PALETTEENTRY *entries); + unsigned int flags, DWORD start, DWORD count, PALETTEENTRY *entries); void __cdecl wined3d_palette_apply_to_dc(const struct wined3d_palette *palette, HDC dc); ULONG __cdecl wined3d_palette_incref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_set_entries(struct wined3d_palette *palette, - DWORD flags, DWORD start, DWORD count, const PALETTEENTRY *entries); + unsigned int flags, DWORD start, DWORD count, const PALETTEENTRY *entries);

HRESULT __cdecl wined3d_query_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query); ULONG __cdecl wined3d_query_decref(struct wined3d_query *query); -HRESULT __cdecl wined3d_query_get_data(struct wined3d_query *query, void *data, UINT data_size, DWORD flags); +HRESULT __cdecl wined3d_query_get_data(struct wined3d_query *query, void *data, + UINT data_size, unsigned int flags); UINT __cdecl wined3d_query_get_data_size(const struct wined3d_query *query); void * __cdecl wined3d_query_get_parent(const struct wined3d_query *query); enum wined3d_query_type __cdecl wined3d_query_get_type(const struct wined3d_query *query); ULONG __cdecl wined3d_query_incref(struct wined3d_query *query); -HRESULT __cdecl wined3d_query_issue(struct wined3d_query *query, DWORD flags); +HRESULT __cdecl wined3d_query_issue(struct wined3d_query *query, unsigned int flags);

static inline void wined3d_private_store_init(struct wined3d_private_store *store) { @@ -2624,7 +2625,7 @@ static inline void wined3d_private_store_cleanup(struct wined3d_private_store *s }

static inline HRESULT wined3d_private_store_set_private_data(struct wined3d_private_store *store, - const GUID *guid, const void *data, DWORD data_size, DWORD flags) + const GUID *guid, const void *data, DWORD data_size, unsigned int flags) { struct wined3d_private_data *d, *old; const void *ptr = data; @@ -2675,7 +2676,7 @@ void __cdecl wined3d_resource_get_desc(const struct wined3d_resource *resource, void * __cdecl wined3d_resource_get_parent(const struct wined3d_resource *resource); DWORD __cdecl wined3d_resource_get_priority(const struct wined3d_resource *resource); HRESULT __cdecl wined3d_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags); void __cdecl wined3d_resource_preload(struct wined3d_resource *resource); void __cdecl wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent); DWORD __cdecl wined3d_resource_set_priority(struct wined3d_resource *resource, DWORD priority); @@ -2813,12 +2814,12 @@ HRESULT __cdecl wined3d_swapchain_get_raster_status(const struct wined3d_swapcha struct wined3d_swapchain_state * __cdecl wined3d_swapchain_get_state(struct wined3d_swapchain *swapchain); ULONG __cdecl wined3d_swapchain_incref(struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, - const RECT *dst_rect, HWND dst_window_override, unsigned int swap_interval, DWORD flags); + const RECT *dst_rect, HWND dst_window_override, unsigned int swap_interval, unsigned int flags); HRESULT __cdecl wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapchain, unsigned int buffer_count, unsigned int width, unsigned int height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, unsigned int multisample_quality); HRESULT __cdecl wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, - DWORD flags, const struct wined3d_gamma_ramp *ramp); + unsigned int flags, const struct wined3d_gamma_ramp *ramp); void __cdecl wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, struct wined3d_palette *palette); void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window);

@@ -2835,7 +2836,7 @@ HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_ HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region); HRESULT __cdecl wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, - UINT layer_count, UINT level_count, DWORD flags, const struct wined3d_sub_resource_data *data, + UINT layer_count, UINT level_count, unsigned int flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture); struct wined3d_texture * __cdecl wined3d_texture_from_resource(struct wined3d_resource *resource); ULONG __cdecl wined3d_texture_decref(struct wined3d_texture *texture); @@ -2854,7 +2855,7 @@ void * __cdecl wined3d_texture_get_sub_resource_parent(struct wined3d_texture *t ULONG __cdecl wined3d_texture_incref(struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_release_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC dc); HRESULT __cdecl wined3d_texture_set_color_key(struct wined3d_texture *texture, - DWORD flags, const struct wined3d_color_key *color_key); + unsigned int flags, const struct wined3d_color_key *color_key); DWORD __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod); HRESULT __cdecl wined3d_texture_set_overlay_position(struct wined3d_texture *texture, unsigned int sub_resource_idx, LONG x, LONG y); @@ -2866,7 +2867,7 @@ HRESULT __cdecl wined3d_texture_update_desc(struct wined3d_texture *texture, uns void *mem, UINT pitch); HRESULT __cdecl wined3d_texture_update_overlay(struct wined3d_texture *texture, unsigned int sub_resource_idx, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, - const RECT *dst_rect, DWORD flags); + const RECT *dst_rect, unsigned int flags);

HRESULT __cdecl wined3d_unordered_access_view_create(const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops,

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1536

Eric Pouech

8:40 a.m.

New subject: [PATCH 2/3] wined3d: Don't use long type for flags field/pmt (internal).

From: Eric Pouech eric.pouech@gmail.com

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fff6841f4c7..bf84e01071b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7939,7 +7939,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl

static void arbfp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, unsigned int flags, const struct wined3d_color *colour, float depth, DWORD stencil) { struct wined3d_blitter *next;

diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 7f7324c8b91..e8d2ef5191e 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -152,7 +152,7 @@ static void wined3d_context_gl_destroy_fbo(struct wined3d_context_gl *context_gl }

static void context_attach_depth_stencil_rb(const struct wined3d_gl_info *gl_info, - GLenum fbo_target, DWORD flags, GLuint rb) + GLenum fbo_target, unsigned int flags, GLuint rb) { if (flags & WINED3D_FBO_ENTRY_FLAG_DEPTH) { diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 8ee7e7fccc9..fa84fda80e7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -157,13 +157,13 @@ struct wined3d_cs_present RECT src_rect; RECT dst_rect; unsigned int swap_interval; - DWORD flags; + unsigned int flags; };

struct wined3d_cs_clear { enum wined3d_cs_op opcode; - DWORD flags; + unsigned int flags; unsigned int rt_count; struct wined3d_fb_state fb; RECT draw_rect; @@ -428,7 +428,7 @@ struct wined3d_cs_query_issue { enum wined3d_cs_op opcode; struct wined3d_query *query; - DWORD flags; + unsigned int flags; };

struct wined3d_cs_preload_resource @@ -450,7 +450,7 @@ struct wined3d_cs_map unsigned int sub_resource_idx; void **map_ptr; const struct wined3d_box *box; - DWORD flags; + unsigned int flags; HRESULT *hr; };

@@ -479,7 +479,7 @@ struct wined3d_cs_blt_sub_resource struct wined3d_resource *src_resource; unsigned int src_sub_resource_idx; struct wined3d_box src_box; - DWORD flags; + unsigned int flags; struct wined3d_blt_fx fx; enum wined3d_texture_filter_type filter; }; @@ -719,7 +719,7 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data)

void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, - unsigned int swap_interval, DWORD flags) + unsigned int swap_interval, unsigned int flags) { struct wined3d_cs_present *op; unsigned int i; @@ -763,7 +763,7 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) }

void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, - DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) + unsigned int flags, const struct wined3d_color *color, float depth, DWORD stencil) { const struct wined3d_state *state = cs->c.state; const struct wined3d_viewport *vp = &state->viewports[0]; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b598c7b7f36..c8135993e49 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3427,7 +3427,7 @@ static void update_fog_factor(float *fog_factor, struct lights_settings *ls) /* Context activation is done by the caller. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) static HRESULT process_vertices_strided(const struct wined3d_device *device, DWORD dwDestIndex, DWORD dwCount, - const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, DWORD flags, DWORD dst_fvf) + const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, unsigned int flags, DWORD dst_fvf) { enum wined3d_material_color_source diffuse_source, specular_source, ambient_source, emissive_source; const struct wined3d_color *material_specular_state_colour; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 239cc2d8320..66c14d9cb3a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3523,7 +3523,7 @@ const struct wined3d_parent_ops wined3d_null_parent_ops = wined3d_null_wined3d_object_destroyed, };

-HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) +HRESULT wined3d_init(struct wined3d *wined3d, unsigned int flags) { wined3d->ref = 1; wined3d->flags = flags; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 994200b737c..b4bba4c1077 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3401,7 +3401,7 @@ static void shader_glsl_get_coord_size(enum wined3d_shader_resource_type resourc }

static void shader_glsl_get_sample_function(const struct wined3d_shader_context *ctx, - DWORD resource_idx, DWORD sampler_idx, DWORD flags, struct glsl_sample_function *sample_function) + DWORD resource_idx, DWORD sampler_idx, unsigned int flags, struct glsl_sample_function *sample_function) { enum wined3d_shader_resource_type resource_type; struct shader_glsl_ctx_priv *priv = ctx->backend_data; @@ -13271,7 +13271,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli

static void glsl_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) + const RECT *draw_rect, unsigned int flags, const struct wined3d_color *color, float depth, DWORD stencil) { struct wined3d_blitter *next;

diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 6445f4d284b..384fa84c4d5 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -140,7 +140,7 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, }

static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wined3d_device *device, - DWORD flags, unsigned int entry_count, const PALETTEENTRY *entries) + unsigned int flags, unsigned int entry_count, const PALETTEENTRY *entries) { HRESULT hr;

diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 189efec0c42..34974ba41a1 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -174,7 +174,7 @@ static struct wined3d_pipeline_statistics_query *wined3d_pipeline_statistics_que }

enum wined3d_fence_result wined3d_fence_test(const struct wined3d_fence *fence, - struct wined3d_device *device, DWORD flags) + struct wined3d_device *device, unsigned int flags) { const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; @@ -502,7 +502,7 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, unsigned int flag return WINED3D_OK; }

-static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD flags) +static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, unsigned int flags) { struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); const struct wined3d_gl_info *gl_info; @@ -534,7 +534,7 @@ static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD return available; }

-static BOOL wined3d_event_query_ops_poll(struct wined3d_query *query, DWORD flags) +static BOOL wined3d_event_query_ops_poll(struct wined3d_query *query, unsigned int flags) { struct wined3d_event_query *event_query = wined3d_event_query_from_query(query); enum wined3d_fence_result ret; @@ -579,7 +579,7 @@ enum wined3d_query_type CDECL wined3d_query_get_type(const struct wined3d_query return query->type; }

-static BOOL wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD flags) +static BOOL wined3d_event_query_ops_issue(struct wined3d_query *query, unsigned int flags) { TRACE("query %p, flags %#x.\n", query, flags);

@@ -599,7 +599,7 @@ static BOOL wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD fla return FALSE; }

-static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD flags) +static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, unsigned int flags) { struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); struct wined3d_device *device = query->device; @@ -672,7 +672,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD return poll; }

-static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query, DWORD flags) +static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query, unsigned int flags) { struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); const struct wined3d_gl_info *gl_info; @@ -707,7 +707,7 @@ static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query, DWORD return available; }

-static BOOL wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD flags) +static BOOL wined3d_timestamp_query_ops_issue(struct wined3d_query *query, unsigned int flags) { struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); const struct wined3d_gl_info *gl_info; @@ -736,21 +736,21 @@ static BOOL wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD return FALSE; }

-static BOOL wined3d_timestamp_disjoint_query_ops_poll(struct wined3d_query *query, DWORD flags) +static BOOL wined3d_timestamp_disjoint_query_ops_poll(struct wined3d_query *query, unsigned int flags) { TRACE("query %p, flags %#x.\n", query, flags);

return TRUE; }

-static BOOL wined3d_timestamp_disjoint_query_ops_issue(struct wined3d_query *query, DWORD flags) +static BOOL wined3d_timestamp_disjoint_query_ops_issue(struct wined3d_query *query, unsigned int flags) { TRACE("query %p, flags %#x.\n", query, flags);

return FALSE; }

-static BOOL wined3d_so_statistics_query_ops_poll(struct wined3d_query *query, DWORD flags) +static BOOL wined3d_so_statistics_query_ops_poll(struct wined3d_query *query, unsigned int flags) { struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); GLuint written_available, generated_available; @@ -806,7 +806,7 @@ static void wined3d_so_statistics_query_end(struct wined3d_so_statistics_query * checkGLcall("end query"); }

-static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, DWORD flags) +static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, unsigned int flags) { struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); struct wined3d_device *device = query->device; @@ -882,7 +882,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D return poll; }

-static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD flags) +static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, unsigned int flags) { struct wined3d_pipeline_statistics_query *pq = wined3d_pipeline_statistics_query_from_query(query); const struct wined3d_gl_info *gl_info; @@ -946,7 +946,7 @@ static void wined3d_pipeline_statistics_query_end(struct wined3d_pipeline_statis checkGLcall("end query"); }

-static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD flags) +static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, unsigned int flags) { struct wined3d_pipeline_statistics_query *pq = wined3d_pipeline_statistics_query_from_query(query); struct wined3d_device *device = query->device; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 91874898025..c01f4e5053d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1933,7 +1933,7 @@ static void shader_dump_sync_flags(struct wined3d_string_buffer *buffer, DWORD s shader_addline(buffer, "_unknown_flags(%#x)", sync_flags); }

-static void shader_dump_precise_flags(struct wined3d_string_buffer *buffer, DWORD flags) +static void shader_dump_precise_flags(struct wined3d_string_buffer *buffer, unsigned int flags) { if (!(flags & WINED3DSI_PRECISE_XYZW)) return; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1b82d387de8..4f7013ebc5e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1979,7 +1979,7 @@ static void stateblock_state_init_default(struct wined3d_stateblock_state *state }

void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, - const struct wined3d_device *device, DWORD flags) + const struct wined3d_device *device, unsigned int flags) { unsigned int i;

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7d62af5b31f..2ec922bfe90 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -541,7 +541,7 @@ static void cpu_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_

static HRESULT surface_cpu_blt_compressed(const BYTE *src_data, BYTE *dst_data, UINT src_pitch, UINT dst_pitch, UINT update_w, UINT update_h, - const struct wined3d_format *format, DWORD flags, const struct wined3d_blt_fx *fx) + const struct wined3d_format *format, unsigned int flags, const struct wined3d_blt_fx *fx) { UINT row_block_count; const BYTE *src_row; @@ -644,7 +644,7 @@ static HRESULT surface_cpu_blt_compressed(const BYTE *src_data, BYTE *dst_data,

static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, - const struct wined3d_box *src_box, DWORD flags, const struct wined3d_blt_fx *fx, + const struct wined3d_box *src_box, unsigned int flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) { unsigned int bpp, src_height, src_width, dst_height, dst_width, row_byte_count; @@ -1241,7 +1241,7 @@ static bool wined3d_box_intersect(struct wined3d_box *ret, const struct wined3d_

static void cpu_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, unsigned int flags, const struct wined3d_color *colour, float depth, DWORD stencil) { struct wined3d_color c = {depth, 0.0f, 0.0f, 0.0f}; struct wined3d_box box, box_clip, box_view; @@ -1385,7 +1385,7 @@ static bool sub_resource_is_on_cpu(const struct wined3d_texture *texture, unsign

HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, - const struct wined3d_box *src_box, DWORD flags, const struct wined3d_blt_fx *fx, + const struct wined3d_box *src_box, unsigned int flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) { struct wined3d_texture_sub_resource *src_sub_resource, *dst_sub_resource; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3fbd3649039..3e8037689af 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -589,7 +589,7 @@ static bool swapchain_present_is_partial_copy(struct wined3d_swapchain *swapchai }

static void swapchain_gl_present(struct wined3d_swapchain *swapchain, - const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval, DWORD flags) + const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval, unsigned int flags) { struct wined3d_swapchain_gl *swapchain_gl = wined3d_swapchain_gl(swapchain); struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; @@ -1316,7 +1316,7 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai }

static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, - const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval, DWORD flags) + const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval, unsigned int flags) { struct wined3d_dc_info *front, *back; HBITMAP bitmap; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d3fc3fb2219..42ef054cdaa 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3834,7 +3834,7 @@ static const struct wined3d_resource_ops texture_resource_ops = };

static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, - unsigned int layer_count, unsigned int level_count, DWORD flags, struct wined3d_device *device, + unsigned int layer_count, unsigned int level_count, unsigned int flags, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops, void *sub_resources, const struct wined3d_texture_ops *texture_ops) { @@ -6068,7 +6068,7 @@ static bool blitter_use_cpu_clear(struct wined3d_rendertarget_view *view)

static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, unsigned int flags, const struct wined3d_color *colour, float depth, DWORD stencil) { struct wined3d_rendertarget_view *view, *previous = NULL; bool have_identical_size = TRUE; @@ -6345,7 +6345,7 @@ static void fbo_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_

static void fbo_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, unsigned int flags, const struct wined3d_color *colour, float depth, DWORD stencil) { struct wined3d_blitter *next;

@@ -6458,7 +6458,7 @@ static void raw_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_

static void raw_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, unsigned int flags, const struct wined3d_color *colour, float depth, DWORD stencil) { struct wined3d_blitter *next;

@@ -6826,7 +6826,7 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk

static void vk_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) + const RECT *draw_rect, unsigned int flags, const struct wined3d_color *colour, float depth, DWORD stencil) { struct wined3d_device_vk *device_vk = wined3d_device_vk(device); struct wined3d_rendertarget_view *view, *previous = NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bdf5783b0e5..00786bdda3d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1378,7 +1378,7 @@ struct wined3d_shader_instruction { const struct wined3d_shader_context *ctx; enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx; - DWORD flags; + unsigned int flags; unsigned int dst_count; unsigned int src_count; const struct wined3d_shader_dst_param *dst; @@ -2020,7 +2020,7 @@ void wined3d_fence_issue(struct wined3d_fence *fence, struct wined3d_device *dev enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, struct wined3d_device *device) DECLSPEC_HIDDEN; enum wined3d_fence_result wined3d_fence_test(const struct wined3d_fence *fence, - struct wined3d_device *device, DWORD flags) DECLSPEC_HIDDEN; + struct wined3d_device *device, unsigned int flags) DECLSPEC_HIDDEN;

/* Direct3D terminology with little modifications. We do not have an issued * state because only the driver knows about it, but we have a created state @@ -2034,8 +2034,8 @@ enum wined3d_query_state

struct wined3d_query_ops { - BOOL (*query_poll)(struct wined3d_query *query, DWORD flags); - BOOL (*query_issue)(struct wined3d_query *query, DWORD flags); + BOOL (*query_poll)(struct wined3d_query *query, unsigned int flags); + BOOL (*query_issue)(struct wined3d_query *query, unsigned int flags); void (*query_destroy)(struct wined3d_query *query); };

@@ -2909,7 +2909,7 @@ struct wined3d_blitter_ops void (*blitter_destroy)(struct wined3d_blitter *blitter, struct wined3d_context *context); void (*blitter_clear)(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, - const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil); + const RECT *draw_rect, unsigned int flags, const struct wined3d_color *colour, float depth, DWORD stencil); DWORD (*blitter_blit)(struct wined3d_blitter *blitter, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, DWORD src_location, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, @@ -3796,7 +3796,7 @@ struct wined3d };

BOOL wined3d_filter_messages(HWND window, BOOL filter) DECLSPEC_HIDDEN; -HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) DECLSPEC_HIDDEN; +HRESULT wined3d_init(struct wined3d *wined3d, unsigned int flags) DECLSPEC_HIDDEN; void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN;

BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size) DECLSPEC_HIDDEN; @@ -4559,7 +4559,7 @@ struct wined3d_texture float pow2_matrix[16]; UINT lod; DWORD sampler; - DWORD flags; + unsigned int flags; DWORD update_map_binding;

unsigned int row_pitch; @@ -4568,7 +4568,7 @@ struct wined3d_texture /* May only be accessed from the command stream worker thread. */ struct wined3d_texture_async { - DWORD flags; + unsigned int flags;

/* Color keys for DDraw */ struct wined3d_color_key dst_blt_color_key; @@ -4698,7 +4698,7 @@ static inline bool wined3d_texture_is_full_rect(const struct wined3d_texture *te

HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_texture *src_texture, - unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags, + unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, unsigned int flags, const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void texture2d_get_blt_info(const struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *rect, struct wined3d_blt_info *info) DECLSPEC_HIDDEN; @@ -4870,7 +4870,7 @@ struct wined3d_fbo_resource struct fbo_entry { struct list entry; - DWORD flags; + unsigned int flags; DWORD rt_mask; GLuint id; struct wined3d_fbo_entry_key @@ -5010,7 +5010,7 @@ struct wined3d_stateblock };

void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, - const struct wined3d_device *device, DWORD flags) DECLSPEC_HIDDEN; + const struct wined3d_device *device, unsigned int flags) DECLSPEC_HIDDEN; void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) DECLSPEC_HIDDEN;

void wined3d_light_state_enable_light(struct wined3d_light_state *state, const struct wined3d_d3d_info *d3d_info, @@ -5116,12 +5116,12 @@ void wined3d_cs_destroy_object(struct wined3d_cs *cs, void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, struct wined3d_texture *texture, unsigned int layer) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, - DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; + unsigned int flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; void wined3d_device_context_emit_clear_uav(struct wined3d_device_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value, bool fp) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, - const RECT *dst_rect, HWND dst_window_override, unsigned int swap_interval, DWORD flags) DECLSPEC_HIDDEN; + const RECT *dst_rect, HWND dst_window_override, unsigned int swap_interval, unsigned int flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, @@ -5302,7 +5302,7 @@ struct wined3d_buffer const struct wined3d_buffer_ops *buffer_ops;

unsigned int structure_byte_stride; - DWORD flags; + unsigned int flags; DWORD locations; void *map_ptr; struct wined3d_bo *buffer_object; @@ -5661,7 +5661,7 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state struct wined3d_swapchain_ops { void (*swapchain_present)(struct wined3d_swapchain *swapchain, - const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval, DWORD flags); + const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval, unsigned int flags); void (*swapchain_frontbuffer_updated)(struct wined3d_swapchain *swapchain); };

@@ -6162,7 +6162,7 @@ struct wined3d_palette

unsigned int size; RGBQUAD colors[256]; - DWORD flags; + unsigned int flags; };

/* DirectDraw utility functions */

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1536

Eric Pouech

8:40 a.m.

New subject: [PATCH 3/3] wined3d: Don't use long type for location parameter.

From: Eric Pouech eric.pouech@gmail.com

Signed-off-by: Eric Pouech eric.pouech@gmail.com --- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/texture.c | 16 ++++++++-------- dlls/wined3d/utils.c | 2 +- dlls/wined3d/view.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 30 +++++++++++++++--------------- 6 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1a953f8e218..460313d69f6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -129,7 +129,7 @@ static void wined3d_buffer_invalidate_range(struct wined3d_buffer *buffer, DWORD ERR("Buffer %p does not have any up to date location.\n", buffer); }

-void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) +void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, unsigned int location) { wined3d_buffer_invalidate_range(buffer, location, 0, 0); } @@ -573,7 +573,7 @@ static void wined3d_buffer_unload_location(struct wined3d_buffer *buffer, }

BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, - struct wined3d_context *context, DWORD location) + struct wined3d_context *context, unsigned int location) { struct wined3d_bo_address src, dst; struct wined3d_range range; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index e8d2ef5191e..682e5aef5b4 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -851,7 +851,7 @@ static void wined3d_context_gl_apply_fbo_state(struct wined3d_context_gl *contex /* Context activation is done by the caller. */ void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_gl, GLenum target, struct wined3d_resource *rt, unsigned int rt_sub_resource_idx, - struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, DWORD location) + struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, unsigned int location) { struct wined3d_rendertarget_info ds_info = {{0}};

diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 42ef054cdaa..a22c9975606 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -137,7 +137,7 @@ GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) return GL_BACK; }

-static DWORD wined3d_resource_access_from_location(DWORD location) +static DWORD wined3d_resource_access_from_location(unsigned int location) { switch (location) { @@ -685,7 +685,7 @@ static void wined3d_texture_evict_sysmem(struct wined3d_texture *texture) }

void wined3d_texture_validate_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, DWORD location) + unsigned int sub_resource_idx, unsigned int location) { struct wined3d_texture_sub_resource *sub_resource; DWORD previous_locations; @@ -709,7 +709,7 @@ static void wined3d_texture_set_dirty(struct wined3d_texture *texture) }

void wined3d_texture_invalidate_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, DWORD location) + unsigned int sub_resource_idx, unsigned int location) { struct wined3d_texture_sub_resource *sub_resource; DWORD previous_locations; @@ -734,7 +734,7 @@ void wined3d_texture_invalidate_location(struct wined3d_texture *texture, }

void wined3d_texture_get_bo_address(const struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD location) + unsigned int sub_resource_idx, struct wined3d_bo_address *data, unsigned int location) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx];

@@ -777,7 +777,7 @@ void wined3d_texture_clear_dirty_regions(struct wined3d_texture *texture) /* Context activation is done by the caller. Context may be NULL in * WINED3D_NO3D mode. */ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) + unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location) { DWORD current = texture->sub_resources[sub_resource_idx].locations; BOOL ret; @@ -3460,7 +3460,7 @@ static bool wined3d_texture_gl_clear(struct wined3d_texture *texture,

/* Context activation is done by the caller. */ static BOOL wined3d_texture_gl_load_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) + unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); @@ -4763,7 +4763,7 @@ static BOOL wined3d_texture_no3d_prepare_location(struct wined3d_texture *textur }

static BOOL wined3d_texture_no3d_load_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) + unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location) { TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", texture, sub_resource_idx, context, wined3d_debug_location(location)); @@ -5584,7 +5584,7 @@ static BOOL wined3d_texture_vk_prepare_location(struct wined3d_texture *texture, }

static BOOL wined3d_texture_vk_load_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) + unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location) { if (!wined3d_texture_vk_prepare_location(texture, sub_resource_idx, context, location)) return FALSE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 47500460a2e..2cf90996f45 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6960,7 +6960,7 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb return memcmp(ka, kb, sizeof(*ka)); }

-const char *wined3d_debug_location(DWORD location) +const char *wined3d_debug_location(unsigned int location) { struct debug_buffer buffer; const char *prefix = ""; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index c4b65921ea7..5f2b082b9bd 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -471,7 +471,7 @@ void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarg }

void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view *view, - struct wined3d_context *context, DWORD location) + struct wined3d_context *context, unsigned int location) { struct wined3d_resource *resource = view->resource; unsigned int i, sub_resource_idx, layer_count; @@ -491,12 +491,12 @@ void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view }

void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view, - struct wined3d_context *context, DWORD location) + struct wined3d_context *context, unsigned int location) { wined3d_view_load_location(view->resource, &view->desc, context, location); }

-void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, DWORD location) +void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, unsigned int location) { struct wined3d_resource *resource = view->resource; unsigned int i, sub_resource_idx, layer_count; @@ -515,7 +515,7 @@ void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_vie wined3d_texture_validate_location(texture, sub_resource_idx, location); }

-void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_view *view, DWORD location) +void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_view *view, unsigned int location) { wined3d_view_invalidate_location(view->resource, &view->desc, location); } @@ -1517,7 +1517,7 @@ void * CDECL wined3d_unordered_access_view_get_parent(const struct wined3d_unord }

void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view, - DWORD location) + unsigned int location) { wined3d_view_invalidate_location(view->resource, &view->desc, location); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 00786bdda3d..97f196e23a6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2445,7 +2445,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, unsigned int rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_gl, GLenum target, struct wined3d_resource *rt, unsigned int rt_sub_resource_idx, - struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; + struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, unsigned int location) DECLSPEC_HIDDEN; void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_context_gl_bind_bo(struct wined3d_context_gl *context_gl, GLenum binding, GLuint name) DECLSPEC_HIDDEN; @@ -4499,7 +4499,7 @@ void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, #define WINED3D_LOCATION_RB_MULTISAMPLE 0x00000080 #define WINED3D_LOCATION_RB_RESOLVED 0x00000100

-const char *wined3d_debug_location(DWORD location) DECLSPEC_HIDDEN; +const char *wined3d_debug_location(unsigned int location) DECLSPEC_HIDDEN;

struct wined3d_blt_info { @@ -4711,16 +4711,16 @@ void wined3d_texture_cleanup(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_texture_get_bo_address(const struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD location) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, struct wined3d_bo_address *data, unsigned int location) DECLSPEC_HIDDEN; GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_invalidate_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, unsigned int location) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; BOOL wined3d_texture_load_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location) DECLSPEC_HIDDEN; BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; + struct wined3d_context *context, unsigned int location) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; BOOL wined3d_texture_can_use_pbo(const struct wined3d_texture *texture, const struct wined3d_d3d_info *d3d_info) @@ -4735,7 +4735,7 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) DECLSPEC_HIDDEN; void wined3d_texture_validate_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, unsigned int location) DECLSPEC_HIDDEN; bool wined3d_texture_validate_sub_resource_idx(const struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_texture_clear_dirty_regions(struct wined3d_texture *texture) DECLSPEC_HIDDEN; @@ -4798,7 +4798,7 @@ static inline GLenum wined3d_texture_gl_get_sub_resource_target(const struct win }

static inline BOOL wined3d_texture_gl_is_multisample_location(const struct wined3d_texture_gl *texture_gl, - DWORD location) + unsigned int location) { if (location == WINED3D_LOCATION_RB_MULTISAMPLE) return TRUE; @@ -5331,11 +5331,11 @@ void wined3d_buffer_copy_bo_address(struct wined3d_buffer *dst_buffer, struct wi unsigned int dst_offset, const struct wined3d_const_bo_address *src_addr, unsigned int size) DECLSPEC_HIDDEN; DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; -void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; +void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, unsigned int location) DECLSPEC_HIDDEN; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; + struct wined3d_context *context, unsigned int location) DECLSPEC_HIDDEN; BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location) DECLSPEC_HIDDEN; @@ -5422,13 +5422,13 @@ void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarg void wined3d_rendertarget_view_get_box(struct wined3d_rendertarget_view *view, struct wined3d_box *box) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_view *view, - DWORD location) DECLSPEC_HIDDEN; + unsigned int location) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; + struct wined3d_context *context, unsigned int location) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view *view, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; + struct wined3d_context *context, unsigned int location) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, - DWORD location) DECLSPEC_HIDDEN; + unsigned int location) DECLSPEC_HIDDEN; DWORD wined3d_rendertarget_view_get_locations(const struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN;

@@ -5581,7 +5581,7 @@ void wined3d_unordered_access_view_cleanup(struct wined3d_unordered_access_view void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_view *view, struct wined3d_buffer *buffer, unsigned int offset, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view, - DWORD location) DECLSPEC_HIDDEN; + unsigned int location) DECLSPEC_HIDDEN; void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_view *view, unsigned int value) DECLSPEC_HIDDEN;

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1536

Henri Verbeet (＠hverbeet)

3:16 p.m.

...

Note to Zebediah (mainly on second commit of this serie):

there is also a load of 'uint32_t flags' parameters that I didn't change (mainly not to change too many things) Is this something to consider?

Not Zebediah, but IMO uint32_t is the right type for flags, as well as for other bit-masks like "location" in patch 3/3.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1536#note_17344

Zebediah Figura (＠zfigura)

5:55 p.m.

...

Not Zebediah, but IMO uint32_t is the right type for flags, as well as for other bit-masks like "location" in patch 3/3.

I concur. If nothing else, changing "uint32_t" to "unsigned int" seems counterproductive.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1536#note_17365

805

Age (days ago)

805

Last active (days ago)

wine-gitlab@winehq.org

5 comments

4 participants

tags (0)

participants (4)

Eric Pouech
eric pouech (＠epo)
Henri Verbeet (＠hverbeet)
Zebediah Figura (＠zfigura)