setupapi: Avoid unnecessary buffer allocation in SetupDiCreateDeviceInfoA().

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

setupapi: Avoid unnecessary buffer allocation in SetupDiCreateDeviceInfoA().
ad531404 · Zebediah Figura · Alexandre Julliard · 8289c651 · ad531404
Commit ad531404 authored Nov 27, 2018 by Zebediah Figura Committed by Alexandre Julliard Nov 28, 2018
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 8 deletions

devinst.c dlls/setupapi/devinst.c +3 -8

No files found.
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -1341,8 +1341,8 @@ BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, const char *name,
        const GUID *ClassGuid, PCSTR DeviceDescription, HWND hwndParent, DWORD CreationFlags,
        PSP_DEVINFO_DATA DeviceInfoData)
 {
+    WCHAR nameW[MAX_DEVICE_ID_LEN];
    BOOL ret = FALSE;
-    LPWSTR DeviceNameW = NULL;
    LPWSTR DeviceDescriptionW = NULL;
    if (!name || strlen(name) >= MAX_DEVICE_ID_LEN)
@@ -1351,23 +1351,18 @@ BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, const char *name,
        return FALSE;
    }
-    DeviceNameW = MultiByteToUnicode(name, CP_ACP);
+    MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, sizeof(nameW));
-    if (DeviceNameW == NULL) return FALSE;
    if (DeviceDescription)
    {
        DeviceDescriptionW = MultiByteToUnicode(DeviceDescription, CP_ACP);
        if (DeviceDescriptionW == NULL)
-        {
-            MyFree(DeviceNameW);
            return FALSE;
    }
-    }
-    ret = SetupDiCreateDeviceInfoW(DeviceInfoSet, DeviceNameW, ClassGuid, DeviceDescriptionW,
+    ret = SetupDiCreateDeviceInfoW(DeviceInfoSet, nameW, ClassGuid, DeviceDescriptionW,
            hwndParent, CreationFlags, DeviceInfoData);
-    MyFree(DeviceNameW);
    MyFree(DeviceDescriptionW);
    return ret;