September 2021 - Wine-Devel

[PATCH 1/4] user32/tests: Fix occasional failure in WmShowNoActivate_2 message sequence.
by Connor McAdams Sept. 18, 2021

Sept. 18, 2021

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index cdb162df765..9c086862cd3 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13413,6 +13413,7 @@ static const struct message WmShowNoActivate_2[] = { { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 sends this. */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|optional }, /* Sometimes sent on Win8+. */ + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, { HCBT_SETFOCUS, hook|optional }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, /* Win7 sends this. */ { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED, 0, SWP_NOACTIVATE }, -- 2.25.1

2 6

[PATCH v2 1/2] oleacc: Add Client_get_accFocus implementation.
by Connor McAdams Sept. 18, 2021

Sept. 18, 2021

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleacc/client.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 0c2215fe62e..38611520b38 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -303,11 +303,35 @@ static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, return S_OK; } -static HRESULT WINAPI Client_get_accFocus(IAccessible *iface, VARIANT *pvarID) +static HRESULT WINAPI Client_get_accFocus(IAccessible *iface, VARIANT *focus) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%p)\n", This, pvarID); - return E_NOTIMPL; + GUITHREADINFO info; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, focus); + + V_VT(focus) = VT_EMPTY; + info.cbSize = sizeof(info); + if(GetGUIThreadInfo(0, &info) && info.hwndFocus) { + if(info.hwndFocus == This->hwnd) { + V_VT(focus) = VT_I4; + V_I4(focus) = CHILDID_SELF; + } + else if(IsChild(This->hwnd, info.hwndFocus)) { + IDispatch *disp; + + hr = AccessibleObjectFromWindow(info.hwndFocus, OBJID_WINDOW, + &IID_IDispatch, (void**)&disp); + if(FAILED(hr)) return hr; + if(!disp) return E_FAIL; + + V_VT(focus) = VT_DISPATCH; + V_DISPATCH(focus) = disp; + } + } + + return S_OK; } static HRESULT WINAPI Client_get_accSelection(IAccessible *iface, VARIANT *pvarID) -- 2.25.1

1 1

[PATCH v2 1/3] ntdll: Factor out SMBIOS table creation.
by Brendan Shanks Sept. 17, 2021

