June 2021 - Wine-commits - list.winehq.org

Rémi Bernon : hid: Rewrite HidP_GetSpecificValueCaps using enum_value_caps.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: dae8caf9f08a8e91647929fd353496168e521bd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dae8caf9f08a8e91647929fd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 24 10:05:55 2021 +0200 hid: Rewrite HidP_GetSpecificValueCaps using enum_value_caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 110 +++++++++++++++++++------------------ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 91 +----------------------------- 2 files changed, 59 insertions(+), 142 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dae8caf9f08a8e916479…

1 0

Rémi Bernon : hid: Rewrite HidP_MaxUsageListLength using enum_value_caps.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: 14caae214fa6bcbef260b4498cf33267318a1ef2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14caae214fa6bcbef260b449… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 24 10:05:56 2021 +0200 hid: Rewrite HidP_MaxUsageListLength using enum_value_caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 58 ++++++++------------------------------ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 --- 2 files changed, 12 insertions(+), 50 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index c11a5d66985..76b9ff5ee2c 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -524,56 +524,22 @@ NTSTATUS WINAPI HidP_InitializeReportForID( HIDP_REPORT_TYPE report_type, UCHAR return HIDP_STATUS_SUCCESS; } -ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData) +static NTSTATUS get_usage_list_length( const struct hid_value_caps *caps, void *data ) { - PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; - WINE_HID_ELEMENT *elems = HID_ELEMS(data); - WINE_HID_REPORT *report = NULL; - int r_count; - int i; - int count = 0; - - TRACE("(%i, %x, %p)\n", ReportType, UsagePage, PreparsedData); - - if (data->magic != HID_MAGIC) - return 0; - - switch(ReportType) - { - case HidP_Input: - report = HID_INPUT_REPORTS(data); - break; - case HidP_Output: - report = HID_OUTPUT_REPORTS(data); - break; - case HidP_Feature: - report = HID_FEATURE_REPORTS(data); - break; - default: - return HIDP_STATUS_INVALID_REPORT_TYPE; - } - r_count = data->reportCount[ReportType]; + *(ULONG *)data += caps->report_count; + return HIDP_STATUS_SUCCESS; +} +ULONG WINAPI HidP_MaxUsageListLength( HIDP_REPORT_TYPE report_type, USAGE usage_page, PHIDP_PREPARSED_DATA preparsed_data ) +{ + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {.buttons = TRUE, .usage_page = usage_page}; + USHORT limit = -1; + ULONG count = 0; - if (!r_count) - return 0; + TRACE( "report_type %d, usage_page %x, preparsed_data %p.\n", report_type, usage_page, preparsed_data ); - for (i = 0; i < r_count; i++) - { - int j; - for (j = 0; j < report[i].elementCount; j++) - { - if (elems[report[i].elementIdx + j].caps.BitSize == 1 && - (UsagePage == 0 || elems[report[i].elementIdx + j].caps.UsagePage == UsagePage)) - { - if (elems[report[i].elementIdx + j].caps.IsRange) - count += (elems[report[i].elementIdx + j].caps.Range.UsageMax - - elems[report[i].elementIdx + j].caps.Range.UsageMin) + 1; - else - count++; - } - } - } + enum_value_caps( preparsed, report_type, &filter, get_usage_list_length, &count, &limit ); return count; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 3ce750728ec..8777880fd9d 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2140,18 +2140,14 @@ static void test_hidp(HANDLE file, int report_id) ok(value == 0, "got value %x, expected %#x\n", value, 0); value = HidP_MaxUsageListLength(HidP_Feature + 1, 0, preparsed_data); - todo_wine ok(value == 0, "HidP_MaxUsageListLength(HidP_Feature + 1, 0) returned %d, expected %d\n", value, 0); value = HidP_MaxUsageListLength(HidP_Input, 0, preparsed_data); - todo_wine ok(value == 42, "HidP_MaxUsageListLength(HidP_Input, 0) returned %d, expected %d\n", value, 42); value = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON, preparsed_data); - todo_wine ok(value == 32, "HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON) returned %d, expected %d\n", value, 32); value = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_LED, preparsed_data); ok(value == 8, "HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_LED) returned %d, expected %d\n", value, 8); value = HidP_MaxUsageListLength(HidP_Feature, HID_USAGE_PAGE_BUTTON, preparsed_data); - todo_wine ok(value == 8, "HidP_MaxUsageListLength(HidP_Feature, HID_USAGE_PAGE_BUTTON) returned %d, expected %d\n", value, 8); value = HidP_MaxUsageListLength(HidP_Feature, HID_USAGE_PAGE_LED, preparsed_data); ok(value == 0, "HidP_MaxUsageListLength(HidP_Feature, HID_USAGE_PAGE_LED) returned %d, expected %d\n", value, 0);

1 0

