December 2022 - Wine-commits

Eric Pouech : wined3d: Reduce usage of long integral types in stateblock.c.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: cbde184047590b54450542bdf364b01fa2fc50f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbde184047590b54450542bdf364b0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 9 10:25:28 2022 +0100 wined3d: Reduce usage of long integral types in stateblock.c. --- dlls/wined3d/stateblock.c | 20 ++++++++++---------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index d678a6ea2a0..f3a4d728c7b 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -189,7 +189,7 @@ static const DWORD vertex_states_sampler[] = WINED3D_SAMP_DMAP_OFFSET, }; -static inline void stateblock_set_all_bits(DWORD *map, UINT map_size) +static inline void stateblock_set_all_bits(uint32_t *map, UINT map_size) { DWORD mask = (1u << (map_size & 0x1f)) - 1; memset(map, 0xff, (map_size >> 5) * sizeof(*map)); @@ -734,7 +734,7 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, const struct wined3d_stateblock_state *state = &device_state->stateblock_state; struct wined3d_range range; unsigned int i, start; - DWORD map; + uint32_t map; TRACE("stateblock %p, device_state %p.\n", stateblock, device_state); @@ -935,8 +935,8 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, /* Texture states */ for (i = 0; i < stateblock->num_contained_tss_states; ++i) { - DWORD stage = stateblock->contained_tss_states[i].stage; - DWORD texture_state = stateblock->contained_tss_states[i].state; + unsigned int stage = stateblock->contained_tss_states[i].stage; + unsigned int texture_state = stateblock->contained_tss_states[i].state; TRACE("Updating texturestage state %u, %u to %#x (was %#x).\n", stage, texture_state, state->texture_states[stage][texture_state], @@ -963,8 +963,8 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, for (i = 0; i < stateblock->num_contained_sampler_states; ++i) { - DWORD stage = stateblock->contained_sampler_states[i].stage; - DWORD sampler_state = stateblock->contained_sampler_states[i].state; + unsigned int stage = stateblock->contained_sampler_states[i].stage; + unsigned int sampler_state = stateblock->contained_sampler_states[i].state; TRACE("Updating sampler state %u, %u to %#x (was %#x).\n", stage, sampler_state, state->sampler_states[stage][sampler_state], @@ -997,7 +997,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; struct wined3d_range range; unsigned int i, start; - DWORD map; + uint32_t map; TRACE("stateblock %p, device_state %p.\n", stateblock, device_state); @@ -1335,7 +1335,7 @@ void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock * } void CDECL wined3d_stateblock_set_render_state(struct wined3d_stateblock *stateblock, - enum wined3d_render_state state, DWORD value) + enum wined3d_render_state state, unsigned int value) { TRACE("stateblock %p, state %s (%#x), value %#x.\n", stateblock, debug_d3drenderstate(state), state, value); @@ -1357,7 +1357,7 @@ void CDECL wined3d_stateblock_set_render_state(struct wined3d_stateblock *stateb } void CDECL wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *stateblock, - UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) + UINT sampler_idx, enum wined3d_sampler_state state, unsigned int value) { TRACE("stateblock %p, sampler_idx %u, state %s, value %#x.\n", stateblock, sampler_idx, debug_d3dsamplerstate(state), value); @@ -1373,7 +1373,7 @@ void CDECL wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *state } void CDECL wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock *stateblock, - UINT stage, enum wined3d_texture_stage_state state, DWORD value) + UINT stage, enum wined3d_texture_stage_state state, unsigned int value) { TRACE("stateblock %p, stage %u, state %s, value %#x.\n", stateblock, stage, debug_d3dtexturestate(state), value); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 449db821249..b22865beafa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2955,7 +2955,7 @@ void context_state_fb(struct wined3d_context *context, struct wined3d_light_info { struct wined3d_light OriginalParms; /* Note D3D8LIGHT == D3D9LIGHT */ - DWORD OriginalIndex; + unsigned int OriginalIndex; LONG glIndex; BOOL enabled; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0070a7dd4c0..f4ec2470bba 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2767,16 +2767,16 @@ HRESULT __cdecl wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *st HRESULT __cdecl wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); void __cdecl wined3d_stateblock_set_render_state(struct wined3d_stateblock *stateblock, - enum wined3d_render_state state, DWORD value); + enum wined3d_render_state state, unsigned int value); void __cdecl wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *stateblock, - UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); + UINT sampler_idx, enum wined3d_sampler_state state, unsigned int value); void __cdecl wined3d_stateblock_set_scissor_rect(struct wined3d_stateblock *stateblock, const RECT *rect); HRESULT __cdecl wined3d_stateblock_set_stream_source(struct wined3d_stateblock *stateblock, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride); HRESULT __cdecl wined3d_stateblock_set_stream_source_freq(struct wined3d_stateblock *stateblock, UINT stream_idx, UINT divider); void __cdecl wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, UINT stage, struct wined3d_texture *texture); void __cdecl wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock *stateblock, - UINT stage, enum wined3d_texture_stage_state state, DWORD value); + UINT stage, enum wined3d_texture_stage_state state, unsigned int value); void __cdecl wined3d_stateblock_set_transform(struct wined3d_stateblock *stateblock, enum wined3d_transform_state state, const struct wined3d_matrix *matrix); void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock,