Sept. 17, 2021

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: create_smbios_tables() now takes arguments in several structs. Also, dmidecode for Windows is helpful for verifying generated SMBIOS tables: http://gnuwin32.sourceforge.net/packages/dmidecode.htm dlls/ntdll/unix/system.c | 478 +++++++++++++++++++++++---------------- 1 file changed, 283 insertions(+), 195 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 2cdc6278f3d..41a7d70fa21 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -166,6 +166,60 @@ struct smbios_boot_info #include "poppack.h" +struct smbios_bios_args +{ + const char *vendor; + size_t vendor_len; + const char *version; + size_t version_len; + const char *date; + size_t date_len; +}; + +struct smbios_system_args +{ + const char *vendor; + size_t vendor_len; + const char *product; + size_t product_len; + const char *version; + size_t version_len; + const char *serial; + size_t serial_len; + GUID uuid; + const char *sku; + size_t sku_len; + const char *family; + size_t family_len; +}; + +struct smbios_board_args +{ + const char *vendor; + size_t vendor_len; + const char *product; + size_t product_len; + const char *version; + size_t version_len; + const char *serial; + size_t serial_len; + const char *asset_tag; + size_t asset_tag_len; +}; + +struct smbios_chassis_args +{ + const char *vendor; + size_t vendor_len; + BYTE type; + const char *version; + size_t version_len; + const char *serial; + size_t serial_len; + const char *asset_tag; + size_t asset_tag_len; +}; + /* Firmware table providers */ #define ACPI 0x41435049 #define FIRM 0x4649524D @@ -1264,13 +1318,194 @@ static NTSTATUS create_cpuset_info(SYSTEM_CPU_SET_INFORMATION *info) #ifdef linux -static void copy_smbios_string( char **buffer, char *s, size_t len ) +static void copy_smbios_string( char **buffer, const char *s, size_t len ) { if (!len) return; memcpy(*buffer, s, len + 1); *buffer += len + 1; } +static NTSTATUS create_smbios_tables( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, + ULONG *required_len, + const struct smbios_bios_args *bios_args, + const struct smbios_system_args *system_args, + const struct smbios_board_args *board_args, + const struct smbios_chassis_args *chassis_args ) +{ + char *buffer = (char*)sfti->TableBuffer; + BYTE string_count; + BYTE handle_count = 0; + struct smbios_prologue *prologue; + struct smbios_bios *bios; + struct smbios_system *system; + struct smbios_board *board; + struct smbios_chassis *chassis; + struct smbios_boot_info *boot_info; + struct smbios_header *end_of_table; + + *required_len = sizeof(struct smbios_prologue); + +#define L(l) (l + (l ? 1 : 0)) + *required_len += sizeof(struct smbios_bios); + *required_len += max(L(bios_args->vendor_len) + L(bios_args->version_len) + L(bios_args->date_len) + 1, 2); + + *required_len += sizeof(struct smbios_system); + *required_len += max(L(system_args->vendor_len) + L(system_args->product_len) + L(system_args->version_len) + + L(system_args->serial_len) + L(system_args->sku_len) + L(system_args->family_len) + 1, 2); + + *required_len += sizeof(struct smbios_board); + *required_len += max(L(board_args->vendor_len) + L(board_args->product_len) + L(board_args->version_len) + + L(board_args->serial_len) + L(board_args->asset_tag_len) + 1, 2); + + *required_len += sizeof(struct smbios_chassis); + *required_len += max(L(chassis_args->vendor_len) + L(chassis_args->version_len) + L(chassis_args->serial_len) + + L(chassis_args->asset_tag_len) + 1, 2); + + *required_len += sizeof(struct smbios_boot_info); + *required_len += 2; + + *required_len += sizeof(struct smbios_header); + *required_len += 2; +#undef L + + sfti->TableBufferLength = *required_len; + + *required_len += FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); + + if (available_len < *required_len) + return STATUS_BUFFER_TOO_SMALL; + + prologue = (struct smbios_prologue*)buffer; + prologue->calling_method = 0; + prologue->major_version = 2; + prologue->minor_version = 4; + prologue->revision = 0; + prologue->length = sfti->TableBufferLength - sizeof(struct smbios_prologue); + buffer += sizeof(struct smbios_prologue); + + string_count = 0; + bios = (struct smbios_bios*)buffer; + bios->hdr.type = 0; + bios->hdr.length = sizeof(struct smbios_bios); + bios->hdr.handle = handle_count++; + bios->vendor = bios_args->vendor_len ? ++string_count : 0; + bios->version = bios_args->version_len ? ++string_count : 0; + bios->start = 0; + bios->date = bios_args->date_len ? ++string_count : 0; + bios->size = 0; + bios->characteristics = 0x4; /* not supported */ + bios->characteristics_ext[0] = 0; + bios->characteristics_ext[1] = 0; + bios->system_bios_major_release = 0xFF; /* not supported */ + bios->system_bios_minor_release = 0xFF; /* not supported */ + bios->ec_firmware_major_release = 0xFF; /* not supported */ + bios->ec_firmware_minor_release = 0xFF; /* not supported */ + buffer += sizeof(struct smbios_bios); + + copy_smbios_string(&buffer, bios_args->vendor, bios_args->vendor_len); + copy_smbios_string(&buffer, bios_args->version, bios_args->version_len); + copy_smbios_string(&buffer, bios_args->date, bios_args->date_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + + string_count = 0; + system = (struct smbios_system*)buffer; + system->hdr.type = 1; + system->hdr.length = sizeof(struct smbios_system); + system->hdr.handle = handle_count++; + system->vendor = system_args->vendor_len ? ++string_count : 0; + system->product = system_args->product_len ? ++string_count : 0; + system->version = system_args->version_len ? ++string_count : 0; + system->serial = system_args->serial_len ? ++string_count : 0; + memcpy( system->uuid, &system_args->uuid, sizeof(GUID) ); + system->wake_up_type = 0x02; /* unknown */ + system->sku_number = system_args->sku_len ? ++string_count : 0; + system->family = system_args->family_len ? ++string_count : 0; + buffer += sizeof(struct smbios_system); + + copy_smbios_string(&buffer, system_args->vendor, system_args->vendor_len); + copy_smbios_string(&buffer, system_args->product, system_args->product_len); + copy_smbios_string(&buffer, system_args->version, system_args->version_len); + copy_smbios_string(&buffer, system_args->serial, system_args->serial_len); + copy_smbios_string(&buffer, system_args->sku, system_args->sku_len); + copy_smbios_string(&buffer, system_args->family, system_args->family_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + + string_count = 0; + chassis = (struct smbios_chassis*)buffer; + chassis->hdr.type = 3; + chassis->hdr.length = sizeof(struct smbios_chassis); + chassis->hdr.handle = handle_count++; + chassis->vendor = chassis_args->vendor_len ? ++string_count : 0; + chassis->type = chassis_args->type; + chassis->version = chassis_args->version_len ? ++string_count : 0; + chassis->serial = chassis_args->serial_len ? ++string_count : 0; + chassis->asset_tag = chassis_args->asset_tag_len ? ++string_count : 0; + chassis->boot_state = 0x02; /* unknown */ + chassis->power_supply_state = 0x02; /* unknown */ + chassis->thermal_state = 0x02; /* unknown */ + chassis->security_status = 0x02; /* unknown */ + chassis->oem_defined = 0; + chassis->height = 0; /* undefined */ + chassis->num_power_cords = 0; /* unspecified */ + chassis->num_contained_elements = 0; + chassis->contained_element_rec_length = 3; + buffer += sizeof(struct smbios_chassis); + + copy_smbios_string(&buffer, chassis_args->vendor, chassis_args->vendor_len); + copy_smbios_string(&buffer, chassis_args->version, chassis_args->version_len); + copy_smbios_string(&buffer, chassis_args->serial, chassis_args->serial_len); + copy_smbios_string(&buffer, chassis_args->asset_tag, chassis_args->asset_tag_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + + string_count = 0; + board = (struct smbios_board*)buffer; + board->hdr.type = 2; + board->hdr.length = sizeof(struct smbios_board); + board->hdr.handle = handle_count++; + board->vendor = board_args->vendor_len ? ++string_count : 0; + board->product = board_args->product_len ? ++string_count : 0; + board->version = board_args->version_len ? ++string_count : 0; + board->serial = board_args->serial_len ? ++string_count : 0; + board->asset_tag = board_args->asset_tag_len ? ++string_count : 0; + board->feature_flags = 0x5; /* hosting board, removable */ + board->location = 0; + board->chassis_handle = chassis->hdr.handle; + board->board_type = 0xa; /* motherboard */ + board->num_contained_handles = 0; + buffer += sizeof(struct smbios_board); + + copy_smbios_string(&buffer, board_args->vendor, board_args->vendor_len); + copy_smbios_string(&buffer, board_args->product, board_args->product_len); + copy_smbios_string(&buffer, board_args->version, board_args->version_len); + copy_smbios_string(&buffer, board_args->serial, board_args->serial_len); + copy_smbios_string(&buffer, board_args->asset_tag, board_args->asset_tag_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + + boot_info = (struct smbios_boot_info*)buffer; + boot_info->hdr.type = 32; + boot_info->hdr.length = sizeof(struct smbios_boot_info); + boot_info->hdr.handle = handle_count++; + memset(boot_info->reserved, 0, sizeof(boot_info->reserved)); + memset(boot_info->boot_status, 0, sizeof(boot_info->boot_status)); /* no errors detected */ + buffer += sizeof(struct smbios_boot_info); + *buffer++ = 0; + *buffer++ = 0; + + end_of_table = (struct smbios_header*)buffer; + end_of_table->type = 127; + end_of_table->length = sizeof(struct smbios_header); + end_of_table->handle = handle_count++; + buffer += sizeof(struct smbios_header); + *buffer++ = 0; + *buffer++ = 0; + + return STATUS_SUCCESS; +} + static size_t get_smbios_string( const char *path, char *str, size_t size ) { FILE *file; @@ -1333,210 +1568,63 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON case RSMB: { char bios_vendor[128], bios_version[128], bios_date[128]; - size_t bios_vendor_len, bios_version_len, bios_date_len; + struct smbios_bios_args bios_args; char system_vendor[128], system_product[128], system_version[128], system_serial[128]; - size_t system_vendor_len, system_product_len, system_version_len, system_serial_len; char system_sku[128], system_family[128]; - size_t system_sku_len, system_family_len; + struct smbios_system_args system_args; char board_vendor[128], board_product[128], board_version[128], board_serial[128], board_asset_tag[128]; - size_t board_vendor_len, board_product_len, board_version_len, board_serial_len, board_asset_tag_len; + struct smbios_board_args board_args; char chassis_vendor[128], chassis_version[128], chassis_serial[128], chassis_asset_tag[128]; char chassis_type[11] = "2"; /* unknown */ - size_t chassis_vendor_len, chassis_version_len, chassis_serial_len, chassis_asset_tag_len; - char *buffer = (char*)sfti->TableBuffer; - BYTE string_count; - BYTE handle_count = 0; - struct smbios_prologue *prologue; - struct smbios_bios *bios; - struct smbios_system *system; - struct smbios_board *board; - struct smbios_chassis *chassis; - struct smbios_boot_info *boot_info; - struct smbios_header *end_of_table; + struct smbios_chassis_args chassis_args; #define S(s) s, sizeof(s) - bios_vendor_len = get_smbios_string("/sys/class/dmi/id/bios_vendor", S(bios_vendor)); - bios_version_len = get_smbios_string("/sys/class/dmi/id/bios_version", S(bios_version)); - bios_date_len = get_smbios_string("/sys/class/dmi/id/bios_date", S(bios_date)); - system_vendor_len = get_smbios_string("/sys/class/dmi/id/sys_vendor", S(system_vendor)); - system_product_len = get_smbios_string("/sys/class/dmi/id/product_name", S(system_product)); - system_version_len = get_smbios_string("/sys/class/dmi/id/product_version", S(system_version)); - system_serial_len = get_smbios_string("/sys/class/dmi/id/product_serial", S(system_serial)); - system_sku_len = get_smbios_string("/sys/class/dmi/id/product_sku", S(system_sku)); - system_family_len = get_smbios_string("/sys/class/dmi/id/product_family", S(system_family)); - board_vendor_len = get_smbios_string("/sys/class/dmi/id/board_vendor", S(board_vendor)); - board_product_len = get_smbios_string("/sys/class/dmi/id/board_name", S(board_product)); - board_version_len = get_smbios_string("/sys/class/dmi/id/board_version", S(board_version)); - board_serial_len = get_smbios_string("/sys/class/dmi/id/board_serial", S(board_serial)); - board_asset_tag_len = get_smbios_string("/sys/class/dmi/id/board_asset_tag", S(board_asset_tag)); - chassis_vendor_len = get_smbios_string("/sys/class/dmi/id/chassis_vendor", S(chassis_vendor)); - chassis_version_len = get_smbios_string("/sys/class/dmi/id/chassis_version", S(chassis_version)); - chassis_serial_len = get_smbios_string("/sys/class/dmi/id/chassis_serial", S(chassis_serial)); - chassis_asset_tag_len = get_smbios_string("/sys/class/dmi/id/chassis_tag", S(chassis_asset_tag)); + bios_args.vendor_len = get_smbios_string("/sys/class/dmi/id/bios_vendor", S(bios_vendor)); + bios_args.vendor = bios_vendor; + bios_args.version_len = get_smbios_string("/sys/class/dmi/id/bios_version", S(bios_version)); + bios_args.version = bios_version; + bios_args.date_len = get_smbios_string("/sys/class/dmi/id/bios_date", S(bios_date)); + bios_args.date = bios_date; + + system_args.vendor_len = get_smbios_string("/sys/class/dmi/id/sys_vendor", S(system_vendor)); + system_args.vendor = system_vendor; + system_args.product_len = get_smbios_string("/sys/class/dmi/id/product_name", S(system_product)); + system_args.product = system_product; + system_args.version_len = get_smbios_string("/sys/class/dmi/id/product_version", S(system_version)); + system_args.version = system_version; + system_args.serial_len = get_smbios_string("/sys/class/dmi/id/product_serial", S(system_serial)); + system_args.serial = system_serial; + get_system_uuid(&system_args.uuid); + system_args.sku_len = get_smbios_string("/sys/class/dmi/id/product_sku", S(system_sku)); + system_args.sku = system_sku; + system_args.family_len = get_smbios_string("/sys/class/dmi/id/product_family", S(system_family)); + system_args.family = system_family; + + board_args.vendor_len = get_smbios_string("/sys/class/dmi/id/board_vendor", S(board_vendor)); + board_args.vendor = board_vendor; + board_args.product_len = get_smbios_string("/sys/class/dmi/id/board_name", S(board_product)); + board_args.product = board_product; + board_args.version_len = get_smbios_string("/sys/class/dmi/id/board_version", S(board_version)); + board_args.version = board_version; + board_args.serial_len = get_smbios_string("/sys/class/dmi/id/board_serial", S(board_serial)); + board_args.serial = board_serial; + board_args.asset_tag_len = get_smbios_string("/sys/class/dmi/id/board_asset_tag", S(board_asset_tag)); + board_args.asset_tag = board_asset_tag; + + chassis_args.vendor_len = get_smbios_string("/sys/class/dmi/id/chassis_vendor", S(chassis_vendor)); + chassis_args.vendor = chassis_vendor; get_smbios_string("/sys/class/dmi/id/chassis_type", S(chassis_type)); + chassis_args.type = atoi(chassis_type); + chassis_args.version_len = get_smbios_string("/sys/class/dmi/id/chassis_version", S(chassis_version)); + chassis_args.version = chassis_version; + chassis_args.serial_len = get_smbios_string("/sys/class/dmi/id/chassis_serial", S(chassis_serial)); + chassis_args.serial = chassis_serial; + chassis_args.asset_tag_len = get_smbios_string("/sys/class/dmi/id/chassis_tag", S(chassis_asset_tag)); + chassis_args.asset_tag = chassis_asset_tag; #undef S - *required_len = sizeof(struct smbios_prologue); - -#define L(l) (l + (l ? 1 : 0)) - *required_len += sizeof(struct smbios_bios); - *required_len += max(L(bios_vendor_len) + L(bios_version_len) + L(bios_date_len) + 1, 2); - - *required_len += sizeof(struct smbios_system); - *required_len += max(L(system_vendor_len) + L(system_product_len) + L(system_version_len) + - L(system_serial_len) + L(system_sku_len) + L(system_family_len) + 1, 2); - - *required_len += sizeof(struct smbios_board); - *required_len += max(L(board_vendor_len) + L(board_product_len) + L(board_version_len) + - L(board_serial_len) + L(board_asset_tag_len) + 1, 2); - - *required_len += sizeof(struct smbios_chassis); - *required_len += max(L(chassis_vendor_len) + L(chassis_version_len) + L(chassis_serial_len) + - L(chassis_asset_tag_len) + 1, 2); - - *required_len += sizeof(struct smbios_boot_info); - *required_len += 2; - - *required_len += sizeof(struct smbios_header); - *required_len += 2; -#undef L - - sfti->TableBufferLength = *required_len; - - *required_len += FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); - - if (available_len < *required_len) - return STATUS_BUFFER_TOO_SMALL; - - prologue = (struct smbios_prologue*)buffer; - prologue->calling_method = 0; - prologue->major_version = 2; - prologue->minor_version = 4; - prologue->revision = 0; - prologue->length = sfti->TableBufferLength - sizeof(struct smbios_prologue); - buffer += sizeof(struct smbios_prologue); - - string_count = 0; - bios = (struct smbios_bios*)buffer; - bios->hdr.type = 0; - bios->hdr.length = sizeof(struct smbios_bios); - bios->hdr.handle = handle_count++; - bios->vendor = bios_vendor_len ? ++string_count : 0; - bios->version = bios_version_len ? ++string_count : 0; - bios->start = 0; - bios->date = bios_date_len ? ++string_count : 0; - bios->size = 0; - bios->characteristics = 0x4; /* not supported */ - bios->characteristics_ext[0] = 0; - bios->characteristics_ext[1] = 0; - bios->system_bios_major_release = 0xFF; /* not supported */ - bios->system_bios_minor_release = 0xFF; /* not supported */ - bios->ec_firmware_major_release = 0xFF; /* not supported */ - bios->ec_firmware_minor_release = 0xFF; /* not supported */ - buffer += sizeof(struct smbios_bios); - - copy_smbios_string(&buffer, bios_vendor, bios_vendor_len); - copy_smbios_string(&buffer, bios_version, bios_version_len); - copy_smbios_string(&buffer, bios_date, bios_date_len); - if (!string_count) *buffer++ = 0; - *buffer++ = 0; - - string_count = 0; - system = (struct smbios_system*)buffer; - system->hdr.type = 1; - system->hdr.length = sizeof(struct smbios_system); - system->hdr.handle = handle_count++; - system->vendor = system_vendor_len ? ++string_count : 0; - system->product = system_product_len ? ++string_count : 0; - system->version = system_version_len ? ++string_count : 0; - system->serial = system_serial_len ? ++string_count : 0; - get_system_uuid( (GUID *)system->uuid ); - system->wake_up_type = 0x02; /* unknown */ - system->sku_number = system_sku_len ? ++string_count : 0; - system->family = system_family_len ? ++string_count : 0; - buffer += sizeof(struct smbios_system); - - copy_smbios_string(&buffer, system_vendor, system_vendor_len); - copy_smbios_string(&buffer, system_product, system_product_len); - copy_smbios_string(&buffer, system_version, system_version_len); - copy_smbios_string(&buffer, system_serial, system_serial_len); - copy_smbios_string(&buffer, system_sku, system_sku_len); - copy_smbios_string(&buffer, system_family, system_family_len); - if (!string_count) *buffer++ = 0; - *buffer++ = 0; - - string_count = 0; - chassis = (struct smbios_chassis*)buffer; - chassis->hdr.type = 3; - chassis->hdr.length = sizeof(struct smbios_chassis); - chassis->hdr.handle = handle_count++; - chassis->vendor = chassis_vendor_len ? ++string_count : 0; - chassis->type = atoi(chassis_type); - chassis->version = chassis_version_len ? ++string_count : 0; - chassis->serial = chassis_serial_len ? ++string_count : 0; - chassis->asset_tag = chassis_asset_tag_len ? ++string_count : 0; - chassis->boot_state = 0x02; /* unknown */ - chassis->power_supply_state = 0x02; /* unknown */ - chassis->thermal_state = 0x02; /* unknown */ - chassis->security_status = 0x02; /* unknown */ - chassis->oem_defined = 0; - chassis->height = 0; /* undefined */ - chassis->num_power_cords = 0; /* unspecified */ - chassis->num_contained_elements = 0; - chassis->contained_element_rec_length = 3; - buffer += sizeof(struct smbios_chassis); - - copy_smbios_string(&buffer, chassis_vendor, chassis_vendor_len); - copy_smbios_string(&buffer, chassis_version, chassis_version_len); - copy_smbios_string(&buffer, chassis_serial, chassis_serial_len); - copy_smbios_string(&buffer, chassis_asset_tag, chassis_asset_tag_len); - if (!string_count) *buffer++ = 0; - *buffer++ = 0; - - string_count = 0; - board = (struct smbios_board*)buffer; - board->hdr.type = 2; - board->hdr.length = sizeof(struct smbios_board); - board->hdr.handle = handle_count++; - board->vendor = board_vendor_len ? ++string_count : 0; - board->product = board_product_len ? ++string_count : 0; - board->version = board_version_len ? ++string_count : 0; - board->serial = board_serial_len ? ++string_count : 0; - board->asset_tag = board_asset_tag_len ? ++string_count : 0; - board->feature_flags = 0x5; /* hosting board, removable */ - board->location = 0; - board->chassis_handle = chassis->hdr.handle; - board->board_type = 0xa; /* motherboard */ - board->num_contained_handles = 0; - buffer += sizeof(struct smbios_board); - - copy_smbios_string(&buffer, board_vendor, board_vendor_len); - copy_smbios_string(&buffer, board_product, board_product_len); - copy_smbios_string(&buffer, board_version, board_version_len); - copy_smbios_string(&buffer, board_serial, board_serial_len); - copy_smbios_string(&buffer, board_asset_tag, board_asset_tag_len); - if (!string_count) *buffer++ = 0; - *buffer++ = 0; - - boot_info = (struct smbios_boot_info*)buffer; - boot_info->hdr.type = 32; - boot_info->hdr.length = sizeof(struct smbios_boot_info); - boot_info->hdr.handle = handle_count++; - memset(boot_info->reserved, 0, sizeof(boot_info->reserved)); - memset(boot_info->boot_status, 0, sizeof(boot_info->boot_status)); /* no errors detected */ - buffer += sizeof(struct smbios_boot_info); - *buffer++ = 0; - *buffer++ = 0; - - end_of_table = (struct smbios_header*)buffer; - end_of_table->type = 127; - end_of_table->length = sizeof(struct smbios_header); - end_of_table->handle = handle_count++; - buffer += sizeof(struct smbios_header); - *buffer++ = 0; - *buffer++ = 0; - - return STATUS_SUCCESS; + return create_smbios_tables( sfti, available_len, required_len, + &bios_args, &system_args, &board_args, &chassis_args ); } default: FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION provider %08x\n", sfti->ProviderSignature); -- 2.30.1 (Apple Git-130)