Rémi Bernon : hid: Rewrite HidP_SetUsages using enum_value_caps.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: 8f5b49c0c4ddb63b156ae3c77f47b5a68ab1a4c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f5b49c0c4ddb63b156ae3c7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 24 10:05:57 2021 +0200 hid: Rewrite HidP_SetUsages using enum_value_caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 71 +++++++++++++++++++++++++----------------- dlls/hidclass.sys/descriptor.c | 2 ++ include/wine/hid.h | 1 + 3 files changed, 45 insertions(+), 29 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 76b9ff5ee2c..6197e30c4da 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -73,6 +73,7 @@ struct caps_filter USAGE usage_page; USHORT collection; USAGE usage; + UCHAR report_id; }; static BOOL match_value_caps( const struct hid_value_caps *caps, const struct caps_filter *filter ) @@ -89,20 +90,22 @@ static BOOL match_value_caps( const struct hid_value_caps *caps, const struct ca typedef NTSTATUS (*enum_value_caps_callback)( const struct hid_value_caps *caps, void *user ); static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPORT_TYPE report_type, - const struct caps_filter *filter, enum_value_caps_callback callback, - void *user, USHORT *count ) + ULONG report_len, const struct caps_filter *filter, + enum_value_caps_callback callback, void *user, USHORT *count ) { const struct hid_value_caps *caps, *caps_end; NTSTATUS status; LONG remaining = *count; - for (status = get_value_caps_range( preparsed, report_type, 0, &caps, &caps_end ); + for (status = get_value_caps_range( preparsed, report_type, report_len, &caps, &caps_end ); status == HIDP_STATUS_SUCCESS && caps != caps_end; caps++) { if (!match_value_caps( caps, filter )) continue; - if (remaining-- > 0) status = callback( caps, user ); + if (filter->report_id && caps->report_id != filter->report_id) continue; + else if (remaining-- > 0) status = callback( caps, user ); } + if (status == HIDP_STATUS_NULL) status = HIDP_STATUS_SUCCESS; if (status != HIDP_STATUS_SUCCESS) return status; *count -= remaining; @@ -539,7 +542,7 @@ ULONG WINAPI HidP_MaxUsageListLength( HIDP_REPORT_TYPE report_type, USAGE usage_ TRACE( "report_type %d, usage_page %x, preparsed_data %p.\n", report_type, usage_page, preparsed_data ); - enum_value_caps( preparsed, report_type, &filter, get_usage_list_length, &count, &limit ); + enum_value_caps( preparsed, report_type, 0, &filter, get_usage_list_length, &count, &limit ); return count; } @@ -575,32 +578,42 @@ NTSTATUS WINAPI HidP_SetUsageValueArray( HIDP_REPORT_TYPE report_type, USAGE usa return HIDP_STATUS_NOT_IMPLEMENTED; } -NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, - PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, - PCHAR Report, ULONG ReportLength) +struct set_usage_params { - WINE_HID_ELEMENT element; - NTSTATUS rc; - ULONG i; + USAGE usage; + char *report_buf; +}; - TRACE("(%i, %x, %i, %p, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, UsageList, - UsageLength, PreparsedData, Report, ReportLength); +static NTSTATUS set_usage( const struct hid_value_caps *caps, void *user ) +{ + struct set_usage_params *params = user; + ULONG bit = caps->start_bit + params->usage - caps->usage_min; + params->report_buf[bit / 8] |= (1 << (bit % 8)); + return HIDP_STATUS_NULL; +} - for (i = 0; i < *UsageLength; i++) - { - rc = find_usage(ReportType, UsagePage, LinkCollection, - UsageList[i], PreparsedData, Report, 1, &element); - if (rc == HIDP_STATUS_SUCCESS) - { - rc = set_report_data((BYTE*)Report, ReportLength, - element.valueStartBit, element.bitCount, -1); - } +NTSTATUS WINAPI HidP_SetUsages( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, USAGE *usages, + ULONG *usage_count, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) +{ + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct set_usage_params params = {.report_buf = report_buf}; + struct caps_filter filter = {.buttons = TRUE, .usage_page = usage_page, .collection = collection}; + NTSTATUS status; + USHORT limit = 1; + ULONG i, count = *usage_count; - if (rc != HIDP_STATUS_SUCCESS) - { - *UsageLength = i; - return rc; - } + TRACE( "report_type %d, usage_page %x, collection %d, usages %p, usage_count %p, preparsed_data %p, " + "report_buf %p, report_len %u.\n", + report_type, usage_page, collection, usages, usage_count, preparsed_data, report_buf, report_len ); + + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; + + filter.report_id = report_buf[0]; + for (i = 0; i < count; ++i) + { + params.usage = filter.usage = usages[i]; + status = enum_value_caps( preparsed, report_type, report_len, &filter, set_usage, &params, &limit ); + if (status != HIDP_STATUS_SUCCESS) return status; } return HIDP_STATUS_SUCCESS; @@ -669,7 +682,7 @@ NTSTATUS WINAPI HidP_GetSpecificButtonCaps( HIDP_REPORT_TYPE report_type, USAGE TRACE( "report_type %d, usage_page %x, collection %d, usage %x, caps %p, caps_count %p, preparsed_data %p.\n", report_type, usage_page, collection, usage, caps, caps_count, preparsed_data ); - return enum_value_caps( preparsed, report_type, &filter, get_button_caps, &caps, caps_count ); + return enum_value_caps( preparsed, report_type, 0, &filter, get_button_caps, &caps, caps_count ); } static NTSTATUS get_value_caps( const struct hid_value_caps *caps, void *user ) @@ -732,7 +745,7 @@ NTSTATUS WINAPI HidP_GetSpecificValueCaps( HIDP_REPORT_TYPE report_type, USAGE u TRACE( "report_type %d, usage_page %x, collection %d, usage %x, caps %p, caps_count %p, preparsed_data %p.\n", report_type, usage_page, collection, usage, caps, caps_count, preparsed_data ); - return enum_value_caps( preparsed, report_type, &filter, get_value_caps, &caps, caps_count ); + return enum_value_caps( preparsed, report_type, 0, &filter, get_value_caps, &caps, caps_count ); } NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollection, USAGE_AND_PAGE *ButtonList, diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index e319519ca90..3b4455a0b88 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -481,6 +481,7 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY if (!*bit_size) *bit_size = 8; *bit_size += state->items.bit_size * state->items.report_count; *byte_size = max( *byte_size, (*bit_size + 7) / 8 ); + state->items.start_bit = *bit_size; if (!state->items.report_count) { @@ -498,6 +499,7 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY state->items.report_count -= usages_size - 1; while (usages_size--) { + state->items.start_bit -= state->items.report_count * state->items.bit_size; state->items.usage_page = state->usages_page[usages_size]; state->items.usage_min = state->usages_min[usages_size]; state->items.usage_max = state->usages_max[usages_size]; diff --git a/include/wine/hid.h b/include/wine/hid.h index ceb07069b52..8d1d6d4d104 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -59,6 +59,7 @@ struct hid_value_caps USHORT bit_field; USHORT bit_size; USHORT report_count; + ULONG start_bit; LONG logical_min; LONG logical_max; LONG physical_min;

1 0

Rémi Bernon : hid: Rewrite HidP_GetUsages using enum_value_caps.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: 1184afb6404b8d817c0bb5974ffc4094d4fa102c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1184afb6404b8d817c0bb597… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 24 10:05:58 2021 +0200 hid: Rewrite HidP_GetUsages using enum_value_caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 98 +++++++++++++------------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 -- 2 files changed, 33 insertions(+), 68 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 6197e30c4da..4889a1e4014 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -420,82 +420,50 @@ NTSTATUS WINAPI HidP_GetUsageValueArray(HIDP_REPORT_TYPE ReportType, USAGE Usage } -NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, - PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, - PCHAR Report, ULONG ReportLength) +struct get_usage_params { - PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; - WINE_HID_ELEMENT *elems = HID_ELEMS(data); - WINE_HID_REPORT *report = NULL; - BOOL found = FALSE; - USHORT b_count = 0, r_count = 0; - int i,uCount; + USAGE *usages; + USAGE *usages_end; + char *report_buf; +}; - TRACE("(%i, %x, %i, %p, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, UsageList, - UsageLength, PreparsedData, Report, ReportLength); +static NTSTATUS get_usage( const struct hid_value_caps *caps, void *user ) +{ + struct get_usage_params *params = user; + ULONG bit, last; - if (data->magic != HID_MAGIC) + for (bit = caps->start_bit, last = bit + caps->usage_max - caps->usage_min; bit <= last; ++bit) { - *UsageLength = 0; - return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (!(params->report_buf[bit / 8] & (1 << (bit % 8)))) continue; + if (params->usages < params->usages_end) *params->usages = caps->usage_min + bit - caps->start_bit; + params->usages++; } - switch(ReportType) - { - case HidP_Input: - b_count = data->caps.NumberInputButtonCaps; - break; - case HidP_Output: - b_count = data->caps.NumberOutputButtonCaps; - break; - case HidP_Feature: - b_count = data->caps.NumberFeatureButtonCaps; - break; - default: - return HIDP_STATUS_INVALID_REPORT_TYPE; - } - r_count = data->reportCount[ReportType]; - report = &data->reports[data->reportIdx[ReportType][(BYTE)Report[0]]]; - - if (!r_count || !b_count) - return HIDP_STATUS_USAGE_NOT_FOUND; + return HIDP_STATUS_SUCCESS; +} - if (report->reportID && report->reportID != Report[0]) - return HIDP_STATUS_REPORT_DOES_NOT_EXIST; +NTSTATUS WINAPI HidP_GetUsages( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, USAGE *usages, + ULONG *usages_len, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) +{ + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct get_usage_params params = {.usages = usages, .usages_end = usages + *usages_len, .report_buf = report_buf}; + struct caps_filter filter = {.buttons = TRUE, .usage_page = usage_page, .collection = collection}; + NTSTATUS status; + USHORT limit = -1; - uCount = 0; - for (i = 0; i < report->elementCount && uCount < *UsageLength; i++) - { - if (elems[report->elementIdx + i].caps.BitSize == 1 && - elems[report->elementIdx + i].caps.UsagePage == UsagePage) - { - int k; - WINE_HID_ELEMENT *element = &elems[report->elementIdx + i]; - for (k=0; k < element->bitCount; k++) - { - UINT v = 0; - NTSTATUS rc = get_report_data((BYTE*)Report, ReportLength, - element->valueStartBit + k, 1, &v); - if (rc != HIDP_STATUS_SUCCESS) - return rc; - found = TRUE; - if (v) - { - if (uCount == *UsageLength) - return HIDP_STATUS_BUFFER_TOO_SMALL; - UsageList[uCount] = element->caps.Range.UsageMin + k; - uCount++; - } - } - } - } + TRACE( "report_type %d, collection %d, usages %p, usages_len %p, preparsed_data %p, report_buf %p, report_len %u.\n", + report_type, collection, usages, usages_len, preparsed_data, report_buf, report_len ); - *UsageLength = uCount; + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; - if (!found) - return HIDP_STATUS_USAGE_NOT_FOUND; + filter.report_id = report_buf[0]; + status = enum_value_caps( preparsed, report_type, report_len, &filter, get_usage, &params, &limit ); + *usages_len = params.usages - usages; + if (status != HIDP_STATUS_SUCCESS) return status; - return HIDP_STATUS_SUCCESS; + if (*usages_len == 0) return HIDP_STATUS_USAGE_NOT_FOUND; + if (params.usages > params.usages_end) return HIDP_STATUS_BUFFER_TOO_SMALL; + return status; } NTSTATUS WINAPI HidP_GetValueCaps( HIDP_REPORT_TYPE report_type, HIDP_VALUE_CAPS *caps, USHORT *caps_count, diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 8777880fd9d..b455fe650f1 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2190,7 +2190,6 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetUsages returned %#x\n", status); - todo_wine ok(value == 2, "got usage count %d, expected %d\n", value, 2); value = ARRAY_SIZE(usages); memset(usages, 0xcd, sizeof(usages)); @@ -2207,9 +2206,7 @@ static void test_hidp(HANDLE file, int report_id) report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status); ok(value == 2, "got usage count %d, expected %d\n", value, 2); - todo_wine ok(usages[0] == 6, "got usages[0] %x, expected %x\n", usages[0], 6); - todo_wine ok(usages[1] == 4, "got usages[1] %x, expected %x\n", usages[1], 4); value = ARRAY_SIZE(usage_and_pages);

