[PATCH] shlwapi: Avoid a temporary variable

Michael Stefaniuc mstefani at winehq.org
Fri Sep 14 17:10:29 CDT 2018


Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
 dlls/shlwapi/thread.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c
index eb2c35d6dc..5726b855dc 100644
--- a/dlls/shlwapi/thread.c
+++ b/dlls/shlwapi/thread.c
@@ -491,7 +491,6 @@ HANDLE WINAPI SHGlobalCounterCreateNamedW(LPCWSTR lpszName, DWORD iInitial)
   static const WCHAR szPrefix[] = { 's', 'h', 'e', 'l', 'l', '.', '\0' };
   const int iPrefixLen = 6;
   WCHAR szBuff[MAX_PATH];
-  const int iBuffLen = sizeof(szBuff)/sizeof(WCHAR);
   SECURITY_DESCRIPTOR sd;
   SECURITY_ATTRIBUTES sAttr, *pSecAttr;
   HANDLE hRet;
@@ -501,7 +500,7 @@ HANDLE WINAPI SHGlobalCounterCreateNamedW(LPCWSTR lpszName, DWORD iInitial)
   /* Create Semaphore name */
   memcpy(szBuff, szPrefix, (iPrefixLen + 1) * sizeof(WCHAR));
   if (lpszName)
-    StrCpyNW(szBuff + iPrefixLen, lpszName, iBuffLen - iPrefixLen);
+    StrCpyNW(szBuff + iPrefixLen, lpszName, ARRAY_SIZE(szBuff) - iPrefixLen);
 
   /* Initialise security attributes */
   pSecAttr = CreateAllAccessSecurityAttributes(&sAttr, &sd, 0);
-- 
2.14.4




More information about the wine-devel mailing list