wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Hans Leidekker : winhttp: Pass a socket pointer to send_bytes() and receive_bytes().
by Alexandre Julliard 22 Sep '21

22 Sep '21

Module: wine Branch: master Commit: 54742a9001a6bd24baeede130c1f1a78c4be3f07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54742a9001a6bd24baeede13… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 22 12:44:12 2021 +0200 winhttp: Pass a socket pointer to send_bytes() and receive_bytes(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 54 +++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index ed3b41a3155..e6802eaaf70 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3135,11 +3135,11 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR return hsocket; } -static DWORD send_bytes( struct netconn *netconn, char *bytes, int len ) +static DWORD send_bytes( struct socket *socket, char *bytes, int len ) { int count; DWORD err; - if ((err = netconn_send( netconn, bytes, len, &count ))) return err; + if ((err = netconn_send( socket->request->netconn, bytes, len, &count ))) return err; return (count == len) ? ERROR_SUCCESS : ERROR_INTERNAL_ERROR; } @@ -3148,7 +3148,7 @@ static DWORD send_bytes( struct netconn *netconn, char *bytes, int len ) #define RESERVED_BIT (7 << 4) #define CONTROL_BIT (1 << 3) -static DWORD send_frame( struct netconn *netconn, enum socket_opcode opcode, USHORT status, const char *buf, +static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHORT status, const char *buf, DWORD buflen, BOOL final ) { DWORD i = 0, j, ret, offset = 2, len = buflen; @@ -3180,27 +3180,27 @@ static DWORD send_frame( struct netconn *netconn, enum socket_opcode opcode, USH offset += 8; } - if ((ret = send_bytes( netconn, hdr, offset ))) return ret; + if ((ret = send_bytes( socket, hdr, offset ))) return ret; if (len) { mask = &hdr[offset]; RtlGenRandom( mask, 4 ); - if ((ret = send_bytes( netconn, mask, 4 ))) return ret; + if ((ret = send_bytes( socket, mask, 4 ))) return ret; } if (opcode == SOCKET_OPCODE_CLOSE) /* prepend status code */ { byte = (status >> 8) ^ mask[i++ % 4]; - if ((ret = send_bytes( netconn, &byte, 1 ))) return ret; + if ((ret = send_bytes( socket, &byte, 1 ))) return ret; byte = (status & 0xff) ^ mask[i++ % 4]; - if ((ret = send_bytes( netconn, &byte, 1 ))) return ret; + if ((ret = send_bytes( socket, &byte, 1 ))) return ret; } for (j = 0; j < buflen; j++) { byte = buf[j] ^ mask[i++ % 4]; - if ((ret = send_bytes( netconn, &byte, 1 ))) return ret; + if ((ret = send_bytes( socket, &byte, 1 ))) return ret; } return ERROR_SUCCESS; @@ -3225,7 +3225,7 @@ static DWORD socket_send( struct socket *socket, WINHTTP_WEB_SOCKET_BUFFER_TYPE enum socket_opcode opcode = map_buffer_type( type ); DWORD ret; - ret = send_frame( socket->request->netconn, opcode, 0, buf, len, TRUE ); + ret = send_frame( socket, opcode, 0, buf, len, TRUE ); if (async) { if (!ret) @@ -3307,10 +3307,10 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ return ret; } -static DWORD receive_bytes( struct netconn *netconn, char *buf, DWORD len, DWORD *ret_len ) +static DWORD receive_bytes( struct socket *socket, char *buf, DWORD len, DWORD *ret_len ) { DWORD err; - if ((err = netconn_recv( netconn, buf, len, 0, (int *)ret_len ))) return err; + if ((err = netconn_recv( socket->request->netconn, buf, len, 0, (int *)ret_len ))) return err; if (*ret_len != len) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; return ERROR_SUCCESS; } @@ -3331,12 +3331,12 @@ static BOOL is_supported_opcode( enum socket_opcode opcode ) } } -static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket_opcode *opcode ) +static DWORD receive_frame( struct socket *socket, DWORD *ret_len, enum socket_opcode *opcode ) { DWORD ret, len, count; char hdr[2]; - if ((ret = receive_bytes( netconn, hdr, sizeof(hdr), &count ))) return ret; + if ((ret = receive_bytes( socket, hdr, sizeof(hdr), &count ))) return ret; if ((hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || !is_supported_opcode( hdr[0] & 0xf )) { return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; @@ -3348,13 +3348,13 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket if (len == 126) { USHORT len16; - if ((ret = receive_bytes( netconn, (char *)&len16, sizeof(len16), &count ))) return ret; + if ((ret = receive_bytes( socket, (char *)&len16, sizeof(len16), &count ))) return ret; len = RtlUshortByteSwap( len16 ); } else if (len == 127) { ULONGLONG len64; - if ((ret = receive_bytes( netconn, (char *)&len64, sizeof(len64), &count ))) return ret; + if ((ret = receive_bytes( socket, (char *)&len64, sizeof(len64), &count ))) return ret; if ((len64 = RtlUlonglongByteSwap( len64 )) > ~0u) return ERROR_NOT_SUPPORTED; len = len64; } @@ -3368,7 +3368,7 @@ static void CALLBACK task_socket_send_pong( TP_CALLBACK_INSTANCE *instance, void struct socket_send *s = ctx; TRACE("running %p\n", work); - send_frame( s->socket->request->netconn, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE ); + send_frame( s->socket, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE ); release_object( &s->socket->hdr ); free( s ); @@ -3392,18 +3392,17 @@ static DWORD socket_send_pong( struct socket *socket ) } return ret; } - return send_frame( socket->request->netconn, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE ); + return send_frame( socket, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE ); } static DWORD socket_drain( struct socket *socket ) { - struct netconn *netconn = socket->request->netconn; DWORD ret, count; while (socket->read_size) { char buf[1024]; - if ((ret = receive_bytes( netconn, buf, min(socket->read_size, sizeof(buf)), &count ))) return ret; + if ((ret = receive_bytes( socket, buf, min(socket->read_size, sizeof(buf)), &count ))) return ret; socket->read_size -= count; } return ERROR_SUCCESS; @@ -3451,14 +3450,13 @@ static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( enum socket_opcode opcode, BOO static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD *ret_len, WINHTTP_WEB_SOCKET_BUFFER_TYPE *ret_type, BOOL async ) { - struct netconn *netconn = socket->request->netconn; DWORD count, ret = ERROR_SUCCESS; if (!socket->read_size) { for (;;) { - if (!(ret = receive_frame( netconn, &socket->read_size, &socket->opcode ))) + if (!(ret = receive_frame( socket, &socket->read_size, &socket->opcode ))) { if (!(socket->opcode & CONTROL_BIT) || (ret = handle_control_frame( socket ))) break; } @@ -3466,7 +3464,7 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD if (ret) break; } } - if (!ret) ret = receive_bytes( netconn, buf, min(len, socket->read_size), &count ); + if (!ret) ret = receive_bytes( socket, buf, min(len, socket->read_size), &count ); if (!ret) { socket->read_size -= count; @@ -3554,11 +3552,10 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D static DWORD socket_shutdown( struct socket *socket, USHORT status, const void *reason, DWORD len, BOOL async ) { - struct netconn *netconn = socket->request->netconn; DWORD ret; stop_queue( &socket->send_q ); - if (!(ret = send_frame( netconn, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE ))) + if (!(ret = send_frame( socket, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE ))) { socket->state = SOCKET_STATE_SHUTDOWN; } @@ -3634,7 +3631,6 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r static DWORD socket_close( struct socket *socket, USHORT status, const void *reason, DWORD len, BOOL async ) { - struct netconn *netconn = socket->request->netconn; DWORD ret, count; if ((ret = socket_drain( socket ))) goto done; @@ -3642,11 +3638,11 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea if (socket->state < SOCKET_STATE_SHUTDOWN) { stop_queue( &socket->send_q ); - if ((ret = send_frame( netconn, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE ))) goto done; + if ((ret = send_frame( socket, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE ))) goto done; socket->state = SOCKET_STATE_SHUTDOWN; } - if ((ret = receive_frame( netconn, &count, &socket->opcode ))) goto done; + if ((ret = receive_frame( socket, &count, &socket->opcode ))) goto done; if (socket->opcode != SOCKET_OPCODE_CLOSE || (count && (count < sizeof(socket->status) || count > sizeof(socket->status) + sizeof(socket->reason)))) { @@ -3657,9 +3653,9 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea if (count) { DWORD reason_len = count - sizeof(socket->status); - if ((ret = receive_bytes( netconn, (char *)&socket->status, sizeof(socket->status), &count ))) goto done; + if ((ret = receive_bytes( socket, (char *)&socket->status, sizeof(socket->status), &count ))) goto done; socket->status = RtlUshortByteSwap( socket->status ); - if ((ret = receive_bytes( netconn, socket->reason, reason_len, &socket->reason_len ))) goto done; + if ((ret = receive_bytes( socket, socket->reason, reason_len, &socket->reason_len ))) goto done; } socket->state = SOCKET_STATE_CLOSED;