1 2

[PATCH] msvcrt: Avoid disallowed unaligned writes in memset on ARM
by Martin Storsjo Sept. 17, 2021

Sept. 17, 2021

From: Martin Storsjö <martin(a)martin.st> This fixes a regression in memset on ARM since 7b17d7081512db52ef852705445762ac4016c29f. ARM can do 64 bit writes with the STRD instruction, but that instruction requires a 32 bit aligned address - while these stores are unaligned. Two consecutive stores to uint32_t* pointers can also be fused into one single STRD, as a uint32_t* is supposed to be properly aligned - therefore, do these stores as stores to volatile uint32_t* to avoid fusing them. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/msvcrt/string.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index f2b1b4a5b11..bf491a91f40 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2878,15 +2878,37 @@ void *__cdecl memset(void *dst, int c, size_t n) if (n >= 16) { +#ifdef __arm__ + *(volatile uint32_t *)(d + 0) = v; + *(volatile uint32_t *)(d + 4) = v; + *(volatile uint32_t *)(d + 8) = v; + *(volatile uint32_t *)(d + 12) = v; + *(volatile uint32_t *)(d + n - 16) = v; + *(volatile uint32_t *)(d + n - 12) = v; + *(volatile uint32_t *)(d + n - 8) = v; + *(volatile uint32_t *)(d + n - 4) = v; +#else *(uint64_t *)(d + 0) = v; *(uint64_t *)(d + 8) = v; *(uint64_t *)(d + n - 16) = v; *(uint64_t *)(d + n - 8) = v; +#endif if (n <= 32) return dst; +#ifdef __arm__ + *(volatile uint32_t *)(d + 16) = v; + *(volatile uint32_t *)(d + 20) = v; + *(volatile uint32_t *)(d + 24) = v; + *(volatile uint32_t *)(d + 28) = v; + *(volatile uint32_t *)(d + n - 32) = v; + *(volatile uint32_t *)(d + n - 28) = v; + *(volatile uint32_t *)(d + n - 24) = v; + *(volatile uint32_t *)(d + n - 20) = v; +#else *(uint64_t *)(d + 16) = v; *(uint64_t *)(d + 24) = v; *(uint64_t *)(d + n - 32) = v; *(uint64_t *)(d + n - 24) = v; +#endif if (n <= 64) return dst; n = (n - a) & ~0x1f; @@ -2895,8 +2917,15 @@ void *__cdecl memset(void *dst, int c, size_t n) } if (n >= 8) { +#ifdef __arm__ + *(volatile uint32_t *)d = v; + *(volatile uint32_t *)(d + 4) = v; + *(volatile uint32_t *)(d + n - 4) = v; + *(volatile uint32_t *)(d + n - 8) = v; +#else *(uint64_t *)d = v; *(uint64_t *)(d + n - 8) = v; +#endif return dst; } if (n >= 4) -- 2.25.1

3 6

[PATCH resend 1/6] winegstreamer: Fix return code in init_gst failure case.
by Derek Lesho Sept. 17, 2021

Sept. 17, 2021

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/quartz_parser.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 5299f4dc2ed..a8e7e3d979f 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -982,7 +982,10 @@ static HRESULT parser_sink_connect(struct strmbase_sink *iface, IPin *peer, cons goto err; if (!filter->init_gst(filter)) + { + hr = E_FAIL; goto err; + } for (i = 0; i < filter->source_count; ++i) { -- 2.33.0

2 6

[PATCH] makefiles: Depend on winebuild even for unix libraries.
by Zebediah Figura Sept. 17, 2021

Sept. 17, 2021

winegcc runs `winebuild --fixup-ctors` when building them. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index eff8e33d3a3..9fa6d8c7f56 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3394,7 +3394,7 @@ static void output_module( struct makefile *make ) output( "%s:", obj_dir_path( make, unix_lib )); output_filenames_obj_dir( make, make->unixobj_files ); output_filenames( unix_deps ); - if (!native_unix_lib) output_filename( tools_path( make, "winebuild" )); + output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); output_winegcc_command( make, 0 ); -- 2.33.0

1 0

[PATCH v3 1/6] robocopy: Add stub
by Florian Eder Sept. 17, 2021

Sept. 17, 2021

Basic files and required changes to configure(.ac) to create a stub version of the robocopy utility Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43653 Signed-off-by: Florian Eder <others.meder(a)gmail.com> --- v3: Identical to the patch sent in v2 --- configure | 2 +- configure.ac | 1 + programs/robocopy/Makefile.in | 8 ++++++++ programs/robocopy/main.c | 29 +++++++++++++++++++++++++++++ programs/robocopy/robocopy.rc | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 programs/robocopy/Makefile.in create mode 100644 programs/robocopy/main.c create mode 100644 programs/robocopy/robocopy.rc diff --git a/configure b/configure index 00a5be6a504..a5767af3c60 100755 --- a/configure +++ b/configure @@ -21234,6 +21234,7 @@ wine_fn_config_makefile programs/regedit/tests enable_tests wine_fn_config_makefile programs/regini enable_regini wine_fn_config_makefile programs/regsvcs enable_regsvcs wine_fn_config_makefile programs/regsvr32 enable_regsvr32 +wine_fn_config_makefile programs/robocopy enable_robocopy wine_fn_config_makefile programs/rpcss enable_rpcss wine_fn_config_makefile programs/rundll.exe16 enable_win16 wine_fn_config_makefile programs/rundll32 enable_rundll32 @@ -22767,4 +22768,3 @@ IFS="$ac_save_IFS" $as_echo " $as_me: Finished. Do '${ac_make}' to compile Wine. " >&6 - diff --git a/configure.ac b/configure.ac index dea5fe61bf3..97c46565db3 100644 --- a/configure.ac +++ b/configure.ac @@ -3958,6 +3958,7 @@ WINE_CONFIG_MAKEFILE(programs/regedit/tests) WINE_CONFIG_MAKEFILE(programs/regini) WINE_CONFIG_MAKEFILE(programs/regsvcs) WINE_CONFIG_MAKEFILE(programs/regsvr32) +WINE_CONFIG_MAKEFILE(programs/robocopy) WINE_CONFIG_MAKEFILE(programs/rpcss) WINE_CONFIG_MAKEFILE(programs/rundll.exe16,enable_win16) WINE_CONFIG_MAKEFILE(programs/rundll32) diff --git a/programs/robocopy/Makefile.in b/programs/robocopy/Makefile.in new file mode 100644 index 00000000000..5a48be3725b --- /dev/null +++ b/programs/robocopy/Makefile.in @@ -0,0 +1,8 @@ +MODULE = robocopy.exe + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c + +RC_SRCS = robocopy.rc diff --git a/programs/robocopy/main.c b/programs/robocopy/main.c new file mode 100644 index 00000000000..00dacc8ab6c --- /dev/null +++ b/programs/robocopy/main.c @@ -0,0 +1,29 @@ +/* + * Copyright 2021 Florian Eder + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(robocopy); + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + WINE_FIXME("robocopy stub"); + return 0; +} diff --git a/programs/robocopy/robocopy.rc b/programs/robocopy/robocopy.rc new file mode 100644 index 00000000000..edae5b71d86 --- /dev/null +++ b/programs/robocopy/robocopy.rc @@ -0,0 +1,34 @@ +/* + * Copyright 2021 Florian Eder + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> + +#pragma makedep po + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define WINE_FILEDESCRIPTION_STR "Wine Robocopy" +#define WINE_FILENAME_STR "robocopy.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 5,1,10,1027 +#define WINE_FILEVERSION_STR "5.1.10.1027" + +#define WINE_PRODUCTVERSION 5,1,10,1027 +#define WINE_PRODUCTVERSION_STR "XP027" + +#include "wine/wine_common_ver.rc" -- 2.32.0

3 13

[PATCH 1/2] oleacc: Add Client_get_accFocus implementation.
by Connor McAdams Sept. 17, 2021

Sept. 17, 2021

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleacc/client.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 0c2215fe62e..4c6dc0ab18b 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -306,8 +306,26 @@ static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, static HRESULT WINAPI Client_get_accFocus(IAccessible *iface, VARIANT *pvarID) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%p)\n", This, pvarID); - return E_NOTIMPL; + GUITHREADINFO info; + + TRACE("(%p)->(%p)\n", This, pvarID); + + V_VT(pvarID) = VT_EMPTY; + info.cbSize = sizeof(info); + if(GetGUIThreadInfo(0, &info) && info.hwndFocus) { + if(info.hwndFocus == This->hwnd) { + V_VT(pvarID) = VT_I4; + V_I4(pvarID) = CHILDID_SELF; + } + else if(IsChild(This->hwnd, info.hwndFocus)) { + V_VT(pvarID) = VT_DISPATCH; + if(FAILED(AccessibleObjectFromWindow(info.hwndFocus, OBJID_WINDOW, + &IID_IDispatch, (void**)&V_DISPATCH(pvarID)))) + V_VT(pvarID) = VT_EMPTY; + } + } + + return S_OK; } static HRESULT WINAPI Client_get_accSelection(IAccessible *iface, VARIANT *pvarID) -- 2.25.1

2 3

[PATCH] makedep: Handle amd64 as x86-64.
by Gerald Pfeifer Sept. 17, 2021

Sept. 17, 2021

For historic reasons FreeBSD call x86-64 by the name of amd64. And when building ports it uses a variable named ARCH to hold that value (or i386 for x86). Wine uses a variable by that name, too, which gets overriden by the one coming from the system, leading to Wine not finding some of its files (since "x86-64" is hardcoded elsewhere). I was thinking to rename Wine's variable from ARCH to WINEARCH, alas that name is already taken for a different purpose. So best have makedep accept amd64 as a synonym for x86-64 and convert the former to the latter. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- tools/makedep.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index 59857762edd..ed7a58ed1f9 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4446,6 +4446,13 @@ int main( int argc, char *argv[] ) if (!man_ext) man_ext = "3w"; if (arch) { + /* For historic reasons FreeBSD calls x86-64 by the name of amd64 + * and features a variable ARCH with that value in the environment + * when building ports. This breaks Wine in interesting ways, so + * revert to the industry standard name when we enouncter amd64. + */ + if ( !strcmp(arch,"amd64") ) + arch = "x86-64"; so_dir = strmake( "$(dlldir)/%s-unix", arch ); pe_dir = strmake( "$(dlldir)/%s-windows", arch ); } -- 2.31.1

2 1

[PATCH] mscoree: Update Wine Mono to 6.4.0.
by Esme Povirk Sept. 17, 2021

Sept. 17, 2021

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index dda94d34e1a..7ef7ca312ae 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,10 +58,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "6.3.0" +#define MONO_VERSION "6.4.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0" +#define MONO_SHA "db8b85f3b910590f61adbfa0005a995d613e299a1cc73d00553d70dc81010e36" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 985cdeff770..04844c8da69 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "6.3.0" +#define WINE_MONO_VERSION "6.4.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.30.2

2 1