1 0

Rémi Bernon : hid: Rewrite HidP_GetUsagesEx using enum_value_caps.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: f8e696503683a99970e7d27e3796e1c5d045328c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8e696503683a99970e7d27e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 24 10:05:59 2021 +0200 hid: Rewrite HidP_GetUsagesEx using enum_value_caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 101 ++++++++++++++----------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 - 2 files changed, 37 insertions(+), 66 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 4889a1e4014..8d893f6327d 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -716,81 +716,54 @@ NTSTATUS WINAPI HidP_GetSpecificValueCaps( HIDP_REPORT_TYPE report_type, USAGE u return enum_value_caps( preparsed, report_type, 0, &filter, get_value_caps, &caps, caps_count ); } -NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollection, USAGE_AND_PAGE *ButtonList, - ULONG *UsageLength, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength) +struct get_usage_and_page_params { - WINE_HIDP_PREPARSED_DATA *data = (WINE_HIDP_PREPARSED_DATA*)PreparsedData; - WINE_HID_ELEMENT *elems = HID_ELEMS(data); - WINE_HID_REPORT *report = NULL; - USHORT b_count = 0, r_count = 0; - int i,uCount = 0; - NTSTATUS rc; - - TRACE("(%i, %i, %p, %p(%i), %p, %p, %i)\n", ReportType, LinkCollection, ButtonList, - UsageLength, *UsageLength, PreparsedData, Report, ReportLength); - - if (data->magic != HID_MAGIC) - return HIDP_STATUS_INVALID_PREPARSED_DATA; - - switch(ReportType) - { - case HidP_Input: - b_count = data->caps.NumberInputButtonCaps; - break; - case HidP_Output: - b_count = data->caps.NumberOutputButtonCaps; - break; - case HidP_Feature: - b_count = data->caps.NumberFeatureButtonCaps; - break; - default: - return HIDP_STATUS_INVALID_REPORT_TYPE; - } - r_count = data->reportCount[ReportType]; - report = &data->reports[data->reportIdx[ReportType][(BYTE)Report[0]]]; - - if (!r_count || !b_count) - return HIDP_STATUS_USAGE_NOT_FOUND; + USAGE_AND_PAGE *usages; + USAGE_AND_PAGE *usages_end; + char *report_buf; +}; - if (report->reportID && report->reportID != Report[0]) - return HIDP_STATUS_REPORT_DOES_NOT_EXIST; +static NTSTATUS get_usage_and_page( const struct hid_value_caps *caps, void *user ) +{ + struct get_usage_and_page_params *params = user; + ULONG bit, last; - for (i = 0; i < report->elementCount; i++) + for (bit = caps->start_bit, last = bit + caps->usage_max - caps->usage_min; bit <= last; bit++) { - if (elems[report->elementIdx + i].caps.BitSize == 1) + if (!(params->report_buf[bit / 8] & (1 << (bit % 8)))) continue; + if (params->usages < params->usages_end) { - int k; - WINE_HID_ELEMENT *element = &elems[report->elementIdx + i]; - for (k=0; k < element->bitCount; k++) - { - UINT v = 0; - NTSTATUS rc = get_report_data((BYTE*)Report, ReportLength, - element->valueStartBit + k, 1, &v); - if (rc != HIDP_STATUS_SUCCESS) - return rc; - if (v) - { - if (uCount < *UsageLength) - { - ButtonList[uCount].Usage = element->caps.Range.UsageMin + k; - ButtonList[uCount].UsagePage = element->caps.UsagePage; - } - uCount++; - } - } + params->usages->UsagePage = caps->usage_page; + params->usages->Usage = caps->usage_min + bit - caps->start_bit; } + params->usages++; } - TRACE("Returning %i usages\n", uCount); + return HIDP_STATUS_SUCCESS; +} - if (*UsageLength < uCount) - rc = HIDP_STATUS_BUFFER_TOO_SMALL; - else - rc = HIDP_STATUS_SUCCESS; +NTSTATUS WINAPI HidP_GetUsagesEx( HIDP_REPORT_TYPE report_type, USHORT collection, USAGE_AND_PAGE *usages, + ULONG *usages_len, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) +{ + struct get_usage_and_page_params params = {.usages = usages, .usages_end = usages + *usages_len, .report_buf = report_buf}; + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {.buttons = TRUE, .collection = collection}; + NTSTATUS status; + USHORT limit = -1; - *UsageLength = uCount; + TRACE( "report_type %d, collection %d, usages %p, usages_len %p, preparsed_data %p, report_buf %p, report_len %u.\n", + report_type, collection, usages, usages_len, preparsed_data, report_buf, report_len ); - return rc; + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; + + filter.report_id = report_buf[0]; + status = enum_value_caps( preparsed, report_type, report_len, &filter, get_usage_and_page, &params, &limit ); + *usages_len = params.usages - usages; + if (status != HIDP_STATUS_SUCCESS) return status; + + if (*usages_len == 0) return HIDP_STATUS_USAGE_NOT_FOUND; + if (params.usages > params.usages_end) return HIDP_STATUS_BUFFER_TOO_SMALL; + return status; } ULONG WINAPI HidP_MaxDataListLength(HIDP_REPORT_TYPE ReportType, PHIDP_PREPARSED_DATA PreparsedData) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index b455fe650f1..ca030599299 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2227,10 +2227,8 @@ static void test_hidp(HANDLE file, int report_id) usage_and_pages[0].Usage, 4); ok(usage_and_pages[1].Usage == 6, "got usage_and_pages[1] Usage %x, expected %x\n", usage_and_pages[1].Usage, 6); - todo_wine ok(usage_and_pages[2].Usage == 6, "got usage_and_pages[2] Usage %x, expected %x\n", usage_and_pages[2].Usage, 6); - todo_wine ok(usage_and_pages[3].Usage == 4, "got usage_and_pages[3] Usage %x, expected %x\n", usage_and_pages[3].Usage, 4);

