Commit 389b962f authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard

winebus.sys: Use a local variable to access hid_device_state.

parent 0bb48fcb
...@@ -237,28 +237,29 @@ BOOL hid_device_add_hatswitch(struct unix_device *iface, INT count) ...@@ -237,28 +237,29 @@ BOOL hid_device_add_hatswitch(struct unix_device *iface, INT count)
static BOOL hid_device_add_axis_count(struct unix_device *iface, BOOL rel, BYTE count) static BOOL hid_device_add_axis_count(struct unix_device *iface, BOOL rel, BYTE count)
{ {
USHORT offset = iface->hid_device_state.bit_size / 8; struct hid_device_state *state = &iface->hid_device_state;
USHORT offset = state->bit_size / 8;
if (!rel && iface->hid_device_state.rel_axis_count) if (!rel && state->rel_axis_count)
ERR("absolute axes should be added before relative axes!\n"); ERR("absolute axes should be added before relative axes!\n");
else if (iface->hid_device_state.button_count || iface->hid_device_state.hatswitch_count) else if (state->button_count || state->hatswitch_count)
ERR("axes should be added before buttons or hatswitches!\n"); ERR("axes should be added before buttons or hatswitches!\n");
else if ((iface->hid_device_state.bit_size % 8)) else if ((state->bit_size % 8))
ERR("axes should be byte aligned, missing padding!\n"); ERR("axes should be byte aligned, missing padding!\n");
else if (iface->hid_device_state.bit_size + 32 * count > 0x80000) else if (state->bit_size + 32 * count > 0x80000)
ERR("report size overflow, too many elements!\n"); ERR("report size overflow, too many elements!\n");
else if (rel) else if (rel)
{ {
if (!iface->hid_device_state.rel_axis_count) iface->hid_device_state.rel_axis_start = offset; if (!state->rel_axis_count) state->rel_axis_start = offset;
iface->hid_device_state.rel_axis_count += count; state->rel_axis_count += count;
iface->hid_device_state.bit_size += 32 * count; state->bit_size += 32 * count;
return TRUE; return TRUE;
} }
else else
{ {
if (!iface->hid_device_state.abs_axis_count) iface->hid_device_state.abs_axis_start = offset; if (!state->abs_axis_count) state->abs_axis_start = offset;
iface->hid_device_state.abs_axis_count += count; state->abs_axis_count += count;
iface->hid_device_state.bit_size += 32 * count; state->bit_size += 32 * count;
return TRUE; return TRUE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment