September 2021 - Wine-Commits

Connor McAdams : user32/tests: Add missing winevents to test_mdi_messages() message sequences.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 78d6c8aa71b13405a60a89f7ef6bbed87863f9ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=78d6c8aa71b13405a60a89f7… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sat Sep 18 21:39:49 2021 -0400 user32/tests: Add missing winevents to test_mdi_messages() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3330d611049..f845286b850 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -393,6 +393,7 @@ static const struct message WmSwitchNotMaximizedChild[] = { { WM_KILLFOCUS, sent }, /* in the MDI client */ { WM_IME_SETCONTEXT, sent|optional }, /* in the MDI client */ { WM_IME_SETCONTEXT, sent|defwinproc|optional }, /* in the 1st MDI child */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, /* in the 2nd MDI child */ { WM_MDIACTIVATE, sent|defwinproc }, /* in the 2nd MDI child */ { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE}, /* in the 2nd MDI child */ @@ -3005,13 +3006,16 @@ static const struct message WmChildActivateWindowSeq[] = { { WM_NCACTIVATE, sent|wparam|defwinproc, 0 }, { WM_MDIACTIVATE, sent|defwinproc }, { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_NCACTIVATE, sent|wparam|defwinproc, 1 }, { HCBT_SETFOCUS, hook }, { WM_KILLFOCUS, sent|defwinproc }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent }, { HCBT_SETFOCUS, hook }, { WM_KILLFOCUS, sent }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, { WM_MDIACTIVATE, sent|defwinproc }, { 0 } @@ -3749,6 +3753,7 @@ static const struct message WmMaximizeMDIchildInvisibleSeq2[] = { { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE, 0, SWP_STATECHANGED /* w1064v1809 */ }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* MDI child, not sent on Win8+. */ { WM_SIZE, sent|defwinproc|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* w1064v1809. */ { 0 } }; /* WM_MDIMAXIMIZE for an MDI child window with invisible parent */

1 0

Rémi Bernon : hidparse.sys: Replace all is_*range members with a single flags member.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 3fa5d9ebf6335bb52e3a315b5857b504998b4534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fa5d9ebf6335bb52e3a315b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 17 09:18:55 2021 +0200 hidparse.sys: Replace all is_*range members with a single flags member. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 31 ++++++++++++++++++++----------- dlls/hidparse.sys/main.c | 34 +++++++++++++++++----------------- include/wine/hid.h | 8 +++++--- 3 files changed, 42 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3fa5d9ebf6335bb52e3a…

1 0

Rémi Bernon : hidparse.sys: Add HID_VALUE_CAPS_IS_(ABSOLUTE|CONSTANT) flags instead of checking bit_field.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 9ade4305f33988feabb5a8b797d0b8231863dadd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ade4305f33988feabb5a8b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 17 09:18:57 2021 +0200 hidparse.sys: Add HID_VALUE_CAPS_IS_(ABSOLUTE|CONSTANT) flags instead of checking bit_field. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 4 ++-- dlls/hidparse.sys/main.c | 3 +++ include/wine/hid.h | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 4a1771e586c..662d3da9d58 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -647,7 +647,7 @@ static NTSTATUS get_button_caps( const struct hid_value_caps *caps, void *user ) dst->LinkUsage = caps->link_usage; dst->BitField = caps->bit_field; dst->IsAlias = FALSE; - dst->IsAbsolute = HID_VALUE_CAPS_IS_ABSOLUTE( caps ); + dst->IsAbsolute = (caps->flags & HID_VALUE_CAPS_IS_ABSOLUTE) ? 1 : 0; dst->IsRange = (caps->flags & HID_VALUE_CAPS_IS_RANGE) ? 1 : 0; if (!dst->IsRange) { @@ -704,7 +704,7 @@ static NTSTATUS get_value_caps( const struct hid_value_caps *caps, void *user ) dst->LinkUsage = caps->link_usage; dst->BitField = caps->bit_field; dst->IsAlias = FALSE; - dst->IsAbsolute = HID_VALUE_CAPS_IS_ABSOLUTE( caps ); + dst->IsAbsolute = (caps->flags & HID_VALUE_CAPS_IS_ABSOLUTE) ? 1 : 0; dst->HasNull = HID_VALUE_CAPS_HAS_NULL( caps ); dst->BitSize = caps->bit_size; dst->UnitsExp = caps->units_exp; diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index 2f7f417a7aa..ea4d84a6e81 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -357,6 +357,9 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY if (!(is_array = HID_VALUE_CAPS_IS_ARRAY( &state->items ))) state->items.report_count -= usages_size - 1; else start_bit -= state->items.report_count * state->items.bit_size; + if (!(state->items.bit_field & INPUT_ABS_REL)) state->items.flags |= HID_VALUE_CAPS_IS_ABSOLUTE; + if (state->items.bit_field & INPUT_DATA_CONST) state->items.flags |= HID_VALUE_CAPS_IS_CONSTANT; + while (usages_size--) { if (!is_array) start_bit -= state->items.report_count * state->items.bit_size; diff --git a/include/wine/hid.h b/include/wine/hid.h index a6c585b2ff4..7661850efc6 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -62,11 +62,12 @@ struct hid_value_caps /* named array continues on next caps */ #define HID_VALUE_CAPS_ARRAY_HAS_MORE 0x01 +#define HID_VALUE_CAPS_IS_CONSTANT 0x02 +#define HID_VALUE_CAPS_IS_ABSOLUTE 0x08 #define HID_VALUE_CAPS_IS_RANGE 0x10 #define HID_VALUE_CAPS_IS_STRING_RANGE 0x40 #define HID_VALUE_CAPS_IS_DESIGNATOR_RANGE 0x80 -#define HID_VALUE_CAPS_IS_ABSOLUTE(x) (((x)->bit_field & 0x04) == 0) #define HID_VALUE_CAPS_HAS_NULL(x) (((x)->bit_field & 0x40) != 0) #define HID_VALUE_CAPS_IS_ARRAY(c) (((c)->bit_field & 2) == 0) #define HID_VALUE_CAPS_IS_BUTTON(c) ((c)->bit_size == 1 || HID_VALUE_CAPS_IS_ARRAY(c))

1 0

Rémi Bernon : winebus.sys: Use WINEBUS\ as a common hardware ids prefix.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 9e3f9408b0d69aebad436a95a6eea5780d2d7a41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e3f9408b0d69aebad436a95… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 20 09:37:05 2021 +0200 winebus.sys: Use WINEBUS\ as a common hardware ids prefix. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 92a41e4d8ef..0fd7a405f80 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -229,13 +229,22 @@ static WCHAR *get_device_id(DEVICE_OBJECT *device) static WCHAR *get_hardware_ids(DEVICE_OBJECT *device) { + static const WCHAR input_format[] = L"&MI_%02u"; + static const WCHAR winebus_format[] = L"WINEBUS\\VID_%04X&PID_%04X"; struct device_extension *ext = (struct device_extension *)device->DeviceExtension; + DWORD pos = 0, len = 0, input_len = 0, winebus_len = 25; WCHAR *dst; - if ((dst = ExAllocatePool(PagedPool, (wcslen(ext->desc.busid) + 2) * sizeof(WCHAR)))) + if (ext->desc.input != -1) input_len = 14; + + len += winebus_len + input_len + 1; + + if ((dst = ExAllocatePool(PagedPool, (len + 1) * sizeof(WCHAR)))) { - wcscpy(dst, ext->desc.busid); - dst[wcslen(dst) + 1] = 0; + pos += swprintf(dst + pos, len - pos, winebus_format, ext->desc.vid, ext->desc.pid); + if (input_len) pos += swprintf(dst + pos, len - pos, input_format, ext->desc.input); + pos += 1; + dst[pos] = 0; } return dst;

1 0

Rémi Bernon : dinput: Pass output instance to get_object_info HID joystick callback.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: d47ec6502b6be1b97399583df76f10d0cbeefba0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d47ec6502b6be1b97399583d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 20 10:57:21 2021 +0200 dinput: Pass output instance to get_object_info HID joystick callback. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 709953be8f0..1614f5e8583 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -652,11 +652,11 @@ static HRESULT WINAPI hid_joystick_GetObjectInfo( IDirectInputDevice8W *iface, D instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW)) return DIERR_INVALIDPARAM; - ret = enum_value_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL ); + ret = enum_value_objects( impl, &filter, DIDFT_ALL, get_object_info, instance ); if (ret != DIENUM_CONTINUE) return S_OK; - ret = enum_button_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL ); + ret = enum_button_objects( impl, &filter, DIDFT_ALL, get_object_info, instance ); if (ret != DIENUM_CONTINUE) return S_OK; - enum_collections_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL ); + enum_collections_objects( impl, &filter, DIDFT_ALL, get_object_info, instance ); return S_OK; }

