August 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : hidclass.sys: Merge parse_descriptor and ParseDescriptor.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: a5e2d821e23061f4f360a8287ab3244d36041c31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5e2d821e23061f4f360a828… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 9 10:32:43 2021 +0200 hidclass.sys: Merge parse_descriptor and ParseDescriptor. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 91 +++++++++++++++++++----------------------- dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/pnp.c | 2 +- 3 files changed, 43 insertions(+), 52 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 7375f3d3214..f8a26d87c9f 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -449,55 +449,68 @@ static WINE_HIDP_PREPARSED_DATA *build_preparsed_data( struct hid_parser_state * return data; } -static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int length, - struct hid_parser_state *state ) +WINE_HIDP_PREPARSED_DATA *parse_descriptor( BYTE *descriptor, unsigned int length ) { - int i; - UINT32 value; + WINE_HIDP_PREPARSED_DATA *data = NULL; + struct hid_parser_state *state; + UINT32 size, value; INT32 signed_value; + BYTE *ptr, *end; + int i; - for (i = index; i < length;) + if (TRACE_ON( hid )) { - BYTE item = descriptor[i++]; - int size = item & 0x03; + TRACE( "descriptor %p, length %u:\n", descriptor, length ); + for (i = 0; i < length;) + { + TRACE( "%08x ", i ); + do { TRACE( " %02x", descriptor[i] ); } while (++i % 16 && i < length); + TRACE( "\n" ); + } + } + + if (!(state = calloc( 1, sizeof(*state) ))) return NULL; + init_parser_state( state ); + for (ptr = descriptor, end = descriptor + length; ptr != end; ptr += size + 1) + { + size = (*ptr & 0x03); if (size == 3) size = 4; - if (length - i < size) + if (ptr + size > end) { ERR("Need %d bytes to read item value\n", size); - return -1; + goto done; } if (size == 0) signed_value = value = 0; - else if (size == 1) signed_value = (INT8)(value = *(UINT8 *)(descriptor + i)); - else if (size == 2) signed_value = (INT16)(value = *(UINT16 *)(descriptor + i)); - else if (size == 4) signed_value = (INT32)(value = *(UINT32 *)(descriptor + i)); + else if (size == 1) signed_value = (INT8)(value = *(UINT8 *)(ptr + 1)); + else if (size == 2) signed_value = (INT16)(value = *(UINT16 *)(ptr + 1)); + else if (size == 4) signed_value = (INT32)(value = *(UINT32 *)(ptr + 1)); else { ERR("Unexpected item value size %d.\n", size); - return -1; + goto done; } - i += size; state->items.bit_field = value; #define SHORT_ITEM(tag,type) (((tag)<<4)|((type)<<2)) - switch (item & SHORT_ITEM(0xf,0x3)) + switch (*ptr & SHORT_ITEM(0xf,0x3)) { case SHORT_ITEM(TAG_MAIN_INPUT, TAG_TYPE_MAIN): - if (!parse_new_value_caps( state, HidP_Input )) return -1; + if (!parse_new_value_caps( state, HidP_Input )) goto done; break; case SHORT_ITEM(TAG_MAIN_OUTPUT, TAG_TYPE_MAIN): - if (!parse_new_value_caps( state, HidP_Output )) return -1; + if (!parse_new_value_caps( state, HidP_Output )) goto done; break; case SHORT_ITEM(TAG_MAIN_FEATURE, TAG_TYPE_MAIN): - if (!parse_new_value_caps( state, HidP_Feature )) return -1; + if (!parse_new_value_caps( state, HidP_Feature )) goto done; break; case SHORT_ITEM(TAG_MAIN_COLLECTION, TAG_TYPE_MAIN): - if (!parse_new_collection( state )) return -1; + if (!parse_new_collection( state )) goto done; break; case SHORT_ITEM(TAG_MAIN_END_COLLECTION, TAG_TYPE_MAIN): - if (!parse_end_collection( state )) return -1; + if (!parse_end_collection( state )) goto done; break; case SHORT_ITEM(TAG_GLOBAL_USAGE_PAGE, TAG_TYPE_GLOBAL): @@ -531,14 +544,14 @@ static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int state->items.report_count = value; break; case SHORT_ITEM(TAG_GLOBAL_PUSH, TAG_TYPE_GLOBAL): - if (!parse_global_push( state )) return -1; + if (!parse_global_push( state )) goto done; break; case SHORT_ITEM(TAG_GLOBAL_POP, TAG_TYPE_GLOBAL): - if (!parse_global_pop( state )) return -1; + if (!parse_global_pop( state )) goto done; break; case SHORT_ITEM(TAG_LOCAL_USAGE, TAG_TYPE_LOCAL): - if (!parse_local_usage( state, value >> 16, value & 0xffff )) return -1; + if (!parse_local_usage( state, value >> 16, value & 0xffff )) goto done; break; case SHORT_ITEM(TAG_LOCAL_USAGE_MINIMUM, TAG_TYPE_LOCAL): parse_local_usage_min( state, value >> 16, value & 0xffff ); @@ -572,40 +585,18 @@ static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int break; case SHORT_ITEM(TAG_LOCAL_DELIMITER, TAG_TYPE_LOCAL): FIXME("delimiter %d not implemented!\n", value); - return -1; + goto done; default: - FIXME("item type %x not implemented!\n", item); - return -1; + FIXME( "item type %x not implemented!\n", *ptr ); + goto done; } #undef SHORT_ITEM } - return i; -} - -WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) -{ - WINE_HIDP_PREPARSED_DATA *data = NULL; - struct hid_parser_state *state; - int i; - - if (TRACE_ON(hid)) - { - TRACE("descriptor %p, length %u:\n", descriptor, length); - for (i = 0; i < length;) - { - TRACE("%08x ", i); - do { TRACE(" %02x", descriptor[i]); } while (++i % 16 && i < length); - TRACE("\n"); - } - } - - if (!(state = calloc( 1, sizeof(*state) ))) return NULL; - init_parser_state( state ); - if (parse_descriptor( descriptor, 0, length, state ) >= 0 && (data = build_preparsed_data( state ))) - debug_print_preparsed( data ); + if ((data = build_preparsed_data( state ))) debug_print_preparsed( data ); +done: free_parser_state( state ); return data; } diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index f0982d508e3..c00f014bb2c 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -123,4 +123,4 @@ NTSTATUS WINAPI pdo_create(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; NTSTATUS WINAPI pdo_close(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; /* Parsing HID Report Descriptors into preparsed data */ -WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) DECLSPEC_HIDDEN; +WINE_HIDP_PREPARSED_DATA *parse_descriptor( BYTE *descriptor, unsigned int length ) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index e5a38dafc1c..d792e5d3ddd 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -251,7 +251,7 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) return; } - pdo_ext->u.pdo.preparsed_data = ParseDescriptor(reportDescriptor, descriptor.DescriptorList[i].wReportLength); + pdo_ext->u.pdo.preparsed_data = parse_descriptor( reportDescriptor, descriptor.DescriptorList[i].wReportLength ); free(reportDescriptor); if (!pdo_ext->u.pdo.preparsed_data) {

1 0

Francois Gouget : user32/tests: Use wine_dbgstr_a() instead of %.8s.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: 1b36c218216cf7cd7793be7973efa882bac8cadd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b36c218216cf7cd7793be79… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Aug 8 00:46:38 2021 +0200 user32/tests: Use wine_dbgstr_a() instead of %.8s. This should better handle NULL pointers and bad strings. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index c8de860f8cc..b10ffaf4c8f 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1927,7 +1927,7 @@ static void test_data_handles(void) ok( is_fixed( h ), "expected fixed mem %p\n", h ); ok( is_moveable( text ), "expected moveable mem %p\n", text ); ptr = GlobalLock( h ); - ok( !strcmp( ptr, "foobar" ), "wrong data '%.8s'\n", ptr ); + ok( ptr && !strcmp( ptr, "foobar" ), "wrong data %s\n", wine_dbgstr_a(ptr) ); GlobalUnlock( h ); r = EmptyClipboard();

1 0

Ziqing Hui : d2d1: Add a properties list for builtin effects.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: b2b73446e572cc321e5f961021ba781b18b98263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2b73446e572cc321e5f9610… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sun Aug 8 12:40:33 2021 +0800 d2d1: Add a properties list for builtin effects. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 2 +- dlls/d2d1/effect.c | 41 +++++++++++++++++++++++++++++++++-------- dlls/d2d1/tests/d2d1.c | 1 - 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 48d15dfcf22..88c712cf51c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -577,7 +577,7 @@ struct d2d_effect size_t input_count; }; -HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) DECLSPEC_HIDDEN; +HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory, const CLSID *effect_id) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index d8704f1b43b..c6ef2e28690 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1894,7 +1894,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_effect_init(object, context->factory))) + if (FAILED(hr = d2d_effect_init(object, context->factory, effect_id))) { WARN("Failed to initialize effect, hr %#x.\n", hr); heap_free(object); diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index acf83ab1b02..c884c3b8d4f 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -20,6 +20,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); +struct d2d_effect_info +{ + const CLSID *clsid; + UINT32 default_input_count; +}; + +static const struct d2d_effect_info builtin_effects[] = +{ + {&CLSID_D2D12DAffineTransform, 1}, + {&CLSID_D2D13DPerspectiveTransform, 1}, + {&CLSID_D2D1Composite, 2} +}; + static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) { return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Effect_iface); @@ -277,19 +290,31 @@ static const ID2D1ImageVtbl d2d_effect_image_vtbl = d2d_effect_image_GetFactory, }; -HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) +HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory, const CLSID *effect_id) { + unsigned int i; + effect->ID2D1Effect_iface.lpVtbl = &d2d_effect_vtbl; effect->ID2D1Image_iface.lpVtbl = &d2d_effect_image_vtbl; effect->refcount = 1; - effect->input_count = 1; - if (!d2d_array_reserve((void **)&effect->inputs, &effect->inputs_size, - effect->input_count, sizeof(*effect->inputs))) - return E_OUTOFMEMORY; - memset(effect->inputs, 0, sizeof(*effect->inputs) * effect->input_count); + for (i = 0; i < ARRAY_SIZE(builtin_effects); ++i) + { + if (IsEqualGUID(effect_id, builtin_effects[i].clsid)) + { + effect->input_count = builtin_effects[i].default_input_count; - ID2D1Factory_AddRef(effect->factory = factory); + if (!d2d_array_reserve((void **)&effect->inputs, &effect->inputs_size, + effect->input_count, sizeof(*effect->inputs))) + return E_OUTOFMEMORY; + memset(effect->inputs, 0, sizeof(*effect->inputs) * effect->input_count); - return S_OK; + ID2D1Factory_AddRef(effect->factory = factory); + + return S_OK; + } + } + + WARN("Unsupported effect clsid %s.\n", debugstr_guid(effect_id)); + return E_FAIL; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 64d9765e866..36882dc4918 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9802,7 +9802,6 @@ static void test_effect(BOOL d3d11) } input_count = ID2D1Effect_GetInputCount(effect); - todo_wine_if(test->default_input_count != 1) ok (input_count == test->default_input_count, "Got unexpected input count %u, expected %u.\n", input_count, test->default_input_count);

