May 2020 - Wine-Devel - list.winehq.org

[PATCH] ntdll: Fix length calculation of generated SMBIOS tables.
by Brendan Shanks May 13, 2020

May 13, 2020

An extra byte for a null-terminator was added for every string, but not used when the string was empty. This resulted in extra bytes at the end of the buffer, causing parse errors in dmidecode. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/nt.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 6c95517e79..4dced31641 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2191,19 +2191,21 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG *required_len = sizeof(struct smbios_prologue); +#define L(l) (l + (l ? 1 : 0)) *required_len += sizeof(struct smbios_bios); - *required_len += max(bios_vendor_len + bios_version_len + bios_date_len + 4, 2); + *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(system_vendor_len + system_product_len + system_version_len + - system_serial_len + system_sku_len + system_family_len + 7, 2); + *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(board_vendor_len + board_product_len + board_version_len + board_serial_len + 5, 2); + *required_len += max(L(board_vendor_len) + L(board_product_len) + L(board_version_len) + L(board_serial_len) + 1, 2); *required_len += sizeof(struct smbios_chassis); - *required_len += max(chassis_vendor_len + chassis_version_len + chassis_serial_len + - chassis_asset_tag_len + 5, 2); + *required_len += max(L(chassis_vendor_len) + L(chassis_version_len) + L(chassis_serial_len) + + L(chassis_asset_tag_len) + 1, 2); +#undef L sfti->TableBufferLength = *required_len; -- 2.26.2

1 0

[PATCH] dmusic: Remove an unused function
by Michael Stefaniuc May 13, 2020

May 13, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/collection.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 1fddab5c5a..13d5ce868d 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -49,11 +49,6 @@ static inline IDirectMusicCollectionImpl *impl_from_IDirectMusicCollection(IDire return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, IDirectMusicCollection_iface); } -static inline struct dmobject *impl_from_IDirectMusicObject(IDirectMusicObject *iface) -{ - return CONTAINING_RECORD(iface, struct dmobject, IDirectMusicObject_iface); -} - static inline IDirectMusicCollectionImpl *impl_from_IPersistStream(IPersistStream *iface) { return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, dmobj.IPersistStream_iface); -- 2.26.2

1 0

[PATCH] dmscript: Remove unused function.
by Jacek Caban May 13, 2020

May 13, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dmscript/script.c | 6 ------ 1 file changed, 6 deletions(-)

2 1

[PATCH] setupapi: Correct SetupDiGetActualSectionToInstall[Ex]A/W .spec file entries.
by Gijs Vermeulen May 13, 2020

May 13, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- section_ext is an out pointer. dlls/setupapi/setupapi.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 26b4a6f7fb..ceb4904b18 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -315,10 +315,10 @@ @ stdcall SetupDiEnumDeviceInterfaces(long ptr ptr long ptr) @ stdcall SetupDiEnumDriverInfoA(ptr ptr long long ptr) @ stdcall SetupDiEnumDriverInfoW(ptr ptr long long ptr) -@ stdcall SetupDiGetActualSectionToInstallA(long str str long ptr ptr) -@ stdcall SetupDiGetActualSectionToInstallExA(long str ptr str long ptr ptr ptr) -@ stdcall SetupDiGetActualSectionToInstallExW(long wstr ptr wstr long ptr ptr ptr) -@ stdcall SetupDiGetActualSectionToInstallW(long wstr wstr long ptr ptr) +@ stdcall SetupDiGetActualSectionToInstallA(long str ptr long ptr ptr) +@ stdcall SetupDiGetActualSectionToInstallExA(long str ptr ptr long ptr ptr ptr) +@ stdcall SetupDiGetActualSectionToInstallExW(long wstr ptr ptr long ptr ptr ptr) +@ stdcall SetupDiGetActualSectionToInstallW(long wstr ptr long ptr ptr) @ stdcall SetupDiGetClassBitmapIndex(ptr ptr) @ stdcall SetupDiGetClassDescriptionA(ptr str long ptr) @ stdcall SetupDiGetClassDescriptionExA(ptr str long ptr str ptr) -- 2.26.2

1 0

[PATCH 1/2] wined3d: Correct required extension for R8G8B8A8_UINT.
by Chip Davis May 13, 2020

May 13, 2020

GL_ARB_texture_rgb10_a2ui provides support for the GL_RGB10_A2UI format, and nothing else. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 3379b7386cfe..c6ae308eb105 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1566,7 +1566,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_R8G8B8A8_UINT, GL_RGBA8UI, GL_RGBA8UI, 0, GL_RGBA_INTEGER, GL_UNSIGNED_INT_8_8_8_8_REV, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, - ARB_TEXTURE_RGB10_A2UI, NULL}, + EXT_TEXTURE_INTEGER, NULL}, {WINED3DFMT_R8G8B8A8_SINT, GL_RGBA8I, GL_RGBA8I, 0, GL_RGBA_INTEGER, GL_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, -- 2.24.0

4 6

[PATCH] include/dwrite.idl: fix typo
by Biswapriyo Nath May 13, 2020

May 13, 2020

1 0

[PATCH] include/dwrite_1.idl: fix typo
by Biswapriyo Nath May 13, 2020

May 13, 2020

1 0

[PATCH] include: edit dwrite.idl file
by Biswapriyo Nath May 13, 2020

May 13, 2020

2 1

[PATCH] notepad: Use int for point size value.
by Jacek Caban May 13, 2020

May 13, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/notepad/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)

1 0

[PATCH] winemac: Add default case in isMouseMoveEventType.
by Gijs Vermeulen May 13, 2020

May 13, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- This fixes a Clang warning. dlls/winemac.drv/cocoa_app.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 87a73b6da9..8e66721da1 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1229,9 +1229,9 @@ - (BOOL) isMouseMoveEventType:(CGEventType)type case kCGEventRightMouseDragged: case kCGEventOtherMouseDragged: return TRUE; + default: + return FALSE; } - - return FALSE; } - (int) warpsFinishedByEventTime:(CGEventTimestamp)eventTime location:(CGPoint)eventLocation -- 2.26.2

2 1