1 0

Rémi Bernon : hidclass.sys: Only send WM_INPUT messages for HID devices.
by Alexandre Julliard 22 Sep '21

22 Sep '21

Module: wine Branch: master Commit: 09895076c6ec9421d26f95103324c6b8c1cc6d9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=09895076c6ec9421d26f9510… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 22 12:27:26 2021 +0200 hidclass.sys: Only send WM_INPUT messages for HID devices. And not for the internal WINEXINPUT devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 8e998bd71be..848f8da906a 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -190,27 +190,30 @@ static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *pack KIRQL irql; IRP *irp; - size = offsetof( RAWINPUT, data.hid.bRawData[packet->reportBufferLen] ); - if (!(rawinput = malloc( size ))) ERR( "Failed to allocate rawinput data!\n" ); - else + if (IsEqualGUID( ext->class_guid, &GUID_DEVINTERFACE_HID )) { - INPUT input; - - rawinput->header.dwType = RIM_TYPEHID; - rawinput->header.dwSize = size; - rawinput->header.hDevice = ULongToHandle( ext->u.pdo.rawinput_handle ); - rawinput->header.wParam = RIM_INPUT; - rawinput->data.hid.dwCount = 1; - rawinput->data.hid.dwSizeHid = packet->reportBufferLen; - memcpy( rawinput->data.hid.bRawData, packet->reportBuffer, packet->reportBufferLen ); - - input.type = INPUT_HARDWARE; - input.hi.uMsg = WM_INPUT; - input.hi.wParamH = 0; - input.hi.wParamL = 0; - __wine_send_input( 0, &input, rawinput ); - - free( rawinput ); + size = offsetof( RAWINPUT, data.hid.bRawData[packet->reportBufferLen] ); + if (!(rawinput = malloc( size ))) ERR( "Failed to allocate rawinput data!\n" ); + else + { + INPUT input; + + rawinput->header.dwType = RIM_TYPEHID; + rawinput->header.dwSize = size; + rawinput->header.hDevice = ULongToHandle( ext->u.pdo.rawinput_handle ); + rawinput->header.wParam = RIM_INPUT; + rawinput->data.hid.dwCount = 1; + rawinput->data.hid.dwSizeHid = packet->reportBufferLen; + memcpy( rawinput->data.hid.bRawData, packet->reportBuffer, packet->reportBufferLen ); + + input.type = INPUT_HARDWARE; + input.hi.uMsg = WM_INPUT; + input.hi.wParamH = 0; + input.hi.wParamL = 0; + __wine_send_input( 0, &input, rawinput ); + + free( rawinput ); + } } if (!(last_report = hid_report_create( packet )))

