From d8efd058a83b88dd66f98685c71141eeccb4f1dd Mon Sep 17 00:00:00 2001 From: winesync Date: Fri, 5 Jan 2024 16:49:06 +0100 Subject: [PATCH] [WINESYNC] setupapi: Make sure DeviceInterfaceData->cbSize is initialized in SetupDiEnumDeviceInterfaces. wine commit id 8d854a4830776aaacb70161709db315d54eb77f0 by Austin English --- dll/win32/setupapi/devinst.c | 3 +++ sdk/tools/winesync/setupapi.cfg | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index 5ded385a717..b71bf227cab 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -2831,8 +2831,11 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + /* In case application fails to check return value, clear output */ memset(DeviceInterfaceData, 0, sizeof(*DeviceInterfaceData)); + DeviceInterfaceData->cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); + if (DeviceInfoData) { struct DeviceInfo *devInfo = diff --git a/sdk/tools/winesync/setupapi.cfg b/sdk/tools/winesync/setupapi.cfg index 497fef193d9..295d65e35bf 100644 --- a/sdk/tools/winesync/setupapi.cfg +++ b/sdk/tools/winesync/setupapi.cfg @@ -5,4 +5,4 @@ files: dlls/setupapi/misc.c: dll/win32/setupapi/misc.c dlls/setupapi/stubs.c: dll/win32/setupapi/stubs.c tags: - wine: 9c76ccfda124ca471b3de4d8a04aed1e15a6b9f2 + wine: 8d854a4830776aaacb70161709db315d54eb77f0