1 0

Zhiyi Zhang : light.msstyles: Add Button parts.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: 991381046e9b3926ff9a217ea680e25df301d984 URL: https://source.winehq.org/git/wine.git/?a=commit;h=991381046e9b3926ff9a217e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 24 22:43:03 2021 +0800 light.msstyles: Add Button parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 13 ++ dlls/light.msstyles/blue_button.bmp | Bin 0 -> 12282 bytes dlls/light.msstyles/blue_button.svg | 24 ++++ dlls/light.msstyles/blue_checkbox_13px.bmp | Bin 0 -> 8250 bytes dlls/light.msstyles/blue_checkbox_13px.svg | 44 ++++++ dlls/light.msstyles/blue_checkbox_16px.bmp | Bin 0 -> 12426 bytes dlls/light.msstyles/blue_checkbox_16px.svg | 36 +++++ dlls/light.msstyles/blue_checkbox_25px.bmp | Bin 0 -> 30138 bytes dlls/light.msstyles/blue_checkbox_25px.svg | 40 ++++++ dlls/light.msstyles/blue_commandlink.bmp | Bin 0 -> 13074 bytes dlls/light.msstyles/blue_commandlink.svg | 18 +++ .../light.msstyles/blue_commandlink_glyph_30px.bmp | Bin 0 -> 18138 bytes .../light.msstyles/blue_commandlink_glyph_30px.svg | 19 +++ .../light.msstyles/blue_commandlink_glyph_45px.bmp | Bin 0 -> 40638 bytes .../light.msstyles/blue_commandlink_glyph_45px.svg | 19 +++ dlls/light.msstyles/blue_groupbox.bmp | Bin 0 -> 1898 bytes dlls/light.msstyles/blue_groupbox.svg | 15 +++ dlls/light.msstyles/blue_radiobutton_13px.bmp | Bin 0 -> 5546 bytes dlls/light.msstyles/blue_radiobutton_13px.svg | 28 ++++ dlls/light.msstyles/blue_radiobutton_16px.bmp | Bin 0 -> 8330 bytes dlls/light.msstyles/blue_radiobutton_16px.svg | 28 ++++ dlls/light.msstyles/blue_radiobutton_25px.bmp | Bin 0 -> 20138 bytes dlls/light.msstyles/blue_radiobutton_25px.svg | 28 ++++ dlls/light.msstyles/light.rc | 149 +++++++++++++++++++++ 24 files changed, 461 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=991381046e9b3926ff9a…