1 0

Brendan Shanks : ntdll: Generate SMBIOS tables on Apple Silicon Macs.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: d49822c8a13d6f70ded4f6f42c4368bae95442b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d49822c8a13d6f70ded4f6f4… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Sep 17 15:57:08 2021 -0700 ntdll: Generate SMBIOS tables on Apple Silicon Macs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51557 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 113 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 57360c2c95c..82c9f0da492 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1316,7 +1316,7 @@ static NTSTATUS create_cpuset_info(SYSTEM_CPU_SET_INFORMATION *info) return STATUS_SUCCESS; } -#ifdef linux +#if defined(linux) || defined(__APPLE__) static void copy_smbios_string( char **buffer, const char *s, size_t len ) { @@ -1506,6 +1506,10 @@ static NTSTATUS create_smbios_tables( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, U return STATUS_SUCCESS; } +#endif + +#ifdef linux + static size_t get_smbios_string( const char *path, char *str, size_t size ) { FILE *file; @@ -1698,6 +1702,112 @@ static NTSTATUS get_smbios_from_iokit( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, return STATUS_SUCCESS; } +static size_t cf_to_string( CFTypeRef type_ref, char *buffer, size_t buffer_size ) +{ + size_t length = 0; + + if (!type_ref) + return 0; + + if (CFGetTypeID(type_ref) == CFDataGetTypeID()) + { + length = MIN(CFDataGetLength(type_ref), buffer_size); + CFDataGetBytes(type_ref, CFRangeMake(0, length), (UInt8*)buffer); + buffer[length] = 0; + length = strlen(buffer); + } + else if (CFGetTypeID(type_ref) == CFStringGetTypeID()) + { + if (CFStringGetCString(type_ref, buffer, buffer_size, kCFStringEncodingASCII)) + length = strlen(buffer); + } + + CFRelease(type_ref); + return length; +} + +static NTSTATUS generate_smbios( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, + ULONG *required_len ) +{ + /* Apple Silicon Macs don't have SMBIOS, we need to generate it. + * Use strings and data from IOKit when available. + */ + io_service_t platform_expert; + CFDataRef cf_manufacturer, cf_model; + CFStringRef cf_serial_number, cf_uuid_string; + char manufacturer[128], model[128], serial_number[128]; + size_t manufacturer_len = 0, model_len = 0, serial_number_len = 0; + GUID system_uuid = {0}; + struct smbios_bios_args bios_args; + struct smbios_system_args system_args; + struct smbios_board_args board_args; + struct smbios_chassis_args chassis_args; + + platform_expert = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice")); + if (!platform_expert) + return STATUS_NO_MEMORY; + + cf_manufacturer = IORegistryEntryCreateCFProperty(platform_expert, CFSTR("manufacturer"), kCFAllocatorDefault, 0); + cf_model = IORegistryEntryCreateCFProperty(platform_expert, CFSTR("model"), kCFAllocatorDefault, 0); + cf_serial_number = IORegistryEntryCreateCFProperty(platform_expert, CFSTR(kIOPlatformSerialNumberKey), kCFAllocatorDefault, 0); + cf_uuid_string = IORegistryEntryCreateCFProperty(platform_expert, CFSTR(kIOPlatformUUIDKey), kCFAllocatorDefault, 0); + + manufacturer_len = cf_to_string(cf_manufacturer, manufacturer, sizeof(manufacturer)); + model_len = cf_to_string(cf_model, model, sizeof(model)); + serial_number_len = cf_to_string(cf_serial_number, serial_number, sizeof(serial_number)); + + if (cf_uuid_string) + { + CFUUIDRef cf_uuid; + CFUUIDBytes bytes; + + cf_uuid = CFUUIDCreateFromString(kCFAllocatorDefault, cf_uuid_string); + bytes = CFUUIDGetUUIDBytes(cf_uuid); + + system_uuid.Data1 = (bytes.byte0 << 24) | (bytes.byte1 << 16) | (bytes.byte2 << 8) | bytes.byte3; + system_uuid.Data2 = (bytes.byte4 << 8) | bytes.byte5; + system_uuid.Data3 = (bytes.byte6 << 8) | bytes.byte7; + memcpy(&system_uuid.Data4, &bytes.byte8, sizeof(system_uuid.Data4)); + + CFRelease(cf_uuid); + CFRelease(cf_uuid_string); + } + + IOObjectRelease(platform_expert); + +#define S(s, t) { s ## _len = t ## _len; s = t; } +#define STR(s, t) { s ## _len = sizeof(t)-1; s = t; } + S(bios_args.vendor, manufacturer); + /* BIOS version and date are both required */ + STR(bios_args.version, "1.0"); + STR(bios_args.date, "01/01/2021"); + + S(system_args.vendor, manufacturer); + S(system_args.product, model); + STR(system_args.version, "1.0"); + S(system_args.serial, serial_number); + system_args.uuid = system_uuid; + system_args.sku_len = 0; + S(system_args.family, model); + + S(board_args.vendor, manufacturer); + S(board_args.product, model); + S(board_args.version, model); + S(board_args.serial, serial_number); + board_args.asset_tag_len = 0; + + S(chassis_args.vendor, manufacturer); + chassis_args.type = 2; /* unknown */ + chassis_args.version_len = 0; + S(chassis_args.serial, serial_number); + chassis_args.asset_tag_len = 0; +#undef STR +#undef S + + return create_smbios_tables( sfti, available_len, required_len, + &bios_args, &system_args, &board_args, &chassis_args ); +} + static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, ULONG *required_len ) { @@ -1707,6 +1817,8 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON { NTSTATUS ret; ret = get_smbios_from_iokit(sfti, available_len, required_len); + if (ret == STATUS_NO_MEMORY) + ret = generate_smbios(sfti, available_len, required_len); return ret; } default:

