Zhiyi Zhang : winemac.drv: Use length returned from sprintfW().

Alexandre Julliard julliard at winehq.org
Tue Aug 17 16:26:51 CDT 2021


Module: wine
Branch: master
Commit: 4a6fb0307b31a8597aa7560586c42566587b1d1f
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4a6fb0307b31a8597aa7560586c42566587b1d1f

Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date:   Tue Aug 17 16:41:47 2021 +0800

winemac.drv: Use length returned from sprintfW().

A minor optimization.

Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

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

diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c
index 6706c88341c..5a87e2331be 100644
--- a/dlls/winemac.drv/display.c
+++ b/dlls/winemac.drv/display.c
@@ -1630,6 +1630,7 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m
     SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)};
     WCHAR nameW[MAX_PATH];
     WCHAR bufferW[MAX_PATH];
+    DWORD length;
     HKEY hkey;
     RECT rect;
     BOOL ret = FALSE;
@@ -1677,9 +1678,9 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m
                                    (const BYTE *)&rect, sizeof(rect), 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, (lstrlenW(bufferW) + 1) * sizeof(WCHAR), 0))
+                                   (const BYTE *)bufferW, (length + 1) * sizeof(WCHAR), 0))
         goto done;
 
     ret = TRUE;




More information about the wine-cvs mailing list