1 0

Zhiyi Zhang : light.msstyles: Add ComboBox parts.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: 2d148334685934d6be5114525c0eab326eb23179 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d148334685934d6be511452… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 24 22:43:15 2021 +0800 light.msstyles: Add ComboBox parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 2 ++ dlls/light.msstyles/blue_combobutton.bmp | Bin 0 -> 6858 bytes dlls/light.msstyles/blue_combobutton.svg | 18 ++++++++++++++ dlls/light.msstyles/blue_combobutton_glyph.bmp | Bin 0 -> 1258 bytes dlls/light.msstyles/blue_combobutton_glyph.svg | 28 ++++++++++++++++++++++ dlls/light.msstyles/light.rc | 31 +++++++++++++++++++++++++ 6 files changed, 79 insertions(+) diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index a024642e201..201ed57d055 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -7,6 +7,8 @@ SVG_SRCS = \ blue_checkbox_13px.svg \ blue_checkbox_16px.svg \ blue_checkbox_25px.svg \ + blue_combobutton.svg \ + blue_combobutton_glyph.svg \ blue_commandlink.svg \ blue_commandlink_glyph_30px.svg \ blue_commandlink_glyph_45px.svg \ diff --git a/dlls/light.msstyles/blue_combobutton.bmp b/dlls/light.msstyles/blue_combobutton.bmp new file mode 100644 index 00000000000..a2b12ba3e1f Binary files /dev/null and b/dlls/light.msstyles/blue_combobutton.bmp differ diff --git a/dlls/light.msstyles/blue_combobutton.svg b/dlls/light.msstyles/blue_combobutton.svg new file mode 100644 index 00000000000..aab7ff06812 --- /dev/null +++ b/dlls/light.msstyles/blue_combobutton.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:20-32" width="20" height="84" version="1.1" viewBox="0 0 5.2917 22.225" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <rect x=".39687" y=".39687" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae"/> + <rect x=".39687" y="5.9531" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#3096fa"/> + <rect x=".39687" y="11.509" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".39687" y="17.066" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_combobutton_glyph.bmp b/dlls/light.msstyles/blue_combobutton_glyph.bmp new file mode 100644 index 00000000000..2c0bd8a357f Binary files /dev/null and b/dlls/light.msstyles/blue_combobutton_glyph.bmp differ diff --git a/dlls/light.msstyles/blue_combobutton_glyph.svg b/dlls/light.msstyles/blue_combobutton_glyph.svg new file mode 100644 index 00000000000..0caf1c4b696 --- /dev/null +++ b/dlls/light.msstyles/blue_combobutton_glyph.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-32" width="10" height="28" version="1.1" viewBox="0 0 2.6458 7.4083" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g> + <path d="m0-1.8521h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/> + <path d="m0 3.7042h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/> + <path d="m0.39688 0.66961 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" stroke-width=".26458"/> + <path d="m2.1173 0.52917-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" stroke-width=".26458"/> + <g> + <g stroke-width=".26458"> + <path d="m0.39688 2.5217 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#3096fa"/> + <path d="m2.1173 2.3812-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#3096fa"/> + <path d="m0.39688 4.3738 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#fff"/> + <path d="m2.1173 4.2333-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#fff"/> + </g> + <path d="m0.39688 6.2259 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#aeaeae"/> + <path d="m2.1173 6.0854-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index cc5b371da8c..2451ffcd4f0 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -294,6 +294,30 @@ BLUE_INI TEXTFILE "ImageFile2 = blue_commandlink_glyph_45px.bmp\r\n" "MinDpi1 = 96\r\n" "MinDpi2 = 144\r\n" + +"\r\n; ComboBox\r\n" +"[ComboBox]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + +"[ComboBox(Disabled)]\r\n" +"BorderColor = 228 228 228\r\n" +"FillColor = 231 231 231\r\n" + +"[ComboBox.DropDownButton]\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_combobutton.bmp\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 4\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_combobutton_glyph.bmp\r\n" +"GlyphTransparent = True\r\n" +"Transparent = True\r\n" } /* Button */ @@ -330,6 +354,13 @@ BLUE_COMMANDLINK_GLYPH_30PX_BMP BITMAP "blue_commandlink_glyph_30px.bmp" /* @makedep: blue_commandlink_glyph_45px.bmp */ BLUE_COMMANDLINK_GLYPH_45PX_BMP BITMAP "blue_commandlink_glyph_45px.bmp" +/* ComboBox */ +/* @makedep: blue_combobutton.bmp */ +BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" + +/* @makedep: blue_combobutton_glyph.bmp */ +BLUE_COMBOBUTTON_GLYPH_BMP BITMAP "blue_combobutton_glyph.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles"

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_WINE_GET_SO_ERROR.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: 8211c3ab36d48f9ce968711f7a63e7bcb10e78f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8211c3ab36d48f9ce968711f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 00:00:10 2021 -0500 server: Introduce IOCTL_AFD_WINE_GET_SO_ERROR. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 1 + server/sock.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index 6370e00539f..0ccd248e614 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -162,6 +162,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN CTL_CODE(FILE_DEVICE_NETWORK, 219, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 220, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 221, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_ERROR CTL_CODE(FILE_DEVICE_NETWORK, 222, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index 71f22845827..f614bf5feaa 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2546,6 +2546,40 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 1; } + case IOCTL_AFD_WINE_GET_SO_ERROR: + { + int error; + socklen_t len = sizeof(error); + unsigned int i; + + if (get_reply_max_size() < sizeof(error)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + if (getsockopt( unix_fd, SOL_SOCKET, SO_ERROR, (char *)&error, &len ) < 0) + { + set_error( sock_get_ntstatus( errno ) ); + return 0; + } + + if (!error) + { + for (i = 0; i < ARRAY_SIZE( sock->errors ); ++i) + { + if (sock->errors[i]) + { + error = sock->errors[i]; + break; + } + } + } + + set_reply_data( &error, sizeof(error) ); + return 1; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0;

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_GET_SO_ERROR.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: fb3956fcf94397bed53598943a9524520bc23e08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb3956fcf94397bed5359894… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 00:00:11 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_GET_SO_ERROR. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 41 +---------------------------------------- dlls/ws2_32/tests/sock.c | 2 -- 2 files changed, 1 insertion(+), 42 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ab111f726a9..b183b85b0b3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -694,19 +694,6 @@ static inline void release_sock_fd( SOCKET s, int fd ) close( fd ); } -static void _get_sock_errors(SOCKET s, int *events) -{ - SERVER_START_REQ( get_socket_event ) - { - req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - req->service = FALSE; - req->c_event = 0; - wine_server_set_reply( req, events, sizeof(int) * FD_MAX_EVENTS ); - wine_server_call( req ); - } - SERVER_END_REQ; -} - static int _get_fd_type(int fd) { int sock_type = -1; @@ -2236,33 +2223,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return 0; case WS_SO_ERROR: - { - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - if (getsockopt(fd, SOL_SOCKET, SO_ERROR, optval, (socklen_t *)optlen) != 0 ) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - release_sock_fd( s, fd ); - - /* The wineserver may have swallowed the error before us */ - if (!ret && *(int*) optval == 0) - { - int i, events[FD_MAX_EVENTS]; - _get_sock_errors(s, events); - for (i = 0; i < FD_MAX_EVENTS; i++) - { - if(events[i]) - { - TRACE("returning SO_ERROR %d from wine server\n", events[i]); - *(int*) optval = events[i]; - break; - } - } - } - return ret; - } + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_ERROR, optval, optlen ); case WS_SO_LINGER: { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7534e75edb3..9f461376853 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1295,7 +1295,6 @@ todo_wine SetLastError(0xdeadbeef); i = 4321; err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); -todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError()); @@ -1306,7 +1305,6 @@ todo_wine SetLastError(0xdeadbeef); size = 1; err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); -todo_wine ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEFAULT), "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError());