1 0

Rémi Bernon : winebus.sys: Use the computed element offsets to create reports.
by Alexandre Julliard 22 Sep '21

22 Sep '21

Module: wine Branch: master Commit: 9d5e9b5f42e30e1ee7f14cc27784b2b021161758 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d5e9b5f42e30e1ee7f14cc2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 22 10:30:44 2021 +0200 winebus.sys: Use the computed element offsets to create reports. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 70 +++++++++++------------------- dlls/winebus.sys/bus_udev.c | 94 ++++++++++++++++++----------------------- dlls/winebus.sys/hid.c | 1 + dlls/winebus.sys/unix_private.h | 1 + 4 files changed, 67 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d5e9b5f42e30e1ee7f1…

1 0

Rémi Bernon : winebus.sys: Compute offsets while building the report descriptor.
by Alexandre Julliard 22 Sep '21

22 Sep '21

Module: wine Branch: master Commit: de050c974ba5ae1b2ed944bd8f4ecf5712fcd8da URL: https://source.winehq.org/git/wine.git/?a=commit;h=de050c974ba5ae1b2ed944bd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 22 10:30:43 2021 +0200 winebus.sys: Compute offsets while building the report descriptor. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/hid.c | 83 +++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/unix_private.h | 14 +++++++ 2 files changed, 97 insertions(+) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 98eb5341a2e..6d3dae5690d 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -32,8 +32,12 @@ #include "hidusage.h" #include "ddk/wdm.h" +#include "wine/debug.h" + #include "unix_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(plugplay); + static BOOL hid_report_descriptor_append(struct hid_report_descriptor *desc, const BYTE *buffer, SIZE_T size) { BYTE *tmp = desc->data; @@ -93,6 +97,25 @@ BOOL hid_device_end_report_descriptor(struct unix_device *iface) return hid_report_descriptor_append(desc, template, sizeof(template)); } +static BOOL hid_device_add_button_count(struct unix_device *iface, BYTE count) +{ + USHORT offset = iface->hid_device_state.bit_size / 8; + + if ((iface->hid_device_state.bit_size % 8) && !iface->hid_device_state.button_count) + ERR("buttons should start byte aligned, missing padding!\n"); + else if (iface->hid_device_state.bit_size + count > 0x80000) + ERR("report size overflow, too many elements!\n"); + else + { + if (!iface->hid_device_state.button_count) iface->hid_device_state.button_start = offset; + iface->hid_device_state.button_count += count; + iface->hid_device_state.bit_size += count; + return TRUE; + } + + return FALSE; +} + BOOL hid_device_add_buttons(struct unix_device *iface, USAGE usage_page, USAGE usage_min, USAGE usage_max) { struct hid_report_descriptor *desc = &iface->hid_report_descriptor; @@ -117,6 +140,9 @@ BOOL hid_device_add_buttons(struct unix_device *iface, USAGE usage_page, USAGE u INPUT(1, Cnst|Var|Abs), }; + if (!hid_device_add_button_count(iface, usage_max - usage_min + 1)) + return FALSE; + if (!hid_report_descriptor_append(desc, template, sizeof(template))) return FALSE; @@ -126,6 +152,27 @@ BOOL hid_device_add_buttons(struct unix_device *iface, USAGE usage_page, USAGE u return TRUE; } +static BOOL hid_device_add_hatswitch_count(struct unix_device *iface, BYTE count) +{ + USHORT offset = iface->hid_device_state.bit_size / 8; + + if (iface->hid_device_state.button_count) + ERR("hatswitches should be added before buttons!\n"); + else if ((iface->hid_device_state.bit_size % 8)) + ERR("hatswitches should be byte aligned, missing padding!\n"); + else if (iface->hid_device_state.bit_size + 8 * count > 0x80000) + ERR("report size overflow, too many elements!\n"); + else + { + if (!iface->hid_device_state.hatswitch_count) iface->hid_device_state.hatswitch_start = offset; + iface->hid_device_state.hatswitch_count += count; + iface->hid_device_state.bit_size += 8 * count; + return TRUE; + } + + return FALSE; +} + BOOL hid_device_add_hatswitch(struct unix_device *iface, INT count) { struct hid_report_descriptor *desc = &iface->hid_report_descriptor; @@ -143,9 +190,42 @@ BOOL hid_device_add_hatswitch(struct unix_device *iface, INT count) INPUT(1, Data|Var|Abs|Null), }; + if (!hid_device_add_hatswitch_count(iface, count)) + return FALSE; + return hid_report_descriptor_append(desc, template, sizeof(template)); } +static BOOL hid_device_add_axis_count(struct unix_device *iface, BOOL rel, BYTE count) +{ + USHORT offset = iface->hid_device_state.bit_size / 8; + + if (!rel && iface->hid_device_state.rel_axis_count) + ERR("absolute axes should be added before relative axes!\n"); + else if (iface->hid_device_state.button_count || iface->hid_device_state.hatswitch_count) + ERR("axes should be added before buttons or hatswitches!\n"); + else if ((iface->hid_device_state.bit_size % 8)) + ERR("axes should be byte aligned, missing padding!\n"); + else if (iface->hid_device_state.bit_size + 32 * count > 0x80000) + ERR("report size overflow, too many elements!\n"); + else if (rel) + { + if (!iface->hid_device_state.rel_axis_count) iface->hid_device_state.rel_axis_start = offset; + iface->hid_device_state.rel_axis_count += count; + iface->hid_device_state.bit_size += 32 * count; + return TRUE; + } + else + { + if (!iface->hid_device_state.abs_axis_count) iface->hid_device_state.abs_axis_start = offset; + iface->hid_device_state.abs_axis_count += count; + iface->hid_device_state.bit_size += 32 * count; + return TRUE; + } + + return FALSE; +} + BOOL hid_device_add_axes(struct unix_device *iface, BYTE count, USAGE usage_page, const USAGE *usages, BOOL rel, LONG min, LONG max) { @@ -171,6 +251,9 @@ BOOL hid_device_add_axes(struct unix_device *iface, BYTE count, USAGE usage_page }; int i; + if (!hid_device_add_axis_count(iface, rel, count)) + return FALSE; + if (!hid_report_descriptor_append(desc, template_begin, sizeof(template_begin))) return FALSE; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index d1d48737e67..acb2f45aca3 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -57,6 +57,19 @@ struct hid_report_descriptor SIZE_T max_size; }; +struct hid_device_state +{ + ULONG bit_size; + USHORT abs_axis_start; + USHORT abs_axis_count; + USHORT rel_axis_start; + USHORT rel_axis_count; + USHORT hatswitch_start; + USHORT hatswitch_count; + USHORT button_start; + USHORT button_count; +}; + struct unix_device { const struct raw_device_vtbl *vtbl; @@ -65,6 +78,7 @@ struct unix_device const struct hid_device_vtbl *hid_vtbl; struct hid_report_descriptor hid_report_descriptor; + struct hid_device_state hid_device_state; }; extern void *raw_device_create(const struct raw_device_vtbl *vtbl, SIZE_T size) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : winebus.sys: Introduce a new raw_device / hid_device abstraction.
by Alexandre Julliard 22 Sep '21