1 0

Rémi Bernon : hidclass.sys: Validate report IDs in hid_device_xfer_report.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: e653a2e0b32ef3f41cd41b77bf54ea97c3cc8907 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e653a2e0b32ef3f41cd41b77… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 9 10:32:39 2021 +0200 hidclass.sys: Validate report IDs in hid_device_xfer_report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 17 +++++++++++++++-- dlls/ntoskrnl.exe/tests/driver_hid.c | 4 ---- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 8 -------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 83c0c1159ff..44965e118a2 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -303,7 +303,7 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP { const WINE_HIDP_PREPARSED_DATA *preparsed = ext->u.pdo.preparsed_data; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); - BYTE report_id = HID_INPUT_VALUE_CAPS( preparsed )->report_id; + struct hid_value_caps *caps = NULL, *caps_end = NULL; ULONG report_len = 0, buffer_len = 0; HID_XFER_PACKET packet; BYTE *buffer = NULL; @@ -326,13 +326,19 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP { case IOCTL_HID_GET_INPUT_REPORT: report_len = preparsed->caps.InputReportByteLength; + caps = HID_INPUT_VALUE_CAPS( preparsed ); + caps_end = caps + preparsed->value_caps_count[HidP_Input]; break; case IOCTL_HID_SET_OUTPUT_REPORT: report_len = preparsed->caps.OutputReportByteLength; + caps = HID_OUTPUT_VALUE_CAPS( preparsed ); + caps_end = caps + preparsed->value_caps_count[HidP_Output]; break; case IOCTL_HID_GET_FEATURE: case IOCTL_HID_SET_FEATURE: report_len = preparsed->caps.FeatureReportByteLength; + caps = HID_FEATURE_VALUE_CAPS( preparsed ); + caps_end = caps + preparsed->value_caps_count[HidP_Feature]; break; } @@ -347,11 +353,18 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP return; } + for (; caps != caps_end; ++caps) if (!caps->report_id || caps->report_id == buffer[0]) break; + if (caps == caps_end) + { + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + return; + } + packet.reportId = buffer[0]; packet.reportBuffer = buffer; packet.reportBufferLen = buffer_len; - if (!report_id) + if (!caps->report_id) { packet.reportId = 0; packet.reportBuffer++; diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 4f0a8591299..83f546aa972 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -532,7 +532,6 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(!in_size, "got input size %u\n", in_size); ok(out_size == sizeof(*packet), "got output size %u\n", out_size); - todo_wine_if(packet->reportId == 0x5a) ok(packet->reportId == report_id, "got id %u\n", packet->reportId); ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); @@ -552,7 +551,6 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(in_size == sizeof(*packet), "got input size %u\n", in_size); ok(!out_size, "got output size %u\n", out_size); - todo_wine_if(packet->reportId == 0x5a) ok(packet->reportId == report_id, "got id %u\n", packet->reportId); ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); @@ -569,7 +567,6 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(!in_size, "got input size %u\n", in_size); ok(out_size == sizeof(*packet), "got output size %u\n", out_size); - todo_wine_if(packet->reportId == 0x5a) ok(packet->reportId == report_id, "got id %u\n", packet->reportId); ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); @@ -588,7 +585,6 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(in_size == sizeof(*packet), "got input size %u\n", in_size); ok(!out_size, "got output size %u\n", out_size); - todo_wine_if(packet->reportId == 0x5a) ok(packet->reportId == report_id, "got id %u\n", packet->reportId); ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 128a81a5f83..4909ab202a6 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2454,9 +2454,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled ret = HidD_GetInputReport(file, buffer, caps.InputReportByteLength); if (report_id || broken(!ret) /* w7u */) { - todo_wine ok(!ret, "HidD_GetInputReport succeeded, last error %u\n", GetLastError()); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), "HidD_GetInputReport returned error %u\n", GetLastError()); } @@ -2499,9 +2497,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled ret = HidD_GetFeature(file, buffer, caps.FeatureReportByteLength); if (report_id || broken(!ret)) { - todo_wine ok(!ret, "HidD_GetFeature succeeded, last error %u\n", GetLastError()); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), "HidD_GetFeature returned error %u\n", GetLastError()); } @@ -2544,9 +2540,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled ret = HidD_SetFeature(file, buffer, caps.FeatureReportByteLength); if (report_id || broken(!ret)) { - todo_wine ok(!ret, "HidD_SetFeature succeeded, last error %u\n", GetLastError()); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), "HidD_SetFeature returned error %u\n", GetLastError()); } @@ -2593,9 +2587,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled ret = HidD_SetOutputReport(file, buffer, caps.OutputReportByteLength); if (report_id || broken(!ret)) { - todo_wine ok(!ret, "HidD_SetOutputReport succeeded, last error %u\n", GetLastError()); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), "HidD_SetOutputReport returned error %u\n", GetLastError()); }