1 0

Brendan Shanks : ntdll: Factor out get_smbios_from_iokit().
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: fb675cefbda09ecadc656878fb27ee72a12692f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb675cefbda09ecadc656878… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Sep 17 15:57:07 2021 -0700 ntdll: Factor out get_smbios_from_iokit(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 118 +++++++++++++++++++++++++---------------------- 1 file changed, 63 insertions(+), 55 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 41a7d70fa21..57360c2c95c 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1634,72 +1634,80 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON #elif defined(__APPLE__) -static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, - ULONG *required_len ) +static NTSTATUS get_smbios_from_iokit( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, + ULONG *required_len ) { - switch (sfti->ProviderSignature) + io_service_t service; + CFDataRef data; + const UInt8 *ptr; + CFIndex len; + struct smbios_prologue *prologue; + BYTE major_version = 2, minor_version = 0; + + if (!(service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("AppleSMBIOS")))) { - case RSMB: + WARN("can't find AppleSMBIOS service\n"); + return STATUS_NO_MEMORY; + } + + if (!(data = IORegistryEntryCreateCFProperty(service, CFSTR("SMBIOS-EPS"), kCFAllocatorDefault, 0))) { - io_service_t service; - CFDataRef data; - const UInt8 *ptr; - CFIndex len; - struct smbios_prologue *prologue; - BYTE major_version = 2, minor_version = 0; + WARN("can't find SMBIOS entry point\n"); + IOObjectRelease(service); + return STATUS_NO_MEMORY; + } - if (!(service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("AppleSMBIOS")))) - { - WARN("can't find AppleSMBIOS service\n"); - return STATUS_NO_MEMORY; - } + len = CFDataGetLength(data); + ptr = CFDataGetBytePtr(data); + if (len >= 8 && !memcmp(ptr, "_SM_", 4)) + { + major_version = ptr[6]; + minor_version = ptr[7]; + } + CFRelease(data); - if (!(data = IORegistryEntryCreateCFProperty(service, CFSTR("SMBIOS-EPS"), kCFAllocatorDefault, 0))) - { - WARN("can't find SMBIOS entry point\n"); - IOObjectRelease(service); - return STATUS_NO_MEMORY; - } + if (!(data = IORegistryEntryCreateCFProperty(service, CFSTR("SMBIOS"), kCFAllocatorDefault, 0))) + { + WARN("can't find SMBIOS table\n"); + IOObjectRelease(service); + return STATUS_NO_MEMORY; + } - len = CFDataGetLength(data); - ptr = CFDataGetBytePtr(data); - if (len >= 8 && !memcmp(ptr, "_SM_", 4)) - { - major_version = ptr[6]; - minor_version = ptr[7]; - } + len = CFDataGetLength(data); + ptr = CFDataGetBytePtr(data); + sfti->TableBufferLength = sizeof(*prologue) + len; + *required_len = sfti->TableBufferLength + FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); + if (available_len < *required_len) + { CFRelease(data); + IOObjectRelease(service); + return STATUS_BUFFER_TOO_SMALL; + } - if (!(data = IORegistryEntryCreateCFProperty(service, CFSTR("SMBIOS"), kCFAllocatorDefault, 0))) - { - WARN("can't find SMBIOS table\n"); - IOObjectRelease(service); - return STATUS_NO_MEMORY; - } - - len = CFDataGetLength(data); - ptr = CFDataGetBytePtr(data); - sfti->TableBufferLength = sizeof(*prologue) + len; - *required_len = sfti->TableBufferLength + FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); - if (available_len < *required_len) - { - CFRelease(data); - IOObjectRelease(service); - return STATUS_BUFFER_TOO_SMALL; - } + prologue = (struct smbios_prologue *)sfti->TableBuffer; + prologue->calling_method = 0; + prologue->major_version = major_version; + prologue->minor_version = minor_version; + prologue->revision = 0; + prologue->length = sfti->TableBufferLength - sizeof(*prologue); - prologue = (struct smbios_prologue *)sfti->TableBuffer; - prologue->calling_method = 0; - prologue->major_version = major_version; - prologue->minor_version = minor_version; - prologue->revision = 0; - prologue->length = sfti->TableBufferLength - sizeof(*prologue); + memcpy(sfti->TableBuffer + sizeof(*prologue), ptr, len); - memcpy(sfti->TableBuffer + sizeof(*prologue), ptr, len); + CFRelease(data); + IOObjectRelease(service); + return STATUS_SUCCESS; +} - CFRelease(data); - IOObjectRelease(service); - return STATUS_SUCCESS; +static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, + ULONG *required_len ) +{ + switch (sfti->ProviderSignature) + { + case RSMB: + { + NTSTATUS ret; + ret = get_smbios_from_iokit(sfti, available_len, required_len); + return ret; } default: FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION provider %08x\n", sfti->ProviderSignature);

1 0

Brendan Shanks : ntdll: Factor out SMBIOS table creation.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 2868881c638f09117d52219fea2614a64f44ce71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2868881c638f09117d52219f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Sep 17 15:57:06 2021 -0700 ntdll: Factor out SMBIOS table creation. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 478 ++++++++++++++++++++++++++++------------------- 1 file changed, 283 insertions(+), 195 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2868881c638f09117d52…

1 0

Rémi Bernon : dinput: Implement more accurate HID joystick device subtypes.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 7c4941d0ec554e27208c370f624bfddb11febea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c4941d0ec554e27208c370f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 20 10:57:25 2021 +0200 dinput: Implement more accurate HID joystick device subtypes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 91 +++++++++++++++++++++++++++++++++++++++++++++- dlls/dinput8/tests/hid.c | 6 --- 2 files changed, 90 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 1614f5e8583..a9ca6fe6cc6 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -919,12 +919,52 @@ static HRESULT hid_joystick_read_state( IDirectInputDevice8W *iface ) return DI_OK; } +static DWORD device_type_for_version( DWORD type, DWORD version ) +{ + if (version >= 0x0800) return type; + + switch (GET_DIDEVICE_TYPE( type )) + { + case DI8DEVTYPE_JOYSTICK: + if (GET_DIDEVICE_SUBTYPE( type ) == DI8DEVTYPEJOYSTICK_LIMITED) + return DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_UNKNOWN << 8) | DIDEVTYPE_HID; + return DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8) | DIDEVTYPE_HID; + + case DI8DEVTYPE_GAMEPAD: + return DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8) | DIDEVTYPE_HID; + + case DI8DEVTYPE_DRIVING: + return DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_WHEEL << 8) | DIDEVTYPE_HID; + + case DI8DEVTYPE_FLIGHT: + return DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_FLIGHTSTICK << 8) | DIDEVTYPE_HID; + + case DI8DEVTYPE_SUPPLEMENTAL: + if (GET_DIDEVICE_SUBTYPE( type ) == DI8DEVTYPESUPPLEMENTAL_HEADTRACKER) + return DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_HEADTRACKER << 8) | DIDEVTYPE_HID; + if (GET_DIDEVICE_SUBTYPE( type ) == DI8DEVTYPESUPPLEMENTAL_RUDDERPEDALS) + return DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_RUDDER << 8) | DIDEVTYPE_HID; + return DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_UNKNOWN << 8) | DIDEVTYPE_HID; + + case DI8DEVTYPE_1STPERSON: + return DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_UNKNOWN << 8) | DIDEVTYPE_HID; + + default: + return DIDEVTYPE_DEVICE | DIDEVTYPE_HID; + } +} + static BOOL hid_joystick_device_try_open( UINT32 handle, const WCHAR *path, HANDLE *device, PHIDP_PREPARSED_DATA *preparsed, HIDD_ATTRIBUTES *attrs, HIDP_CAPS *caps, DIDEVICEINSTANCEW *instance, DWORD version ) { PHIDP_PREPARSED_DATA preparsed_data = NULL; + DWORD type = 0, button_count = 0; + HIDP_BUTTON_CAPS buttons[10]; + HIDP_VALUE_CAPS value; HANDLE device_file; + NTSTATUS status; + USHORT count; device_file = CreateFileW( path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, 0 ); @@ -946,11 +986,60 @@ static BOOL hid_joystick_device_try_open( UINT32 handle, const WCHAR *path, HAND instance->guidInstance.Data1 ^= handle; instance->guidProduct = DInput_PIDVID_Product_GUID; instance->guidProduct.Data1 = MAKELONG( attrs->VendorID, attrs->ProductID ); - instance->dwDevType = get_device_type( version, caps->Usage != HID_USAGE_GENERIC_GAMEPAD ) | DIDEVTYPE_HID; instance->guidFFDriver = GUID_NULL; instance->wUsagePage = caps->UsagePage; instance->wUsage = caps->Usage; + count = ARRAY_SIZE(buttons); + status = HidP_GetSpecificButtonCaps( HidP_Input, HID_USAGE_PAGE_BUTTON, 0, 0, buttons, &count, preparsed_data ); + if (status != HIDP_STATUS_SUCCESS) count = button_count = 0; + while (count--) + { + if (!buttons[count].IsRange) button_count += 1; + else button_count += buttons[count].Range.UsageMax - buttons[count].Range.UsageMin + 1; + } + + switch (caps->Usage) + { + case HID_USAGE_GENERIC_GAMEPAD: + type = DI8DEVTYPE_GAMEPAD | DIDEVTYPE_HID; + if (button_count < 6) type |= DI8DEVTYPEGAMEPAD_LIMITED << 8; + else type |= DI8DEVTYPEGAMEPAD_STANDARD << 8; + break; + case HID_USAGE_GENERIC_JOYSTICK: + type = DI8DEVTYPE_JOYSTICK | DIDEVTYPE_HID; + if (button_count < 5) type |= DI8DEVTYPEJOYSTICK_LIMITED << 8; + else type |= DI8DEVTYPEJOYSTICK_STANDARD << 8; + + count = 1; + status = HidP_GetSpecificValueCaps( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, + HID_USAGE_GENERIC_Z, &value, &count, preparsed_data ); + if (status != HIDP_STATUS_SUCCESS || !count) + type = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DIDEVTYPE_HID; + + count = 1; + status = HidP_GetSpecificValueCaps( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, + HID_USAGE_GENERIC_HATSWITCH, &value, &count, preparsed_data ); + if (status != HIDP_STATUS_SUCCESS || !count) + type = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DIDEVTYPE_HID; + + break; + } + + count = 1; + status = HidP_GetSpecificValueCaps( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, + &value, &count, preparsed_data ); + if (status != HIDP_STATUS_SUCCESS || !count) + type = DI8DEVTYPE_SUPPLEMENTAL | (DI8DEVTYPESUPPLEMENTAL_UNKNOWN << 8) | DIDEVTYPE_HID; + + count = 1; + status = HidP_GetSpecificValueCaps( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, + &value, &count, preparsed_data ); + if (status != HIDP_STATUS_SUCCESS || !count) + type = DI8DEVTYPE_SUPPLEMENTAL | (DI8DEVTYPESUPPLEMENTAL_UNKNOWN << 8) | DIDEVTYPE_HID; + + instance->dwDevType = device_type_for_version( type, version ); + *device = device_file; *preparsed = preparsed_data; return TRUE; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 63e909047aa..b02cdf1aa30 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3666,7 +3666,6 @@ static void test_simple_joystick(void) check_member( devinst, expect_devinst, "%d", dwSize ); check_member_guid( devinst, expect_devinst, guidProduct ); - todo_wine check_member( devinst, expect_devinst, "%#x", dwDevType ); todo_wine check_member_wstr( devinst, expect_devinst, tszInstanceName ); @@ -3736,7 +3735,6 @@ static void test_simple_joystick(void) todo_wine check_member_guid( devinst, expect_devinst, guidInstance ); check_member_guid( devinst, expect_devinst, guidProduct ); - todo_wine check_member( devinst, expect_devinst, "%#x", dwDevType ); todo_wine check_member_wstr( devinst, expect_devinst, tszInstanceName ); @@ -3751,7 +3749,6 @@ static void test_simple_joystick(void) todo_wine check_member_guid( devinst, expect_devinst, guidInstance ); check_member_guid( devinst, expect_devinst, guidProduct ); - todo_wine check_member( devinst, expect_devinst, "%#x", dwDevType ); todo_wine check_member_wstr( devinst, expect_devinst, tszInstanceName ); @@ -3771,7 +3768,6 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "IDirectInputDevice8_GetCapabilities returned %#x\n", hr ); check_member( caps, expect_caps, "%d", dwSize ); check_member( caps, expect_caps, "%#x", dwFlags ); - todo_wine check_member( caps, expect_caps, "%#x", dwDevType ); check_member( caps, expect_caps, "%d", dwAxes ); check_member( caps, expect_caps, "%d", dwButtons ); @@ -4958,7 +4954,6 @@ static void test_device_types( void ) todo_wine check_member_guid( devinst, expect_devinst[i], guidInstance ); check_member_guid( devinst, expect_devinst[i], guidProduct ); - todo_wine_if( i < 2 ) check_member( devinst, expect_devinst[i], "%#x", dwDevType ); todo_wine check_member_wstr( devinst, expect_devinst[i], tszInstanceName ); @@ -4972,7 +4967,6 @@ static void test_device_types( void ) ok( hr == DI_OK, "IDirectInputDevice8_GetCapabilities returned %#x\n", hr ); check_member( caps, expect_caps[i], "%d", dwSize ); check_member( caps, expect_caps[i], "%#x", dwFlags ); - todo_wine_if( i < 2 ) check_member( caps, expect_caps[i], "%#x", dwDevType ); check_member( caps, expect_caps[i], "%d", dwAxes ); check_member( caps, expect_caps[i], "%d", dwButtons );

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick device types tests.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 9c30042c0c70e138e6e03f988177e09d12aee8cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c30042c0c70e138e6e03f98… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 20 10:57:24 2021 +0200 dinput8/tests: Add some HID joystick device types tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 337 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 337 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9c30042c0c70e138e6e0…

1 0