1 0

Zebediah Figura : server: Remove the no longer used get_socket_event request.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: f7ffd71f3c202add51159bffde032832109c2e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7ffd71f3c202add51159bff… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 00:00:12 2021 -0500 server: Remove the no longer used get_socket_event request. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 22 +--------------------- server/protocol.def | 12 ------------ server/request.h | 9 --------- server/sock.c | 39 --------------------------------------- server/trace.c | 17 ----------------- 5 files changed, 1 insertion(+), 98 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index aac97b26b99..095c2ac7d04 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1730,23 +1730,6 @@ struct unlock_file_reply -struct get_socket_event_request -{ - struct request_header __header; - obj_handle_t handle; - int service; - obj_handle_t c_event; -}; -struct get_socket_event_reply -{ - struct reply_header __header; - unsigned int mask; - unsigned int pmask; - /* VARARG(errors,ints); */ -}; - - - struct recv_socket_request { struct request_header __header; @@ -5456,7 +5439,6 @@ enum request REQ_get_volume_info, REQ_lock_file, REQ_unlock_file, - REQ_get_socket_event, REQ_recv_socket, REQ_poll_socket, REQ_send_socket, @@ -5736,7 +5718,6 @@ union generic_request struct get_volume_info_request get_volume_info_request; struct lock_file_request lock_file_request; struct unlock_file_request unlock_file_request; - struct get_socket_event_request get_socket_event_request; struct recv_socket_request recv_socket_request; struct poll_socket_request poll_socket_request; struct send_socket_request send_socket_request; @@ -6014,7 +5995,6 @@ union generic_reply struct get_volume_info_reply get_volume_info_reply; struct lock_file_reply lock_file_reply; struct unlock_file_reply unlock_file_reply; - struct get_socket_event_reply get_socket_event_reply; struct recv_socket_reply recv_socket_reply; struct poll_socket_reply poll_socket_reply; struct send_socket_reply send_socket_reply; @@ -6238,7 +6218,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 715 +#define SERVER_PROTOCOL_VERSION 716 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index b5bc049ccf6..343febda6c5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1423,18 +1423,6 @@ enum server_fd_type @END -/* Get socket event parameters */ -(a)REQ(get_socket_event) - obj_handle_t handle; /* handle to the socket */ - int service; /* clear pending? */ - obj_handle_t c_event; /* event to clear */ -(a)REPLY - unsigned int mask; /* event mask */ - unsigned int pmask; /* pending events */ - VARARG(errors,ints); /* event errors */ -(a)END - - /* Perform a recv on a socket */ @REQ(recv_socket) int oob; /* are we receiving OOB data? */ diff --git a/server/request.h b/server/request.h index 30fbfcc516a..d38ddae6c5e 100644 --- a/server/request.h +++ b/server/request.h @@ -172,7 +172,6 @@ DECL_HANDLER(get_file_info); DECL_HANDLER(get_volume_info); DECL_HANDLER(lock_file); DECL_HANDLER(unlock_file); -DECL_HANDLER(get_socket_event); DECL_HANDLER(recv_socket); DECL_HANDLER(poll_socket); DECL_HANDLER(send_socket); @@ -451,7 +450,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_get_volume_info, (req_handler)req_lock_file, (req_handler)req_unlock_file, - (req_handler)req_get_socket_event, (req_handler)req_recv_socket, (req_handler)req_poll_socket, (req_handler)req_send_socket, @@ -1034,13 +1032,6 @@ C_ASSERT( FIELD_OFFSET(struct unlock_file_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct unlock_file_request, offset) == 16 ); C_ASSERT( FIELD_OFFSET(struct unlock_file_request, count) == 24 ); C_ASSERT( sizeof(struct unlock_file_request) == 32 ); -C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, service) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, c_event) == 20 ); -C_ASSERT( sizeof(struct get_socket_event_request) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_socket_event_reply, mask) == 8 ); -C_ASSERT( FIELD_OFFSET(struct get_socket_event_reply, pmask) == 12 ); -C_ASSERT( sizeof(struct get_socket_event_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_request, oob) == 12 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_request, async) == 16 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_request, status) == 56 ); diff --git a/server/sock.c b/server/sock.c index f614bf5feaa..e7754dc0da3 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2976,45 +2976,6 @@ struct object *create_socket_device( struct object *root, const struct unicode_s return create_named_object( root, &socket_device_ops, name, attr, sd ); } -/* get socket event parameters */ -DECL_HANDLER(get_socket_event) -{ - unsigned int errors[FD_MAX_EVENTS] = {0}; - struct sock *sock; - - if (!(sock = (struct sock *)get_handle_obj( current->process, req->handle, - FILE_READ_ATTRIBUTES, &sock_ops ))) return; - if (get_unix_fd( sock->fd ) == -1) return; - reply->mask = afd_poll_flag_to_win32( sock->mask ); - reply->pmask = afd_poll_flag_to_win32( sock->pending_events ); - - errors[FD_READ_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_READ] ); - errors[FD_WRITE_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_WRITE] ); - errors[FD_OOB_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_OOB] ); - errors[FD_ACCEPT_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_ACCEPT] ); - errors[FD_CONNECT_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_CONNECT_ERR] ); - if (!(errors[FD_CLOSE_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_HUP] ))) - errors[FD_CLOSE_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_RESET] ); - set_reply_data( errors, min( get_reply_max_size(), sizeof(errors) )); - - if (req->service) - { - if (req->c_event) - { - struct event *cevent = get_event_obj( current->process, req->c_event, - EVENT_MODIFY_STATE ); - if (cevent) - { - reset_event( cevent ); - release_object( cevent ); - } - } - sock->pending_events = 0; - sock_reselect( sock ); - } - release_object( &sock->obj ); -} - DECL_HANDLER(recv_socket) { struct sock *sock = (struct sock *)get_handle_obj( current->process, req->async.handle, 0, &sock_ops ); diff --git a/server/trace.c b/server/trace.c index 46f6678fb87..81b482b8338 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2073,20 +2073,6 @@ static void dump_unlock_file_request( const struct unlock_file_request *req ) dump_uint64( ", count=", &req->count ); } -static void dump_get_socket_event_request( const struct get_socket_event_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", service=%d", req->service ); - fprintf( stderr, ", c_event=%04x", req->c_event ); -} - -static void dump_get_socket_event_reply( const struct get_socket_event_reply *req ) -{ - fprintf( stderr, " mask=%08x", req->mask ); - fprintf( stderr, ", pmask=%08x", req->pmask ); - dump_varargs_ints( ", errors=", cur_size ); -} - static void dump_recv_socket_request( const struct recv_socket_request *req ) { fprintf( stderr, " oob=%d", req->oob ); @@ -4571,7 +4557,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_volume_info_request, (dump_func)dump_lock_file_request, (dump_func)dump_unlock_file_request, - (dump_func)dump_get_socket_event_request, (dump_func)dump_recv_socket_request, (dump_func)dump_poll_socket_request, (dump_func)dump_send_socket_request, @@ -4847,7 +4832,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_volume_info_reply, (dump_func)dump_lock_file_reply, NULL, - (dump_func)dump_get_socket_event_reply, (dump_func)dump_recv_socket_reply, (dump_func)dump_poll_socket_reply, (dump_func)dump_send_socket_reply, @@ -5123,7 +5107,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_volume_info", "lock_file", "unlock_file", - "get_socket_event", "recv_socket", "poll_socket", "send_socket",

1 0