1 0

Eric Pouech : wined3d: Enable long integral types in stateblock.c.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 4d4841832a7d418872bfb7ba32b9d500234c1a8f URL: https://gitlab.winehq.org/wine/wine/-/commit/4d4841832a7d418872bfb7ba32b9d5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 9 10:25:30 2022 +0100 wined3d: Enable long integral types in stateblock.c. --- dlls/wined3d/stateblock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f3a4d728c7b..16f58b726d0 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -21,7 +21,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include "wined3d_private.h" @@ -2065,7 +2064,7 @@ HRESULT CDECL wined3d_stateblock_create(struct wined3d_device *device, const str hr = stateblock_init(object, device_state, device, type); if (FAILED(hr)) { - WARN("Failed to initialize stateblock, hr %#x.\n", hr); + WARN("Failed to initialize stateblock, hr %#lx.\n", hr); heap_free(object); return hr; }

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in state.c.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 45509911b8154eb12497c4a7d6dda00c72776fb9 URL: https://gitlab.winehq.org/wine/wine/-/commit/45509911b8154eb12497c4a7d6dda0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 9 10:25:31 2022 +0100 wined3d: Reduce usage of long integral types in state.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 557db3c9759..ae10ccbf13f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2193,7 +2193,7 @@ static void state_swvp(struct wined3d_context *context, const struct wined3d_sta } } -static void get_src_and_opr(DWORD arg, BOOL is_alpha, GLenum* source, GLenum* operand) { +static void get_src_and_opr(uint32_t arg, BOOL is_alpha, GLenum* source, GLenum* operand) { /* The WINED3DTA_ALPHAREPLICATE flag specifies the alpha component of the * input should be used for all input components. The WINED3DTA_COMPLEMENT * flag specifies the complement of the input should be used. */ @@ -2233,7 +2233,7 @@ static void get_src_and_opr(DWORD arg, BOOL is_alpha, GLenum* source, GLenum* op /* Setup the texture operations texture stage states */ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, - BOOL isAlpha, int Stage, enum wined3d_texture_op op, DWORD arg1, DWORD arg2, DWORD arg3) + BOOL isAlpha, int Stage, enum wined3d_texture_op op, uint32_t arg1, uint32_t arg2, uint32_t arg3) { GLenum src1, src2, src3; GLenum opr1, opr2, opr3; @@ -5633,7 +5633,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {206, 209}, { 0, 0}, }; - static const DWORD simple_states[] = + static const unsigned int simple_states[] = { STATE_MATERIAL, STATE_VDECL, @@ -5693,7 +5693,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) for (i = 0; i < STATE_HIGHEST + 1; ++i) { - DWORD rep = state_table[i].representative; + unsigned int rep = state_table[i].representative; if (rep) { if (state_table[rep].representative != rep) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b22865beafa..3e4d4c91017 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2808,7 +2808,7 @@ struct wined3d_state_entry struct wined3d_state_entry_template { - DWORD state; + unsigned int state; struct wined3d_state_entry content; unsigned int extension; };