1 0

Huw Davies : dnsapi: Return ERROR_MORE_DATA on insufficient buffer.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: 734de3bef82ff5456b27cca663f9e91e939f0c29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=734de3bef82ff5456b27cca6… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 9 10:06:25 2021 +0100 dnsapi: Return ERROR_MORE_DATA on insufficient buffer. This was already done correctly in the res_getservers() case. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/libresolv.c | 2 +- dlls/dnsapi/tests/query.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index 7e545cf36fb..864c517333d 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -414,7 +414,7 @@ DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DW if (!addrs || *len < needed) { *len = needed; - return !addrs ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER; + return !addrs ? ERROR_SUCCESS : ERROR_MORE_DATA; } *len = needed; memset( addrs, 0, needed ); diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index 5fb47d89782..e691822a46a 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -155,6 +155,10 @@ static void test_DnsQueryConfig( void ) err = DnsQueryConfig( DnsConfigDnsServersIpv4, 0, name, NULL, NULL, &size ); if (err) continue; ipv4 = malloc( size ); + size--; + err = DnsQueryConfig( DnsConfigDnsServersIpv4, 0, name, NULL, ipv4, &size ); + ok( err == ERROR_MORE_DATA, "got %d\n", err ); + size++; err = DnsQueryConfig( DnsConfigDnsServersIpv4, 0, name, NULL, ipv4, &size ); ok( !err, "got %d\n", err );