22 Sep '21

Module: wine Branch: master Commit: fa3905bafaca4aec18860b5319f4575833c76146 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa3905bafaca4aec18860b53… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 22 10:30:42 2021 +0200 winebus.sys: Introduce a new raw_device / hid_device abstraction. For any device which requires building HID reports. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 4 +- dlls/winebus.sys/bus_sdl.c | 70 ++++++++++--------------- dlls/winebus.sys/bus_udev.c | 46 ++++++---------- dlls/winebus.sys/hid.c | 113 +++++++++++++++++++++++++++++++--------- dlls/winebus.sys/unix_private.h | 51 +++++++++++------- dlls/winebus.sys/unixlib.c | 70 ++++--------------------- 6 files changed, 174 insertions(+), 180 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fa3905bafaca4aec1886…

1 0

Rémi Bernon : winebus.sys: Rename IOHID bus device variables to be consistent.
by Alexandre Julliard 22 Sep '21

22 Sep '21

Module: wine Branch: master Commit: 0e18098bd506ff398541a803f129d7b796465fc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e18098bd506ff398541a803… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 22 10:30:41 2021 +0200 winebus.sys: Rename IOHID bus device variables to be consistent. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 62 ++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 71efd6cedcc..1df0653b00b 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -108,24 +108,24 @@ static struct list event_queue = LIST_INIT(event_queue); static struct list device_list = LIST_INIT(device_list); static struct iohid_bus_options options; -struct platform_private +struct iohid_device { struct unix_device unix_device; IOHIDDeviceRef device; uint8_t *buffer; }; -static inline struct platform_private *impl_from_unix_device(struct unix_device *iface) +static inline struct iohid_device *impl_from_unix_device(struct unix_device *iface) { - return CONTAINING_RECORD(iface, struct platform_private, unix_device); + return CONTAINING_RECORD(iface, struct iohid_device, unix_device); } -static struct platform_private *find_device_from_iohid(IOHIDDeviceRef IOHIDDevice) +static struct iohid_device *find_device_from_iohid(IOHIDDeviceRef IOHIDDevice) { - struct platform_private *private; + struct iohid_device *impl; - LIST_FOR_EACH_ENTRY(private, &device_list, struct platform_private, unix_device.entry) - if (private->device == IOHIDDevice) return private; + LIST_FOR_EACH_ENTRY(impl, &device_list, struct iohid_device, unix_device.entry) + if (impl->device == IOHIDDevice) return impl; return NULL; } @@ -153,33 +153,33 @@ static void iohid_device_destroy(struct unix_device *iface) static NTSTATUS iohid_device_start(struct unix_device *iface) { DWORD length; - struct platform_private *private = impl_from_unix_device(iface); + struct iohid_device *impl = impl_from_unix_device(iface); CFNumberRef num; - num = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDMaxInputReportSizeKey)); + num = IOHIDDeviceGetProperty(impl->device, CFSTR(kIOHIDMaxInputReportSizeKey)); length = CFNumberToDWORD(num); - private->buffer = malloc(length); + impl->buffer = malloc(length); - IOHIDDeviceRegisterInputReportCallback(private->device, private->buffer, length, handle_IOHIDDeviceIOHIDReportCallback, iface); + IOHIDDeviceRegisterInputReportCallback(impl->device, impl->buffer, length, handle_IOHIDDeviceIOHIDReportCallback, iface); return STATUS_SUCCESS; } static void iohid_device_stop(struct unix_device *iface) { - struct platform_private *private = impl_from_unix_device(iface); + struct iohid_device *impl = impl_from_unix_device(iface); - IOHIDDeviceRegisterInputReportCallback(private->device, NULL, 0, NULL, NULL); + IOHIDDeviceRegisterInputReportCallback(impl->device, NULL, 0, NULL, NULL); pthread_mutex_lock(&iohid_cs); - list_remove(&private->unix_device.entry); + list_remove(&impl->unix_device.entry); pthread_mutex_unlock(&iohid_cs); } static NTSTATUS iohid_device_get_report_descriptor(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length) { - struct platform_private *private = impl_from_unix_device(iface); - CFDataRef data = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDReportDescriptorKey)); + struct iohid_device *impl = impl_from_unix_device(iface); + CFDataRef data = IOHIDDeviceGetProperty(impl->device, CFSTR(kIOHIDReportDescriptorKey)); int data_length = CFDataGetLength(data); const UInt8 *ptr; @@ -195,8 +195,8 @@ static NTSTATUS iohid_device_get_report_descriptor(struct unix_device *iface, BY static void iohid_device_set_output_report(struct unix_device *iface, HID_XFER_PACKET *packet, IO_STATUS_BLOCK *io) { IOReturn result; - struct platform_private *private = impl_from_unix_device(iface); - result = IOHIDDeviceSetReport(private->device, kIOHIDReportTypeOutput, packet->reportId, + struct iohid_device *impl = impl_from_unix_device(iface); + result = IOHIDDeviceSetReport(impl->device, kIOHIDReportTypeOutput, packet->reportId, packet->reportBuffer, packet->reportBufferLen); if (result == kIOReturnSuccess) { @@ -214,9 +214,9 @@ static void iohid_device_get_feature_report(struct unix_device *iface, HID_XFER_ { IOReturn ret; CFIndex report_length = packet->reportBufferLen; - struct platform_private *private = impl_from_unix_device(iface); + struct iohid_device *impl = impl_from_unix_device(iface); - ret = IOHIDDeviceGetReport(private->device, kIOHIDReportTypeFeature, packet->reportId, + ret = IOHIDDeviceGetReport(impl->device, kIOHIDReportTypeFeature, packet->reportId, packet->reportBuffer, &report_length); if (ret == kIOReturnSuccess) { @@ -233,9 +233,9 @@ static void iohid_device_get_feature_report(struct unix_device *iface, HID_XFER_ static void iohid_device_set_feature_report(struct unix_device *iface, HID_XFER_PACKET *packet, IO_STATUS_BLOCK *io) { IOReturn result; - struct platform_private *private = impl_from_unix_device(iface); + struct iohid_device *impl = impl_from_unix_device(iface); - result = IOHIDDeviceSetReport(private->device, kIOHIDReportTypeFeature, packet->reportId, + result = IOHIDDeviceSetReport(impl->device, kIOHIDReportTypeFeature, packet->reportId, packet->reportBuffer, packet->reportBufferLen); if (result == kIOReturnSuccess) { @@ -267,7 +267,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * .input = -1, .serialnumber = {"0000"}, }; - struct platform_private *private; + struct iohid_device *impl; CFStringRef str = NULL; desc.vid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVendorIDKey))); @@ -336,17 +336,17 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * TRACE("dev %p, desc %s.\n", IOHIDDevice, debugstr_device_desc(&desc)); - if (!(private = unix_device_create(&iohid_device_vtbl, sizeof(struct platform_private)))) return; - list_add_tail(&device_list, &private->unix_device.entry); - private->device = IOHIDDevice; - private->buffer = NULL; + if (!(impl = unix_device_create(&iohid_device_vtbl, sizeof(struct iohid_device)))) return; + list_add_tail(&device_list, &impl->unix_device.entry); + impl->device = IOHIDDevice; + impl->buffer = NULL; - bus_event_queue_device_created(&event_queue, &private->unix_device, &desc); + bus_event_queue_device_created(&event_queue, &impl->unix_device, &desc); } static void handle_RemovalCallback(void *context, IOReturn result, void *sender, IOHIDDeviceRef IOHIDDevice) { - struct platform_private *device; + struct iohid_device *impl; TRACE("OS/X IOHID Device Removed %p\n", IOHIDDevice); IOHIDDeviceRegisterInputReportCallback(IOHIDDevice, NULL, 0, NULL, NULL); @@ -355,8 +355,8 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender, IOHIDDeviceUnscheduleFromRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); IOHIDDeviceClose(IOHIDDevice, 0); - device = find_device_from_iohid(IOHIDDevice); - if (device) bus_event_queue_device_removed(&event_queue, &device->unix_device); + impl = find_device_from_iohid(IOHIDDevice); + if (impl) bus_event_queue_device_removed(&event_queue, &impl->unix_device); else WARN("failed to find device for iohid device %p\n", IOHIDDevice); }

1 0

Rémi Bernon : winebus.sys: Rename UDEV bus device variables to be consistent.
by Alexandre Julliard 22 Sep '21

22 Sep '21

Module: wine Branch: master Commit: 40a9f69a1de088fb72c6b8966bc4333dea5fdfff URL: https://source.winehq.org/git/wine.git/?a=commit;h=40a9f69a1de088fb72c6b896… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 22 10:30:40 2021 +0200 winebus.sys: Rename UDEV bus device variables to be consistent. Introducing a struct base_device, and hidraw_device / lnxev_device depending on the sub-type of the device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 319 +++++++++++++++++++++++--------------------- 1 file changed, 165 insertions(+), 154 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=40a9f69a1de088fb72c6…

1 0

Rémi Bernon : winebus.sys: Rename SDL bus device to struct sdl_device.
by Alexandre Julliard 22 Sep '21

22 Sep '21

Module: wine Branch: master Commit: 12b5bc87db4502b9378ca81e1b92caaf289913bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=12b5bc87db4502b9378ca81e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 22 10:30:39 2021 +0200 winebus.sys: Rename SDL bus device to struct sdl_device. And use impl everywhere instead of inconsistent private / ext / device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 254 ++++++++++++++++++++++----------------------- 1 file changed, 127 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12b5bc87db4502b9378c…

1 0

Rémi Bernon : hidparse.sys: Fill additional HID internal structure fields.
by Alexandre Julliard 22 Sep '21

22 Sep '21

Module: wine Branch: master Commit: f17ba9f67ac0627229b32dea3b33d6242784ec3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f17ba9f67ac0627229b32dea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 22 10:08:35 2021 +0200 hidparse.sys: Fill additional HID internal structure fields. Although we don't need them, it fixes a few todo_wine and reduces the test output. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 7 ------- dlls/hidparse.sys/main.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index d29cad5690f..371edc99251 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3151,10 +3151,8 @@ static void test_hidp_kdr(void) check_member( kdr->caps[i], expect_caps[i], "%d", bit_size ); check_member( kdr->caps[i], expect_caps[i], "%d", report_count ); check_member( kdr->caps[i], expect_caps[i], "%d", start_byte ); - todo_wine check_member( kdr->caps[i], expect_caps[i], "%d", total_bits ); check_member( kdr->caps[i], expect_caps[i], "%#x", bit_field ); - todo_wine_if( expect_caps[i].end_byte ) check_member( kdr->caps[i], expect_caps[i], "%d", end_byte ); check_member( kdr->caps[i], expect_caps[i], "%d", link_collection ); check_member( kdr->caps[i], expect_caps[i], "%04x", link_usage_page ); @@ -3176,16 +3174,11 @@ static void test_hidp_kdr(void) check_member( kdr->caps[i], expect_caps[i], "%d", designator_max ); check_member( kdr->caps[i], expect_caps[i], "%#x", data_index_min ); check_member( kdr->caps[i], expect_caps[i], "%#x", data_index_max ); - todo_wine_if( expect_caps[i].null_value ) check_member( kdr->caps[i], expect_caps[i], "%d", null_value ); check_member( kdr->caps[i], expect_caps[i], "%d", unknown ); - todo_wine_if( !(kdr->caps[i].bit_field & 2) ) check_member( kdr->caps[i], expect_caps[i], "%d", logical_min ); - todo_wine_if( kdr->caps[i].flags & HIDP_KDR_CAPS_IS_BUTTON ) check_member( kdr->caps[i], expect_caps[i], "%d", logical_max ); - todo_wine_if( kdr->caps[i].flags & HIDP_KDR_CAPS_IS_BUTTON ) check_member( kdr->caps[i], expect_caps[i], "%d", physical_min ); - todo_wine_if( kdr->caps[i].flags & HIDP_KDR_CAPS_IS_BUTTON ) check_member( kdr->caps[i], expect_caps[i], "%d", physical_max ); check_member( kdr->caps[i], expect_caps[i], "%#x", units ); check_member( kdr->caps[i], expect_caps[i], "%#x", units_exp ); diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index f577ef952c3..ca15a91c75a 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -335,6 +335,8 @@ static void add_new_value_caps( struct hid_parser_state *state, struct hid_value state->items.start_byte = start_bit / 8; state->items.start_bit = start_bit % 8; + state->items.total_bits = state->items.report_count * state->items.bit_size; + state->items.end_byte = (start_bit + state->items.total_bits + 7) / 8; state->items.usage_page = state->usages_page[usages_size - 1 - i]; state->items.usage_min = state->usages_min[usages_size - 1 - i]; state->items.usage_max = state->usages_max[usages_size - 1 - i]; @@ -343,6 +345,15 @@ static void add_new_value_caps( struct hid_parser_state *state, struct hid_value state->items.data_index_min = state->items.data_index_max + 1; state->items.data_index_max = state->items.data_index_min + count; values[i] = state->items; + + if (values[i].flags & HID_VALUE_CAPS_IS_BUTTON) + { + if (!HID_VALUE_CAPS_IS_ARRAY( values + i )) values[i].logical_min = 0; + else values[i].logical_min = values[i].logical_max; + values[i].logical_max = 0; + values[i].physical_min = 0; + values[i].physical_max = 0; + } } static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TYPE type ) @@ -380,6 +391,10 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY if (state->items.bit_field & INPUT_DATA_CONST) state->items.flags |= HID_VALUE_CAPS_IS_CONSTANT; if (state->items.bit_size == 1 || is_array) state->items.flags |= HID_VALUE_CAPS_IS_BUTTON; + if (is_array) state->items.null_value = state->items.logical_min; + else if (!(state->items.bit_field & INPUT_NULL)) state->items.null_value = 0; + else state->items.null_value = 1; + state->items.data_index_max = state->data_count[type] - 1; for (i = 0; i < usages_size; ++i) {

1 0

Rémi Bernon : hidparse.sys: Output array caps data indexes in the correct order.
by Alexandre Julliard 22 Sep '21

22 Sep '21

Module: wine Branch: master Commit: 9aaea0c17dcdbb7dba1a0c2d821cf4c760fcc374 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aaea0c17dcdbb7dba1a0c2d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 22 10:08:34 2021 +0200 hidparse.sys: Output array caps data indexes in the correct order. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 2 -- dlls/hidparse.sys/main.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 2694391bc4e..d29cad5690f 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3174,9 +3174,7 @@ static void test_hidp_kdr(void) check_member( kdr->caps[i], expect_caps[i], "%d", string_max ); check_member( kdr->caps[i], expect_caps[i], "%d", designator_min ); check_member( kdr->caps[i], expect_caps[i], "%d", designator_max ); - todo_wine_if( !(kdr->caps[i].bit_field & 2) && !(kdr->caps[i].flags & HIDP_KDR_CAPS_IS_RANGE) ) check_member( kdr->caps[i], expect_caps[i], "%#x", data_index_min ); - todo_wine_if( !(kdr->caps[i].bit_field & 2) && !(kdr->caps[i].flags & HIDP_KDR_CAPS_IS_RANGE) ) check_member( kdr->caps[i], expect_caps[i], "%#x", data_index_max ); todo_wine_if( expect_caps[i].null_value ) check_member( kdr->caps[i], expect_caps[i], "%d", null_value ); diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index ca102765f93..f577ef952c3 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -384,9 +384,9 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY for (i = 0; i < usages_size; ++i) { if (!is_array) start_bit -= state->items.report_count * state->items.bit_size; - else if (i < usages_size - 1) state->items.flags |= HID_VALUE_CAPS_ARRAY_HAS_MORE; + else if (i) state->items.flags |= HID_VALUE_CAPS_ARRAY_HAS_MORE; else state->items.flags &= ~HID_VALUE_CAPS_ARRAY_HAS_MORE; - add_new_value_caps( state, values, i, start_bit ); + add_new_value_caps( state, values, is_array ? usages_size - i - 1 : i, start_bit ); if (!is_array) state->items.report_count = 1; } state->caps_count[type] += usages_size;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2021