[PATCH v6 1/6] winex11.drv: Use length returned from sprintfW().

Zhiyi Zhang zzhang at codeweavers.com
Tue Jun 1 22:03:35 CDT 2021


A minor optimization.

Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
---
v5: Supersede 206067~206071. Rebase to master and some minor improvements, thanks to Rémi.
v6: Supersede 207021~207026. Changes in 5/6 nulldrv_GetMonitorInfo() should be in 3/6.

 dlls/winex11.drv/display.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c
index b647455a01f..b3ff213ae89 100644
--- a/dlls/winex11.drv/display.c
+++ b/dlls/winex11.drv/display.c
@@ -586,6 +586,7 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo
 {
     SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)};
     WCHAR bufferW[MAX_PATH];
+    DWORD length;
     HKEY hkey;
     BOOL ret = FALSE;
 
@@ -629,9 +630,9 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo
                                    (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0))
         goto done;
     /* Adapter name */
-    sprintfW(bufferW, adapter_name_fmtW, video_index + 1);
+    length = sprintfW(bufferW, adapter_name_fmtW, video_index + 1);
     if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING,
-                                   (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR), 0))
+                                   (const BYTE *)bufferW, (length + 1) * sizeof(WCHAR), 0))
         goto done;
 
     ret = TRUE;
-- 
2.30.2




More information about the wine-devel mailing list