1 0

Rémi Bernon : xinput1_3: Move device(_path) members to struct xinput_controller.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: f896333c37ea3c91d5f668d4e0d23f67fa0ba176 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f896333c37ea3c91d5f668d4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 9 11:25:33 2021 +0200 xinput1_3: Move device(_path) members to struct xinput_controller. And use device instead of platform_private to check connection. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 25f3b0f0407..3892f5a4e9b 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -56,6 +56,8 @@ struct xinput_controller XINPUT_STATE state; XINPUT_GAMEPAD last_keystroke; XINPUT_VIBRATION vibration; + HANDLE device; + WCHAR device_path[MAX_PATH]; BOOL enabled; }; @@ -114,9 +116,6 @@ struct hid_platform_private PHIDP_PREPARSED_DATA preparsed; HIDP_CAPS caps; - HANDLE device; - WCHAR device_path[MAX_PATH]; - char *input_report_buf[2]; char *output_report_buf; @@ -127,14 +126,13 @@ static DWORD last_check = 0; static BOOL find_opened_device(SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *free_slot) { - struct hid_platform_private *private; int i; *free_slot = XUSER_MAX_COUNT; for (i = XUSER_MAX_COUNT; i > 0; i--) { - if (!(private = controllers[i - 1].platform_private)) *free_slot = i - 1; - else if (!wcscmp(detail->DevicePath, private->device_path)) return TRUE; + if (!controllers[i - 1].device) *free_slot = i - 1; + else if (!wcscmp(detail->DevicePath, controllers[i - 1].device_path)) return TRUE; } return FALSE; } @@ -259,7 +257,7 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO output_report_buf[3] = (BYTE)(state->wLeftMotorSpeed / 256); output_report_buf[4] = (BYTE)(state->wRightMotorSpeed / 256); - if (!HidD_SetOutputReport(private->device, output_report_buf, output_report_len)) + if (!HidD_SetOutputReport(controller->device, output_report_buf, output_report_len)) { WARN("unable to set output report, HidD_SetOutputReport failed with error %u\n", GetLastError()); return GetLastError(); @@ -302,18 +300,18 @@ static BOOL init_controller(struct xinput_controller *controller, PHIDP_PREPARSE TRACE("Found gamepad %s\n", debugstr_w(device_path)); private->preparsed = preparsed; - private->device = device; if (!(private->input_report_buf[0] = calloc(1, private->caps.InputReportByteLength))) goto failed; if (!(private->input_report_buf[1] = calloc(1, private->caps.InputReportByteLength))) goto failed; if (!(private->output_report_buf = calloc(1, private->caps.OutputReportByteLength))) goto failed; - lstrcpynW(private->device_path, device_path, MAX_PATH); + controller->platform_private = private; memset(&controller->state, 0, sizeof(controller->state)); memset(&controller->vibration, 0, sizeof(controller->vibration)); + lstrcpynW(controller->device_path, device_path, MAX_PATH); controller->enabled = FALSE; EnterCriticalSection(&controller->crit); - controller->platform_private = private; + controller->device = device; controller_enable(controller); LeaveCriticalSection(&controller->crit); return TRUE; @@ -399,14 +397,15 @@ static void remove_gamepad(struct xinput_controller *controller) { EnterCriticalSection(&controller->crit); - if (controller->platform_private) + if (controller->device) { struct hid_platform_private *private = controller->platform_private; controller_disable(controller); + CloseHandle(controller->device); + controller->device = NULL; controller->platform_private = NULL; - CloseHandle(private->device); free(private->input_report_buf[0]); free(private->input_report_buf[1]); free(private->output_report_buf); @@ -447,7 +446,7 @@ static void HID_update_state(struct xinput_controller *controller, XINPUT_STATE if (!controller->enabled) return; - if (!HidD_GetInputReport(private->device, report_buf[0], report_len)) + if (!HidD_GetInputReport(controller->device, report_buf[0], report_len)) { if (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_INVALID_HANDLE) { @@ -555,11 +554,11 @@ static void HID_update_state(struct xinput_controller *controller, XINPUT_STATE static BOOL verify_and_lock_device(struct xinput_controller *controller) { - if (!controller->platform_private) return FALSE; + if (!controller->device) return FALSE; EnterCriticalSection(&controller->crit); - if (!controller->platform_private) + if (!controller->device) { LeaveCriticalSection(&controller->crit); return FALSE; @@ -640,7 +639,7 @@ static DWORD xinput_get_state(DWORD index, XINPUT_STATE *state) HID_update_state(&controllers[index], state); - if (!controllers[index].platform_private) + if (!controllers[index].device) { /* update_state may have disconnected the controller */ unlock_device(&controllers[index]); @@ -913,7 +912,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetDSoundAudioDeviceGuids(DWORD index, GUID FIXME("(index %u, render guid %p, capture guid %p) Stub!\n", index, render_guid, capture_guid); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; - if (!controllers[index].platform_private) return ERROR_DEVICE_NOT_CONNECTED; + if (!controllers[index].device) return ERROR_DEVICE_NOT_CONNECTED; return ERROR_NOT_SUPPORTED; } @@ -925,7 +924,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetBatteryInformation(DWORD index, BYTE typ if (!once++) FIXME("(index %u, type %u, battery %p) Stub!\n", index, type, battery); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; - if (!controllers[index].platform_private) return ERROR_DEVICE_NOT_CONNECTED; + if (!controllers[index].device) return ERROR_DEVICE_NOT_CONNECTED; return ERROR_NOT_SUPPORTED; }

1 0

Huw Davies : iphlpapi: Implement GetAdaptersAddresses() on top of nsi.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: 091c92521ee22558bbc2adcdd8b18b213d818180 URL: https://source.winehq.org/git/wine.git/?a=commit;h=091c92521ee22558bbc2adcd… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 9 10:06:28 2021 +0100 iphlpapi: Implement GetAdaptersAddresses() on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ifenum.c | 672 +----------------------------------------- dlls/iphlpapi/ifenum.h | 42 --- dlls/iphlpapi/iphlpapi_main.c | 647 +++++++++++++++------------------------- 3 files changed, 233 insertions(+), 1128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=091c92521ee22558bbc2…

1 0

Huw Davies : iphlpapi: Mark non-loopback, non-linklocal addresses as dns eligible.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: fade7a5862a31d26c7368818824cce6c4988a1b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fade7a5862a31d26c7368818… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 9 10:06:27 2021 +0100 iphlpapi: Mark non-loopback, non-linklocal addresses as dns eligible. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index dbe4a12afe8..22e17e06757 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1036,6 +1036,37 @@ static PMIB_IPFORWARDROW findIPv4Gateway(DWORD index, return row; } +static BOOL sockaddr_is_loopback( SOCKADDR *sock ) +{ + if (sock->sa_family == WS_AF_INET) + { + SOCKADDR_IN *sin = (SOCKADDR_IN *)sock; + return (sin->sin_addr.WS_s_addr & 0xff) == 127; + } + else if (sock->sa_family == WS_AF_INET6) + { + SOCKADDR_IN6 *sin6 = (SOCKADDR_IN6 *)sock; + return WS_IN6_IS_ADDR_LOOPBACK( &sin6->sin6_addr ); + } + return FALSE; +} + +static BOOL sockaddr_is_linklocal( SOCKADDR *sock ) +{ + if (sock->sa_family == WS_AF_INET6) + { + SOCKADDR_IN6 *sin6 = (SOCKADDR_IN6 *)sock; + return WS_IN6_IS_ADDR_LINKLOCAL( &sin6->sin6_addr ); + } + return FALSE; +} + +static BOOL unicast_is_dns_eligible( IP_ADAPTER_UNICAST_ADDRESS *uni ) +{ + return !sockaddr_is_loopback( uni->Address.lpSockaddr ) && + !sockaddr_is_linklocal( uni->Address.lpSockaddr ); +} + static void fill_unicast_addr_data(IP_ADAPTER_ADDRESSES *aa, IP_ADAPTER_UNICAST_ADDRESS *ua) { /* Actually this information should be read somewhere from the system @@ -1059,6 +1090,8 @@ static void fill_unicast_addr_data(IP_ADAPTER_ADDRESSES *aa, IP_ADAPTER_UNICAST_ ua->ValidLifetime = 60000; ua->PreferredLifetime = 60000; ua->LeaseLifetime = 60000; + + if (unicast_is_dns_eligible( ua )) ua->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; } static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index, @@ -1186,8 +1219,6 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); ua->Address.lpSockaddr = (SOCKADDR *)(ua + 1); - if (num_v4_gateways) - ua->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; sa = (struct WS_sockaddr_in *)ua->Address.lpSockaddr; sa->sin_family = WS_AF_INET;

1 0

Zhiyi Zhang : user32/tests: Test that user32 loads uxtheme.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: cbf7bdce2877645fa2c5c847f48f6a4ffcaeef03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbf7bdce2877645fa2c5c847… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 9 15:00:06 2021 +0800 user32/tests: Test that user32 loads uxtheme. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/class.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 94dd8105a50..0f4fd1cf90e 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1490,6 +1490,55 @@ static void test_actctx_classes(void) ReleaseActCtx(context); } +static void test_uxtheme(void) +{ + static const CHAR *class_name = "test_uxtheme_class"; + BOOL (WINAPI * pIsThemeActive)(void); + BOOL dll_loaded, is_theme_active; + WNDCLASSEXA class; + HMODULE uxtheme; + ATOM atom; + HWND hwnd; + + memset(&class, 0, sizeof(class)); + class.cbSize = sizeof(class); + class.lpfnWndProc = DefWindowProcA; + class.hInstance = GetModuleHandleA(NULL); + class.lpszClassName = class_name; + atom = RegisterClassExA(&class); + ok(atom, "RegisterClassExA failed, error %u.\n", GetLastError()); + + dll_loaded = !!GetModuleHandleA("comctl32.dll"); + ok(!dll_loaded, "Expected comctl32.dll not loaded.\n"); + dll_loaded = !!GetModuleHandleA("uxtheme.dll"); + ok(!dll_loaded, "Expected uxtheme.dll not loaded.\n"); + + /* Creating a window triggers uxtheme load when theming is active */ + hwnd = CreateWindowA(class_name, "Test", WS_POPUP, 0, 0, 1, 1, NULL, NULL, + GetModuleHandleA(NULL), NULL); + ok(!!hwnd, "Failed to create a test window, error %u.\n", GetLastError()); + + dll_loaded = !!GetModuleHandleA("comctl32.dll"); + ok(!dll_loaded, "Expected comctl32.dll not loaded.\n"); + + /* Uxtheme is loaded when theming is active */ + dll_loaded = !!GetModuleHandleA("uxtheme.dll"); + + uxtheme = LoadLibraryA("uxtheme.dll"); + ok(!!uxtheme, "Failed to load uxtheme.dll, error %u.\n", GetLastError()); + pIsThemeActive = (void *)GetProcAddress(uxtheme, "IsThemeActive"); + ok(!!pIsThemeActive, "Failed to load IsThemeActive, error %u.\n", GetLastError()); + is_theme_active = pIsThemeActive(); + FreeLibrary(uxtheme); + + todo_wine_if(is_theme_active) + ok(dll_loaded == is_theme_active, "Expected uxtheme %s when theming is %s.\n", + is_theme_active ? "loaded" : "not loaded", is_theme_active ? "active" : "inactive"); + + DestroyWindow(hwnd); + UnregisterClassA(class_name, GetModuleHandleA(NULL)); +} + START_TEST(class) { char **argv; @@ -1502,6 +1551,7 @@ START_TEST(class) return; } + test_uxtheme(); test_IME(); test_GetClassInfo(); test_extra_values();

1 0

Rémi Bernon : xinput1_3: Rename controller helper functions.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: wine Branch: master Commit: 3d9a6fe6600d6134757d2a83197fdfc7cf495739 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d9a6fe6600d6134757d2a83… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 9 11:25:36 2021 +0200 xinput1_3: Rename controller helper functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 1cc554a8aa7..ae2670ba306 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -262,7 +262,7 @@ static void controller_disable(struct xinput_controller *controller) controller->enabled = FALSE; } -static BOOL init_controller(struct xinput_controller *controller, PHIDP_PREPARSED_DATA preparsed, +static BOOL controller_init(struct xinput_controller *controller, PHIDP_PREPARSED_DATA preparsed, HIDP_CAPS *caps, HANDLE device, WCHAR *device_path) { controller->hid.caps = *caps; @@ -350,7 +350,7 @@ static void HID_find_gamepads(void) else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); - else if (!init_controller(&controllers[i], preparsed, &caps, device, detail->DevicePath)) + else if (!controller_init(&controllers[i], preparsed, &caps, device, detail->DevicePath)) WARN("ignoring HID device, failed to initialize\n"); else continue; @@ -363,7 +363,7 @@ static void HID_find_gamepads(void) LeaveCriticalSection(&xinput_crit); } -static void remove_gamepad(struct xinput_controller *controller) +static void controller_destroy(struct xinput_controller *controller) { EnterCriticalSection(&controller->crit); @@ -386,7 +386,7 @@ static void remove_gamepad(struct xinput_controller *controller) static void HID_destroy_gamepads(void) { int i; - for (i = 0; i < XUSER_MAX_COUNT; i++) remove_gamepad(&controllers[i]); + for (i = 0; i < XUSER_MAX_COUNT; i++) controller_destroy(&controllers[i]); } static LONG sign_extend(ULONG value, const HIDP_VALUE_CAPS *caps) @@ -421,7 +421,7 @@ static void HID_update_state(struct xinput_controller *controller, XINPUT_STATE if (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_INVALID_HANDLE) { EnterCriticalSection(&xinput_crit); - remove_gamepad(controller); + controller_destroy(controller); LeaveCriticalSection(&xinput_crit); } else ERR("Failed to get input report, HidD_GetInputReport failed with error %u\n", GetLastError()); @@ -523,7 +523,7 @@ static void HID_update_state(struct xinput_controller *controller, XINPUT_STATE memcpy(state, &controller->state, sizeof(*state)); } -static BOOL verify_and_lock_device(struct xinput_controller *controller) +static BOOL controller_lock(struct xinput_controller *controller) { if (!controller->device) return FALSE; @@ -538,7 +538,7 @@ static BOOL verify_and_lock_device(struct xinput_controller *controller) return TRUE; } -static void unlock_device(struct xinput_controller *controller) +static void controller_unlock(struct xinput_controller *controller) { LeaveCriticalSection(&controller->crit); } @@ -572,10 +572,10 @@ void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable) for (index = 0; index < XUSER_MAX_COUNT; index++) { - if (!verify_and_lock_device(&controllers[index])) continue; + if (!controller_lock(&controllers[index])) continue; if (enable) controller_enable(&controllers[index]); else controller_disable(&controllers[index]); - unlock_device(&controllers[index]); + controller_unlock(&controllers[index]); } } @@ -588,11 +588,11 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputSetState(DWORD index, XINPUT_VIBRATION *vib HID_find_gamepads(); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; - if (!verify_and_lock_device(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; + if (!controller_lock(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; ret = HID_set_state(&controllers[index], vibration); - unlock_device(&controllers[index]); + controller_unlock(&controllers[index]); return ret; } @@ -606,18 +606,18 @@ static DWORD xinput_get_state(DWORD index, XINPUT_STATE *state) HID_find_gamepads(); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; - if (!verify_and_lock_device(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; + if (!controller_lock(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; HID_update_state(&controllers[index], state); if (!controllers[index].device) { /* update_state may have disconnected the controller */ - unlock_device(&controllers[index]); + controller_unlock(&controllers[index]); return ERROR_DEVICE_NOT_CONNECTED; } - unlock_device(&controllers[index]); + controller_unlock(&controllers[index]); return ERROR_SUCCESS; } @@ -765,7 +765,7 @@ static DWORD check_for_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke) /* note: guide button does not send an event */ }; - if (!verify_and_lock_device(controller)) return ERROR_DEVICE_NOT_CONNECTED; + if (!controller_lock(controller)) return ERROR_DEVICE_NOT_CONNECTED; cur = &controller->state.Gamepad; @@ -832,7 +832,7 @@ static DWORD check_for_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke) goto done; done: - unlock_device(controller); + controller_unlock(controller); return ret; } @@ -863,17 +863,17 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilities(DWORD index, DWORD flags, X if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; - if (!verify_and_lock_device(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; + if (!controller_lock(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; if (flags & XINPUT_FLAG_GAMEPAD && controllers[index].caps.SubType != XINPUT_DEVSUBTYPE_GAMEPAD) { - unlock_device(&controllers[index]); + controller_unlock(&controllers[index]); return ERROR_DEVICE_NOT_CONNECTED; } memcpy(capabilities, &controllers[index].caps, sizeof(*capabilities)); - unlock_device(&controllers[index]); + controller_unlock(&controllers[index]); return ERROR_SUCCESS; }

1 0