1 0

Eric Pouech : wined3d: Enable long integral types in state.c.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 2a0133ffd1b3a1b32196cbf6006b0c888b14db14 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a0133ffd1b3a1b32196cbf6006b0c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 9 10:25:33 2022 +0100 wined3d: Enable long integral types in state.c. --- dlls/wined3d/state.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ae10ccbf13f..eb25f01130e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -24,7 +24,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include <stdio.h> @@ -262,7 +261,7 @@ HRESULT CDECL wined3d_rasterizer_state_create(struct wined3d_device *device, static void state_undefined(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - ERR("Undefined state %s (%#x).\n", debug_d3dstate(state_id), state_id); + ERR("Undefined state %s (%#lx).\n", debug_d3dstate(state_id), state_id); } void state_nop(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -813,7 +812,7 @@ void state_alpha_test(struct wined3d_context *context, const struct wined3d_stat float ref; BOOL enable_ckey = FALSE; - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); /* Find out if the texture on the first stage has a ckey set. The alpha * state func reads the texture settings, even though alpha and texture @@ -1256,7 +1255,7 @@ static void state_fog_vertexpart(struct wined3d_context *context, const struct w { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); if (!state->render_states[WINED3D_RS_FOGENABLE]) return; @@ -1347,7 +1346,7 @@ void state_fog_fragpart(struct wined3d_context *context, const struct wined3d_st DWORD fogstart = state->render_states[WINED3D_RS_FOGSTART]; DWORD fogend = state->render_states[WINED3D_RS_FOGEND]; - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); if (!state->render_states[WINED3D_RS_FOGENABLE]) { @@ -3653,7 +3652,7 @@ static void sampler_texmatrix(struct wined3d_context *context, const struct wine const DWORD sampler = state_id - STATE_SAMPLER(0); const struct wined3d_texture *texture = state->textures[sampler]; - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); if (!texture) return; @@ -4578,7 +4577,7 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); if (needs_srgb_write(context->d3d_info, state, &state->fb)) gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); @@ -4594,7 +4593,7 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state unsigned int i, base, count; struct wined3d_bo_gl *bo_gl; - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); if (STATE_IS_GRAPHICS_CONSTANT_BUFFER(state_id)) shader_type = state_id - STATE_GRAPHICS_CONSTANT_BUFFER(0); @@ -4627,7 +4626,7 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state static void state_cb_warn(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); WARN("Constant buffers (%s) no supported.\n", debug_d3dstate(state_id)); } @@ -4635,7 +4634,7 @@ static void state_cb_warn(struct wined3d_context *context, const struct wined3d_ static void state_shader_resource_binding(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); context->update_shader_resource_bindings = 1; } @@ -4643,21 +4642,21 @@ static void state_shader_resource_binding(struct wined3d_context *context, static void state_cs_resource_binding(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); context->update_compute_shader_resource_bindings = 1; } static void state_uav_binding(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); context->update_unordered_access_view_bindings = 1; } static void state_cs_uav_binding(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); context->update_compute_unordered_access_view_bindings = 1; } @@ -4674,7 +4673,7 @@ static void state_so(struct wined3d_context *context, const struct wined3d_state unsigned int offset, size, i; struct wined3d_bo_gl *bo_gl; - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); wined3d_context_gl_end_transform_feedback(context_gl);

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in view.c.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 1c682aa2f424d6d66bfb7ce264c10b4402b80270 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c682aa2f424d6d66bfb7ce264c10b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 9 10:25:34 2022 +0100 wined3d: Reduce usage of long integral types in view.c. --- dlls/wined3d/view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a650ab4c4bd..cf17db62da8 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1800,7 +1800,7 @@ struct wined3d_uav_clear_constants_vk }; static VkPipeline create_uav_pipeline(struct wined3d_context_vk *context_vk, - struct wined3d_pipeline_layout_vk *layout, const DWORD *byte_code, size_t byte_code_size, + struct wined3d_pipeline_layout_vk *layout, const unsigned int *byte_code, size_t byte_code_size, enum wined3d_shader_resource_type resource_type) { VkComputePipelineCreateInfo pipeline_info; @@ -1815,7 +1815,7 @@ static VkPipeline create_uav_pipeline(struct wined3d_context_vk *context_vk, vk_info = context_vk->vk_info; context = &context_vk->c; - shader_desc.byte_code = byte_code; + shader_desc.byte_code = (const DWORD *)byte_code; shader_desc.byte_code_size = byte_code_size; shader_module = (VkShaderModule)context->device->adapter->shader_backend->shader_compile(context, &shader_desc,

1 0

Eric Pouech : wined3d: Enable long integral types in view.c.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: d2009c7305283fdd56d99888633276cea351a023 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2009c7305283fdd56d99888633276… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 9 10:25:36 2022 +0100 wined3d: Enable long integral types in view.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/view.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index cf17db62da8..11f099b7ec5 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#define WINE_NO_LONG_TYPES /* temporary */ #include "wined3d_private.h" #include "wined3d_shaders.h"

1 0

Ivo Ivanov : wineusb.sys: Pass interface and interface_index from the event data to the usb device data.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: ddb3a5ee895c7dc4be1d5d2cd91fc235670127f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ddb3a5ee895c7dc4be1d5d2cd91fc2… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Sat Aug 20 06:13:13 2022 +0300 wineusb.sys: Pass interface and interface_index from the event data to the usb device data. --- dlls/wineusb.sys/wineusb.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 9512ecc8d12..05a9d81dcd6 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -127,6 +127,9 @@ static void add_unix_device(const struct usb_add_device_event *event) InitializeListHead(&device->irp_list); device->removed = FALSE; + device->interface = event->interface; + device->interface_index = event->interface_index; + device->class = event->class; device->subclass = event->subclass; device->protocol = event->protocol;

1 0

Ivo Ivanov : wineusb.sys: Implement DevClass compatible id for devices with multiple interfaces.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: a51af111ab2fa7d63be5cab60950880d0f88c785 URL: https://gitlab.winehq.org/wine/wine/-/commit/a51af111ab2fa7d63be5cab6095088… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Sat Aug 20 10:19:42 2022 +0300 wineusb.sys: Implement DevClass compatible id for devices with multiple interfaces. Fixes also single interface devices not showing class, subclass, protocol of the first interface, which is the behavior on Windows. --- dlls/wineusb.sys/unixlib.c | 25 ++++++++++++++++++++++--- dlls/wineusb.sys/unixlib.h | 2 +- dlls/wineusb.sys/wineusb.c | 20 +++++++++++++++----- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c index f72686b5a78..406049d2fe3 100644 --- a/dlls/wineusb.sys/unixlib.c +++ b/dlls/wineusb.sys/unixlib.c @@ -143,10 +143,28 @@ static void add_usb_device(libusb_device *libusb_device) usb_event.u.added_device.subclass = device_desc.bDeviceSubClass; usb_event.u.added_device.protocol = device_desc.bDeviceProtocol; usb_event.u.added_device.interface = false; - queue_event(&usb_event); + usb_event.u.added_device.interface_index = -1; if (!(ret = libusb_get_active_config_descriptor(libusb_device, &config_desc))) { + const struct libusb_interface *interface; + const struct libusb_interface_descriptor *iface_desc; + + if (config_desc->bNumInterfaces == 1) + { + interface = &config_desc->interface[0]; + if (interface->num_altsetting != 1) + FIXME("Interface 0 has %u alternate settings; using the first one.\n", + interface->num_altsetting); + iface_desc = &interface->altsetting[0]; + + usb_event.u.added_device.class = iface_desc->bInterfaceClass; + usb_event.u.added_device.subclass = iface_desc->bInterfaceSubClass; + usb_event.u.added_device.protocol = iface_desc->bInterfaceProtocol; + usb_event.u.added_device.interface_index = iface_desc->bInterfaceNumber; + } + queue_event(&usb_event); + /* Create new devices for interfaces of composite devices. * * On Windows this is the job of usbccgp.sys, a separate driver that @@ -163,10 +181,9 @@ static void add_usb_device(libusb_device *libusb_device) for (i = 0; i < config_desc->bNumInterfaces; ++i) { - const struct libusb_interface *interface = &config_desc->interface[i]; - const struct libusb_interface_descriptor *iface_desc; struct unix_device *unix_iface; + interface = &config_desc->interface[i]; if (interface->num_altsetting != 1) FIXME("Interface %u has %u alternate settings; using the first one.\n", i, interface->num_altsetting); @@ -196,6 +213,8 @@ static void add_usb_device(libusb_device *libusb_device) } else { + queue_event(&usb_event); + ERR("Failed to get configuration descriptor: %s\n", libusb_strerror(ret)); } } diff --git a/dlls/wineusb.sys/unixlib.h b/dlls/wineusb.sys/unixlib.h index 3d27d3715c3..9941bd138ed 100644 --- a/dlls/wineusb.sys/unixlib.h +++ b/dlls/wineusb.sys/unixlib.h @@ -45,7 +45,7 @@ struct usb_event UINT16 vendor, product, revision; UINT8 class, subclass, protocol; bool interface; - UINT8 interface_index; + INT16 interface_index; } added_device; struct unix_device *removed_device; IRP *completed_irp; diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 05a9d81dcd6..5447fabacda 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -76,7 +76,7 @@ struct usb_device DEVICE_OBJECT *device_obj; bool interface; - uint8_t interface_index; + int16_t interface_index; uint8_t class, subclass, protocol; @@ -377,10 +377,20 @@ static void get_hardware_ids(const struct usb_device *device, struct string_buff static void get_compatible_ids(const struct usb_device *device, struct string_buffer *buffer) { - append_id(buffer, L"USB\\Class_%02x&SubClass_%02x&Prot_%02x", - device->class, device->subclass, device->protocol); - append_id(buffer, L"USB\\Class_%02x&SubClass_%02x", device->class, device->subclass); - append_id(buffer, L"USB\\Class_%02x", device->class); + if (device->interface_index != -1) + { + append_id(buffer, L"USB\\Class_%02x&SubClass_%02x&Prot_%02x", + device->class, device->subclass, device->protocol); + append_id(buffer, L"USB\\Class_%02x&SubClass_%02x", device->class, device->subclass); + append_id(buffer, L"USB\\Class_%02x", device->class); + } + else + { + append_id(buffer, L"USB\\DevClass_%02x&SubClass_%02x&Prot_%02x", + device->class, device->subclass, device->protocol); + append_id(buffer, L"USB\\DevClass_%02x&SubClass_%02x", device->class, device->subclass); + append_id(buffer, L"USB\\DevClass_%02x", device->class); + } append_id(buffer, L""); }

1 0

Ivo Ivanov : wineusb.sys: Add usbver, revision, busnum and portnum to PDO's instance id.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 647bec85eebceea5cc99771659365b9e1d73bdc8 URL: https://gitlab.winehq.org/wine/wine/-/commit/647bec85eebceea5cc99771659365b… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Sat Aug 20 07:23:49 2022 +0300 wineusb.sys: Add usbver, revision, busnum and portnum to PDO's instance id. Makes the device instance id unique (at least to the bus), as required by MS. It is also easily addressable by other drivers. --- dlls/wineusb.sys/unixlib.c | 3 +++ dlls/wineusb.sys/unixlib.h | 4 ++-- dlls/wineusb.sys/wineusb.c | 15 ++++++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c index 406049d2fe3..8116e46c67c 100644 --- a/dlls/wineusb.sys/unixlib.c +++ b/dlls/wineusb.sys/unixlib.c @@ -139,9 +139,12 @@ static void add_usb_device(libusb_device *libusb_device) usb_event.u.added_device.vendor = device_desc.idVendor; usb_event.u.added_device.product = device_desc.idProduct; usb_event.u.added_device.revision = device_desc.bcdDevice; + usb_event.u.added_device.usbver = device_desc.bcdUSB; usb_event.u.added_device.class = device_desc.bDeviceClass; usb_event.u.added_device.subclass = device_desc.bDeviceSubClass; usb_event.u.added_device.protocol = device_desc.bDeviceProtocol; + usb_event.u.added_device.busnum = libusb_get_bus_number(libusb_device); + usb_event.u.added_device.portnum = libusb_get_port_number(libusb_device); usb_event.u.added_device.interface = false; usb_event.u.added_device.interface_index = -1; diff --git a/dlls/wineusb.sys/unixlib.h b/dlls/wineusb.sys/unixlib.h index 9941bd138ed..33469f5a2b5 100644 --- a/dlls/wineusb.sys/unixlib.h +++ b/dlls/wineusb.sys/unixlib.h @@ -42,8 +42,8 @@ struct usb_event struct usb_add_device_event { struct unix_device *device; - UINT16 vendor, product, revision; - UINT8 class, subclass, protocol; + UINT16 vendor, product, revision, usbver; + UINT8 class, subclass, protocol, busnum, portnum; bool interface; INT16 interface_index; } added_device; diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 5447fabacda..f965241d59e 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -78,9 +78,9 @@ struct usb_device bool interface; int16_t interface_index; - uint8_t class, subclass, protocol; + uint8_t class, subclass, protocol, busnum, portnum; - uint16_t vendor, product, revision; + uint16_t vendor, product, revision, usbver; struct unix_device *unix_device; @@ -133,9 +133,13 @@ static void add_unix_device(const struct usb_add_device_event *event) device->class = event->class; device->subclass = event->subclass; device->protocol = event->protocol; + device->busnum = event->busnum; + device->portnum = event->portnum; + device->vendor = event->vendor; device->product = event->product; device->revision = event->revision; + device->usbver = event->usbver; EnterCriticalSection(&wineusb_cs); list_add_tail(&device_list, &device->entry); @@ -362,6 +366,11 @@ static void get_device_id(const struct usb_device *device, struct string_buffer append_id(buffer, L"USB\\VID_%04X&PID_%04X", device->vendor, device->product); } +static void get_instance_id(const struct usb_device *device, struct string_buffer *buffer) +{ + append_id(buffer, L"%u&%u&%u&%u", device->usbver, device->revision, device->busnum, device->portnum); +} + static void get_hardware_ids(const struct usb_device *device, struct string_buffer *buffer) { if (device->interface) @@ -407,7 +416,7 @@ static NTSTATUS query_id(struct usb_device *device, IRP *irp, BUS_QUERY_ID_TYPE break; case BusQueryInstanceID: - append_id(&buffer, L"0"); + get_instance_id(device, &buffer); break; case BusQueryHardwareIDs:

1 0

Jacek Caban : win32u: Move NtUserWaitMessage implementation from user32.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: ae7effbd78f63a0a899b7888a9a1aa19959aa85a URL: https://gitlab.winehq.org/wine/wine/-/commit/ae7effbd78f63a0a899b7888a9a1aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 12:31:54 2022 +0100 win32u: Move NtUserWaitMessage implementation from user32. --- dlls/user32/message.c | 13 ------------- dlls/user32/user32.spec | 2 +- dlls/win32u/message.c | 8 ++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 5 +++++ include/ntuser.h | 1 + 8 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 92096e4a81d..9ad4abd21b5 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1026,19 +1026,6 @@ BOOL WINAPI GetCurrentInputMessageSource( INPUT_MESSAGE_SOURCE *source ) } -/*********************************************************************** - * WaitMessage (USER.112) Suspend thread pending messages - * WaitMessage (USER32.@) Suspend thread pending messages - * - * WaitMessage() suspends a thread until events appear in the thread's - * queue. - */ -BOOL WINAPI WaitMessage(void) -{ - return NtUserMsgWaitForMultipleObjectsEx( 0, NULL, INFINITE, QS_ALLINPUT, 0 ) != WAIT_FAILED; -} - - /*********************************************************************** * MsgWaitForMultipleObjects (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index a53d02cd064..d9cf610b470 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -820,7 +820,7 @@ @ stdcall WINNLSGetIMEHotkey(long) @ stub WNDPROC_CALLBACK @ stdcall WaitForInputIdle(long long) -@ stdcall WaitMessage() +@ stdcall WaitMessage() NtUserWaitMessage # @ stub Win32PoolAllocationStats @ stdcall WinHelpA(long str long long) @ stdcall WinHelpW(long wstr long long) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 8db81a57065..ff417169ad1 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2256,6 +2256,14 @@ DWORD WINAPI NtUserWaitForInputIdle( HANDLE process, DWORD timeout, BOOL wow ) return WAIT_TIMEOUT; } +/*********************************************************************** + * NtUserWaitMessage (win32u.@) + */ +BOOL WINAPI NtUserWaitMessage(void) +{ + return NtUserMsgWaitForMultipleObjectsEx( 0, NULL, INFINITE, QS_ALLINPUT, 0 ) != WAIT_FAILED; +} + /*********************************************************************** * NtUserPeekMessage (win32u.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 6c59c91b5b0..cfe2961c45d 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -308,6 +308,7 @@ static void * const syscalls[] = NtUserValidateRect, NtUserVkKeyScanEx, NtUserWaitForInputIdle, + NtUserWaitMessage, NtUserWindowFromDC, NtUserWindowFromPoint, }; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 1ffcfcaef5a..af70ad7d3e5 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1308,7 +1308,7 @@ @ stdcall -syscall NtUserWaitForInputIdle(long long long) @ stub NtUserWaitForMsgAndEvent @ stub NtUserWaitForRedirectionStartComplete -@ stub NtUserWaitMessage +@ stdcall -syscall NtUserWaitMessage() @ stdcall -syscall NtUserWindowFromDC(long) @ stub NtUserWindowFromPhysicalPoint @ stdcall -syscall NtUserWindowFromPoint(long long) diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 24e52a2a476..e84d4dd60c6 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -294,6 +294,7 @@ SYSCALL_ENTRY( NtUserValidateRect ) \ SYSCALL_ENTRY( NtUserVkKeyScanEx ) \ SYSCALL_ENTRY( NtUserWaitForInputIdle ) \ + SYSCALL_ENTRY( NtUserWaitMessage ) \ SYSCALL_ENTRY( NtUserWindowFromDC ) \ SYSCALL_ENTRY( NtUserWindowFromPoint ) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index c8354e6b04a..0841119c2d6 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -4154,6 +4154,11 @@ NTSTATUS WINAPI wow64_NtUserWaitForInputIdle( UINT *args ) return NtUserWaitForInputIdle( process, timeout, wow ); } +NTSTATUS WINAPI wow64_NtUserWaitMessage( UINT *args ) +{ + return NtUserWaitMessage(); +} + NTSTATUS WINAPI wow64_NtUserWindowFromDC( UINT *args ) { HDC hdc = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 2ca383c6e69..5b2b24a7f33 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -898,6 +898,7 @@ BOOL WINAPI NtUserUpdateLayeredWindow( HWND hwnd, HDC hdc_dst, const POINT *p BOOL WINAPI NtUserValidateRect( HWND hwnd, const RECT *rect ); WORD WINAPI NtUserVkKeyScanEx( WCHAR chr, HKL layout ); DWORD WINAPI NtUserWaitForInputIdle( HANDLE process, DWORD timeout, BOOL wow ); +BOOL WINAPI NtUserWaitMessage(void); HWND WINAPI NtUserWindowFromDC( HDC hdc ); HWND WINAPI NtUserWindowFromPoint( LONG x, LONG y );

1 0